From 2e4dc3becd0e62fb019b2b2b1007b50a12e684d2 Mon Sep 17 00:00:00 2001
From: 王恒 <318726284@qq.com>
Date: 星期一, 11 八月 2025 15:16:04 +0800
Subject: [PATCH] '合并代码'
---
src/views/system/manage/index.vue | 154 ++++++++++++++++++++++++++++----------------------
1 files changed, 86 insertions(+), 68 deletions(-)
diff --git a/src/views/system/manage/index.vue b/src/views/system/manage/index.vue
index c9cc324..d2545aa 100644
--- a/src/views/system/manage/index.vue
+++ b/src/views/system/manage/index.vue
@@ -11,7 +11,7 @@
>
<el-form-item label="璁″垝鍚嶇О" prop="companyName">
<el-input
- v-model="queryParams.planName"
+ v-model="queryParams.enforceReason"
placeholder="璇疯緭鍏ヨ鍒掑悕绉�"
clearable
style="width: 200px"
@@ -27,9 +27,9 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎵ф硶鍗曚綅" prop="executiveSection">
+ <el-form-item label="鎵ф硶鍗曚綅" prop="applyDeptIds">
<el-input
- v-model="queryParams.executiveSection"
+ v-model="queryParams.applyDeptIds"
placeholder="璇疯緭鍏ユ墽娉曞崟浣�"
clearable
style="width: 200px"
@@ -102,27 +102,27 @@
<template #default="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column
- prop="planNo"
+ prop="orderNo"
label="璁″垝缂栧彿"
width="180"
></el-table-column>
<el-table-column
- prop="planName"
+ prop="enforceReason"
label="璁″垝鍚嶇О"
width="180"
></el-table-column>
<el-table-column
- prop="makeOrgName"
+ prop="applyOrgName"
label="鍒跺畾鏈烘瀯"
width="180"
></el-table-column>
<el-table-column
- prop="checkdObject"
+ prop="companyName"
label="琚鏌ュ璞�"
width="180"
></el-table-column>
<el-table-column
- prop="unifiedSocialCreditCode"
+ prop="companyCode"
label="缁熶竴绀句細淇＄敤浠ｇ爜"
width="180"
></el-table-column>
@@ -132,17 +132,17 @@
width="180"
></el-table-column>
<el-table-column
- prop="checkdType"
+ prop="inspectionMethod"
label="妫�鏌ユ柟寮�"
width="180"
></el-table-column>
<el-table-column
- prop="checkdContent"
+ prop="enforceContent"
label="妫�鏌ュ唴瀹�"
width="180"
></el-table-column>
<el-table-column
- prop="executiveSection"
+ prop="applyDeptNames"
label="鎵ц绉戝"
width="180"
></el-table-column>
@@ -157,7 +157,7 @@
width="180"
></el-table-column>
<el-table-column
- prop="planStatus"
+ prop="orderStatus"
label="鐘舵��"
width="180"
></el-table-column>
@@ -190,8 +190,8 @@
<el-form ref="deptRef" :model="form" :rules="rules" label-width="140px">
<el-row :gutter="20">
<el-col :span="24">
- <el-form-item label="璁″垝鍚嶇О" prop="planName">
- <el-input v-model="form.planName" placeholder="璇疯緭鍏ヨ鍒掑悕绉�" />
+ <el-form-item label="璁″垝鍚嶇О" prop="enforceReason">
+ <el-input v-model="form.enforceReason" placeholder="璇疯緭鍏ヨ鍒掑悕绉�" />
</el-form-item>
</el-col>
</el-row>
@@ -210,7 +210,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎵ц绉戝" prop="executiveSection">
+ <el-form-item label="鎵ц绉戝" prop="applyDeptIds">
<el-select
v-model="selectOffices"
multiple
@@ -244,7 +244,7 @@
<el-col :span="24">
<el-form-item label="琚鏌ュ璞′俊鎭�">
<el-table
- :data="form.checkdObject"
+ :data="checkedList"
max-height="200px"
style="width: 100%"
>
@@ -256,9 +256,9 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="妫�鏌ユ柟寮�" prop="checkdType">
+ <el-form-item label="妫�鏌ユ柟寮�" prop="inspectionMethod">
<el-select
- v-model="form.checkdType"
+ v-model="form.inspectionMethod"
placeholder="璇烽�夋嫨妫�鏌ユ柟寮�"
style="width: 100%"
>
@@ -290,9 +290,9 @@
</el-row>
<el-row :gutter="20">
<el-col :span="24">
- <el-form-item label="妫�鏌ュ唴瀹�" prop="checkdContent">
+ <el-form-item label="妫�鏌ュ唴瀹�" prop="enforceContent">
<el-input
- v-model="form.checkdContent"
+ v-model="form.enforceContent"
type="textarea"
placeholder="璇疯緭鍏ユ鏌ュ唴瀹�"
/>
@@ -397,12 +397,12 @@
planDetail.planNo
}}</el-form-item>
<el-form-item label="璁″垝鍚嶇О锛�">{{
- planDetail.planName
+ planDetail.enforceReason
}}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍒跺畾璁″垝鐨勬満鏋勶細">{{
- planDetail.makeOrgName
+ planDetail.applyOrgName
}}</el-form-item>
<el-form-item label="琚鏌ョ殑瀵硅薄锛�">{{
planDetail.checkdObject
@@ -420,17 +420,17 @@
</el-col>
<el-col :span="12">
<el-form-item label="妫�鏌ユ柟寮忥細">{{
- planDetail.checkdType
+ planDetail.inspectionMethod
}}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎵ц绉戝锛�">{{
- planDetail.executiveSection
+ planDetail.applyDeptNames
}}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="妫�鏌ュ唴瀹癸細">{{
- planDetail.checkdContent
+ planDetail.enforceContent
}}</el-form-item>
</el-col>
<el-col :span="12">
@@ -567,26 +567,29 @@
const deptOptions = ref(undefined);
const selectOffices = ref([]);
const officeList = ref([]);
+let checkedList = ref([]); // 閫変腑鐨勪紒涓氬垪琛�
const data = reactive({
form: {
- planName: "", // 璁″垝鍚嶇О
- makeOrgId: "", // 鍒跺畾鏈烘瀯id
- makeOrgName: "", // 鍒跺畾鏈烘瀯
- executiveSection: "", // 鎵ц绉戝
- executiveSectionName: "", // 鎵ц绉戝鍚嶇О
- checkdObject: [], // 琚鏌ュ璞″垪琛�
- checkdIds: "", // 琚鏌ュ璞d
- checkdType: "", // 妫�鏌ユ柟寮�
+ enforceReason: "", // 璁″垝鍚嶇О
+ applyOrgId: "", // 鍒跺畾鏈烘瀯id
+ applyOrgName: "", // 鍒跺畾鏈烘瀯
+ applyDeptIds: "", // 鎵ц绉戝
+ applyDeptNames: "", // 鎵ц绉戝鍚嶇О
+ companyName: "", // 琚鏌ュ璞�
+ companyId: "", // 琚鏌ュ璞d
+ companyCode: "", // 琚鏌ュ璞�
industry: "", // 鎵�灞炶涓�
- checkdContent: "", // 妫�鏌ュ唴瀹�
+ inspectionMethod: "", // 妫�鏌ユ柟寮�
+ enforceContent: "", // 妫�鏌ュ唴瀹�
planFrequency: "", // 璁″垝棰戞
planFrequencyUnit: "1", // 璁″垝棰戞鍗曚綅
planMonth: "", // 璁″垝鏈堜唤
},
queryParams: {
+ orderType: 1,
planNo: "",
- planName: "",
- executiveSection: "",
+ enforceReason: "",
+ applyDeptNames: "",
value1: "",
pageNum: 1,
pageSize: 10,
@@ -594,10 +597,10 @@
},
rules: {
planNo: [{ required: true, message: "璁″垝缂栧彿涓嶈兘涓虹┖", trigger: "blur" }],
- planName: [
+ enforceReason: [
{ required: true, message: "璁″垝鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
],
- makeOrgId: [
+ applyOrgId: [
{ required: true, message: "鍒跺畾璁″垝鐨勬満鏋勪笉鑳戒负绌�", trigger: "blur" },
],
checkdIds: [
@@ -609,10 +612,10 @@
industry: [
{ required: true, message: "鎵�灞炶涓氫笉鑳戒负绌�", trigger: "blur" },
],
- checkdContent: [
+ enforceContent: [
{ required: true, message: "妫�鏌ュ唴瀹逛笉鑳戒负绌�", trigger: "blur" },
],
- executiveSection: [
+ applyDeptIds: [
{ required: true, message: "鎵ц绉戝涓嶈兘涓虹┖", trigger: "blur" },
],
planFrequency: [
@@ -621,7 +624,7 @@
planMonth: [
{ required: true, message: "璁″垝鏈堜唤涓嶈兘涓虹┖", trigger: "blur" },
],
- checkdType: [
+ inspectionMethod: [
{ required: true, message: "妫�鏌ユ柟寮忎笉鑳戒负绌�", trigger: "blur" },
],
planStatus: [{ required: true, message: "鐘舵�佷笉鑳戒负绌�", trigger: "blur" }],
@@ -640,7 +643,7 @@
listDept({
pageNum: 1,
pageSize: 1000,
- parentId: form.value.makeOrgId,
+ parentId: form.value.applyOrgId,
}).then((response) => {
officeList.value = response.data;
});
@@ -660,11 +663,11 @@
// 鏈烘瀯閫夋嫨
const changeTreeHandler = (e) => {
- form.value.makeOrgId = e.id;
- form.value.makeOrgName = e.label;
+ form.value.applyOrgId = e.id;
+ form.value.applyOrgName = e.label;
selectOffices.value = [];
- form.value.executiveSection = "";
- form.value.executiveSectionName = "";
+ form.value.applyDeptIds = "";
+ form.value.applyDeptNames = "";
if (e.id) {
getOfficeList();
}
@@ -672,12 +675,14 @@
// 绉戝閫夋嫨
const handleSelectOffices = (value) => {
- form.value.executiveSectionName = value.map((item) => {
- return officeList.value.find((obj) => obj.deptId === item).deptName;
- }).join(",");
- form.value.executiveSection = value.join(",");
- console.log(form.value.executiveSection);
- console.log(form.value.executiveSectionName);
+ form.value.applyDeptNames = value
+ .map((item) => {
+ return officeList.value.find((obj) => obj.deptId === item).deptName;
+ })
+ .join(",");
+ form.value.applyDeptIds = value.join(",");
+ console.log(form.value.applyDeptIds);
+ console.log(form.value.applyDeptNames);
};
/*** 璁″垝瀵煎叆鍙傛暟 */
@@ -693,7 +698,7 @@
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
headers: { Authorization: "Bearer " + getToken() },
// 涓婁紶鐨勫湴鍧�
- url: import.meta.env.VITE_APP_BASE_API + "/system/manage/importData",
+ url: import.meta.env.VITE_APP_BASE_API + "/enforce/order/importData",
});
/**鏂囦欢涓婁紶涓鐞� */
const handleFileUploadProgress = (event, file, fileList) => {
@@ -748,19 +753,21 @@
/** 琛ㄥ崟閲嶇疆 */
function reset() {
form.value = {
- planName: "", // 璁″垝鍚嶇О
+ enforceReason: "", // 璁″垝鍚嶇О
makeOrgId: "", // 鍒跺畾鏈烘瀯id
- makeOrgName: "", // 鍒跺畾鏈烘瀯
- executiveSection: "", // 鎵ц绉戝
- executiveSectionName: "", // 鎵ц绉戝鍚嶇О
- checkdObject: [], // 琚鏌ュ璞″垪琛�
+ applyOrgName: "", // 鍒跺畾鏈烘瀯
+ applyDeptIds: "", // 鎵ц绉戝id
+ applyDeptNames: "", // 鎵ц绉戝鍚嶇О
checkdIds: "", // 琚鏌ュ璞d
- checkdType: "", // 妫�鏌ユ柟寮�
+ companyName: "", // 琚鏌ュ璞″悕绉�
+ companyCode: "", // 缁熶竴绀句細淇＄敤浠ｇ爜
+ inspectionMethod: "", // 妫�鏌ユ柟寮�
industry: "", // 鎵�灞炶涓�
- checkdContent: "", // 妫�鏌ュ唴瀹�
+ enforceContent: "", // 妫�鏌ュ唴瀹�
planFrequency: "", // 璁″垝棰戞
planFrequencyUnit: "", // 璁″垝棰戞鍗曚綅
planMonth: "", // 璁″垝鏈堜唤
+ orderType: 1,
};
proxy.resetForm("deptRef");
}
@@ -775,10 +782,11 @@
dateRange.value = [];
queryParams.value = {
planNo: "", // 璁″垝缂栧彿
- planName: "", // 璁″垝鍚嶇О
- executiveSection: "", // 鎵ф硶鍗曚綅
+ enforceReason: "", // 璁″垝鍚嶇О
+ applyDeptIds: "", // 鎵ф硶鍗曚綅
planMonthStart: "", // 璁″垝寮�濮嬫湀浠�
planMonthEnd: "", // 璁″垝缁撴潫鏈堜唤
+ orderType: 1,
};
handleQuery();
}
@@ -819,10 +827,20 @@
getList();
});
} else {
- addManage(form.value).then((response) => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
+ checkedList.value.forEach((item, index) => {
+ console.log(item);
+ const submitForm = { ...form.value };
+ submitForm.companyId = item.companyId;
+ submitForm.companyName = item.companyName;
+ submitForm.companyCode = item.companyCode;
+ addManage(submitForm).then((response) => {
+ if (index === checkedList.value.length - 1) {
+ proxy.$modal.msgSuccess("鏂板鎴愬姛");
+ open.value = false;
+ getList();
+ reset();
+ }
+ });
});
}
}
@@ -833,7 +851,7 @@
proxy.$modal
.confirm("鏄惁纭鍒犻櫎璇ユ暟鎹�?")
.then(function () {
- return delManage(row.id);
+ return delManage(row.orderId);
})
.then(() => {
getList();
@@ -896,7 +914,7 @@
}
function handleSelectionChange(e) {
- form.value.checkdObject = e;
+ checkedList.value = e;
form.value.checkdIds = e.map((item) => item.companyId).join(",");
}
--
Gitblit v1.9.1