From d04868e8b70fea325b324629c86c2403c41bb595 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 2 Mar 2022 15:01:56 +0800 Subject: [PATCH] fix bug --- proxy.conf.js | 4 ++-- .../components/bulk/bulk.component.html | 5 ++++- .../components/bulk/bulk.component.ts | 1 + .../components/vehicle/vehicle.component.html | 5 ++++- .../components/vehicle/vehicle.component.ts | 1 + .../components/bulk/bulk.component.html | 3 +++ .../components/bulk/bulk.component.ts | 1 + .../components/vehicle/vehicle.component.html | 3 +++ .../components/vehicle/vehicle.component.ts | 17 +++++++++-------- .../components/bulk/bulk.component.html | 6 ++++++ .../components/bulk/bulk.component.ts | 1 + .../components/vehicle/vehicle.component.html | 8 +++++++- .../components/vehicle/vehicle.component.ts | 1 + 13 files changed, 43 insertions(+), 13 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 562ad00b..d8d9c635 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-02-25 17:52:10 + * @LastEditTime : 2022-03-02 14:52:07 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,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/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index 32cbd517..f8f92131 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-01 13:26:59 + * @LastEditTime : 2022-03-02 14:56:27 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -81,6 +81,9 @@
{{ item?.payeeName }}/{{ item?.payeePhone }}
+ +
{{ item?.createUserName }}/{{ item?.createUserPhone }}
+ {{ item.billCode }}
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index a28a46fd..4652ed26 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -429,6 +429,7 @@ export class OrderManagementBulkComponent implements OnInit { className: 'text-right', render: 'mybidDetailInfo' }, + { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' }, { title: '所属项目', index: 'enterpriseProjectName', width: '250px', className: 'text-left' }, diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index c8966484..1573ce29 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-02-28 13:59:54 + * @LastEditTime : 2022-03-02 14:57:31 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -83,6 +83,9 @@ {{ item?.goodsNumber ? item?.goodsNumber + '件' : '' }}
+ +
{{ item?.createUserName }}/{{ item?.createUserPhone }}
+

diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 6a1f0494..1e14877d 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -390,6 +390,7 @@ resourceStatus: any; className: 'text-right', render: 'mybidDetailInfo', }, + { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' }, { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' }, diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html index 08d2310d..513afced 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -75,6 +75,9 @@ [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="loading" > + +

{{ item?.createUserName }}/{{ item?.createUserPhone }}
+
{{ item?.freightPrice | currency }}
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index 0288c323..acd942c8 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -255,6 +255,7 @@ export class SupplyManagementBulkComponent implements OnInit { className: 'text-left', render: 'resourceCode' }, + { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' }, { title: '项目名称', index: 'enterpriseProjectName', width: '220px', className: 'text-left' }, { title: '关联订单', render: 'orderSn', width: '200px', className: 'text-left' }, diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index 15870eb2..7baaf88d 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -71,6 +71,9 @@ [loading]="loading" [scroll]="{ x: '1200px', y: '500px' }" > + +
{{ item?.createUserName }}/{{ item?.createUserPhone }}
+ {{ item?.resourceCode }}

{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}

diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 552e1a30..95e34137 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -21,7 +21,7 @@ export class SupplyManagementVehicleComponent implements OnInit { @ViewChild('st') private readonly st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sfFre', { static: false }) sfFre!: SFComponent; - loading:boolean = true; + loading: boolean = true; schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); _$expand = false; @@ -58,7 +58,7 @@ export class SupplyManagementVehicleComponent implements OnInit { if (this.resourceStatus) { a.resourceStatus = this.resourceStatus; } - this.loading = true + this.loading = true; return { ...a }; @@ -81,13 +81,13 @@ export class SupplyManagementVehicleComponent implements OnInit { return requestOptions; }; afterRes = (data: any[], rawData?: any) => { - this.loading = false + this.loading = false; return data.map(item => ({ ...item, - disabled: item.auditStatus !== '1', + disabled: item.auditStatus !== '1' })); }; - + get selectedRows() { return this.st?.list.filter(item => item.checked) || []; } @@ -362,7 +362,7 @@ export class SupplyManagementVehicleComponent implements OnInit { }, allowClear: true, onSearch: (q: any) => { - let str =q.replace(/^\s+|\s+$/g,""); + let str = q.replace(/^\s+|\s+$/g, ''); if (str) { return this.service .request(this.service.$api_enterpriceList, { enterpriseName: str }) @@ -477,12 +477,14 @@ export class SupplyManagementVehicleComponent implements OnInit { className: 'text-left', render: 'resourceCode' }, + { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' }, + { title: '项目名称', index: 'enterpriseProjectName', @@ -606,8 +608,7 @@ export class SupplyManagementVehicleComponent implements OnInit { iif: item => item.resourceStatus === '1' && item.serviceType === '2', acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] } }, - {type: 'divider'}, - + { type: 'divider' } ] } ]; diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html index 5bb5507e..16a60a9f 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.html +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html @@ -63,6 +63,12 @@ [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="service.http.loading" > + +
{{ item?.createUserName }}/{{ item?.createUserPhone }}
+ + +
{{ item?.createUserName }}/{{ item?.createUserPhone }}
+
{{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }}
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index 53ebc4c6..feacd841 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -247,6 +247,7 @@ tabs = { className: 'text-right', render: 'billExpenseDetailVOList' }, + { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' }, { title: '关联订单号', index: 'billCode', width: '180px', className: 'text-left' }, diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html index 6b1e452b..6d04ebdb 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@