From a55b2dc7ca986000b127fb86c1b6791c13537ea3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 14:33:26 +0800 Subject: [PATCH 1/9] fix bug --- .../individual-declare.component.ts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) 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', From 1b0a7d4c9513a204fa161e14dddf8c2be77e57c9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 14:51:51 +0800 Subject: [PATCH 2/9] fix bug --- .../partnertable/partnertable.component.ts | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts index 0a289a0b..1d50eaea 100644 --- a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts +++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts @@ -8,7 +8,7 @@ import { DataService } from '../../../services/data.service'; @Component({ selector: 'app-datatable-partnertable', - templateUrl: './partnertable.component.html', + templateUrl: './partnertable.component.html' }) export class DatatablePartnertableComponent implements OnInit { @ViewChild('st', { static: false }) st!: STComponent; @@ -24,7 +24,7 @@ export class DatatablePartnertableComponent implements OnInit { public service: DataService, private modalSrv: NzModalService, private modal: ModalHelper, - private envSrv: EAEnvironmentService, + private envSrv: EAEnvironmentService ) {} /** @@ -47,7 +47,7 @@ export class DatatablePartnertableComponent implements OnInit { * 选中行 */ get selectedRows() { - return this.st?.list.filter((item) => item.checked) || []; + return this.st?.list.filter(item => item.checked) || []; } /** @@ -60,17 +60,17 @@ export class DatatablePartnertableComponent implements OnInit { /** * 重置表单 */ - resetSF() { + resetSF() { this.sf.reset(); this._$expand = false; - this.isLoading = true + this.isLoading = true; } /** * 程序初始化入口 */ ngOnInit() { this.initSF(); - this.initST() + this.initST(); } /** @@ -84,33 +84,37 @@ export class DatatablePartnertableComponent implements OnInit { title: '合伙人名称', type: 'string', ui: { placeholder: '请输入' }, - readOnly: false, + readOnly: false }, phone: { title: '合伙人类型', type: 'string', - ui: { + ui: { widget: 'select', - placeholder: '请输入' }, - readOnly: false, + placeholder: '请输入' + }, + readOnly: false }, phone01: { title: '合伙人状态', type: 'string', - ui: { + ui: { widget: 'select', - placeholder: '请输入' }, - readOnly: false, + placeholder: '请输入' + }, + readOnly: false }, createTime: { type: 'string', title: '注册时间', - ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema, - }, + ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: { + _$expand: (value: boolean) => value, + }, } as SFDateWidgetSchema + } }, - type: 'object', + type: 'object' }; - this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } }; + this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } }; } /** @@ -118,7 +122,7 @@ export class DatatablePartnertableComponent implements OnInit { */ initST() { this.columns = [ - { title: '合伙人名称', index: 'name', className: 'text-center' }, + { title: '合伙人名称', index: 'networkTransporterName', className: 'text-center' }, { title: '注册时间', index: 'telephone', className: 'text-center' }, { title: '注册时间', index: 'roleName', className: 'text-center' }, { title: '业务员', index: 'lastLoginDate', className: 'text-center' }, @@ -127,23 +131,21 @@ export class DatatablePartnertableComponent implements OnInit { index: 'stateLocked', className: 'text-center', type: 'enum', - enum: { 0: '正常', 1: '冻结' }, + enum: { 0: '正常', 1: '冻结' } }, { title: '客户数', index: 'lastLoginDate', className: 'text-center' }, { title: '收益额', index: 'lastLoginDate', className: 'text-center' }, { title: '已提现金额', index: 'lastLoginDate', className: 'text-center' }, { title: '订单数', index: 'lastLoginDate', className: 'text-center' }, { title: '订单金额', index: 'lastLoginDate', className: 'text-center' }, - { title: '应收订单数', index: 'lastLoginDate', className: 'text-center' }, + { title: '应收订单数', index: 'lastLoginDate', className: 'text-center' } ]; } - + /** * 数据列表状态变化事件 */ change(change: STChange) { // console.log(change); } - - } From 1f5d770714a67a66b12267eb7a7fd9ae54a2f869 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 19 Apr 2022 14:58:11 +0800 Subject: [PATCH 3/9] edit --- src/app/routes/sys-setting/services/system.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'; From b40ca2f5ea1a02139d95510d2c31e391ad45c3f8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 15:06:49 +0800 Subject: [PATCH 4/9] fix bug --- .../mancustomtable.component.ts | 139 +++++++++++++----- 1 file changed, 100 insertions(+), 39 deletions(-) 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 33d0efd4..685633e1 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -19,7 +19,7 @@ export class DatatableMancustomtableComponent implements OnInit { mode = 'year'; date: any = null; defineDate = []; - columns: STColumn[] =[]; + columns: STColumn[] = []; resourceStatus: number = 1; time: any = ['2022-01-01 00:00:00']; dateFormat = 'yyyy'; @@ -61,41 +61,104 @@ export class DatatableMancustomtableComponent implements OnInit { } } }; - initST() { - this.columns =[ - { title: '部门', index: 'department', className: 'text-center', width: '200px' }, - { title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' }, - { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px', iif: ()=> { - console.log(this.resourceStatus); - return this.resourceStatus !== 1 - - } }, - { title: '已认证合伙人', index: 'certifiedCount', className: 'text-center', width: '100px' }, - { title: '新增合伙人数', index: 'addCount', className: 'text-center', width: '100px' }, - { title: '合伙人活跃率', index: 'alivePer', className: 'text-center', width: '100px' }, - { title: '活跃合伙人数', index: 'aliveCount', className: 'text-center', width: '100px' }, - { title: '沉默合伙人数', index: 'silentCount', className: 'text-center', width: '100px' }, - { title: '流失合伙人数', index: 'drainCount', className: 'text-center', width: '100px' }, - { title: '未激活合伙人数', index: 'notActiveCount', className: 'text-center', width: '100px' }, + initST() { + this.columns = [ + { title: '部门', index: 'department', className: 'text-center', width: '150px' }, + { title: '业务员', index: 'salesmen', className: 'text-center', width: '150px' }, + { + title: '已认证货主数', + index: 'certifiedCount', + className: 'text-center', + width: '150px', + iif: () => { + 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: 'addCount', className: 'text-center', width: '100px' }, - { title: '货主活跃率', index: 'alivePer', className: 'text-center', width: '100px' }, - { - title: '活跃货主数', - index: 'aliveCount', - className: 'text-center', - width: '100px' - }, - { title: '沉默货主数', index: 'silentCount', className: 'text-center', width: '100px' }, - { - title: '流失货主数', - index: 'drainCount', - className: 'text-right', - width: '100px', - }, - { title: '未激活货主数', index: 'notActiveCount', className: 'text-center', width: '120px' } - ]; - } + { + title: '新增货主数', + index: 'addCount', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 1 ? false : true; + } + }, + { + title: '货主活跃率', + index: 'alivePer', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 1 ? false : true; + } + }, + { + title: '活跃货主数', + index: 'aliveCount', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 1 ? false : true; + } + }, + { + title: '沉默货主数', + index: 'silentCount', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 1 ? false : true; + } + }, + { + title: '流失货主数', + index: 'drainCount', + className: 'text-right', + width: '150px', + iif: () => { + return this?.resourceStatus !== 1 ? false : true; + } + }, + { + title: '未激活货主数', + index: 'notActiveCount', + className: 'text-center', + width: '150px', + iif: () => { + return this?.resourceStatus !== 1 ? false : true; + } + } + ]; + } /** * 查询参数 */ @@ -238,12 +301,10 @@ export class DatatableMancustomtableComponent implements OnInit { } selectChange(e: number) { console.log(e); - this.resourceStatus = e + 1; - // this.initST(); setTimeout(() => { - this.initST(); - // this.st.load(1); + this.st?.resetColumns(); + this.st?.load(1); }, 500); } } From 522c990d62bb4ada52fd1274ff8971018a31f407 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 19 Apr 2022 15:09:29 +0800 Subject: [PATCH 5/9] edit --- .../withdrawals-detail.component.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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: '服务类型', From 616f3c64cdd817c9cc917a874bb5a3aa96ca2d82 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 15:09:37 +0800 Subject: [PATCH 6/9] 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 7/9] 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 From 77e8b09d2a8676237ad3050f5e27ffcad7e20b09 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 19 Apr 2022 15:54:37 +0800 Subject: [PATCH 8/9] edit --- .../components/invoice-detail/invoice-detail.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 }) } } ]; } From 9babeb38b11e793c2b442f3a01369eec91dd6398 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 16:21:55 +0800 Subject: [PATCH 9/9] fix bug --- .../busitable/busiindex/busiindex.component.html | 4 ++-- .../compliance/customer/customer.component.html | 2 +- .../compliance/index/index.component.html | 2 +- .../compliance/salesman/salesman.component.html | 2 +- .../customindex/customindex.component.html | 6 +++--- .../customtable/driver/driver.component.html | 4 ++-- .../mancustomtable/mancustomtable.component.html | 2 +- .../customtable/owner/owner.component.html | 2 +- .../partnertable/partnertable.component.html | 4 ++-- .../financetable/financetable.component.html | 8 ++++---- .../operationtable/operationtable.component.html | 6 +++--- .../receipts-audit/receipts-audit.component.html | 2 +- .../components/risk/risk.component.html | 16 ++++++++++++++-- 13 files changed, 36 insertions(+), 24 deletions(-) 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/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 }}