From a4ac4f696eca98e7f6918288321ff1b1784fc803 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 21 四月 2026 14:38:01 +0800
Subject: [PATCH] 新增入库审批功能，优化审批人选择逻辑，支持动态添加审批节点
---
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 150 +++++++++++++++++++++++++++++-
src/views/collaborativeApproval/approvalProcess/index.vue | 12 ++
src/views/salesManagement/salesLedger/index.vue | 122 ++++++++++++++++++++++++
3 files changed, 276 insertions(+), 8 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index a9df154..9e5a1ce 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -18,6 +18,8 @@
name="6"></el-tab-pane>
<el-tab-pane label="鍙戣揣瀹℃壒"
name="7"></el-tab-pane>
+ <el-tab-pane label="鍏ュ簱瀹℃壒"
+ name="9"></el-tab-pane>
</el-tabs>
<div class="search_form">
<div>
@@ -52,12 +54,12 @@
<el-button @click="handleOut">瀹℃壒浜虹淮鎶�</el-button>
<el-button type="primary"
@click="openForm('add')"
- v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7">鏂板</el-button>
+ v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7 && currentApproveType !== 9">鏂板</el-button>
<el-button @click="handleExport">瀵煎嚭</el-button>
<el-button type="danger"
plain
@click="handleDelete"
- v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7">鍒犻櫎</el-button>
+ v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7 && currentApproveType !== 9">鍒犻櫎</el-button>
</div>
</div>
<div class="table_list">
@@ -187,6 +189,7 @@
const isReimburseType = currentApproveType.value === 4; // 鎶ラ攢绠＄悊
const isQuotationType = currentApproveType.value === 6; // 鎶ヤ环瀹℃壒
const isPurchaseType = currentApproveType.value === 5; // 閲囪喘瀹℃壒
+ const isInboundType = currentApproveType.value === 9; // 鍏ュ簱瀹℃壒
// 鍩虹鍒楅厤缃�
const baseColumns = [
@@ -237,6 +240,8 @@
? "鎶ヤ环鍗曞彿"
: isPurchaseType
? "閲囪喘鍚堝悓鍙�"
+ : isInboundType
+ ? "鍏ュ簱鍗曞彿"
: "瀹℃壒浜嬬敱",
prop: "approveReason",
},
@@ -289,6 +294,7 @@
currentApproveType.value === 5 ||
currentApproveType.value === 6 ||
currentApproveType.value === 7 ||
+ currentApproveType.value === 9 ||
row.approveStatus == 2 ||
row.approveStatus == 1 ||
row.approveStatus == 4,
@@ -402,6 +408,7 @@
5: "/approveProcess/exportFive",
6: "/approveProcess/exportSix",
7: "/approveProcess/exportSeven",
+ 9: "/approveProcess/exportNine",
};
const url = urlMap[type] || urlMap[0];
const nameMap = {
@@ -413,6 +420,7 @@
5: "閲囪喘鐢宠瀹℃壒琛�",
6: "鎶ヤ环瀹℃壒琛�",
7: "鍙戣揣瀹℃壒琛�",
+ 9: "鍏ュ簱瀹℃壒琛�",
};
const fileName = nameMap[type] || nameMap[0];
proxy.download(url, {}, `${fileName}.xlsx`);
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 5170b60..5fe236c 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -88,13 +88,13 @@
clearable :precision="2" :disabled="supplierQuantityDisabled"/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�娴嬪崟浣嶏細" prop="checkCompany">
<el-input v-model="form.checkCompany" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�娴嬬粨鏋滐細" prop="checkResult">
<el-select v-model="form.checkResult">
@@ -103,8 +103,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
<el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable style="width: 100%">
@@ -112,6 +110,8 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�娴嬫棩鏈燂細" prop="checkTime">
<el-date-picker
@@ -123,6 +123,47 @@
clearable
style="width: 100%"
/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="24">
+ <el-form-item>
+ <template #label>
+ <div style="display: flex; align-items: center; justify-content: space-between; width: 100%;">
+ <span>瀹℃壒浜洪�夋嫨锛�</span>
+ <el-button type="primary"
+ size="small"
+ @click="addApproverNode"
+ icon="Plus">鏂板鑺傜偣</el-button>
+ </div>
+ </template>
+ <div class="approver-nodes-container">
+ <div v-for="(node, index) in approverNodes"
+ :key="node.id"
+ class="approver-node-item">
+ <div class="approver-node-header">
+ <span class="approver-node-label">瀹℃壒鑺傜偣 {{ index + 1 }}</span>
+ <el-button v-if="approverNodes.length > 1"
+ type="danger"
+ size="small"
+ text
+ @click="removeApproverNode(index)"
+ icon="Delete">鍒犻櫎</el-button>
+ </div>
+ <el-select v-model="node.userId"
+ placeholder="璇烽�夋嫨瀹℃壒浜�"
+ filterable
+ style="width: 100%">
+ <el-option
+ v-for="item in userList"
+ :key="item.userId"
+ :label="item.nickName"
+ :value="item.userId"
+ />
+ </el-select>
+ </div>
+ </div>
</el-form-item>
</el-col>
</el-row>
@@ -180,6 +221,7 @@
quantity: "",
checkCompany: "",
checkResult: "",
+ reviewName: "",
},
rules: {
checkTime: [{required: true, message: "璇疯緭鍏�", trigger: "blur"},],
@@ -229,6 +271,14 @@
const testStandardOptions = ref([]); // 鎸囨爣閫夋嫨涓嬫媺妗嗘暟鎹�
const modelOptions = ref([]);
const userList = ref([]); // 妫�楠屽憳涓嬫媺鍒楄〃
+const approverNodes = ref([{ id: 1, userId: null }]);
+let nextApproverId = 2;
+const addApproverNode = () => {
+ approverNodes.value.push({ id: nextApproverId++, userId: null });
+};
+const removeApproverNode = index => {
+ approverNodes.value.splice(index, 1);
+};
// 缂栬緫鏃讹細productMainId 鎴� purchaseLedgerId 浠讳竴鏈夊�煎垯渚涘簲鍟嗐�佹暟閲忕疆鐏�
const supplierQuantityDisabled = computed(() => {
@@ -265,7 +315,10 @@
quantity: "",
checkCompany: "",
checkResult: "",
+ reviewName: "",
}
+ approverNodes.value = [{ id: 1, userId: null }];
+ nextApproverId = 2;
testStandardOptions.value = [];
tableData.value = [];
// 鍏堢‘淇濅骇鍝佹爲宸插姞杞斤紝鍚﹀垯缂栬緫鏃朵骇鍝�/瑙勬牸鍨嬪彿鏃犳硶鍙嶆樉
@@ -274,6 +327,25 @@
// 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
const savedTestStandardId = row.testStandardId;
form.value = {...row}
+ if (form.value.approveUserIds) {
+ const ids = String(form.value.approveUserIds)
+ .split(",")
+ .map(id => id.trim())
+ .filter(Boolean);
+ if (ids.length > 0) {
+ approverNodes.value = ids.map((id, index) => ({
+ id: index + 1,
+ userId: Number(id),
+ }));
+ nextApproverId = ids.length + 1;
+ }
+ } else if (form.value.reviewName) {
+ const matchedReviewer = userList.value.find(item => item.nickName === form.value.reviewName);
+ if (matchedReviewer?.userId) {
+ approverNodes.value = [{ id: 1, userId: matchedReviewer.userId }];
+ nextApproverId = 2;
+ }
+ }
currentProductId.value = row.productId || 0
// 鍏抽敭锛氱紪杈戞椂鍔犺浇瑙勬牸鍨嬪彿涓嬫媺閫夐」锛屾墠鑳藉弽鏄� productModelId
if (currentProductId.value) {
@@ -397,13 +469,29 @@
const submitForm = () => {
proxy.$refs.formRef.validate(valid => {
if (valid) {
+ const hasEmptyApprover = approverNodes.value.some(node => !node.userId);
+ if (hasEmptyApprover) {
+ proxy.$modal.msgError("璇蜂负鎵�鏈夊鎵硅妭鐐归�夋嫨瀹℃壒浜猴紒");
+ return;
+ }
+ const approveUserIds = approverNodes.value.map(node => node.userId).join(",");
+ const firstApproverName =
+ userList.value.find(item => String(item.userId) === String(approverNodes.value[0]?.userId))
+ ?.nickName || "";
form.value.inspectType = 0
if (operationType.value === "add") {
tableData.value.forEach((item) => {
delete item.id
})
}
- const data = {...form.value, qualityInspectParams: tableData.value}
+ const data = {
+ ...form.value,
+ reviewName: firstApproverName,
+ approveUserIds,
+ // 鍏煎鍚庣涓嶅悓瀛楁鍛藉悕
+ auditName: firstApproverName,
+ qualityInspectParams: tableData.value,
+ }
if (operationType.value === "add") {
qualityInspectAdd(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
@@ -464,6 +552,8 @@
// 鍏抽棴寮规
const closeDia = () => {
proxy.resetForm("formRef");
+ approverNodes.value = [{ id: 1, userId: null }];
+ nextApproverId = 2;
tableData.value = [];
testStandardOptions.value = [];
form.value.testStandardId = '';
@@ -488,4 +578,54 @@
cursor: not-allowed;
}
+.approver-nodes-container {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 16px;
+ padding: 16px;
+ background-color: #f8f9fa;
+ border-radius: 4px;
+ border: 1px solid #e4e7ed;
+}
+
+.approver-node-item {
+ flex: 0 0 calc(33.333% - 12px);
+ min-width: 200px;
+ padding: 12px;
+ background-color: #fff;
+ border-radius: 4px;
+ border: 1px solid #dcdfe6;
+ transition: all 0.3s;
+}
+
+.approver-node-item:hover {
+ border-color: #409eff;
+ box-shadow: 0 2px 8px rgba(64, 158, 255, 0.1);
+}
+
+.approver-node-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 8px;
+}
+
+.approver-node-label {
+ font-size: 13px;
+ font-weight: 500;
+ color: #606266;
+}
+
+@media (max-width: 1200px) {
+ .approver-node-item {
+ flex: 0 0 calc(50% - 8px);
+ }
+}
+
+@media (max-width: 768px) {
+ .approver-node-item {
+ flex: 0 0 100%;
+ }
+}
+
</style>
\ No newline at end of file
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 5f36cee..c69c168 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -1675,6 +1675,46 @@
title="閫夋嫨鍏ュ簱浜у搧"
width="60%"
:close-on-click-modal="false">
+ <div style="margin-bottom: 12px;">
+ <el-form>
+ <el-form-item required>
+ <template #label>
+ <div style="display: flex; align-items: center; justify-content: space-between; width: 100%;">
+ <span>瀹℃壒浜洪�夋嫨锛�</span>
+ <el-button type="primary"
+ size="small"
+ @click="addStockApproverNode"
+ icon="Plus">鏂板鑺傜偣</el-button>
+ </div>
+ </template>
+ <div class="approver-nodes-container">
+ <div v-for="(node, index) in stockApproverNodes"
+ :key="node.id"
+ class="approver-node-item">
+ <div class="approver-node-header">
+ <span class="approver-node-label">瀹℃壒鑺傜偣 {{ index + 1 }}</span>
+ <el-button v-if="stockApproverNodes.length > 1"
+ type="danger"
+ size="small"
+ text
+ @click="removeStockApproverNode(index)"
+ icon="Delete">鍒犻櫎</el-button>
+ </div>
+ <el-select v-model="node.userId"
+ placeholder="璇烽�夋嫨瀹℃壒浜�"
+ filterable
+ clearable
+ style="width: 100%;">
+ <el-option v-for="item in stockApproverOptions"
+ :key="item.userId"
+ :label="item.userName"
+ :value="item.userId" />
+ </el-select>
+ </div>
+ </div>
+ </el-form-item>
+ </el-form>
+ </div>
<el-table :data="stockProductList"
border
stripe
@@ -1815,6 +1855,15 @@
const selectedStockProductIds = ref([]);
const stockLoading = ref(false);
const currentStockLedgerId = ref(null);
+ const stockApproverOptions = ref([]);
+ const stockApproverNodes = ref([{ id: 1, userId: null }]);
+ let nextStockApproverId = 2;
+ const addStockApproverNode = () => {
+ stockApproverNodes.value.push({ id: nextStockApproverId++, userId: null });
+ };
+ const removeStockApproverNode = index => {
+ stockApproverNodes.value.splice(index, 1);
+ };
const ledgerQrDialogVisible = ref(false);
const ledgerQrCompositeUrl = ref("");
@@ -2957,22 +3006,36 @@
currentStockLedgerId.value = id;
selectedStockProductIds.value = [];
stockProductList.value = [];
+ stockApproverNodes.value = [{ id: 1, userId: null }];
+ nextStockApproverId = 2;
stockDialogVisible.value = true;
stockLoading.value = true;
try {
+ const approverRes = await approveUserList({ approveType: 9 });
+ stockApproverOptions.value = Array.isArray(approverRes?.data)
+ ? approverRes.data.map(item => ({
+ userId: item.userId,
+ userName: item.userName,
+ }))
+ : [];
const res = await productList({ salesLedgerId: id, type: 1 });
stockProductList.value = [];
stockProductList.value =
res.data.filter(item => item.productStockStatus == 0 || item.productStockStatus == 1) || [];
} catch (e) {
- proxy?.$modal?.msgError?.("鑾峰彇浜у搧鍒楄〃澶辫触");
+ proxy?.$modal?.msgError?.("鑾峰彇浜у搧鎴栧鎵逛汉澶辫触");
} finally {
stockLoading.value = false;
}
};
const submitStock = async () => {
+ const hasEmptyApprover = stockApproverNodes.value.some(node => !node.userId);
+ if (hasEmptyApprover) {
+ ElMessage.warning("璇蜂负鎵�鏈夊鎵硅妭鐐归�夋嫨瀹℃壒浜�");
+ return;
+ }
if (selectedStockProductIds.value.length === 0) {
ElMessage.warning("璇烽�夋嫨鑷冲皯涓�涓骇鍝佽繘琛屽叆搴�");
return;
@@ -2990,9 +3053,16 @@
proxy?.$modal?.loading?.("姝ｅ湪鍏ュ簱锛岃绋嶅��...");
try {
+ const approveUserIds = stockApproverNodes.value.map(node => node.userId).join(",");
+ const approveUserName = stockApproverNodes.value
+ .map(node => stockApproverOptions.value.find(item => String(item.userId) === String(node.userId))?.userName)
+ .filter(Boolean)
+ .join(",");
await salesStock({
salesLedgerId: currentStockLedgerId.value,
salesLedgerProducts: selectedStockProductIds.value,
+ approveUserIds,
+ approveUserName,
});
proxy?.$modal?.msgSuccess?.("鍏ュ簱鎴愬姛");
stockDialogVisible.value = false;
@@ -4793,4 +4863,54 @@
.ledger-qr-save-btn {
margin-bottom: 12px;
}
+
+ .approver-nodes-container {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 16px;
+ padding: 16px;
+ background-color: #f8f9fa;
+ border-radius: 4px;
+ border: 1px solid #e4e7ed;
+ }
+
+ .approver-node-item {
+ flex: 0 0 calc(33.333% - 12px);
+ min-width: 200px;
+ padding: 12px;
+ background-color: #fff;
+ border-radius: 4px;
+ border: 1px solid #dcdfe6;
+ transition: all 0.3s;
+ }
+
+ .approver-node-item:hover {
+ border-color: #409eff;
+ box-shadow: 0 2px 8px rgba(64, 158, 255, 0.1);
+ }
+
+ .approver-node-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 8px;
+ }
+
+ .approver-node-label {
+ font-size: 13px;
+ font-weight: 500;
+ color: #606266;
+ }
+
+ @media (max-width: 1200px) {
+ .approver-node-item {
+ flex: 0 0 calc(50% - 8px);
+ }
+ }
+
+ @media (max-width: 768px) {
+ .approver-node-item {
+ flex: 0 0 100%;
+ }
+ }
</style>
--
Gitblit v1.9.3