From 1c0863efe062af3ebcdecb8c10568d779f5c8295 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 26 一月 2026 15:10:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New' into dev_tide_mis_xindao
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 44a0bcd..167a921 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -6,7 +6,7 @@
width="700px"
@close="closeDia"
>
- <el-form :model="form" label-width="140px" label-position="top" ref="formRef">
+ <el-form :model="form" :rules="rules" label-width="140px" label-position="top" ref="formRef">
<el-row>
<el-col :span="24">
<el-form-item label="娴佺▼缂栧彿锛�" prop="approveId">
@@ -16,7 +16,7 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="鐢宠閮ㄩ棬锛�">
+ <el-form-item label="鐢宠閮ㄩ棬锛�" prop="approveDeptId">
<el-select
disabled
v-model="form.approveDeptId"
@@ -218,8 +218,12 @@
approveReason: "",
checkResult: "",
},
+ rules: {
+ // 浣跨敤閮ㄩ棬ID鍋氬繀濉牎楠岋紝閬垮厤鍚嶇О鏈悓姝ュ鑷磋鎶�
+ approveDeptId: [{ required: true, message: "璇烽�夋嫨鐢宠閮ㄩ棬", trigger: "change" }],
+ },
});
-const { form } = toRefs(data);
+const { form, rules } = toRefs(data);
// 鑺傜偣鏍囬
const getNodeTitle = (index, len) => {
@@ -261,8 +265,8 @@
getProductOptions().then(() => {
// 纭繚鍊肩被鍨嬪尮閰嶏紙濡傛灉閫夐」宸插姞杞斤級
if (productOptions.value.length > 0 && form.value.approveDeptId) {
- const matchedOption = productOptions.value.find(opt =>
- opt.deptId == form.value.approveDeptId ||
+ const matchedOption = productOptions.value.find(opt =>
+ opt.deptId == form.value.approveDeptId ||
String(opt.deptId) === String(form.value.approveDeptId)
);
if (matchedOption) {
@@ -379,4 +383,4 @@
width: 200px;
height: 60px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3