Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-04-27 11:14:27 +08:00
parent d235bdad8f 20c1c2e4f4
commit 622bc004ee
15 changed files with 107 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
View File

@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core';
* @Author : Shiming
* @Date : 2022-01-05 11:01:55
* @LastEditors : Shiming
* @LastEditTime : 2022-04-25 10:28:10
* @LastEditTime : 2022-04-27 11:13:07
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -220,16 +220,22 @@ export class ContractManagementTemplateTextComponent implements OnInit {
}
save() {
// if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) {
// this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
// return;
// }
// if (this.sf.value.templateType == 'MX') {
// if (this.sf.value.contractType == '') {
// this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
// return;
// }
// }
console.log(this.sf.value.templateName);
console.log(this.sf.value.templateType);
console.log(this.sf2.value.templateContent);
console.log(this.title);
console.log(this.title || this.detailList.templateName);
if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !(this.title || this.detailList.templateName)) {
this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
return;
}
if (this.sf.value.templateType == 'MX') {
if (this.sf.value.contractType == '') {
this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
return;
}
}
const params = {
...this.sf.value,
...this.sf2.value,

2
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-04-20 14:46:48
* @LastEditTime : 2022-04-27 10:15:09
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/

16
src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
View File

@ -77,7 +77,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@ -122,7 +122,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@ -175,7 +175,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@ -220,7 +220,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@ -284,7 +284,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@ -330,7 +330,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@ -392,7 +392,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',
@ -438,7 +438,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
],
position: '2',

16
src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
View File

