From d67cf55491333a9c3fc4549a8702be4cbb458188 Mon Sep 17 00:00:00 2001 From: weicw1996 Date: Thu, 22 Oct 2026 13:32:35 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E8=BF=90=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=94=AF=E6=8C=81=E5=BE=85=E5=9B=9E=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/business/common.js | 1 + src/views/business/components/waybill-manage-page.vue | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) 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) {