From 90b6240233ef9a896a4075758eabb7342e2c49a0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 四月 2026 09:00:56 +0800
Subject: [PATCH] 湟水峡 1.销售、采购模块不要客户合同号、项目名称 2.销售报价和销售台账价格导入按照客户类型赋值 3.人力资源字段增减 4.仓储物流四根模块tab标签页和查询条件修改 5.销售、采购模块字段增减
---
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 82 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 27 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index 67a635c..92737fc 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -19,9 +19,12 @@
<el-form-item label="鐢宠閮ㄩ棬锛�" prop="approveDeptName">
<!-- <el-input v-model="form.approveDeptName" placeholder="璇疯緭鍏�" clearable/>-->
<el-select
- v-model="form.approveDeptId"
+ v-model="form.approveDeptIdArray"
placeholder="閫夋嫨閮ㄩ棬"
+ multiple
+ collapse-tags
@change="handleDeptChange"
+ style="width: 100%"
>
<el-option
v-for="user in productOptions"
@@ -33,9 +36,17 @@
</el-form-item>
</el-col>
</el-row>
+ <!-- 瀹℃壒鏍囬锛堜粎褰� approveType 涓� 9 鏃舵樉绀猴級 -->
+ <el-row v-if="props.approveType == 9">
+ <el-col :span="24">
+ <el-form-item label="瀹℃壒鏍囬锛�" prop="approveTitle">
+ <el-input v-model="form.approveTitle" placeholder="璇疯緭鍏ュ鎵规爣棰�" clearable />
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-row>
<el-col :span="24">
- <el-form-item :label="props.approveType == 5 ? '閲囪喘璇存槑锛�' : '瀹℃壒浜嬬敱锛�'" prop="approveReason">
+ <el-form-item :label="getApproveReasonLabel()" prop="approveReason">
<el-input v-model="form.approveReason" placeholder="璇疯緭鍏�" clearable type="textarea" />
</el-form-item>
</el-col>
@@ -234,8 +245,9 @@
approveTime: "",
approveId: "",
approveUser: "",
- approveDeptId: "",
+ approveDeptIdArray: [],
approveDeptName: "",
+ approveTitle: "", // 瀹℃壒鏍囬锛堣嚜鐢卞崗鍚屽鎵逛娇鐢級
approveReason: "",
checkResult: "",
tempFileIds: [],
@@ -249,7 +261,8 @@
approveTime: [{ required: false, message: "璇疯緭鍏�", trigger: "change" },],
approveId: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
approveUser: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
- approveDeptName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ approveDeptName: [{ required: true, message: "璇烽�夋嫨鐢宠閮ㄩ棬", trigger: "change" }],
+ approveTitle: [{ required: true, message: "璇疯緭鍏ュ鎵规爣棰�", trigger: "blur" }],
approveReason: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
checkResult: [{ required: false, message: "璇疯緭鍏�", trigger: "blur" }],
startDate: [{ required: true, message: "璇烽�夋嫨璇峰亣寮�濮嬫椂闂�", trigger: "change" }],
@@ -268,6 +281,19 @@
}
})
+// 鑾峰彇瀹℃壒浜嬬敱鏍囩
+const getApproveReasonLabel = () => {
+ const type = Number(props.approveType)
+ if (type === 5) {
+ return '閲囪喘璁″垝璇存槑锛�'
+ } else if (type === 9) {
+ return '閿�鍞悎鍚屽彿锛�'
+ } else if (type === 10) {
+ return '瀹℃壒浜嬬敱锛�'
+ }
+ return '瀹℃壒浜嬬敱锛�'
+}
+
// 瀹℃壒浜鸿妭鐐圭浉鍏�
const approverNodes = ref([
{ id: 1, userId: null }
@@ -281,12 +307,12 @@
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;
- }
+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 = '';
}
@@ -298,6 +324,7 @@
userListNoPageByTenantId().then((res) => {
userList.value = res.data;
});
+ getProductOptions();
form.value = {}
approverNodes.value = [
{ id: 1, userId: null }
@@ -306,16 +333,26 @@
form.value.approveTime = getCurrentDate();
// 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅骞惰缃儴闂↖D
- form.value.approveDeptId = userStore.currentDeptId
-
- // 鍔犺浇閮ㄩ棬閫夐」锛屽苟鍦ㄥ姞杞藉畬鎴愬悗璁剧疆閮ㄩ棬鍚嶇О
- getProductOptions();
+ 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(',')
@@ -332,18 +369,8 @@
}
}
const getProductOptions = () => {
- return getDept().then((res) => {
+ 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) {
@@ -403,13 +430,14 @@
}
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();
})
--
Gitblit v1.9.3