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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-22 10:23:10 +08:00
parent d2b42d961c
commit 870a2119d8
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/order-management/components/bulk/bulk.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 11:10:14 * @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-22 10:09:02 * @LastEditTime: 2021-12-22 10:10:22
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@ -63,7 +63,7 @@
<ng-template st-row="billCode" let-item let-index="index"> <ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.wayBillCode}}</a> <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.wayBillCode}}</a>
<div> <div>
<span>{{item?.billStatusLabel}}99999</span> <span>{{item?.billStatusLabel}}</span>
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="goodsName" let-item let-index="index"> <ng-template st-row="goodsName" let-item let-index="index">

10
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -432,22 +432,32 @@ tabs = {
{ {
text: '查看评价', text: '查看评价',
click: (_record) => this.viewEvaluate(_record), click: (_record) => this.viewEvaluate(_record),
iif: item => item.billStatus == '5',
}, },
{ {
text: '运费变更记录', text: '运费变更记录',
click: (_record) => this.OpenPrice(_record), click: (_record) => this.OpenPrice(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6',
}, },
{ {
text: '变更运费', text: '变更运费',
click: (_record) => this.updateFreight(_record), click: (_record) => this.updateFreight(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
}, },
{ {
text: '确认签收', text: '确认签收',
click: (_record) => this.confirmReceipt(_record), click: (_record) => this.confirmReceipt(_record),
iif: item => item.billStatus == '4',
}, },
{ {
text: '取消订单', text: '取消订单',
click: (_record) => this.cancellation(_record), click: (_record) => this.cancellation(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
},
{
text: '修改订单',
click: (_record) => this.cancellation(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
}, },
], ],
}, },

16
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -374,23 +374,37 @@ resourceStatus: any;
{ {
text: '查看评价', text: '查看评价',
click: (_record) => this.viewEvaluate(_record), click: (_record) => this.viewEvaluate(_record),
iif: item => item.billStatus == '5',
}, },
{ {
text: '运费变更记录', text: '运费变更记录',
click: (_record) => this.OpenPrice(_record), click: (_record) => this.OpenPrice(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6',
}, },
{ {
text: '变更运费', text: '变更运费',
click: (_record) => this.updateFreight(_record), click: (_record) => this.updateFreight(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
}, },
{ {
text: '确认签收', text: '确认签收',
click: (_record) => this.confirmReceipt(_record), click: (_record) => this.confirmReceipt(_record),
iif: item => item.billStatus == '4',
}, },
{ {
text: '取消订单', text: '取消订单',
click: (_record) => this.cancellation(_record), click: (_record) => this.cancellation(_record),
iif: item => item.externalSn === '1' || item.externalSn === 1, iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
},
{
text: '修改订单',
click: (_record) => this.cancellation(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
},
{
text: '查看轨迹',
click: (_record) => this.cancellation(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
}, },
], ],