From 616f3c64cdd817c9cc917a874bb5a3aa96ca2d82 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 15:09:37 +0800 Subject: [PATCH 1/2] fix bug --- .../mancustomtable.component.html | 2 +- .../mancustomtable.component.ts | 91 +++++++++++++------ 2 files changed, 64 insertions(+), 29 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html index 47dd8d20..5c5612fb 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-30 17:57:46 * @LastEditors : Shiming - * @LastEditTime : 2022-04-18 16:45:14 + * @LastEditTime : 2022-04-19 15:09:26 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\mancustomtable\\mancustomtable.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index 685633e1..d6d5b692 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -74,34 +74,69 @@ export class DatatableMancustomtableComponent implements OnInit { return this?.resourceStatus !== 1 ? false : true; } }, - { title: '已认证合伙人', index: 'certifiedCount', className: 'text-center', width: '150px' , - iif: () => { - return this?.resourceStatus !== 2 ? false : true; - }}, - { title: '新增合伙人数', index: 'addCount', className: 'text-center', width: '150px' , - iif: () => { - return this?.resourceStatus !== 2 ? false : true; - }}, - { title: '合伙人活跃率', index: 'alivePer', className: 'text-center', width: '150px' , - iif: () => { - return this?.resourceStatus !== 2 ? false : true; - } }, - { title: '活跃合伙人数', index: 'aliveCount', className: 'text-center', width: '150px' , - iif: () => { - return this?.resourceStatus !== 2 ? false : true; - } }, - { title: '沉默合伙人数', index: 'silentCount', className: 'text-center', width: '150px' , - iif: () => { - return this?.resourceStatus !== 2 ? false : true; - } }, - { title: '流失合伙人数', index: 'drainCount', className: 'text-center', width: '150px' , - iif: () => { - return this?.resourceStatus !== 2 ? false : true; - }}, - { title: '未激活合伙人数', index: 'notActiveCount', className: 'text-center', width: '150px' , - iif: () => { - return this?.resourceStatus !== 2 ? false : true; - } }, + { + title: '已认证合伙人', + index: 'certifiedCount', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 2 ? false : true; + } + }, + { + title: '新增合伙人数', + index: 'addCount', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 2 ? false : true; + } + }, + { + title: '合伙人活跃率', + index: 'alivePer', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 2 ? false : true; + } + }, + { + title: '活跃合伙人数', + index: 'aliveCount', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 2 ? false : true; + } + }, + { + title: '沉默合伙人数', + index: 'silentCount', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 2 ? false : true; + } + }, + { + title: '流失合伙人数', + index: 'drainCount', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 2 ? false : true; + } + }, + { + title: '未激活合伙人数', + index: 'notActiveCount', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 2 ? false : true; + } + }, { title: '新增货主数', From ec7374a5fd909671bdf52eb9e99b103ccb34fef5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 15:45:48 +0800 Subject: [PATCH 2/2] fix bug --- .../update-freight.component.html | 8 +++++- .../update-freight.component.ts | 28 +++++++++++++++++++ .../services/order-management.service.ts | 4 ++- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html index 04a93740..34cbd0a0 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html @@ -20,7 +20,7 @@

-  确认已阅读并知晓 《变更协议》 +  确认已阅读并知晓 《变更协议》

@@ -28,3 +28,9 @@ + + +
+ + \ No newline at end of file diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts index 347247e1..8f5794f0 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts @@ -24,6 +24,8 @@ export class VehicleUpdateFreightComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; + isVisible = false; + modalcontent = ''; aggreechecked = false; @@ -192,4 +194,30 @@ export class VehicleUpdateFreightComponent implements OnInit { }; return params; } + agreement() { + + const param = { + billId: this.data.id, + pre: this.sf.value.prePay, + rece: this.sf.value.toPay, + back: this.sf.value.receiptPay, + total: this.data.totalFreight, + freightAmount: this.data.totalAmount, + } + this.service.request(this.service.$api_getSupplementaryAgreement, param).subscribe(res => { + if (res) { + this.modalcontent = res.contractContent; + this.isVisible = true; + } + }); + + } + + + handleCancel() { + this.isVisible = false; + } + handleOK() { + this.isVisible = false; + } } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index f8cd497c..178e640f 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 18:52:24 + * @LastEditTime : 2022-04-19 15:16:37 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -206,6 +206,8 @@ export class OrderManagementService extends ShipperBaseService { $api_asyncExportComplaintListDrv = `/api/sdc/complaint/operate/asyncExportComplaintListDrv`; //操作日志 public $api_get_log_list = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`; + // 查看补充协议 + public $api_getSupplementaryAgreement = `/api/sdc/billShipper/getSupplementaryAgreement`; /** * 根据企业ID，获取企业历史网络货运人 * @returns