diff --git a/web-admin/src/utils/pl-display.ts b/web-admin/src/utils/pl-display.ts index a78e45ac1..e0cfe8804 100644 --- a/web-admin/src/utils/pl-display.ts +++ b/web-admin/src/utils/pl-display.ts @@ -661,7 +661,7 @@ export function buildFuelRegisterCopyText(row: { export function getPlRechargeApplyStatusLabel(status: string) { const map: Record = { draft: '草稿', - pending: '待发放', + pending: '发放中', in_approval: '审批中', rejected: '已驳回', disbursed: '已发放', diff --git a/web-admin/src/views/pl/etc-vehicle-recharge-apply/columnFilterDefs.ts b/web-admin/src/views/pl/etc-vehicle-recharge-apply/columnFilterDefs.ts index cb8dfd883..87f609775 100644 --- a/web-admin/src/views/pl/etc-vehicle-recharge-apply/columnFilterDefs.ts +++ b/web-admin/src/views/pl/etc-vehicle-recharge-apply/columnFilterDefs.ts @@ -5,6 +5,7 @@ const RECHARGE_TYPE_OPTIONS = [{ value: 'etc', label: 'ETC' }] const RECHARGE_STATUS_OPTIONS = [ { value: 'draft', label: '草稿' }, { value: 'in_approval', label: '审批中' }, + { value: 'pending', label: '发放中' }, { value: 'rejected', label: '已驳回' }, { value: 'disbursed', label: '已发放' }, { value: 'cancelled', label: '已作废' } diff --git a/web-admin/src/views/pl/etc-vehicle-recharge-record/index.vue b/web-admin/src/views/pl/etc-vehicle-recharge-record/index.vue index 0f46567f2..05b511a5c 100644 --- a/web-admin/src/views/pl/etc-vehicle-recharge-record/index.vue +++ b/web-admin/src/views/pl/etc-vehicle-recharge-record/index.vue @@ -1089,7 +1089,7 @@ async function handleSubmit() { async function handleDelete(row: VehicleRechargeDisburseBoardItem) { if (!row.recordId) return - await ElMessageBox.confirm('确定撤销该发放登记吗?关联申请将回退为待发放。', '提示', { type: 'warning' }) + await ElMessageBox.confirm('确定撤销该发放登记吗?关联申请将回退为发放中。', '提示', { type: 'warning' }) deleteLoadingMap[row.recordId] = true try { await vehicleRechargeRecordApi.delete(row.recordId) diff --git a/web-admin/src/views/pl/vehicle-recharge-apply/columnFilterDefs.ts b/web-admin/src/views/pl/vehicle-recharge-apply/columnFilterDefs.ts index c2767be94..055dea657 100644 --- a/web-admin/src/views/pl/vehicle-recharge-apply/columnFilterDefs.ts +++ b/web-admin/src/views/pl/vehicle-recharge-apply/columnFilterDefs.ts @@ -9,6 +9,7 @@ const RECHARGE_TYPE_OPTIONS = [ const RECHARGE_STATUS_OPTIONS = [ { value: 'draft', label: '草稿' }, { value: 'in_approval', label: '审批中' }, + { value: 'pending', label: '发放中' }, { value: 'rejected', label: '已驳回' }, { value: 'disbursed', label: '已发放' }, { value: 'cancelled', label: '已作废' } diff --git a/web-admin/src/views/pl/vehicle-recharge-record/index.vue b/web-admin/src/views/pl/vehicle-recharge-record/index.vue index b9722d481..bb0e317e4 100644 --- a/web-admin/src/views/pl/vehicle-recharge-record/index.vue +++ b/web-admin/src/views/pl/vehicle-recharge-record/index.vue @@ -1148,7 +1148,7 @@ async function handleSubmit() { async function handleDelete(row: VehicleRechargeDisburseBoardItem) { if (!row.recordId) return - await ElMessageBox.confirm('确定撤销该发放登记吗?关联申请将回退为待发放。', '提示', { type: 'warning' }) + await ElMessageBox.confirm('确定撤销该发放登记吗?关联申请将回退为发放中。', '提示', { type: 'warning' }) deleteLoadingMap[row.recordId] = true try { await vehicleRechargeRecordApi.delete(row.recordId)