✨ 运单列表支持待回单确认状态
This commit is contained in:
@@ -42,6 +42,7 @@ export const waybillStatusOptions = [
|
|||||||
{ label: '草稿', value: 'draft' },
|
{ label: '草稿', value: 'draft' },
|
||||||
{ label: '待执行', value: 'pending' },
|
{ label: '待执行', value: 'pending' },
|
||||||
{ label: '进行中', value: 'running' },
|
{ label: '进行中', value: 'running' },
|
||||||
|
{ label: '待回单确认', value: 'pending_return_confirm' },
|
||||||
{ label: '已完成', value: 'completed' },
|
{ label: '已完成', value: 'completed' },
|
||||||
{ label: '已取消', value: 'cancelled' },
|
{ label: '已取消', value: 'cancelled' },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -5127,7 +5127,7 @@ export default {
|
|||||||
this.hasPermission(`${this.config.permission}_complete`) &&
|
this.hasPermission(`${this.config.permission}_complete`) &&
|
||||||
!this.readonlyScope &&
|
!this.readonlyScope &&
|
||||||
!row.readonly &&
|
!row.readonly &&
|
||||||
this.statusValue(row) === 'running'
|
this.statusValue(row) === 'pending_return_confirm'
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
canMaintainMileage(row) {
|
canMaintainMileage(row) {
|
||||||
@@ -6560,6 +6560,9 @@ export default {
|
|||||||
if (status === 'completed') {
|
if (status === 'completed') {
|
||||||
return 'primary';
|
return 'primary';
|
||||||
}
|
}
|
||||||
|
if (['pending_return_confirm'].includes(status)) {
|
||||||
|
return 'warning';
|
||||||
|
}
|
||||||
return 'warning';
|
return 'warning';
|
||||||
},
|
},
|
||||||
normalizeRow(row, saveAsDraft = false) {
|
normalizeRow(row, saveAsDraft = false) {
|
||||||
|
|||||||
Reference in New Issue
Block a user