diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html index ae51e0e3..01b5aed3 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html @@ -5,7 +5,7 @@
- + @@ -27,7 +27,7 @@
- + diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.html b/src/app/routes/datatable/components/compliance/customer/customer.component.html index 13193b65..f12c62b1 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.html +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.html @@ -19,7 +19,7 @@
- + diff --git a/src/app/routes/datatable/components/compliance/index/index.component.html b/src/app/routes/datatable/components/compliance/index/index.component.html index 0d55f76b..5b3c4635 100644 --- a/src/app/routes/datatable/components/compliance/index/index.component.html +++ b/src/app/routes/datatable/components/compliance/index/index.component.html @@ -9,7 +9,7 @@
- + diff --git a/src/app/routes/datatable/components/compliance/salesman/salesman.component.html b/src/app/routes/datatable/components/compliance/salesman/salesman.component.html index 745c3ec5..ea425eca 100644 --- a/src/app/routes/datatable/components/compliance/salesman/salesman.component.html +++ b/src/app/routes/datatable/components/compliance/salesman/salesman.component.html @@ -20,7 +20,7 @@
- + diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html index dece86a1..b41b90b2 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 13:20:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-14 15:43:56 + * @LastEditTime : 2022-04-19 15:52:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -32,7 +32,7 @@
- + @@ -80,7 +80,7 @@
- + diff --git a/src/app/routes/datatable/components/customtable/driver/driver.component.html b/src/app/routes/datatable/components/customtable/driver/driver.component.html index 383fe343..e636c1a1 100644 --- a/src/app/routes/datatable/components/customtable/driver/driver.component.html +++ b/src/app/routes/datatable/components/customtable/driver/driver.component.html @@ -9,8 +9,8 @@
- - + + + + (click)="st?.load(1)" acl [acl-ability]="['partnertable-search']">查询
@@ -18,7 +18,7 @@
+ (click)="st?.load(1)" acl [acl-ability]="['partnertable-search']">查询 +
- + @@ -28,7 +28,7 @@
- +
diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index c674cb95..c91b3e29 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -123,10 +123,13 @@ export class WithdrawalsDetailComponent implements OnInit { history.go(-1); } - // 导出 - exprot() { - this.service.exportStart({ ...this.inputSF.value, pageSize: -1 }, this.service.$api_export_refund_detail_page); - } + // 导出 + exprot() { + this.service.exportStart( + { ...this.inputSF.value, pageSize: -1, refundApplicationId: this.route.snapshot.params.id }, + this.service.$api_export_refund_detail_page + ); + } private initInputSF(): SFSchema { return { @@ -228,7 +231,7 @@ export class WithdrawalsDetailComponent implements OnInit { { title: '运费明细', render: 'amountDetails', className: 'text-right', width: 150 }, { title: '货主', index: 'ltdName', className: 'text-left', width: 200 }, { title: '订单号', render: 'billId', width: 200 }, - { title: '运单号', render: 'wayBillId', width: 200 }, + { title: '运单号', render: 'wayBillId', width: 200 }, { title: '货源编号', index: 'resourceCode', width: 200 }, { title: '服务类型', diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index cb49f728..cabacf83 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -1,4 +1,4 @@ - @@ -64,7 +64,7 @@ [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false" > - + + + + {{ item.billCode }} + {{ item.billCode }} + {{ item.billCode }} +
+ {{ item?.representationsStatusLabel }} +
+
+ {{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' : item?.serviceTypeLabel}} +

创建时间：{{ item?.createTime }}

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 diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 208ea905..bad5ae64 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -65,7 +65,7 @@ export class SystemService extends BaseService { $api_deletebatch_crmCustomer = '/api/mdc/cuc/crmCustomer/deletebatch'; // 获取某个应用的所有菜单 - $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppId'; + $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppIdNoHide'; // 查询网络货运信息表 $api_networkTransporter_page = '/api/mdc/cuc/networkTransporter/list/page'; diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 95bd1a94..703a2fa2 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -140,19 +140,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { } } }, - declareResult: { - title: '申报结果', - type: 'string', - ui: { - placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } - } - }, + isOvertime: { title: '是否逾期', type: 'string', diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index 97ab5369..f5115ec0 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -268,10 +268,10 @@ export class InvoiceDetailComponent implements OnInit { }, { title: '开票金额', - index: 'vatnotax', + index: 'vatmoney', type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) } } ]; }