From 8f2b5fa22cdcde075cd739bbfa0079bccde8ba9c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 13:25:04 +0800 Subject: [PATCH 01/16] fix bug --- .../components/config/config.component.html | 13 ++-- .../components/config/config.component.ts | 73 +++++++++++++++++-- .../routes/sys-setting/sys-setting.module.ts | 4 +- 3 files changed, 76 insertions(+), 14 deletions(-) diff --git a/src/app/routes/sys-setting/components/config/config.component.html b/src/app/routes/sys-setting/components/config/config.component.html index aaea9add..65bdca2c 100644 --- a/src/app/routes/sys-setting/components/config/config.component.html +++ b/src/app/routes/sys-setting/components/config/config.component.html @@ -7,7 +7,7 @@
按照提现金额收取 - + %手续费
@@ -15,7 +15,7 @@
按照提现金额收取
客户 - + 天内没有交易订单的视为“沉默客户”
客户 - + 天内没有交易订单的视为“流失客户”
@@ -66,15 +66,13 @@
- - +
-
-
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index 544ca3bc..5c3b0261 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -28,6 +28,8 @@ export class DynamicSettingH5Component implements OnInit { @Input() configList: any = []; + @Input() + isCanSave = true; @Output() selectedEvent = new EventEmitter(); @Output() From ab323d0f8c70c5cf06fcd7fee72b9513b3ad0d03 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 13:43:30 +0800 Subject: [PATCH 03/16] fix bug --- proxy.conf.js | 4 +- .../components/config/config.component.ts | 38 +++++++++++-------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 29173019..d12c4111 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 17:26:44 + * @LastEditTime : 2022-04-28 13:43:18 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, 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 5ddaa8ee..90340eca 100644 --- a/src/app/routes/sys-setting/components/config/config.component.ts +++ b/src/app/routes/sys-setting/components/config/config.component.ts @@ -111,11 +111,29 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { // }; constructor(private service: SystemService) {} - ngOnChanges(changes: SimpleChanges): void { + ngOnChanges(changes: any): void { if (changes.configList) { - console.log(changes.configList); - console.log(changes.configList.currentValue); - + console.log(changes.configList.currentValue[0]?.remark); + this.personServe = changes.configList.currentValue[0]?.remark.personServe, // 个人提现手续费 + this.enterpriseServe= changes.configList.currentValue[0]?.remark.enterpriseServe, // 企业提现手续费 + this.auditValue= changes.configList.currentValue[0]?.remark.auditValue, // 提现审核 + this.auditTime= changes.configList.currentValue[0]?.remark.auditTime, // 审核时间 + this.silenceClient= changes.configList.currentValue[0]?.remark.silenceClient, // 沉默客户 + this.loseClient= changes.configList.currentValue[0]?.remark.loseClient // 流失客户 + this.everyDayData= changes.configList.currentValue[0]?.remark.everyDayData // 流失客户 + this.MonthDayData= changes.configList.currentValue[0]?.remark.MonthDayData // 流失客户 + if (this.auditTime == '2') { + this.auditTimeStatus = true; + // 每天 + if(this.everyDayData){ + this.everyDayData = this.everyDayData + } else if(this.MonthDay) { + // 每周 + this.MonthDayData = this.MonthDayData + } + } else { + this.auditTimeStatus = false; + } } } @@ -173,14 +191,12 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { console.log(this.MonthDayData); } everyDayChange(type: any): void { - console.log(type); if (type) { this.MonthDay = false; this.TimeStatus = true; } } MonthDayChange(type: any): void { - console.log(type); if (type) { this.everyDay = false; this.TimeStatus = false; @@ -323,7 +339,6 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { }); }; changeAuto(value: any) { - console.log(value); if (value == '2') { this.auditTimeStatus = true; } else { @@ -331,7 +346,6 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { } } save() { - console.log(); let params : any = { personServe: this.personServe, // 个人提现手续费 enterpriseServe: this.enterpriseServe, // 企业提现手续费 @@ -343,21 +357,15 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { if(this.auditTime == '2') { // 每天 if(this.everyDay){ - console.log(this.everyDayData); params.everyDayData = this.everyDayData } else if(this.MonthDay) { // 每周 params.MonthDayData = this.MonthDayData - console.log(this.MonthDayData); } } - console.log( JSON.stringify(params)); - console.log( this.configList); const pra = Object.assign({}, ...this.configList) pra.remark = JSON.stringify(params) - console.log(pra); - - this.service.request(this.service.$api_update_config_batch, pra).subscribe(res => { + this.service.request(this.service.$api_update_config_batch, [pra]).subscribe(res => { if (res) { this.service.msgSrv.success('修改配置成功'); setTimeout(() => { From 2f890e79bf1c639d32f4497864c89014d9990678 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 13:47:29 +0800 Subject: [PATCH 04/16] fix bug --- .../invoice-requested-detail.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index 901d2adb..12c787a3 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -179,8 +179,10 @@ export class InvoiceRequestedDetailComponent implements OnInit { routeToOrder(item: any) { if (item.billType === '1') { this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.billHId]); - } else { + } else if (item.billType === '2'){ this.router.navigate(['/order-management/bulk/bulk-detail/' + item.billHId]); + } else if (item.billType === '3'){ + this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.billHId]); } } From 5d1075db9c92423dbb36fe2d846fc7e986499fb0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 13:57:33 +0800 Subject: [PATCH 05/16] fix bug --- .../requested-invoice-modal.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 9ea837e3..6deff18a 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-23 16:50:17 - * @LastEditTime : 2022-04-21 13:57:43 + * @LastEditTime : 2022-04-28 13:54:14 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts @@ -88,7 +88,7 @@ export class RequestedInvoiceModalComponent { { title: '订单号', index: 'billHCode', width: 150 }, { title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 }, { title: '所属项目', index: 'projectIdName', width: 250 }, - { title: '订单类型', index: 'billTypeName', width: 90 }, + { title: '订单类型', index: 'billTypeLabel', width: 90 }, { title: '装货地', index: 'loadingfrom', width: 250 }, { title: '卸货地', index: 'loadingto', width: 250 }, { title: '货物信息', index: 'goodsinfo', width: 170 }, From 9fdc8e047ec358d7afff16105e0ffe0cc0b1e82b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 14:00:43 +0800 Subject: [PATCH 06/16] edit --- proxy.conf.js | 2 +- .../payment-order/payment-order.component.html | 3 ++- .../financial-managemen-routing.module.ts | 9 ++++----- .../freight/list/detail/detail.component.html | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 29173019..07bcd291 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.html b/src/app/routes/financial-management/components/payment-order/payment-order.component.html index 2443272a..2dad7899 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.html @@ -32,7 +32,8 @@
- +
diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index bcea97b3..ba87c4ec 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -60,9 +60,9 @@ const routes: Routes = [ { path: 'abnormal-gold/detail/:id', component: AbnormalGoldDetailComponent }, { path: 'payment-record', component: PaymentRecordComponent }, { path: 'transaction-flow', component: TransactionFlowComponent }, - { path: 'payment-order', component: PaymentOrderComponent }, + { path: 'payment-order', component: PaymentOrderComponent, data: { guard: { ability: ['FINANCIAL-PAYMENT-ORDER-list'] } } }, { path: 'payment-order/detail/:id', component: PaymentOrderDetailComponent }, - { path: 'receipt-order', component: ReceiptOrderComponent }, + { path: 'receipt-order', component: ReceiptOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIPT-list'] } } }, { path: 'receipt-order/detail/:id', component: ReceiptOrderDetailComponent }, { path: 'advance-collection', component: AdvanceCollectionComponent }, { path: 'advance-collection/detail/:id', component: AdvanceCollectionDetailComponent }, @@ -70,12 +70,11 @@ const routes: Routes = [ { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent }, { path: 'payable-order', component: PayableOrderComponent }, { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent }, - { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent }, - + { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent } ]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class FinancialManagementRoutingModule { } +export class FinancialManagementRoutingModule {} diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 42599f9b..490143b2 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -16,8 +16,8 @@

{{ detailData?.enterpriseName }}

- - + +
@@ -48,30 +48,30 @@ 保存 From 4d5f329c62cd41ed42b55c78af7f3fa691042ec2 Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 14:01:13 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../routes/order-management/components/bulk/bulk.component.ts | 4 ++-- .../order-management/components/vehicle/vehicle.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 b29ce305..0a2bb7df 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -555,8 +555,8 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements },{ text: '订单上报推送', click: _record => this.orderReportPush(_record), - iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5') - // acl: { ability: ['VEHICLE-LIST-view'] }, + iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'), + acl: { ability: ['ORDER-BULK-push'] }, } ] } 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 19b0ddd9..7411341a 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -473,8 +473,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme { text: '订单上报推送', click: _record => this.orderReportPush(_record), - iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5') - // acl: { ability: ['VEHICLE-LIST-view'] }, + iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'), + acl: { ability: ['ORDER-VEHICLE-push'] }, } ] } From ab77085d2ae9cee37f30ca5b47d0a3ab9e340a76 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 14:08:35 +0800 Subject: [PATCH 08/16] edit --- .../agreement-config.component.html | 3 ++- .../sys-setting/sys-setting-routing.module.ts | 26 ++++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.html b/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.html index 17d718f0..a9e98fc1 100644 --- a/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.html +++ b/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.html @@ -19,7 +19,8 @@ 更新时间： {{ tabItem.modifyTime }} 预览 - +
diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index ea5ae5c4..3eb42854 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -29,26 +29,34 @@ import { SmsTemplateComponent } from './components/sms-template/sms-template.com import { OrganizationManagementComponent } from './components/organization-management/organization-management.component'; const routes: Routes = [ - { path: 'staff-management', component: StaffManagementComponent }, + { path: 'staff-management', component: StaffManagementComponent, data: { guard: { ability: ['SYSTEM-STAFF-list'] } } }, { path: 'role-management/user/:type', component: RoleManagementComponent }, { path: 'role-management/freight/:type', component: RoleManagementComponent }, - { path: 'organization-management', component: OrganizationManagementComponent }, - { path: 'basic-setting', component: BasicSettingComponent }, + { path: 'organization-management', component: OrganizationManagementComponent, data: { guard: { ability: ['SYSTEM-ROLE-list'] } } }, + { path: 'basic-setting', component: BasicSettingComponent, data: { guard: { ability: ['SYSTEM-BASIC_SETTING-list'] } } }, { path: 'note-management', component: NoTeManagementComponent }, { path: 'basic-config', component: BasicConfigComponent }, { path: 'audit-reason-config', component: AuditReasonConfigComponent }, - { path: 'cart-config', component: CartConfigComponent }, - { path: 'agreement-config', component: AgreementConfigComponentsBaseComponent }, + { + path: 'cart-config', + component: CartConfigComponent, + data: { guard: { ability: ['SYSTEM-CART-CONFIG-modeList', 'SYSTEM-CART-CONFIG-cartLength', 'SYSTEM-CART-CONFIG-goodsList'] } } + }, + { + path: 'agreement-config', + component: AgreementConfigComponentsBaseComponent, + data: { guard: { ability: ['SYSTEM-AGREEMENT-CONFIG-list'] } } + }, { path: 'system-config', component: SystemConfigComponent }, - { path: 'goods-name-config', component: GoodsNameConfigComponent }, - { path: 'crm-management', component: CrmManagementComponent }, - { path: 'network-freight', component: NetworkFreightComponent }, + { path: 'goods-name-config', component: GoodsNameConfigComponent, data: { guard: { ability: ['SYSTEM-GOODS-NAME-CONFIG-list'] } } }, + { path: 'crm-management', component: CrmManagementComponent, data: { guard: { ability: ['SYSTEM-CRM-list'] } } }, + { path: 'network-freight', component: NetworkFreightComponent, data: { guard: { ability: ['SYSTEM-NETWORK-FREIGHT-list'] } } }, { path: 'network-freight/new/:id', component: NetworkFreightNewComponent }, { path: 'close-account', component: CloseAccountComponent }, // { path: 'btn-management', component: BtnManagementComponent }, { path: 'announcement-message', component: AnnouncementMessageComponent }, { path: 'insurance-set', component: InsuranceSetComponent }, - { path: 'sms-template', component: SmsTemplateComponent} + { path: 'sms-template', component: SmsTemplateComponent } ]; @NgModule({ From 2d7a4476659834fd7d4590dbed3c11f3e5cb4364 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 14:33:40 +0800 Subject: [PATCH 09/16] fix bug --- proxy.conf.js | 4 +- .../components/config/config.component.ts | 68 +++++++++++++------ 2 files changed, 51 insertions(+), 21 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index d12c4111..4690cd30 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-28 13:43:18 + * @LastEditTime : 2022-04-28 14:09:56 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, 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 90340eca..4cb4e19f 100644 --- a/src/app/routes/sys-setting/components/config/config.component.ts +++ b/src/app/routes/sys-setting/components/config/config.component.ts @@ -45,9 +45,9 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { auditTime!: any; // 审核时间 silenceClient!: number; // 沉默客户 loseClient!: number; // 流失客户 - everyDay: boolean = false; + everyDay: any; auditTimeStatus: boolean = false; - MonthDay: boolean = false; + MonthDay: any; time: Date | null = null; defaultOpenValue = new Date(0, 0, 0, 0, 0, 0); tabs = [ @@ -123,13 +123,16 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { this.everyDayData= changes.configList.currentValue[0]?.remark.everyDayData // 流失客户 this.MonthDayData= changes.configList.currentValue[0]?.remark.MonthDayData // 流失客户 if (this.auditTime == '2') { - this.auditTimeStatus = true; // 每天 + this.auditTimeStatus = true; if(this.everyDayData){ this.everyDayData = this.everyDayData - } else if(this.MonthDay) { + this.everyDay = 1 + } else if(this.MonthDayData) { // 每周 + this.MonthDay = 2 this.MonthDayData = this.MonthDayData + this.TimeStatus =false } } else { this.auditTimeStatus = false; @@ -162,23 +165,47 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { }); } addMonth() { - this.MonthDayData.push({ - month: [ - { label: '周一', value: '周一' }, - { label: '周二', value: '周二' }, - { label: '周三', value: '周三' }, - { label: '周四', value: '周四' }, - { label: '周五', value: '周五' }, - { label: '周六', value: '周六' }, - { label: '周日', value: '周日' } - ], - Times: [ + console.log(this.MonthDayData); + if(this.MonthDayData) { + this.MonthDayData.push({ + month: [ + { label: '周一', value: '周一' }, + { label: '周二', value: '周二' }, + { label: '周三', value: '周三' }, + { label: '周四', value: '周四' }, + { label: '周五', value: '周五' }, + { label: '周六', value: '周六' }, + { label: '周日', value: '周日' } + ], + Times: [ + { + startTime: '', + endTime: '' + } + ] + }); + } else { + this.MonthDayData = [ { - startTime: '', - endTime: '' + month: [ + { label: '周一', value: '周一' }, + { label: '周二', value: '周二' }, + { label: '周三', value: '周三' }, + { label: '周四', value: '周四' }, + { label: '周五', value: '周五' }, + { label: '周六', value: '周六' }, + { label: '周日', value: '周日' } + ], + Times: [ + { + startTime: [], + endTime: [] + } + ] } - ] - }); + ]; + } + } delMonth(value: number, index: number) { this.MonthDayData[value].Times.splice(index, 1); @@ -356,6 +383,9 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { }; if(this.auditTime == '2') { // 每天 + console.log(this.everyDay); + console.log(this.MonthDay); + if(this.everyDay){ params.everyDayData = this.everyDayData } else if(this.MonthDay) { From 9c8ed295eb72f7340cfb6355c3fcbe935cbac950 Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 14:35:32 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/shared/index.ts | 2 +- src/app/shared/shared.module.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts index 68efd6c7..a4df14f5 100644 --- a/src/app/shared/index.ts +++ b/src/app/shared/index.ts @@ -22,7 +22,7 @@ export * from './components/dynamic-setting'; export * from './components/singlepage-setting'; export * from './components/insurance-table/index'; export * from './components/rebate-table/index'; -export * from './components/search-drawer'; +export * from './components/search-drawer/index'; // Utils export * from './utils'; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 1662aafc..50040d13 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -39,8 +39,9 @@ import { PipeModule } from './pipes'; import { AccountDetailComponent } from './components/account-detail/account-detail.component'; import { CaptchaModule } from './components/captcha'; import { rebateTableModule } from './components/rebate-table'; -import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component'; -import { SearchDrawerModule } from './components/search-drawer/search-drawer.module'; +import { SearchDrawerModule } from './components/search-drawer'; +// import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component'; + const MODULES = [ AddressModule, From c5a2453564344821c4bd08f03875873e247d007f Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 14:40:53 +0800 Subject: [PATCH 11/16] edit --- .../components/index/index.component.ts | 1 - .../components/index/index.component.html | 4 +- .../components/index/index.component.ts | 8 ++++ .../vehicle-detail.component.html | 20 +++++---- .../supply-management-routing.module.ts | 43 +++++++++++++++++-- 5 files changed, 60 insertions(+), 16 deletions(-) diff --git a/src/app/routes/contract-management/components/index/index.component.ts b/src/app/routes/contract-management/components/index/index.component.ts index 4c42914d..b9005e8a 100644 --- a/src/app/routes/contract-management/components/index/index.component.ts +++ b/src/app/routes/contract-management/components/index/index.component.ts @@ -26,7 +26,6 @@ export class ContractManagementIndexComponent implements OnInit { const acls = acl.data.abilities || []; this.isShowDetail = !!acls.find(acl => acl === 'CONTRACT-INDEX-searchDetail'); this.isShowFrame = !!acls.find(acl => acl === 'CONTRACT-INDEX-listFrame'); - console.log(this.isShowFrame); } diff --git a/src/app/routes/supply-management/components/index/index.component.html b/src/app/routes/supply-management/components/index/index.component.html index ebe89624..8849d48c 100644 --- a/src/app/routes/supply-management/components/index/index.component.html +++ b/src/app/routes/supply-management/components/index/index.component.html @@ -25,10 +25,10 @@ - + - + diff --git a/src/app/routes/supply-management/components/index/index.component.ts b/src/app/routes/supply-management/components/index/index.component.ts index 17b7b0c7..bb48dc54 100644 --- a/src/app/routes/supply-management/components/index/index.component.ts +++ b/src/app/routes/supply-management/components/index/index.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent } from '@delon/abc/st'; +import { ACLService } from '@delon/acl'; import { SFSchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { SearchDrawerService } from '@shared'; @@ -12,7 +13,14 @@ import { BasicTableComponent } from 'src/app/routes/commom'; }) export class SupplyManagementIndexComponent implements OnInit { selectedIndex = 0; + isShowVehicle = false; + isShowBulk = false; + constructor(private http: _HttpClient, private modal: ModalHelper, private acl: ACLService) { + const acls = acl.data.abilities || []; + this.isShowVehicle = !!acls.find(acl => acl === 'SUPPLY-INDEX-vehicleSearch'); + this.isShowBulk = !!acls.find(acl => acl === 'SUPPLY-INDEX-bulkSearch'); + } ngOnInit(): void {} } diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index bcb7cb4a..4d122788 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -113,14 +113,16 @@ {{ i?.carrierInformationVO?.driverLicensePlate }} - - {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} / - {{i?.carrierInformationVO.driverLicensePlate || '--'}} - - - {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight || - '--')+'吨'}} - + + + {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} / + {{i?.carrierInformationVO.driverLicensePlate || '--'}} + + + {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight || + '--')+'吨'}} + +

