From d6a1a3997beda891d467754d0838a953ddb17606 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 22 一月 2026 13:48:59 +0800
Subject: [PATCH] fix: 优化协同审批部门选择初始化校验及通知公告类型维护删除传参
---
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index a269375..67a635c 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -17,19 +17,19 @@
<el-row>
<el-col :span="24">
<el-form-item label="鐢宠閮ㄩ棬锛�" prop="approveDeptName">
- <el-input v-model="form.approveDeptName" placeholder="璇疯緭鍏�" clearable/>
-<!-- <el-select-->
-<!-- disabled-->
-<!-- v-model="form.approveDeptId"-->
-<!-- placeholder="閫夋嫨閮ㄩ棬"-->
-<!-- >-->
-<!-- <el-option-->
-<!-- v-for="user in productOptions"-->
-<!-- :key="user.deptId"-->
-<!-- :label="user.deptName"-->
-<!-- :value="user.deptId"-->
-<!-- />-->
-<!-- </el-select>-->
+<!-- <el-input v-model="form.approveDeptName" placeholder="璇疯緭鍏�" clearable/>-->
+ <el-select
+ v-model="form.approveDeptId"
+ placeholder="閫夋嫨閮ㄩ棬"
+ @change="handleDeptChange"
+ >
+ <el-option
+ v-for="user in productOptions"
+ :key="user.deptId"
+ :label="user.deptName"
+ :value="user.deptId"
+ />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -217,6 +217,7 @@
const emit = defineEmits(['close'])
import useUserStore from "@/store/modules/user";
import { getCurrentDate } from "@/utils/index.js";
+import log from "@/views/monitor/job/log.vue";
const userStore = useUserStore();
const dialogFormVisible = ref(false);
@@ -279,7 +280,17 @@
function removeApproverNode(index) {
approverNodes.value.splice(index, 1)
}
-
+// 澶勭悊閮ㄩ棬閫夋嫨鍙樺寲
+const handleDeptChange = (deptId) => {
+ if (deptId) {
+ const selectedDept = productOptions.value.find(dept => dept.deptId === deptId);
+ if (selectedDept) {
+ form.value.approveDeptName = selectedDept.deptName;
+ }
+ } else {
+ form.value.approveDeptName = '';
+ }
+};
// 鎵撳紑寮规
const openDialog = (type, row) => {
operationType.value = type;
@@ -287,7 +298,6 @@
userListNoPageByTenantId().then((res) => {
userList.value = res.data;
});
- getProductOptions();
form.value = {}
approverNodes.value = [
{ id: 1, userId: null }
@@ -297,6 +307,9 @@
// 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅骞惰缃儴闂↖D
form.value.approveDeptId = userStore.currentDeptId
+
+ // 鍔犺浇閮ㄩ棬閫夐」锛屽苟鍦ㄥ姞杞藉畬鎴愬悗璁剧疆閮ㄩ棬鍚嶇О
+ getProductOptions();
if (operationType.value === 'edit') {
fileList.value = row.commonFileList
form.value.tempFileIds = fileList.value.map(file => file.id)
@@ -319,8 +332,18 @@
}
}
const getProductOptions = () => {
- getDept().then((res) => {
+ return getDept().then((res) => {
productOptions.value = res.data;
+ // 濡傛灉宸叉湁閮ㄩ棬ID锛岃嚜鍔ㄨ缃儴闂ㄥ悕绉帮紙鐢ㄤ簬楠岃瘉锛�
+ if (form.value.approveDeptId && productOptions.value.length > 0) {
+ const matchedDept = productOptions.value.find(dept =>
+ dept.deptId == form.value.approveDeptId ||
+ String(dept.deptId) === String(form.value.approveDeptId)
+ );
+ if (matchedDept) {
+ form.value.approveDeptName = matchedDept.deptName;
+ }
+ }
});
};
function convertIdToValue(data) {
--
Gitblit v1.9.3