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/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 { 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..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-06 14:20:04 + * @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,21 +92,32 @@ -

已选({{selectedRows?.length}})

- +

已选({{ selectedRows?.length }})

+
- +
-

客户转移:客户跟着上级合伙人转移一并到新渠道销售下,会同步发起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, 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 434f4f8d..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,7 +213,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' }, 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 7ae365b3..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,10 +106,9 @@ export class EditPartnerComponentsAddComponent implements OnInit { } as SFRadioWidgetSchema, enum: [ { label: '修改成功后立即生效', value: 1 }, - { label: 'CRM流程审核后生效', value: 2 }, - { label: 'CRM流程审核通过后生效', value: 3 } - ] - } + // { label: 'CRM流程审核通过后生效', value: 2 }, + ], + }, }, 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 6c77f517..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,10 +80,9 @@ export class EditSaleComponentsAddComponent implements OnInit { } as SFRadioWidgetSchema, enum: [ { label: '修改成功后立即生效', value: 1 }, - { label: 'CRM流程审核后生效', value: 2 }, - { label: 'CRM流程审核通过后生效', value: 3 } - ] - } + // { label: 'CRM流程审核通过后生效', value: 2 }, + ], + }, }, required: ['channelId', 'remark', 'effectiveNode'] };