装货卸货信息 ( @@ -258,4 +260,4 @@

- + \ No newline at end of file diff --git a/src/app/routes/supply-management/supply-management-routing.module.ts b/src/app/routes/supply-management/supply-management-routing.module.ts index c3eb4ba2..73eb6dd2 100644 --- a/src/app/routes/supply-management/supply-management-routing.module.ts +++ b/src/app/routes/supply-management/supply-management-routing.module.ts @@ -21,11 +21,46 @@ import { SupplyManagementReleasePublishComponent } from './components/release-pu import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; const routes: Routes = [ - { path: 'index', component: SupplyManagementIndexComponent }, - { path: 'index/bulk-detail/:id', component: SupplyManagementBulkDetailComponent }, - { path: 'index/vehicle-detail/:id', component: SupplyManagementVehicleDetailComponent }, + { + path: 'index', + component: SupplyManagementIndexComponent, + data: { guard: { ability: ['SUPPLY-INDEX-vehicleSearch', 'SUPPLY-INDEX-bulkSearch'] } } + }, + { + path: 'index/bulk-detail/:id', + component: SupplyManagementBulkDetailComponent, + data: { + guard: { ability: ['SUPPLY-BULK-DETAIL-cancelSupply', 'SUPPLY-BULK-DETAIL-updatePrice', 'SUPPLY-BULK-DETAIL-bulkAnotherOrder'] } + } + }, + { + path: 'index/vehicle-detail/:id', + component: SupplyManagementVehicleDetailComponent, + data: { + guard: { + ability: [ + 'SUPPLY-VEHICLE-DETAIL-cancelSupply', + 'SUPPLY-VEHICLE-DETAIL-changeSupply', + 'SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder', + 'SUPPLY-VEHICLE-DETAIL-vehicleAnew' + ] + } + } + }, { path: 'add-drivers', component: SupplyManagementAddDriversComponent }, - { path: 'vehicle-amend/:id', component: SupplyManagementOnecarPublishComponent }, + { + path: 'vehicle-amend/:id', + component: SupplyManagementOnecarPublishComponent, + data: { + guard: { + ability: [ + 'SUPPLY-VEHICLE-PLACEORDER-QRCode', + 'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate', + 'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder' + ] + } + } + }, { path: 'vehicle-release', component: SupplyManagementReleasePublishComponent }, { path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent }, { path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent } From 352a664b44b0397afa8413a42097985ced6492b0 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 14:44:59 +0800 Subject: [PATCH 12/16] edit --- .../supply-management/components/index/index.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/supply-management/components/index/index.component.ts b/src/app/routes/supply-management/components/index/index.component.ts index bb48dc54..ef804c30 100644 --- a/src/app/routes/supply-management/components/index/index.component.ts +++ b/src/app/routes/supply-management/components/index/index.component.ts @@ -18,8 +18,8 @@ export class SupplyManagementIndexComponent implements OnInit { constructor(private http: _HttpClient, private modal: ModalHelper, private acl: ACLService) { const acls = acl.data.abilities || []; - this.isShowVehicle = !!acls.find(acl => acl === 'SUPPLY-INDEX-vehicleSearch'); - this.isShowBulk = !!acls.find(acl => acl === 'SUPPLY-INDEX-bulkSearch'); + this.isShowVehicle = acl.data.full || !!acls.find(acl => acl === 'SUPPLY-INDEX-vehicleSearch'); + this.isShowBulk = acl.data.full || !!acls.find(acl => acl === 'SUPPLY-INDEX-bulkSearch'); } ngOnInit(): void {} From 90a688a356784bab3837c24331d7db50380d88c7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 14:46:07 +0800 Subject: [PATCH 13/16] edit --- .../contract-management/components/index/index.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/contract-management/components/index/index.component.ts b/src/app/routes/contract-management/components/index/index.component.ts index b9005e8a..d3e7efc8 100644 --- a/src/app/routes/contract-management/components/index/index.component.ts +++ b/src/app/routes/contract-management/components/index/index.component.ts @@ -24,8 +24,8 @@ export class ContractManagementIndexComponent implements OnInit { constructor(private http: _HttpClient, private modal: ModalHelper, private acl: ACLService) { const acls = acl.data.abilities || []; - this.isShowDetail = !!acls.find(acl => acl === 'CONTRACT-INDEX-searchDetail'); - this.isShowFrame = !!acls.find(acl => acl === 'CONTRACT-INDEX-listFrame'); + this.isShowDetail =acl.data.full || !!acls.find(acl => acl === 'CONTRACT-INDEX-searchDetail'); + this.isShowFrame =acl.data.full || !!acls.find(acl => acl === 'CONTRACT-INDEX-listFrame'); } From 7b5e32b815c6056bfbdafa3c5dd3d6a2cbcd6050 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 14:48:59 +0800 Subject: [PATCH 14/16] fix bug --- .../bulk-detail/bulk-detail.component.ts | 2 +- .../components/bulk/bulk.component.ts | 2 +- .../vehicle-detail.component.ts | 15 ++------------ .../components/vehicle/vehicle.component.ts | 2 +- .../supply-management-routing.module.ts | 20 ++++++++++++++++--- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index b7711049..f8b11cf7 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -125,7 +125,7 @@ export class SupplyManagementBulkDetailComponent implements OnInit { */ placeOrder(record: any) { console.log(record) - this.router.navigate(['/supply-management/bulk-amend', record.id], { + this.router.navigate(['/supply-management/bulk-next', record.id], { queryParams: { sta: 4 }, diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index 5055964a..aa0b4eae 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -492,7 +492,7 @@ export class SupplyManagementBulkComponent extends BasicTableComponent implement // 再下一单 nextOrder(item: any) { - this.router.navigate(['/supply-management/bulk-amend', item.id], { + this.router.navigate(['/supply-management/bulk-next', item.id], { queryParams: { sta: 4 } diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts index c2af6ae7..bf86c271 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts @@ -115,18 +115,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { }) } - /** - *再下一单 - * @param record - */ - placeOrder(record: any) { - this.router.navigate(['./pbg/onecar-publish'], { - queryParams: { - id: record?.id, - type: 'add' - } - }) - } + /** * 编辑外部货源号 * @param item st当前行对象 @@ -168,7 +157,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { }); } nextOrder(item: any) { - this.router.navigate(['/supply-management/vehicle-amend', item.id], { + this.router.navigate(['/supply-management/vehicle-next', item.id], { queryParams: { sta: 2 } diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 1d0f3c65..817a0c97 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -324,7 +324,7 @@ export class SupplyManagementVehicleComponent extends BasicTableComponent implem }); } nextOrder(item: any) { - this.router.navigate(['/supply-management/vehicle-amend', item.id], { + this.router.navigate(['/supply-management/vehicle-next', item.id], { queryParams: { sta: 2 } diff --git a/src/app/routes/supply-management/supply-management-routing.module.ts b/src/app/routes/supply-management/supply-management-routing.module.ts index 73eb6dd2..10425568 100644 --- a/src/app/routes/supply-management/supply-management-routing.module.ts +++ b/src/app/routes/supply-management/supply-management-routing.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-02-10 14:39:00 + * @LastEditTime : 2022-04-28 14:45:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\supply-management-routing.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -58,11 +58,25 @@ const routes: Routes = [ 'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate', 'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder' ] - } - } + } + } + }, + { + path: 'vehicle-next/:id', + component: SupplyManagementOnecarPublishComponent, + // data: { + // guard: { + // ability: [ + // 'SUPPLY-VEHICLE-PLACEORDER-QRCode', + // 'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate', + // 'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder' + // ] + // } + // } }, { path: 'vehicle-release', component: SupplyManagementReleasePublishComponent }, { path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent }, + { path: 'bulk-next/:id', component: SupplyManagementBulkPublishComponent }, { path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent } ]; From 3188d0805f38ab8b34f4998e2fa2c6a376749ae8 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 15:00:43 +0800 Subject: [PATCH 15/16] edit --- .../financial-managemen-routing.module.ts | 4 +- .../onecar-publish.component.html | 4 +- .../supply-management-routing.module.ts | 46 ++++++++++++------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index ba87c4ec..43fcbaca 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -66,8 +66,8 @@ const routes: Routes = [ { path: 'receipt-order/detail/:id', component: ReceiptOrderDetailComponent }, { path: 'advance-collection', component: AdvanceCollectionComponent }, { path: 'advance-collection/detail/:id', component: AdvanceCollectionDetailComponent }, - { path: 'receivable-order', component: ReceivableOrderComponent }, - { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent }, + { path: 'receivable-order', component: ReceivableOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-list'] } } }, + { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-DETAIL-view'] } } }, { path: 'payable-order', component: PayableOrderComponent }, { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent }, { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent } diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 3c489ffb..73a34d9a 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -260,9 +260,9 @@ + [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate']">指派熟车 + [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder']">司机抢单 diff --git a/src/app/routes/supply-management/supply-management-routing.module.ts b/src/app/routes/supply-management/supply-management-routing.module.ts index 10425568..29f59068 100644 --- a/src/app/routes/supply-management/supply-management-routing.module.ts +++ b/src/app/routes/supply-management/supply-management-routing.module.ts @@ -51,6 +51,15 @@ const routes: Routes = [ { path: 'vehicle-amend/:id', component: SupplyManagementOnecarPublishComponent, + data: { + guard: { + ability: ['SUPPLY-VEHICLE-AMEND-submitChange'] + } + } + }, + { + path: 'vehicle-next/:id', + component: SupplyManagementOnecarPublishComponent, data: { guard: { ability: [ @@ -58,25 +67,30 @@ const routes: Routes = [ 'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate', 'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder' ] - } - } + } + } }, { - path: 'vehicle-next/:id', - component: SupplyManagementOnecarPublishComponent, - // data: { - // guard: { - // ability: [ - // 'SUPPLY-VEHICLE-PLACEORDER-QRCode', - // 'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate', - // 'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder' - // ] - // } - // } + path: 'vehicle-release', + component: SupplyManagementReleasePublishComponent, + data: { + guard: { ability: ['SUPPLY-VEHICLE-RELEASE-bulkDesignate', 'SUPPLY-VEHICLE-RELEASE-bulkDriverOrder'] } + } + }, + { + path: 'bulk-release', + component: SupplyManagementBulkReleasePublishComponent, + data: { + guard: { ability: ['SUPPLY-BULK-RELEASE-consignBulkAssign', 'SUPPLY-BULK-RELEASE-consignBulk'] } + } + }, + { + path: 'bulk-next/:id', + component: SupplyManagementBulkPublishComponent, + data: { + guard: { ability: ['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder', 'SUPPLY-BULK-PLACEORDER-vehicleDesignate'] } + } }, - { path: 'vehicle-release', component: SupplyManagementReleasePublishComponent }, - { path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent }, - { path: 'bulk-next/:id', component: SupplyManagementBulkPublishComponent }, { path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent } ]; From 18378cc8a221a828084aebdfd68512e814171ca5 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 15:05:52 +0800 Subject: [PATCH 16/16] edit --- .../financial-managemen-routing.module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index 43fcbaca..c29dc430 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -68,8 +68,8 @@ const routes: Routes = [ { path: 'advance-collection/detail/:id', component: AdvanceCollectionDetailComponent }, { path: 'receivable-order', component: ReceivableOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-list'] } } }, { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-DETAIL-view'] } } }, - { path: 'payable-order', component: PayableOrderComponent }, - { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent }, + { path: 'payable-order', component: PayableOrderComponent, data: { guard: { ability: ['FINANCIAL-PAYABLE-list'] } } }, + { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent, data: { guard: { ability: ['FINANCIAL-PAYABLE-DETAIL-view'] } } }, { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent } ];