Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

车辆接口更新

Browse Source
This commit is contained in:
wangshiming
2022-01-19 14:32:46 +08:00
parent 2c208636e6
commit eca3b314df
6 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -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
},

3
src/app/routes/order-management/components/complaint/complaint.component.ts
View File

@ -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: '投诉原因',

12
src/app/routes/order-management/components/risk/risk.component.ts
View File

@ -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',

2
src/app/routes/order-management/components/vehicle/vehicle.component.html
View File

@ -101,7 +101,7 @@
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div>
{{item?.driverName}}/{{item?.driverPhone}}
{{item?.driverName}}/{{item?.driverPhone}}/{{item?.plateNumber}}
</div>
</ng-template>
<ng-template st-row="payeeName" let-item let-index="index">

54
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
View File

@ -42,7 +42,7 @@
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
<!-- <nz-form-control [nzErrorTip]="'请输入联系人信息'">
<div class="align-center">
<input nz-input [(ngModel)]="data.appUserName" formControlName="loadName{{ idx }}" maxlength="30" />
<input
@ -53,7 +53,30 @@
maxlength="11"
/>
</div>
</nz-form-control>
</nz-form-control> -->
<div style="display: flex">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input
nz-input
[(ngModel)]="data.appUserName"
formControlName="loadName{{ idx }}"
name="loadName{{ idx }}"
maxlength="30"
placeholder="请输入联系人姓名"
/>
</nz-form-control>
<nz-form-control [nzErrorTip]="'请输入联系人电话'">
<input
style="margin-left: 12px"
nz-input
[(ngModel)]="data.contractTelephone"
maxlength="11"
formControlName="loadPhone{{ idx }}"
name="loadPhone{{ idx }}"
placeholder="请输入联系人电话"
/>
</nz-form-control>
</div>
</nz-form-item>
</div>
<button nz-button nzType="primary" (click)="addStartInfo($event)">
@ -90,7 +113,7 @@
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
<!-- <nz-form-control [nzErrorTip]="'请输入联系人信息'">
<div class="align-center">
<input nz-input [(ngModel)]="data.appUserName" formControlName="unloadName{{ idx }}" maxlength="30" />
<input
@ -101,7 +124,30 @@
maxlength="11"
/>
</div>
</nz-form-control>
</nz-form-control> -->
<div style="display: flex">
<nz-form-control [nzErrorTip]="'请输入联系人姓名'">
<input
nz-input
[(ngModel)]="data.appUserName"
maxlength="30"
formControlName="unloadName{{ idx }}"
name="unloadAddress{{ idx }}"
placeholder="请输入联系人姓名"
/>
</nz-form-control>
<nz-form-control [nzErrorTip]="'请输入联系人电话'">
<input
style="margin-left: 12px"
nz-input
[(ngModel)]="data.contractTelephone"
formControlName="unloadPhone{{ idx }}"
name="unloadAddress{{ idx }}"
maxlength="11"
placeholder="请输入联系人电话"
/>
</nz-form-control>
</div>
</nz-form-item>
</div>
<button nz-button nzType="primary" (click)="addEndInfo($event)">

7
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -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 =