diff --git a/proxy.conf.js b/proxy.conf.js index 87118004..3e80aedb 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-01-19 11:29:14 + * @LastEditTime : 2022-01-19 13:56:39 * @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/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index 919b1453..edf11ab5 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -126,6 +126,7 @@ export class OrderManagementComplaintComponent implements OnInit { { title: '投诉单号', width: '170px', + fixed: 'left', className: 'text-center', render: 'complaintCode' }, @@ -141,7 +142,7 @@ export class OrderManagementComplaintComponent implements OnInit { index: 'complainantTime', className: 'text-center', }, - { title: '托运方', index: 'shipperAppUserName', width: '120px', className: 'text-center' }, + { title: '托运方', index: 'shipperAppUserName', width: '200px', className: 'text-center' }, { title: '司机', index: 'driverIdLabel', width: '120px', className: 'text-center' }, { title: '投诉原因', diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index f9f0b509..70e47d00 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -223,18 +223,18 @@ export class OrderManagementRiskComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, - { - title: '申诉状态', - width: '100px', - className: 'text-left', - index: 'representationsStatusLabel' - }, { title: '订单号', width: '200px', className: 'text-left', render: 'billCode' }, + { + title: '申诉状态', + width: '100px', + className: 'text-left', + index: 'representationsStatusLabel' + }, { title: '货源编号', width: '200px', 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 383b5426..f2c3e486 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -101,7 +101,7 @@ - {{item?.driverName}}/{{item?.driverPhone}} + {{item?.driverName}}/{{item?.driverPhone}}/{{item?.plateNumber}} diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 38fff258..d95e1f50 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -42,7 +42,7 @@ 联系人 - + + + + + + + + + @@ -90,7 +113,7 @@ 联系人 - + + + + + + + + + diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index c4474e29..9779a9ac 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -57,6 +57,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { public shipperSrv: ShipperBaseService ) { this.validateForm1 = fb.group({ + loadAddress0: [null, [Validators.required]], + loadName0: [null, [Validators.required]], + loadPhone0: [null, [Validators.required,Validators.pattern('^[0-9]*$')]], + unloadAddress0: [null, [Validators.required]], + unloadName0: [null, [Validators.required]], + unloadPhone0: [null, [Validators.required,Validators.pattern('^[0-9]*$')]], loadingTime: [null, []], unloadingTime: [null, []] }); @@ -766,6 +772,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { if (this.validateForm1.invalid || !this.sf3.valid || !this.sf1.valid || !this.sf4.valid || !this.sf6.valid || !this.sf7.valid) { return; } + console.log(this.validateForm1.value?.unloadingTime) if (typeof this.validateForm1.value.unloadingTime !== 'string') { var c = new Date(this.validateForm1.value.unloadingTime); this.validateForm1.value.unloadingTime =