From c4d0cb81b2edf9bc4deeb51eb151d69d05b7f502 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 11:23:46 +0800 Subject: [PATCH 1/8] fix bug --- .../partner-list/components/index/partner-list.component.html | 4 ++-- .../freight/list/editPartner/editPartner.component.ts | 3 +-- .../components/freight/list/editSale/editSale.component.ts | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html index cba079c7..7e290abc 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-29 17:28:23 * @LastEditors : Shiming - * @LastEditTime : 2022-05-06 14:20:04 + * @LastEditTime : 2022-05-09 11:23:22 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -79,7 +79,7 @@ - + diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts index b517e581..b343f09c 100644 --- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts @@ -119,8 +119,7 @@ export class EditPartnerComponentsAddComponent implements OnInit { } as SFRadioWidgetSchema, enum: [ { label: '修改成功后立即生效', value: 1 }, - { label: 'CRM流程审核后生效', value: 2 }, - { label: 'CRM流程审核通过后生效', value: 3 } + // { label: 'CRM流程审核通过后生效', value: 2 }, ], }, }, diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts index 1b1b174b..f2caf0a9 100644 --- a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts @@ -93,8 +93,7 @@ export class EditSaleComponentsAddComponent implements OnInit { } as SFRadioWidgetSchema, enum: [ { label: '修改成功后立即生效', value: 1 }, - { label: 'CRM流程审核后生效', value: 2 }, - { label: 'CRM流程审核通过后生效', value: 3 } + // { label: 'CRM流程审核通过后生效', value: 2 }, ], }, }, From 63b4b034f8e97dfbcb415fe083746cfde371bc83 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 11:24:57 +0800 Subject: [PATCH 2/8] fix bug --- .../freight/list/editPartner/editPartner.component.ts | 7 ------- .../components/freight/list/editSale/editSale.component.ts | 7 ------- 2 files changed, 14 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts index a00e0e88..d0ebdf71 100644 --- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts @@ -106,16 +106,9 @@ export class EditPartnerComponentsAddComponent implements OnInit { } as SFRadioWidgetSchema, enum: [ { label: '修改成功后立即生效', value: 1 }, -<<<<<<< HEAD // { label: 'CRM流程审核通过后生效', value: 2 }, ], }, -======= - { label: 'CRM流程审核后生效', value: 2 }, - { label: 'CRM流程审核通过后生效', value: 3 } - ] - } ->>>>>>> ce53cdf83506568de0b8d5d43c83106c97e85545 }, required: ['channelId', 'remark', 'effectiveNode'] }; diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts index c87ae14f..0ce1ec43 100644 --- a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts @@ -80,16 +80,9 @@ export class EditSaleComponentsAddComponent implements OnInit { } as SFRadioWidgetSchema, enum: [ { label: '修改成功后立即生效', value: 1 }, -<<<<<<< HEAD // { label: 'CRM流程审核通过后生效', value: 2 }, ], }, -======= - { label: 'CRM流程审核后生效', value: 2 }, - { label: 'CRM流程审核通过后生效', value: 3 } - ] - } ->>>>>>> ce53cdf83506568de0b8d5d43c83106c97e85545 }, required: ['channelId', 'remark', 'effectiveNode'] }; From b6b51c9a662efd271b713242c077a04c199ed167 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 11:35:41 +0800 Subject: [PATCH 3/8] fix bug --- proxy.conf.js | 4 +- .../index/partner-list.component.html | 77 ++++++++++++++----- .../index/partner-list.component.ts | 2 +- 3 files changed, 59 insertions(+), 24 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 057e4e2c..7db07ae1 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-07 17:54:06 + * @LastEditTime : 2022-05-09 11:25:41 * @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/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html index 7e290abc..24522919 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-29 17:28:23 * @LastEditors : Shiming - * @LastEditTime : 2022-05-09 11:23:22 + * @LastEditTime : 2022-05-09 11:33:34 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -13,11 +13,15 @@
- +
-
+
- + +
- +
- {{selectItem?.enterpriseName || selectItem?.contactName}} + {{ selectItem?.enterpriseName || selectItem?.contactName }} @@ -57,8 +81,8 @@
- {{selectItem?.enterpriseName || selectItem?.contactName}} - {{selectItem?.channelIdLabel}} + {{ selectItem?.enterpriseName || selectItem?.contactName }} + {{ selectItem?.channelIdLabel }} @@ -68,12 +92,21 @@ -

已选（{{selectedRows?.length}}）

- +

已选（{{ selectedRows?.length }}）

+ @@ -84,5 +117,7 @@
-

客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客

- \ No newline at end of file +

客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客

+ diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 427c6c58..62134560 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -162,7 +162,7 @@ export class PartnerListComponent { const modal = this.nzModalService.confirm({ nzTitle: '确定提交吗？', nzOnOk: () => { - this.cannelItem.enterpriseIdList = this.selectedRows.map(row => row.id); + this.cannelItem.enterpriseIdList = this.selectedRows.map(row => row.enterpriseId); this.service .request(this.service.$api_update_partner_channel_by_id, { ...this.cannelItem, From 619092504322c284824b055ae2a68db5b8185e5a Mon Sep 17 00:00:00 2001 From: weiyu Date: Mon, 9 May 2022 13:41:58 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/billing-order/billing-order.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index f3c05aef..6555807e 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -214,7 +214,7 @@ export class BillingOrderComponent extends BasicTableComponent { className: 'text-center', index: 'paymentMethodRate', width: 130, - format: record => `${record.paymentMethodRate*100}%` + format: record => `${(record.paymentMethodRate*100).toFixed(2)}%` }, { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' }, { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' }, From 2bf2b47b5c1acda6c2a7334c099c8f53a31c5655 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 13:44:54 +0800 Subject: [PATCH 5/8] fix bug --- .../components/receipts-audit/receipts-audit.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index 57c825d0..8209902c 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -127,7 +127,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i this.initST(); setTimeout(() => { this.st.load(); - this.getGoodsSourceStatistical(); }, 500); } ngOnInit(): void { From 456c24e79da0bd98ab5dc845a447caff1319b30c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 13:47:02 +0800 Subject: [PATCH 6/8] fix bug --- .../components/billing-order/billing-order.component.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index aceeaac5..beaf5437 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -213,11 +213,7 @@ export class BillingOrderComponent extends BasicTableComponent { className: 'text-center', index: 'paymentMethodRate', width: 130, -<<<<<<< HEAD format: record => `${(record.paymentMethodRate*100).toFixed(2)}%` -======= - format: record => `${record.paymentMethodRate * 100}%` ->>>>>>> b6b51c9a662efd271b713242c077a04c199ed167 }, { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' }, { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' }, From cd9ec05afba0b9ac0172e33bf056cb21e91dd1e0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 13:50:27 +0800 Subject: [PATCH 7/8] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index afdba959..d8652768 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -46,12 +46,12 @@
  • 新增企业
    • -
  • +
    • diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 020eb8c4..8ec7d565 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -469,14 +469,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服
    ', click: item => this.showService(item) }, - { - text: '修改合伙人', - click: item => this.editPartner(item) - }, - { - text: '修改渠道销售', - click: item => this.editSale(item) - } + // { + // text: '修改合伙人', + // click: item => this.editPartner(item) + // }, + // { + // text: '修改渠道销售', + // click: item => this.editSale(item) + // } ] } ]; From 6295d72b111150e86465085c9b723d106b279088 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 13:53:43 +0800 Subject: [PATCH 8/8] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index d8652768..afdba959 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -46,12 +46,12 @@
  • 新增企业
    • - +
    diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 8ec7d565..020eb8c4 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -469,14 +469,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服
    ', click: item => this.showService(item) }, - // { - // text: '修改合伙人', - // click: item => this.editPartner(item) - // }, - // { - // text: '修改渠道销售', - // click: item => this.editSale(item) - // } + { + text: '修改合伙人', + click: item => this.editPartner(item) + }, + { + text: '修改渠道销售', + click: item => this.editSale(item) + } ] } ];