From 741b5e4f8e65c201be026bd55a76777325a49de2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 15:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bulk/bulk.component.html | 2 +- .../components/bulk/bulk.component.ts | 6 +- .../compliance-audit.component.ts | 8 +- .../components/vehicle/vehicle.component.ts | 6 +- .../rebate-setting/add/add.component.html | 2 +- .../rebate-setting/add/add.component.ts | 70 ++++---- .../rebate-setting.component.html | 2 +- .../rebate-setting.component.ts | 8 +- .../basic-setting.component.html | 4 +- .../components/config/config.component.ts | 151 ++++++++++-------- 10 files changed, 135 insertions(+), 124 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index a2b6d182..47b1cd8f 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 16:51:29 + * @LastEditTime : 2022-04-27 15:32:22 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index aeccbc6d..f027a4e3 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -608,11 +608,11 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements title: '变更前', width: '100px', className: 'text-center', - index: 'amountAfterChange', - render: 'amountAfterChange' + index: 'amountBeforeChange', + render: 'amountBeforeChange' }, { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center', render: 'amountchangeValue' }, - { title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' } + { title: '变更后', index: 'amountAfterChange', render: 'amountAfterChange', width: '120px', className: 'text-center' } ]; } /** diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 4b645c2f..231c5d61 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -422,8 +422,8 @@ export class OrderManagementComplianceAuditComponent extends BasicTableComponent title: '变更前', width: '100px', className: 'text-center', - index: 'amountAfterChange', - render: 'amountAfterChange' + index: 'amountBeforeChange', + render: 'amountBeforeChange' }, { title: '变更值', @@ -434,8 +434,8 @@ export class OrderManagementComplianceAuditComponent extends BasicTableComponent }, { title: '变更后', - index: 'amountBeforeChange', - render: 'amountBeforeChange', + index: 'amountAfterChange', + render: 'amountAfterChange', width: '120px', className: 'text-center' } diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 5e6bca10..ef242949 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -522,11 +522,11 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme title: '变更前', width: '100px', className: 'text-center', - index: 'amountAfterChange', - render: 'amountAfterChange' + index: 'amountBeforeChange', + render: 'amountBeforeChange' }, { title: '变更值', index: 'amountchangeValue', render: 'amountchangeValue', width: '120px', className: 'text-center' }, - { title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' } + { title: '变更后', index: 'amountAfterChange', render: 'amountAfterChange', width: '120px', className: 'text-center' } ]; } // 获取城市列表 diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index e1f63b54..a72764af 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 13:38:57 + * @LastEditTime : 2022-04-27 15:03:23 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 5e40e54d..96080492 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-21 09:26:45 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 13:44:19 + * @LastEditTime : 2022-04-27 14:14:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -143,33 +143,33 @@ export class ParterRebateManageMentAddComponent implements OnInit { }); } save() { - if(!this.configName) { - this.service.msgSrv.warning('请输入配置名称！'); - return - } - if(!this.accountingRate) { - this.service.msgSrv.warning('请输入固定结算费率！'); - return - } - if(!this.partnerType) { - this.service.msgSrv.warning('请选择合伙人范围！'); - return - } - if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) { - this.service.msgSrv.warning('请选择合伙人！'); - return - } - let real = false; - this.table.data.forEach((element: any) => { - if (element.startAmount > element.endAmount) { - real = true; - return; - } - }); - if (real) { - this.service.msgSrv.warning('初始业务量不能超过到达业务量！'); - return; - } + // if(!this.configName) { + // this.service.msgSrv.warning('请输入配置名称！'); + // return + // } + // if(!this.accountingRate) { + // this.service.msgSrv.warning('请输入固定结算费率！'); + // return + // } + // if(!this.partnerType) { + // this.service.msgSrv.warning('请选择合伙人范围！'); + // return + // } + // if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) { + // this.service.msgSrv.warning('请选择合伙人！'); + // return + // } + // let real = false; + // this.table.data.forEach((element: any) => { + // if (element.startAmount > element.endAmount) { + // real = true; + // return; + // } + // }); + // if (real) { + // this.service.msgSrv.warning('初始业务量不能超过到达业务量！'); + // return; + // } const params = { accountingRate: this.accountingRate, @@ -182,12 +182,14 @@ export class ParterRebateManageMentAddComponent implements OnInit { remark: this.remark, partnerType: this.partnerType }; - this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('新增成功！'); - this.router.navigate(['/partner/rebate/setting']); - } - }); + console.log(params); + + // this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { + // if (res) { + // this.service.msgSrv.success('新增成功！'); + // this.router.navigate(['/partner/rebate/setting']); + // } + // }); } initData(id: string) { this.service.request(this.service.$api_get_getPartnerRebateConfigInfo, { id: id }).subscribe((res: any) => { diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html index 5d636436..b433bc9f 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html @@ -58,7 +58,7 @@
自定义合伙人
-
{{item?.stateLocked ? '启用' : '禁用'}}
+
{{item?.stateLocked ? '生效中' : '失效'}}
 diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts index 49a1d8d0..08265976 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts @@ -77,12 +77,12 @@ export class ParterRebateManageMentSettingComponent implements OnInit { initST() { this.columns = [ { - title: '配置名称', + title: '模板名称', index: 'configName', width: '200px', }, { - title: '配置类型', + title: '等级类型', render: 'configType', width: '200px', @@ -93,7 +93,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit { width: '250px', }, { - title: '关联合伙人范围', + title: '合伙人范围', render: 'partnerType', width: '200px', }, @@ -103,7 +103,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit { width: '200px', }, { - title: '启用时间', + title: '生效时间', index: 'enableTime', width: '200px', }, diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html index b9beb147..c1c43834 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-21 13:49:22 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 11:29:10 + * @LastEditTime : 2022-04-27 15:17:08 * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -17,6 +17,6 @@ [labelWidth]="labelWidth" > - + diff --git a/src/app/routes/sys-setting/components/config/config.component.ts b/src/app/routes/sys-setting/components/config/config.component.ts index 54e0265c..d1a92c7b 100644 --- a/src/app/routes/sys-setting/components/config/config.component.ts +++ b/src/app/routes/sys-setting/components/config/config.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, Input, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; import { SFComponent, SFSchema, SFUploadWidgetSchema } from '@delon/form'; import { NzUploadFile } from 'ng-zorro-antd/upload'; import { Observable, Observer, of } from 'rxjs'; @@ -23,9 +23,13 @@ const IMAGECONFIG = { templateUrl: './config.component.html', styleUrls: ['./config.component.less'] }) -export class PartnerSystemConfigComponent implements OnInit { +export class PartnerSystemConfigComponent implements OnInit, OnChanges { @ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf2', { static: false }) sf2!: SFComponent; + + @Input() + configList: any[] = []; + formDate: any = { isAudit: false, isEveryDay: false, @@ -35,9 +39,9 @@ export class PartnerSystemConfigComponent implements OnInit { enterpriseValue!: number; auditValue!: number; auditTime!: any; - auditTimeStatus: boolean = false - everyDay: boolean = false - MonthDay: boolean = false + auditTimeStatus: boolean = false; + everyDay: boolean = false; + MonthDay: boolean = false; time: Date | null = null; defaultOpenValue = new Date(0, 0, 0, 0, 0, 0); tabs = [ @@ -49,22 +53,27 @@ export class PartnerSystemConfigComponent implements OnInit { } ]; selectedTab = 0; - TimeStatus: boolean = true - everyDayData: Array =[]; + TimeStatus: boolean = true; + everyDayData: Array = []; MonthDayData: any = [ - {month: [ - { label: '周一', value: '周一', }, - { label: '周二', value: '周二' }, - { label: '周三', value: '周三' }, - { label: '周四', value: '周四' }, - { label: '周五', value: '周五' }, - { label: '周六', value: '周六' }, - { label: '周日', value: '周日' } - ], Times:[ { - startTime: [], - endTime: [], - }]} - ] + { + month: [ + { label: '周一', value: '周一' }, + { label: '周二', value: '周二' }, + { label: '周三', value: '周三' }, + { label: '周四', value: '周四' }, + { label: '周五', value: '周五' }, + { label: '周六', value: '周六' }, + { label: '周日', value: '周日' } + ], + Times: [ + { + startTime: [], + endTime: [] + } + ] + } + ]; checkOptionsOne = [ { label: '周一', value: '周一', checked: true }, @@ -94,83 +103,83 @@ export class PartnerSystemConfigComponent implements OnInit { // listType: 'picture-card', // showRequired: true // }; - + constructor(private service: SystemService) {} + ngOnChanges(changes: SimpleChanges): void { + if (changes.configList) { + console.log(changes.configList.currentValue); + } + } ngOnInit() { this.initSF(); this.everyDayData = [ - { - startTime: '', - endTime: '', - } - ] - } - addEvery() { - this.everyDayData.push( - { - startTime: [], - endTime: [], - } - ) - } - delEvery(index: number) { - this.everyDayData.splice(index, 1) - - } - addMonthEvery(value: any) { - this.MonthDayData[value].Times.push( { startTime: '', endTime: '' } - ) + ]; + } + addEvery() { + this.everyDayData.push({ + startTime: [], + endTime: [] + }); + } + delEvery(index: number) { + this.everyDayData.splice(index, 1); + } + addMonthEvery(value: any) { + this.MonthDayData[value].Times.push({ + startTime: '', + endTime: '' + }); } addMonth() { - this.MonthDayData.push( - {month: [ - { label: '周一', value: '周一', }, + this.MonthDayData.push({ + month: [ + { label: '周一', value: '周一' }, { label: '周二', value: '周二' }, { label: '周三', value: '周三' }, { label: '周四', value: '周四' }, { label: '周五', value: '周五' }, { label: '周六', value: '周六' }, { label: '周日', value: '周日' } - ], Times:[{ - startTime: '', - endTime: '' - }]} - ) - + ], + Times: [ + { + startTime: '', + endTime: '' + } + ] + }); } - delMonth(value: number,index: number) { - this.MonthDayData[value].Times.splice(index, 1) + delMonth(value: number, index: number) { + this.MonthDayData[value].Times.splice(index, 1); } changeType(type: number): void { this.selectedTab = type; } changeMonth(type: any): void { console.log(type); - console.log( this.MonthDayData); + console.log(this.MonthDayData); } everyDayChange(type: any): void { console.log(type); - if(type) { - this.MonthDay = false - this.TimeStatus = true + if (type) { + this.MonthDay = false; + this.TimeStatus = true; } } MonthDayChange(type: any): void { console.log(type); - if(type) { - this.everyDay = false - this.TimeStatus = false + if (type) { + this.everyDay = false; + this.TimeStatus = false; } } - initSF() { - this.schema = { properties: { roadTransportPhoto: { title: '', type: 'string', ui: { hidden: true } }, @@ -184,7 +193,7 @@ export class PartnerSystemConfigComponent implements OnInit { if (args.type === 'success') { this.sf.setValue('/roadTransportPhoto', args.fileList[0].response.data.fullFilePath); } - }, + } } as SFUploadWidgetSchema }, share: { title: '', type: 'string', ui: { hidden: true } }, @@ -198,7 +207,7 @@ export class PartnerSystemConfigComponent implements OnInit { if (args.type === 'success') { this.sf.setValue('/share', args.fileList[0].response.data.fullFilePath); } - }, + } } as SFUploadWidgetSchema }, take: { title: '', type: 'string', ui: { hidden: true } }, @@ -212,7 +221,7 @@ export class PartnerSystemConfigComponent implements OnInit { if (args.type === 'success') { this.sf.setValue('/take', args.fileList[0].response.data.fullFilePath); } - }, + } } as SFUploadWidgetSchema }, complianceRemark: { @@ -241,7 +250,7 @@ export class PartnerSystemConfigComponent implements OnInit { if (args.type === 'success') { this.sf2.setValue('/roadTransportPhoto', args.fileList[0].response.data.fullFilePath); } - }, + } } as SFUploadWidgetSchema }, share: { title: '', type: 'string', ui: { hidden: true } }, @@ -255,7 +264,7 @@ export class PartnerSystemConfigComponent implements OnInit { if (args.type === 'success') { this.sf2.setValue('/share', args.fileList[0].response.data.fullFilePath); } - }, + } } as SFUploadWidgetSchema }, take: { title: '', type: 'string', ui: { hidden: true } }, @@ -269,7 +278,7 @@ export class PartnerSystemConfigComponent implements OnInit { if (args.type === 'success') { this.sf2.setValue('/take', args.fileList[0].response.data.fullFilePath); } - }, + } } as SFUploadWidgetSchema }, complianceRemark: { @@ -307,10 +316,10 @@ export class PartnerSystemConfigComponent implements OnInit { }; changeAuto(value: any) { console.log(value); - if(value == '2') { - this.auditTimeStatus = true + if (value == '2') { + this.auditTimeStatus = true; } else { - this.auditTimeStatus = false + this.auditTimeStatus = false; } } private getImageModel(args: any, key: any) {