@ -70,7 +70,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -115,7 +115,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -168,7 +168,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.dischargePlace[0]}`,
`上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -213,7 +213,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.dischargePlace[0]}`,
`上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -283,7 +283,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -328,7 +328,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -381,7 +381,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.dischargePlace[0]}`,
`上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -426,7 +426,7 @@ export class VehicleSureArriveComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.dischargePlace[0]}`,
`上传位置:${this.i?.unloadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',

8
src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
View File

@ -82,7 +82,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -127,7 +127,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -205,7 +205,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -250,7 +250,7 @@ export class VehicleSureDepartComponent implements OnInit {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingPlace[0]}`,
`上传位置:${this.i?.loadDetailedAddress}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',

16
src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
View File

@ -4,8 +4,8 @@
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
* @LastEditTime : 2022-02-24 20:14:21
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\list\\particulars.component.html
* @LastEditTime : 2022-04-27 10:17:31
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\particulars\\particulars.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''"> </page-header-wrapper>
@ -43,8 +43,16 @@
</div>
</nz-card>
<nz-card>
<nz-card class="table-box">
<div class="tab_header">
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
<nz-tab [nzTitle]="'付款单'"></nz-tab>
<nz-tab [nzTitle]="'退款单'"></nz-tab>
</nz-tabset>
</div>
<!-- 数据列表 -->
<div>
<st
#st
[bordered]="true"
@ -57,4 +65,6 @@
[loading]="service.http.loading"
>
</st>
</div>
</nz-card>

21
src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts
View File

@ -20,7 +20,12 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
sf!: SFComponent;
spuStatus = '1';
_$expand = false;
data = [{ name1: 1111 }];
tabs = {
payQuantity: 0,
cancelQuantity: 0,
};
resourceStatus: any;
data = this.service.$api_get_searchPageList;
constructor(
public router: Router,
public ar: ActivatedRoute,
@ -46,8 +51,13 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
*/
get reqParams() {
const params: any = Object.assign({}, this.sf?.value || {});
const a: any = {};
if (this.resourceStatus) {
a.representationsStatus = this.resourceStatus;
}
delete params._$expand;
return {
...a,
...params,
deadlineTime: {
start: this.sf?.value?.deadlineTime?.[0] || '',
@ -120,7 +130,14 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
}
};
}
selectChange(e: number) {
this.resourceStatus = e;
this.initST();
setTimeout(() => {
this.data = this.service.$api_get_searchRefundPageList
this.st.load();
}, 500);
}
initST() {
this.columns = [
{

4
src/app/routes/partner/rebate-management/services/rebate-management.service.ts
View File

@ -29,6 +29,10 @@ export class RebateManagementService extends BaseService {
public $api_get_getIncomeByBillpage = '/api/bpc/partnerIncomeHead/getIncomeByBillpage';
// 获取返佣模板信息
public $api_get_getPartnerRebateConfigInfo = '/api/mdc/rebateConfig/getPartnerRebateConfigInfo';
// 合伙人管理/返佣管理/返佣明细
public $api_get_searchPageList= '/api/fcc/billPaymentApplicationOBC/list/searchPageList';
// 合伙人管理/返佣管理/退款返佣明细
public $api_get_searchRefundPageList= '/api/fcc/billPaymentApplicationOBC/list/searchRefundPageList';
  // 查询合伙人信息-分页
public $api_get_partner_page = '/api/mdc/partner/list/page';
constructor(public injector: Injector) {

39
src/app/routes/partner/system-config/components/config/config.component.html
View File

@ -1,13 +1,5 @@
<nz-card>
<div nz-row [nzGutter]="8">
<div nz-col nzSpan="4">
<ul nz-menu nzMode="inline" class="card-height">
<li nz-menu-item [nzSelected]="idx === 0" (click)="changeType(idx)" *ngFor="let item of tabs; let idx = index">
{{ item.name }}
</li>
</ul>
</div>
<div nz-col nzSpan="20" style="overflow: scroll">
<nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab === 0">
<h3 style="font-weight: 600">提现手续费配置</h3>
@ -74,37 +66,6 @@
</div>
</div>
</nz-card>
<nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab === 1">
<h3 style="font-weight: 600;">邀请合伙人</h3>
<sf
style="margin-left: 14px"
#sf
mode="default"
[formData]="i"
[schema]="schema"
[ui]="{ '*': { spanLabelFixed: 200, grid: { span: 24 } } }"
button="none"
>
</sf>
<h3 style="font-weight: 600;">邀请客户</h3>
<sf
style="margin-left: 14px"
#sf2
mode="default"
[formData]="i"
[schema]="schema2"
[ui]="{ '*': { spanLabelFixed: 200, grid: { span: 24 } } }"
button="none"
>
<ng-template sf-template="start" let-me let-ui="ui" let-schema="schema"> </ng-template>
<template id="tpl">
<span>so good </span>
</template>
</sf>
</nz-card>
<div class="mb-md save-btn">
<button class="ml-lg" nz-button nzSize="large" nzType="primary">保存</button>
<button class="ml-lg" nz-button nzSize="large">取消</button>

25
src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
View File

@ -1,3 +1,22 @@
<app-dynamic-setting-h5 [tabs]="tabs" [configList]="configList" [selectedTab]="selectedTab"
(selectedEvent)="getConfigList($event)" (saveEvent)="saveAction($event)" [labelWidth]="labelWidth">
</app-dynamic-setting-h5>
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-21 13:49:22
* @LastEditors : Shiming
* @LastEditTime : 2022-04-27 10:56:40
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<app-dynamic-setting-h5
[tabs]="tabs"
[configList]="configList"
[selectedTab]="selectedTab"
(selectedEvent)="getConfigList($event)"
(saveEvent)="saveAction($event)"
[labelWidth]="labelWidth"
>
<custom-element>
<app-parterl-config></app-parterl-config>
</custom-element>
</app-dynamic-setting-h5>

5
src/app/routes/sys-setting/sys-setting.module.ts
View File

@ -6,7 +6,7 @@
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts
*/
import { NgModule } from '@angular/core';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { DynamicSettingModule, SharedModule } from '@shared';
import { StaffManagementComponent } from './components/staff-management/staff-management.component';
@ -73,6 +73,7 @@ const NOTROUTECOMPONENTS = [
];
@NgModule({
declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],
imports: [CommonModule, SysSettingRoutingModule, SharedModule, DynamicSettingModule]
imports: [CommonModule, SysSettingRoutingModule, SharedModule, DynamicSettingModule],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class SysSettingModule {}