From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
index 9aab81e..b6df90d 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
@@ -7,7 +7,16 @@
 		destroy-on-close
 		:close-on-click-modal="false"
 	>
+		<div v-if="dialogReadonly">
+			<el-row class="detail-row-view">
+				<el-col :span="24">
+					<div class="label">{{formLabelStr}}:</div>
+					<div class="val">{{ formData.rejectReason || '' }}</div>
+				</el-col>
+			</el-row>
+		</div>
 		<el-form
+			v-else
 			class="gd-dialog-form"
 			ref="formRef"
 			:model="formData"
@@ -49,7 +58,7 @@
 <script setup>
 import { computed, ref } from 'vue'
 import { ElMessage } from 'element-plus'
-import { fieldRules } from '@ztzf/utils'
+import { fieldRules, getDictLabel } from '@ztzf/utils'
 import { gdWorkOrderHandleStatusApi } from '@/views/orderView/orderManage/orderManage/orderManageApi'
 
 // 初始化表单数据
@@ -88,18 +97,19 @@
 		})
 }
 
-function loadDetail() {
-
-}
-
 let formLabelStr = ref('原因')
-// 打开弹框
+
+
+// 操作类型:1接单,2拒接接单,3申请取消,4申请修改, 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改
 async function open({ mode = 'add', row, formLabel, type } = {}) {
 	dialogMode.value = mode
 	formLabelStr.value = formLabel
-	formData.value = { ...initForm(), ...row, operationType: type }
-	if (mode === 'view'){
-		await loadDetail()
+	formData.value = {
+		workOrderId: row.id,
+		operationType: type,
+	}
+	if (dialogMode.value !== 'add'){
+		formData.value.rejectReason = row.rejectReason
 	}
 }
 

--
Gitblit v1.9.3