Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
@ -89,7 +89,7 @@
|
||||
<div *ngFor="let i of item?.goodsInfoVOList">
|
||||
<p>货物名称:{{i?.goodsName}}</p>
|
||||
<p>重量/体积:{{i?.weight}}吨/{{i?.volume}}方</p>
|
||||
<p>车型/车长:{{i?.maxWeight}}/ {{i?.maxCube}}</p>
|
||||
<p>车型/车长:{{i?.carModel}}/ {{i?.carLength}}</p>
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
|
||||
@ -76,7 +76,7 @@
|
||||
</sv-container>
|
||||
<sv-container col="2">
|
||||
<sv label="货物数量">
|
||||
{{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
|
||||
{{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
|
||||
</sv>
|
||||
<sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
|
||||
<sv label="承运司机">
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
[nzCustomContent]="true"
|
||||
>
|
||||
<span>{{ car.carNo }} -</span>
|
||||
<span>{{ car.carLength }}米,{{ car.carLoad }}顿 -</span>
|
||||
<span>{{ car.carLength }}米,{{ car.carLoad }}吨 -</span>
|
||||
<span *ngIf="car?.approvalStatus === 20 && !car.carStatus" class="text-success-dark">空闲</span>
|
||||
<span *ngIf="car?.approvalStatus === 20 && car.carStatus" class="text-warning-dark">已被指派</span>
|
||||
<span *ngIf="car?.approvalStatus !== 20" class="text-red-dark">未认证</span>
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div sv-container *ngIf="i">
|
||||
<sv label="项目">{{ i?.enterpriseProjectId }}</sv>
|
||||
<sv label="项目">{{ i?.enterpriseProjectName }}</sv>
|
||||
<sv label="截止时间">{{ i?.deadlineTime }}</sv>
|
||||
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
|
||||
<sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
|
||||
@ -64,9 +64,9 @@
|
||||
<sv label="货物名称">
|
||||
{{ item?.goodsName }}
|
||||
</sv>
|
||||
<sv label="货物数量"> {{ item?.weight }}顿 | {{ item?.volume }}方 </sv>
|
||||
<sv label="剩余"> {{ 10 }}顿 | {{ 10 }}方 </sv>
|
||||
<sv label="用车需求"> {{ item?.maxWeight }} | {{ item?.maxCube }}米 </sv>
|
||||
<sv label="货物数量"> {{ item?.weight }}吨 | {{ item?.volume }}方 </sv>
|
||||
<sv label="剩余"> {{ 10 }}吨 | {{ 10 }}方 </sv>
|
||||
<sv label="用车需求"> {{ item?.carModel }} | {{ item?.carLength }}米 </sv>
|
||||
<sv label="承运信息">
|
||||
{{ i?.carrierInformationVO?.driverName }} / {{ i?.carrierInformationVO?.driverTelephone }} /
|
||||
{{ i?.carrierInformationVO?.driverLicensePlate }}
|
||||
|
||||
@ -353,7 +353,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
placeholder: '请输入'
|
||||
}
|
||||
},
|
||||
maxWeight: {
|
||||
carModel: {
|
||||
type: 'string',
|
||||
title: '车型/车长',
|
||||
ui: {
|
||||
@ -364,7 +364,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
errors: { required: '请选择车型' }
|
||||
}
|
||||
},
|
||||
maxCube: {
|
||||
carLength: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
ui: {
|
||||
@ -376,7 +376,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
},
|
||||
required: ['weight', 'maxWeight', 'maxCube', 'freightPrice', 'rule', 'settlementBasis']
|
||||
required: ['weight', 'carModel', 'carLength', 'freightPrice', 'rule', 'settlementBasis']
|
||||
};
|
||||
this.ui4 = {
|
||||
'*': {
|
||||
@ -401,10 +401,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
$number: {
|
||||
grid: { span: 8 }
|
||||
},
|
||||
$maxWeight: {
|
||||
$carModel: {
|
||||
grid: { span: 12 }
|
||||
},
|
||||
$maxCube: {
|
||||
$carLength: {
|
||||
grid: { span: 12 }
|
||||
}
|
||||
};
|
||||
@ -680,8 +680,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
{
|
||||
...this.sf4.value,
|
||||
...this.sf3.value,
|
||||
maxWeight: this.sf4.value.maxWeight.join(','),
|
||||
maxCube: this.sf4.value.maxCube.join(',')
|
||||
carModel: this.sf4.value.carModel.join(','),
|
||||
carLength: this.sf4.value.carLength.join(',')
|
||||
}
|
||||
]
|
||||
};
|
||||
@ -926,8 +926,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
|
||||
weight: res?.goodsInfoVOList[0]?.weight || '',
|
||||
volume: res?.goodsInfoVOList[0]?.volume || '',
|
||||
number: res?.goodsInfoVOList[0]?.number || '',
|
||||
maxWeight: res?.goodsInfoVOList[0]?.maxWeight?.split(',') || '',
|
||||
maxCube: res?.goodsInfoVOList[0]?.maxCube?.split(',') || ''
|
||||
carModel: res?.goodsInfoVOList[0]?.carModel?.split(',') || '',
|
||||
carLength: res?.goodsInfoVOList[0]?.carLength?.split(',') || ''
|
||||
};
|
||||
if (this.PageStatus === '大宗修改') {
|
||||
this.sf4data.id = res?.goodsInfoVOList[0]?.id;
|
||||
|
||||
@ -373,7 +373,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
|
||||
placeholder: '请输入'
|
||||
}
|
||||
},
|
||||
maxWeight: {
|
||||
carModel: {
|
||||
type: 'string',
|
||||
title: '车型/车长',
|
||||
default: [],
|
||||
@ -385,7 +385,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
|
||||
errors: { required: '请选择车型' }
|
||||
}
|
||||
},
|
||||
maxCube: {
|
||||
carLength: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
default: [],
|
||||
@ -398,7 +398,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
},
|
||||
required: ['weight', 'maxWeight', 'maxCube', 'freightPrice', 'rule', 'settlementBasis']
|
||||
required: ['weight', 'carModel', 'carLength', 'freightPrice', 'rule', 'settlementBasis']
|
||||
};
|
||||
this.ui4 = {
|
||||
'*': {
|
||||
@ -423,10 +423,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
|
||||
$number: {
|
||||
grid: { span: 8 }
|
||||
},
|
||||
$maxWeight: {
|
||||
$carModel: {
|
||||
grid: { span: 12 }
|
||||
},
|
||||
$maxCube: {
|
||||
$carLength: {
|
||||
grid: { span: 12 }
|
||||
}
|
||||
};
|
||||
@ -598,8 +598,8 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
|
||||
{
|
||||
...sf3Values,
|
||||
...this.sf4.value,
|
||||
maxWeight: this.sf4.value.maxWeight.join(','),
|
||||
maxCube: this.sf4.value.maxCube.join(',')
|
||||
carModel: this.sf4.value.carModel.join(','),
|
||||
carLength: this.sf4.value.carLength.join(',')
|
||||
}
|
||||
];
|
||||
const params = {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-12 10:52:50
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-02-10 14:39:20
|
||||
* @LastEditTime : 2022-02-10 16:32:01
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
-->
|
||||
@ -71,27 +71,29 @@
|
||||
[data]="service.$api_get_bulkPage_list"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||
[loading]="service.http.loading"
|
||||
>
|
||||
<!--运费单价 -->
|
||||
<ng-template st-row="freightPrice" let-item let-index="index">
|
||||
<div class="mr-xs">{{ item.freightPrice | currency }} </div>
|
||||
<div class="mr-xs">{{ item?.freightPrice | currency }} </div>
|
||||
</ng-template>
|
||||
<!--货源编号 -->
|
||||
<ng-template st-row="resourceCode" let-item let-index="index">
|
||||
<a [routerLink]="'bulk-detail/' + item.id">{{ item?.resourceCode }}</a>
|
||||
<a [routerLink]="'bulk-detail/' + item?.id">{{ item?.resourceCode }}</a>
|
||||
<div>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</div>
|
||||
<div>{{ item?.resourceStatusLabel }}</div>
|
||||
</ng-template>
|
||||
<!-- 服务类型 -->
|
||||
<ng-template st-row="serviceType" let-item let-index="index">
|
||||
<div *ngIf="item.serviceType === 1">抢单</div>
|
||||
<div *ngIf="item.serviceType === 2">指派</div>
|
||||
<div *ngIf="item?.serviceType === 1">抢单</div>
|
||||
<div *ngIf="item?.serviceType === 2">指派</div>
|
||||
</ng-template>
|
||||
<!-- 关联订单 -->
|
||||
<ng-template st-row="orderSn" let-item let-index="index">
|
||||
<div *ngFor="let item of item?.wayBillClassifiedStatisticsVOList">
|
||||
<label>{{ item.wayBillStatusLabel }}</label>
|
||||
<label>{{ item?.wayBillStatusLabel }}</label>
|
||||
(<span [ngStyle]="{ color: item?.count > 0 ? '#1890FF' : '' }">{{ item?.count }}</span
|
||||
>)
|
||||
</div>
|
||||
@ -104,8 +106,8 @@
|
||||
</ng-template>
|
||||
<!-- 用车需求 -->
|
||||
<ng-template st-row="useCarDemand" let-item let-index="index">
|
||||
<div>车型: {{ item.carModelLabel }}</div>
|
||||
<div class="error">车长: {{ item.carLenghtLabel }} 米</div>
|
||||
<div>车型: {{ item?.carModelLabel }}</div>
|
||||
<div class="error">车长: {{ item?.carLenghtLabel }} 米</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</div>
|
||||
|
||||
@ -78,6 +78,13 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
this.st?.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
}
|
||||
afterRes = (data: any[], rawData?: any) => {
|
||||
console.log(data)
|
||||
return data.map(item => ({
|
||||
...item,
|
||||
disabled: item.auditStatus !== '1'
|
||||
}));
|
||||
};
|
||||
/**
|
||||
* 初始化查询表单
|
||||
*/
|
||||
@ -207,7 +214,7 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
},
|
||||
}
|
||||
};
|
||||
this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
|
||||
this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 16 } } };
|
||||
}
|
||||
/**
|
||||
* 初始化数据列表
|
||||
@ -222,7 +229,6 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
className: 'text-left',
|
||||
render: 'resourceCode'
|
||||
},
|
||||
{ title: '服务类型', index: 'serviceTypeLabel', width: '150px', 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' },
|
||||
@ -297,22 +303,22 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
{
|
||||
text: '货源审核',
|
||||
click: (_record) => this.audit(_record, 1),
|
||||
iif: item => item.auditStatus == 1,
|
||||
iif: item => item.resourceStatus == 1,
|
||||
},
|
||||
{
|
||||
text: '二维码 ',
|
||||
click: (_record) => this.assignedQrcode(_record),
|
||||
iif: item => item.auditStatus == 1 || item.auditStatus == 2,
|
||||
iif: item => item.resourceStatus == 1,
|
||||
},
|
||||
{
|
||||
text: '修改单价',
|
||||
click: (_record) => this.modification(_record),
|
||||
iif: item => item.auditStatus == 1 || item.auditStatus == 2,
|
||||
iif: item => item.resourceStatus == 1 ,
|
||||
},
|
||||
{
|
||||
text: '取消货源',
|
||||
click: (_record) => this.delOne(_record),
|
||||
iif: item => item.auditStatus == 1 || item.auditStatus == 2,
|
||||
iif: item => item.resourceStatus == 1,
|
||||
},
|
||||
{
|
||||
text: '再下一单',
|
||||
@ -492,8 +498,8 @@ export class SupplyManagementBulkComponent implements OnInit {
|
||||
});
|
||||
modalRef.afterClose.subscribe(res => {
|
||||
if (res) {
|
||||
console.log(res)
|
||||
// this.getGoodsSourceDetail();
|
||||
this.st?.reload();
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@ -67,10 +67,12 @@
|
||||
</div>
|
||||
</nz-form-item>
|
||||
</div>
|
||||
<button nz-button nzType="primary" (click)="addStartInfo($event)">
|
||||
<i nz-icon nzType="plus"></i>
|
||||
添加装货地
|
||||
</button>
|
||||
<div style="display: flex; justify-content: center;">
|
||||
<button nz-button nzType="primary" (click)="addStartInfo($event)">
|
||||
<i nz-icon nzType="plus"></i>
|
||||
添加装货地
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="8">
|
||||
<div style="display: flex; justify-content: center">
|
||||
@ -126,11 +128,13 @@
|
||||
</div>
|
||||
</nz-form-item>
|
||||
</div>
|
||||
<div style="display: flex; justify-content: center;">
|
||||
<button nz-button nzType="primary" (click)="addEndInfo($event)">
|
||||
<i nz-icon nzType="plus"></i>
|
||||
添加卸货地
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-row [nzGutter]="24" style="margin-top: 24px">
|
||||
<div nz-col [nzSpan]="9">
|
||||
@ -142,6 +146,7 @@
|
||||
nzFormat="yyyy-MM-dd HH:mm:ss"
|
||||
formControlName="loadingTime"
|
||||
[(ngModel)]="loadingTime"
|
||||
(ngModelChange)="changeLO(loadingTime)"
|
||||
></nz-date-picker>
|
||||
</nz-form-control>
|
||||
</nz-form-item>
|
||||
@ -155,6 +160,7 @@
|
||||
nzFormat="yyyy-MM-dd HH:mm:ss"
|
||||
formControlName="unloadingTime"
|
||||
[(ngModel)]="unloadingTime"
|
||||
(ngModelChange)="changeUn(unloadingTime)"
|
||||
></nz-date-picker>
|
||||
</nz-form-control>
|
||||
</nz-form-item>
|
||||
|
||||
@ -316,7 +316,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
placeholder: '请输入'
|
||||
}
|
||||
},
|
||||
maxWeight: {
|
||||
carModel: {
|
||||
type: 'string',
|
||||
title: '车型/车长',
|
||||
ui: {
|
||||
@ -327,7 +327,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
errors: { required: '请选择车型' }
|
||||
}
|
||||
},
|
||||
maxCube: {
|
||||
carLength: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
ui: {
|
||||
@ -339,7 +339,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
},
|
||||
required: ['weight', 'maxWeight', 'maxCube']
|
||||
required: ['weight', 'carModel', 'carLength']
|
||||
};
|
||||
this.ui4 = {
|
||||
'*': {
|
||||
@ -355,10 +355,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
$number: {
|
||||
grid: { span: 8 }
|
||||
},
|
||||
$maxWeight: {
|
||||
$carModel: {
|
||||
grid: { span: 12 }
|
||||
},
|
||||
$maxCube: {
|
||||
$carLength: {
|
||||
grid: { span: 12 }
|
||||
}
|
||||
};
|
||||
@ -871,8 +871,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
{
|
||||
...this.sf4.value,
|
||||
...this.sf3.value,
|
||||
maxWeight: this.sf4.value.maxWeight.join(','),
|
||||
maxCube: this.sf4.value.maxCube.join(',')
|
||||
carModel: this.sf4.value.carModel.join(','),
|
||||
carLength: this.sf4.value.carLength.join(',')
|
||||
}
|
||||
]
|
||||
};
|
||||
@ -1076,8 +1076,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
weight: res?.goodsInfoVOList[0]?.weight,
|
||||
volume: res?.goodsInfoVOList[0]?.volume,
|
||||
vehicleDemand: res?.goodsInfoVOList[0]?.vehicleDemand,
|
||||
maxCube: res?.goodsInfoVOList[0]?.maxCube?.split(','),
|
||||
maxWeight: res?.goodsInfoVOList[0]?.maxWeight?.split(',') || '',
|
||||
carLength: res?.goodsInfoVOList[0]?.carLength?.split(','),
|
||||
carModel: res?.goodsInfoVOList[0]?.carModel?.split(',') || '',
|
||||
number: res?.goodsInfoVOList[0]?.number,
|
||||
goodsTypeName: res?.goodsInfoVOList[0]?.goodsTypeName,
|
||||
modifyUserId: res?.goodsInfoVOList[0]?.modifyUserId,
|
||||
@ -1171,4 +1171,54 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
}
|
||||
});
|
||||
}
|
||||
changeUn(value: any) {
|
||||
console.log(value)
|
||||
if (typeof value !== 'string') {
|
||||
var c = new Date(value);
|
||||
value =
|
||||
c.getFullYear() +
|
||||
'-' +
|
||||
this.addPreZero(c.getMonth() + 1) +
|
||||
'-' +
|
||||
this.addPreZero(c.getDate()) +
|
||||
' ' +
|
||||
this.addPreZero(c.getHours()) +
|
||||
':' +
|
||||
this.addPreZero(c.getMinutes()) +
|
||||
':' +
|
||||
this.addPreZero(c.getSeconds());
|
||||
}
|
||||
console.log(value)
|
||||
console.log(this.loadingTime)
|
||||
console.log(this.loadingTime > value)
|
||||
if(this.loadingTime > value) {
|
||||
console.log('错误')
|
||||
this.unloadingTime = ''
|
||||
}
|
||||
}
|
||||
changeLO(value: any) {
|
||||
console.log(value)
|
||||
if (typeof value !== 'string') {
|
||||
var c = new Date(value);
|
||||
value =
|
||||
c.getFullYear() +
|
||||
'-' +
|
||||
this.addPreZero(c.getMonth() + 1) +
|
||||
'-' +
|
||||
this.addPreZero(c.getDate()) +
|
||||
' ' +
|
||||
this.addPreZero(c.getHours()) +
|
||||
':' +
|
||||
this.addPreZero(c.getMinutes()) +
|
||||
':' +
|
||||
this.addPreZero(c.getSeconds());
|
||||
}
|
||||
console.log(value)
|
||||
console.log(this.unloadingTime)
|
||||
console.log(this.unloadingTime < value)
|
||||
if(this.unloadingTime < value) {
|
||||
console.log('错误')
|
||||
this.loadingTime = ''
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -76,11 +76,13 @@
|
||||
</div>
|
||||
<div nz-row>
|
||||
<div nz-col [nzSpan]="4"></div>
|
||||
<div style="display: flex; justify-content: center;">
|
||||
<button nz-button nzType="primary" (click)="addStartInfo()">
|
||||
<i nz-icon nzType="plus"></i>
|
||||
添加装货地
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="4">
|
||||
<div style="display: flex; justify-content: center">
|
||||
@ -141,11 +143,13 @@
|
||||
</div>
|
||||
<div nz-row>
|
||||
<div nz-col [nzSpan]="4"></div>
|
||||
<div style="display: flex; justify-content: center;">
|
||||
<button nz-button nzType="primary" (click)="addEndInfo()">
|
||||
<i nz-icon nzType="plus"></i>
|
||||
添加卸货地
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-row [nzGutter]="24" style="margin-top: 24px">
|
||||
|
||||
@ -333,7 +333,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
|
||||
placeholder: '请输入'
|
||||
}
|
||||
},
|
||||
maxWeight: {
|
||||
carModel: {
|
||||
type: 'string',
|
||||
title: '车型/车长',
|
||||
ui: {
|
||||
@ -344,7 +344,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
|
||||
errors: { required: '请选择车型' }
|
||||
}
|
||||
},
|
||||
maxCube: {
|
||||
carLength: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
ui: {
|
||||
@ -356,7 +356,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
},
|
||||
required: ['weight', 'maxWeight', 'maxCube']
|
||||
required: ['weight', 'carModel', 'carLength']
|
||||
};
|
||||
this.ui4 = {
|
||||
'*': {
|
||||
@ -372,10 +372,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
|
||||
$number: {
|
||||
grid: { span: 8 }
|
||||
},
|
||||
$maxWeight: {
|
||||
$carModel: {
|
||||
grid: { span: 12 }
|
||||
},
|
||||
$maxCube: {
|
||||
$carLength: {
|
||||
grid: { span: 12 }
|
||||
}
|
||||
};
|
||||
@ -781,8 +781,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
|
||||
{
|
||||
...this.sf4.value,
|
||||
...this.sf3.value,
|
||||
maxWeight: this.sf4.value.maxWeight.join(','),
|
||||
maxCube: this.sf4.value.maxCube.join(',')
|
||||
carModel: this.sf4.value.carModel.join(','),
|
||||
carLength: this.sf4.value.carLength.join(',')
|
||||
}
|
||||
];
|
||||
// 运费信息
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
{{item.goodsName}}
|
||||
</sv>
|
||||
<sv label="货物数量">
|
||||
{{item.weight}}顿,{{item.volume}}方,{{item.number}}件
|
||||
{{item.weight}}吨,{{item.volume}}方,{{item.number}}件
|
||||
</sv>
|
||||
</ng-container>
|
||||
</sv-container>
|
||||
@ -118,7 +118,7 @@
|
||||
<nz-card nzTitle="服务信息">
|
||||
<sv-container>
|
||||
<sv label="增值服务套餐">
|
||||
{{i?.insuranceType}}
|
||||
{{i?.insuranceTypeLabel}}
|
||||
</sv>
|
||||
<sv label="货物价值">
|
||||
{{i?.goodsValue}}
|
||||
|
||||
@ -57,24 +57,25 @@
|
||||
[data]="service.$api_get_wholePage_list"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||
[loading]="service.http.loading"
|
||||
[scroll]="{ x: '1200px', y: '500px' }"
|
||||
>
|
||||
<ng-template st-row="resourceCode" let-item let-index="index">
|
||||
<a [routerLink]="'vehicle-detail/' + item.id">{{ item.resourceCode }}</a>
|
||||
<p>{{ item.resourceTypeLabel }}{{ item.serviceTypeLabel }}</p>
|
||||
<a [routerLink]="'vehicle-detail/' + item?.id">{{ item?.resourceCode }}</a>
|
||||
<p>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</p>
|
||||
<p>{{ item?.resourceStatusLabel }}</p>
|
||||
</ng-template>
|
||||
<ng-template st-row="totalAmount" let-item let-index="index">
|
||||
<div class="mr-xs">{{ item.totalAmount | currency }} </div>
|
||||
<div class="mr-xs">{{ item?.totalAmount | currency }} </div>
|
||||
</ng-template>
|
||||
<ng-template st-row="surcharge" let-item let-index="index">
|
||||
<div class="mr-xs">{{ item.surcharge | currency }} </div>
|
||||
<div class="mr-xs">{{ item?.surcharge | currency }} </div>
|
||||
</ng-template>
|
||||
<ng-template st-row="useCarDemand" let-item let-index="index">
|
||||
<div>车型: {{ item.carModelLabel }}</div>
|
||||
<div class="error">车长: {{ item.expand }} 米</div>
|
||||
<div>车型: {{ item?.carModelLabel }}</div>
|
||||
<div class="error">车长: {{ item?.expand }} 米</div>
|
||||
</ng-template>
|
||||
<ng-template #contentTemplate>
|
||||
<div>
|
||||
|
||||
@ -61,6 +61,13 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
...a
|
||||
};
|
||||
}
|
||||
afterRes = (data: any[], rawData?: any) => {
|
||||
console.log(data)
|
||||
return data.map(item => ({
|
||||
...item,
|
||||
disabled: item.auditStatus !== '1'
|
||||
}));
|
||||
};
|
||||
get selectedRows() {
|
||||
return this.st?.list.filter(item => item.checked) || [];
|
||||
}
|
||||
@ -81,13 +88,13 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
maxLength: 50,
|
||||
ui: {
|
||||
placeholder: '请输入备注',
|
||||
widget: 'textarea'
|
||||
widget: 'textarea',
|
||||
}
|
||||
}
|
||||
},
|
||||
require: ['remarks']
|
||||
};
|
||||
this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
|
||||
this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 16 } } };
|
||||
}
|
||||
|
||||
add(): void {
|
||||
@ -533,7 +540,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
||||
{
|
||||
text: '货源审核',
|
||||
click: _record => this.audit(_record, 1),
|
||||
iif: item => item.auditStatus === '1'
|
||||
iif: item => item.resourceStatus === '1'
|
||||
},
|
||||
{
|
||||
text: '修改货源',
|
||||
|
||||
@ -74,7 +74,7 @@
|
||||
{{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件
|
||||
</sv>
|
||||
<sv label="用车需求">
|
||||
{{i?.goodsInfos?.[0]?.maxWeightLabel}}/{{i?.goodsInfos?.[0]?.maxCube}}
|
||||
{{i?.goodsInfos?.[0]?.carModelLabel}}/{{i?.goodsInfos?.[0]?.carLength}}
|
||||
</sv>
|
||||
<sv label="承运司机">
|
||||
{{i?.driver?.name}}/{{i?.driver?.phone}}
|
||||
|
||||
@ -74,7 +74,7 @@
|
||||
{{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件
|
||||
</sv>
|
||||
<sv label="用车需求">
|
||||
{{i?.goodsInfos?.[0]?.maxWeightLabel}}/{{i?.goodsInfos?.[0]?.maxCube}}
|
||||
{{i?.goodsInfos?.[0]?.carModelLabel}}/{{i?.goodsInfos?.[0]?.carLength}}
|
||||
</sv>
|
||||
<sv label="承运司机">
|
||||
{{i?.driverVo?.name}}/{{i?.driverVo?.phone}}
|
||||
|
||||
Reference in New Issue
Block a user