From 9c3d26fb81cc44044ac9bd92647cdcb82ad3d271 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:19:16 +0800 Subject: [PATCH 1/5] fix bug --- proxy.conf.js | 4 ++-- .../withdrawals-record.component.ts | 6 ++++++ .../withdrawals-record.component.ts | 11 +++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 28e2be41..1bd3c8df 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-05-06 16:57:23 + * @LastEditTime : 2022-05-06 17:09:51 * @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/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 24d45038..8491ea1d 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -83,6 +83,12 @@ export class WithdrawalsRecordComponent extends BasicTableComponent { if (item) { params = [item.id]; } else { + console.log(this.selectedRows); + + if (this.selectedRows.length <= 0) { + this.service.msgSrv.error('请选择提现单！'); + return; + } params = this.selectedRows.map(node => node.id); } const modal = this.nzModalService.create({ diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 3c579f38..5a26c0ba 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -107,6 +107,11 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni if (item) { params = [item.id]; } else { + + if (this.selectedRows.length <= 0) { + this.service.msgSrv.error('请选择提现单！'); + return; + } params = this.selectedRows.map(node => node.id); } const modal = this.nzModalService.create({ @@ -117,6 +122,10 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni label: '拒绝', type: 'default', onClick: () => { + if (!this.msg || this.msg.trim().length === 0) { + this.service.msgSrv.warning('请填写拒绝原因 '); + return false; + } this.service .request(this.service.$api_disagree_refund, { refundApplicationId: params, @@ -129,6 +138,8 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni this.st.load(1); } }); + return false; + } }, { From 5803d5943e298d407fae9304101e43636ab4e23f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:26:48 +0800 Subject: [PATCH 2/5] fix bug --- .../withdrawals-record.component.ts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 5a26c0ba..4b48ec35 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -247,18 +247,14 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni accountType: { type: 'string', title: '账户类型', - enum: [ - {label: '全部', value: ''}, - {label: '个人合伙人', value: '4'}, - {label: '企业合伙人', value: '5'} - ], - ui: { - widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value + ui: { + widget: 'dict-select', + params: { dictKey: 'bank:type' }, + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } } - } }, ltdId: { type: 'string', From 4fbaaf7d2b9b658ad12ebdf092d53db88fc54c44 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:31:06 +0800 Subject: [PATCH 3/5] fix bug --- .../routes/order-management/components/bulk/bulk.component.ts | 2 +- .../order-management/components/vehicle/vehicle.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 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 63c7932e..0dd9918b 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -297,7 +297,7 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.shipperservice.getNetworkEnterpriseName() + asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, serviceType: { 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 7411341a..7bec1594 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -304,7 +304,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.shipperservice.getNetworkEnterpriseName() + asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, // goodsNameId: { From ad0ad744d77077a9ab163428fc4d836a542d0d7c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:38:28 +0800 Subject: [PATCH 4/5] fix bug --- .../withdrawals-record.component.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html index 4317c033..0249bbd6 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html @@ -1,3 +1,13 @@ +
@@ -34,7 +44,7 @@
已选择 {{ selectedRows.length }} 条数据   累计提现 {{ - totalCallNo }} + totalCallNo | currency }}
From e24f32c97ee78e473515e73310e0690df84f40c3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:42:55 +0800 Subject: [PATCH 5/5] fix bug --- .../components/network-freight/new/new.component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts index b8736ed2..5792a7bf 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts @@ -354,9 +354,7 @@ export class NetworkFreightNewComponent implements OnInit { type: 'string', title: '行业', enum: [ - { label: '大陆身份证', value: 0 }, - { label: '港澳居民通行证', value: 1 }, - { label: '香港居民通行证', value: 2 } + { label: '道路运输业', value: 54}, ], default: 0, ui: {