diff --git a/src/option/business/common.js b/src/option/business/common.js index 8221c47..1d4c113 100644 --- a/src/option/business/common.js +++ b/src/option/business/common.js @@ -42,6 +42,7 @@ export const waybillStatusOptions = [ { label: '草稿', value: 'draft' }, { label: '待执行', value: 'pending' }, { label: '进行中', value: 'running' }, + { label: '待回单确认', value: 'pending_return_confirm' }, { label: '已完成', value: 'completed' }, { label: '已取消', value: 'cancelled' }, ]; diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue index 77529db..6434ca1 100644 --- a/src/views/business/components/waybill-manage-page.vue +++ b/src/views/business/components/waybill-manage-page.vue @@ -5127,7 +5127,7 @@ export default { this.hasPermission(`${this.config.permission}_complete`) && !this.readonlyScope && !row.readonly && - this.statusValue(row) === 'running' + this.statusValue(row) === 'pending_return_confirm' ); }, canMaintainMileage(row) { @@ -6560,6 +6560,9 @@ export default { if (status === 'completed') { return 'primary'; } + if (['pending_return_confirm'].includes(status)) { + return 'warning'; + } return 'warning'; }, normalizeRow(row, saveAsDraft = false) {