From 9babeb38b11e793c2b442f3a01369eec91dd6398 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 16:21:55 +0800 Subject: [PATCH 1/4] 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 }}

From 6dcb90f7f41860973648c6e55e34755d952c1235 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 16:37:30 +0800 Subject: [PATCH 2/4] fix bug --- .../order-reporting.component.ts | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 0b7f33a6..58833620 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -109,7 +109,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { placeholder: '请输入', }, }, - shipperAppUserId: { + shipperId: { type: 'string', title: '货主', ui: { @@ -163,27 +163,33 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, - putStatus: { - title: '上传状态', - type: 'string', - ui: { - placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value, - }, - } - }, + // putStatus: { + // title: '上传状态', + // type: 'string', + // enum: [ + // {label: '待上传',value: 0}, + // {label: '已上传',value: 1}, + // {label: '上传异常',value: 2}, + // ], + // ui: { + // widget:'select', + // placeholder: '请选择', + // visibleIf: { + // _$expand: (value: boolean) => value, + // }, + // } + // }, checkStatus: { title: '本地校验', type: 'string', + enum: [ + {label: '校验中',value: 0}, + {label: '通过',value: 1}, + {label: '不通过',value: 2}, + ], ui: { + widget:'select', placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, visibleIf: { _$expand: (value: boolean) => value, }, From c86d7005554400d68cfe4f3a114c80709a707858 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 17:36:36 +0800 Subject: [PATCH 3/4] fix bug --- .../order-reporting/order-reporting.component.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 58833620..4477e8e8 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -261,6 +261,18 @@ export class TaxManagementOrderReportingComponent implements OnInit { className: 'text-center', width: '180px', }, + { + title: '档案编号', + index: 'archivesNo', + className: 'text-center', + width: '180px', + }, + { + title: '品牌型号', + index: 'carBrand', + className: 'text-center', + width: '180px', + }, { title: '装货地', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' }, { title: '装货地详细地址', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' }, { title: '卸货地', index: 'unloadAddress', render: 'dischargePlace', className: 'text-center', width: '120px' }, From 1b2dd81fed658c78d97b24fa3fccf8524bbcf3bc Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 17:48:29 +0800 Subject: [PATCH 4/4] fix bug --- .../compliance/customer/customer.component.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.ts b/src/app/routes/datatable/components/compliance/customer/customer.component.ts index 00fefb7d..067f73c7 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.ts +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.ts @@ -5,7 +5,7 @@ import { SFComponent } from '@delon/form'; * @Author : Shiming * @Date : 2022-03-30 13:55:41 * @LastEditors : Shiming - * @LastEditTime : 2022-04-15 17:40:53 + * @LastEditTime : 2022-04-19 17:45:44 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\compliance\\customer\\customer.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -125,15 +125,15 @@ export class DatatableComplianceCustomerComponent implements OnInit { ngOnInit(): void {} onChange(result: any) { if (this.mode === 'year') { - this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00']; + this.time = [this.datePipe.transform(this.date, 'yyyy')]; } else if (this.mode === 'month') { - this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00']; + this.time = [this.datePipe.transform(this.date, 'yyyy-MM')]; } else if (this.mode === 'date') { - this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00']; + this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd')]; } else { this.time = [ - this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', - this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00' + this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd'), + this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') ]; } this.st.reload({ ...this.reqParams });