From f954d74ed0eb856d4b88e151ee8d3ab329d9d6ad Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 02 Feb 2026 10:38:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
index 914e977..0d26f6f 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -235,7 +235,7 @@
</template>
<template v-if="permission.flyOrder_controlReview">
<el-button v-if="taskStatus === '3'" @click="addDescription" color="#F2F3F5">驳回</el-button>
- <el-button v-if="taskStatus === '3'" @click="statusChange(4)" color="#4C34FF">同意</el-button>
+ <el-button v-if="taskStatus === '3'" @click="statusChange(4)" color="#4C34FF">通过</el-button>
</template>
</template>
<RefuseOrderDialog1
@@ -300,10 +300,10 @@
const getAirName = inject('getAirName')
const gdStatusObj = {
- '0': { reason: '拒绝原因', operationType: '2' },
+ '0': { reason: '拒绝原因', operationType: '2',title:'拒绝签收' },
'1': { reason: '拒绝原因' },
'2': { reason: '' },
- '3': { reason: '驳回原因', operationType: '5' },
+ '3': { reason: '驳回原因', operationType: '5',title:'驳回' },
'4': { reason: '驳回原因' },
'5': { reason: '' },
'6': { reason: '拒绝原因' },
@@ -337,6 +337,7 @@
row: formData.value,
type: gdStatusObj[taskStatus.value].operationType,
formLabel: gdStatusObj[taskStatus.value].reason,
+ title: gdStatusObj[taskStatus.value]?.title
})
})
}
--
Gitblit v1.9.3