From 6ed0045e0f379dbd7fdd065a65f8898c482a7cab Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 22 Jan 2026 15:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 7575fcc..07f477c 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
@@ -2,12 +2,21 @@
<el-dialog
class="gd-dialog"
v-model="visible"
- :title="titleEnum[dialogMode]"
+ title="编辑"
@closed="visible = false"
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"
@@ -17,7 +26,7 @@
>
<el-row>
<el-col :span="24">
- <el-form-item label="拒绝原因" prop="rejectReason">
+ <el-form-item :label="formLabelStr" prop="rejectReason">
<el-input
class="gd-input"
v-model="formData.rejectReason"
@@ -49,12 +58,14 @@
<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'
+import { pxToRem } from '@/utils/rem'
+import dayjs from 'dayjs'
// 初始化表单数据
const initForm = () => ({
- operationType: 2,
+ operationType: null,
rejectReason: '',
workOrderId: null,
})
@@ -79,7 +90,7 @@
submitting.value = true
gdWorkOrderHandleStatusApi(formData.value)
.then(res => {
- ElMessage.success('拒绝接单成功')
+ ElMessage.success('提交成功')
visible.value = false
emit('success')
})
@@ -88,10 +99,12 @@
})
}
+let formLabelStr = ref('原因')
// 打开弹框
-async function open({ mode = 'add', row } = {}) {
+async function open({ mode = 'add', row, formLabel, type } = {}) {
dialogMode.value = mode
- formData.value = {...formData.value,...row}
+ formLabelStr.value = formLabel
+ formData.value = { workOrderId: row.id, operationType: type, rejectReason: row.rejectReason }
}
defineExpose({ open })
--
Gitblit v1.9.3