From a19afa518be370078ff505ab65dcf0fbfe5de07a Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期三, 01 四月 2026 17:13:16 +0800
Subject: [PATCH] fix: 移除提交数据中多余的approveDeptIdArray赋值
---
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 102 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 38 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index e0af994..d85bb76 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -16,11 +16,15 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="鐢宠閮ㄩ棬锛�" prop="approveDeptId">
+ <el-form-item label="鐢宠閮ㄩ棬锛�" prop="approveDeptName">
+<!-- <el-input v-model="form.approveDeptName" placeholder="璇疯緭鍏�" clearable/>-->
<el-select
- disabled
- v-model="form.approveDeptId"
+ v-model="form.approveDeptIdArray"
placeholder="閫夋嫨閮ㄩ棬"
+ multiple
+ collapse-tags
+ @change="handleDeptChange"
+ style="width: 100%"
>
<el-option
v-for="user in productOptions"
@@ -42,9 +46,9 @@
<!-- 璇峰亣鏃堕棿锛堜粎褰� approveType 涓� 2 鏃舵樉绀猴級 -->
<el-row :gutter="30" v-if="props.approveType == 2">
<el-col :span="12">
- <el-form-item label="璇峰亣寮�濮嬫椂闂达細" prop="leaveStartTime">
+ <el-form-item label="璇峰亣寮�濮嬫椂闂达細" prop="startDate">
<el-date-picker
- v-model="form.leaveStartTime"
+ v-model="form.startDate"
type="date"
placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
value-format="YYYY-MM-DD"
@@ -55,9 +59,9 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璇峰亣缁撴潫鏃堕棿锛�" prop="leaveEndTime">
+ <el-form-item label="璇峰亣缁撴潫鏃堕棿锛�" prop="endDate">
<el-date-picker
- v-model="form.leaveEndTime"
+ v-model="form.endDate"
type="date"
placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
value-format="YYYY-MM-DD"
@@ -71,9 +75,9 @@
<!-- 鎶ラ攢閲戦锛堜粎褰� approveType 涓� 4 鏃舵樉绀猴級 -->
<el-row v-if="props.approveType == 4">
<el-col :span="24">
- <el-form-item label="鎶ラ攢閲戦锛�" prop="reimbursementAmount">
+ <el-form-item label="鎶ラ攢閲戦锛�" prop="price">
<el-input-number
- v-model="form.reimbursementAmount"
+ v-model="form.price"
placeholder="璇疯緭鍏ユ姤閿�閲戦"
:min="0"
:precision="2"
@@ -87,9 +91,9 @@
<!-- 鍑哄樊鍦扮偣锛堜粎褰� approveType 涓� 3 鏃舵樉绀猴級 -->
<el-row v-if="props.approveType == 3">
<el-col :span="24">
- <el-form-item label="鍑哄樊鍦扮偣锛�" prop="businessTripLocation">
+ <el-form-item label="鍑哄樊鍦扮偣锛�" prop="location">
<el-input
- v-model="form.businessTripLocation"
+ v-model="form.location"
placeholder="璇疯緭鍏ュ嚭宸湴鐐�"
clearable
/>
@@ -145,6 +149,9 @@
<el-select
v-model="form.approveUser"
placeholder="閫夋嫨浜哄憳"
+ filterable
+ default-first-option
+ :reserve-keyword="false"
>
<el-option
v-for="user in userList"
@@ -212,6 +219,8 @@
const { proxy } = getCurrentInstance()
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);
@@ -228,27 +237,28 @@
approveTime: "",
approveId: "",
approveUser: "",
- approveDeptId: "",
+ approveDeptIdArray: [],
+ approveDeptName: "",
approveReason: "",
checkResult: "",
tempFileIds: [],
approverList: [], // 鏂板瀛楁锛屽瓨鍌ㄦ墍鏈夎妭鐐圭殑瀹℃壒浜篿d
- leaveStartTime: "", // 璇峰亣寮�濮嬫椂闂�
- leaveEndTime: "", // 璇峰亣缁撴潫鏃堕棿
- reimbursementAmount: null, // 鎶ラ攢閲戦
- businessTripLocation: "" // 鍑哄樊鍦扮偣
+ startDate: "", // 璇峰亣寮�濮嬫椂闂�
+ endDate: "", // 璇峰亣缁撴潫鏃堕棿
+ price: null, // 鎶ラ攢閲戦
+ location: "" // 鍑哄樊鍦扮偣
},
rules: {
approveTime: [{ required: false, message: "璇疯緭鍏�", trigger: "change" },],
approveId: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
approveUser: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- approveDeptId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ approveDeptName: [{ required: true, message: "璇烽�夋嫨鐢宠閮ㄩ棬", trigger: "change" }],
approveReason: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkResult: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- leaveStartTime: [{ required: true, message: "璇烽�夋嫨璇峰亣寮�濮嬫椂闂�", trigger: "change" }],
- leaveEndTime: [{ required: true, message: "璇烽�夋嫨璇峰亣缁撴潫鏃堕棿", trigger: "change" }],
- reimbursementAmount: [{ required: true, message: "璇疯緭鍏ユ姤閿�閲戦", trigger: "blur" }],
- businessTripLocation: [{ required: true, message: "璇疯緭鍏ュ嚭宸湴鐐�", trigger: "blur" }],
+ startDate: [{ required: true, message: "璇烽�夋嫨璇峰亣寮�濮嬫椂闂�", trigger: "change" }],
+ endDate: [{ required: true, message: "璇烽�夋嫨璇峰亣缁撴潫鏃堕棿", trigger: "change" }],
+ price: [{ required: true, message: "璇疯緭鍏ユ姤閿�閲戦", trigger: "blur" }],
+ location: [{ required: true, message: "璇疯緭鍏ュ嚭宸湴鐐�", trigger: "blur" }],
},
});
const { form, rules } = toRefs(data);
@@ -273,7 +283,17 @@
function removeApproverNode(index) {
approverNodes.value.splice(index, 1)
}
-
+// 澶勭悊閮ㄩ棬閫夋嫨鍙樺寲
+const handleDeptChange = (deptIds) => {
+ if (deptIds && deptIds.length > 0) {
+ const selectedNames = productOptions.value
+ .filter(dept => deptIds.includes(dept.deptId))
+ .map(dept => dept.deptName);
+ form.value.approveDeptName = selectedNames.join(',');
+ } else {
+ form.value.approveDeptName = '';
+ }
+};
// 鎵撳紑寮规
const openDialog = (type, row) => {
operationType.value = type;
@@ -290,13 +310,26 @@
form.value.approveTime = getCurrentDate();
// 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅骞惰缃儴闂↖D
- form.value.approveDeptId = userStore.currentDeptId
+ form.value.approveDeptIdArray = []
if (operationType.value === 'edit') {
fileList.value = row.commonFileList
form.value.tempFileIds = fileList.value.map(file => file.id)
currentApproveStatus.value = row.approveStatus
approveProcessGetInfo({id: row.approveId,approveReason: '1'}).then(res => {
form.value = {...res.data}
+ // 澶勭悊閮ㄩ棬鍙嶆樉锛堟牴鎹悗绔繑鍥炵殑 approveDeptId 澶勭悊涓烘暟缁勶級
+ const deptId = res.data.approveDeptId;
+ if (deptId !== undefined && deptId !== null) {
+ if (Array.isArray(deptId)) {
+ form.value.approveDeptIdArray = deptId;
+ } else if (typeof deptId === 'string' && deptId.includes(',')) {
+ form.value.approveDeptIdArray = deptId.split(',').map(id => parseInt(id.trim())).filter(id => !isNaN(id));
+ } else if (typeof deptId === 'string' || typeof deptId === 'number') {
+ form.value.approveDeptIdArray = [parseInt(deptId)];
+ }
+ } else {
+ form.value.approveDeptIdArray = [];
+ }
// 鍙嶆樉瀹℃壒浜�
if (res.data && res.data.approveUserIds) {
const userIds = res.data.approveUserIds.split(',')
@@ -344,43 +377,44 @@
}
// 褰� approveType 涓� 2 鏃讹紝鏍￠獙璇峰亣鏃堕棿
if (props.approveType == 2) {
- if (!form.value.leaveStartTime) {
+ if (!form.value.startDate) {
proxy.$modal.msgError("璇烽�夋嫨璇峰亣寮�濮嬫椂闂达紒")
return
}
- if (!form.value.leaveEndTime) {
+ if (!form.value.endDate) {
proxy.$modal.msgError("璇烽�夋嫨璇峰亣缁撴潫鏃堕棿锛�")
return
}
// 鏍￠獙缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�
- if (new Date(form.value.leaveEndTime) < new Date(form.value.leaveStartTime)) {
+ if (new Date(form.value.endDate) < new Date(form.value.startDate)) {
proxy.$modal.msgError("璇峰亣缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂达紒")
return
}
}
// 褰� approveType 涓� 3 鏃讹紝鏍￠獙鍑哄樊鍦扮偣
if (props.approveType == 3) {
- if (!form.value.businessTripLocation || form.value.businessTripLocation.trim() === '') {
+ if (!form.value.location || form.value.location.trim() === '') {
proxy.$modal.msgError("璇疯緭鍏ュ嚭宸湴鐐癸紒")
return
}
}
// 褰� approveType 涓� 4 鏃讹紝鏍￠獙鎶ラ攢閲戦
if (props.approveType == 4) {
- if (!form.value.reimbursementAmount || form.value.reimbursementAmount <= 0) {
+ if (!form.value.price || form.value.price <= 0) {
proxy.$modal.msgError("璇疯緭鍏ユ湁鏁堢殑鎶ラ攢閲戦锛�")
return
}
}
proxy.$refs.formRef.validate(valid => {
if (valid) {
+ const submitData = { ...form.value };
if (operationType.value === "add" || currentApproveStatus.value == 3) {
- approveProcessAdd(form.value).then(res => {
+ approveProcessAdd(submitData).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
})
} else {
- approveProcessUpdate(form.value).then(res => {
+ approveProcessUpdate(submitData).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
})
@@ -395,14 +429,6 @@
dialogFormVisible.value = false;
emit('close')
};
-// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
-function getCurrentDate() {
- const today = new Date();
- const year = today.getFullYear();
- const month = String(today.getMonth() + 1).padStart(2, "0"); // 鏈堜唤浠�0寮�濮�
- const day = String(today.getDate()).padStart(2, "0");
- return `${year}-${month}-${day}`;
-}
// 涓婁紶鍓嶆牎妫�
function handleBeforeUpload(file) {
--
Gitblit v1.9.3