From b1dc2d5e939ebf014de356b0b066a0c6ed868c5d Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 25 三月 2026 11:46:29 +0800
Subject: [PATCH] fix: 完成采购审批申请、审批功能
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 75 ++++++++++++++++++++++++
src/views/procurementManagement/procurementLedger/index.vue | 70 +++++++++++++++++++++++
src/views/collaborativeApproval/approvalProcess/index6.vue | 22 +++++++
src/api/procurementManagement/procurementLedger.js | 9 +++
src/views/collaborativeApproval/approvalProcess/index.vue | 1
5 files changed, 175 insertions(+), 2 deletions(-)
diff --git a/src/api/procurementManagement/procurementLedger.js b/src/api/procurementManagement/procurementLedger.js
index 9fb284e..573c893 100644
--- a/src/api/procurementManagement/procurementLedger.js
+++ b/src/api/procurementManagement/procurementLedger.js
@@ -72,3 +72,12 @@
method: "get",
});
}
+
+// 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇㈣鎯�
+export function getPurchaseByCode(query) {
+ return request({
+ url: "/purchase/ledger/getPurchaseByCode",
+ method: "get",
+ params: query,
+ });
+}
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index bb99278..7d34424 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -49,7 +49,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row v-if="!isPurchaseApproval">
<el-col :span="24">
<el-form-item label="瀹℃壒浜嬬敱锛�" prop="approveReason">
<el-input v-model="form.approveReason" placeholder="璇疯緭鍏�" clearable type="textarea" disabled/>
@@ -90,6 +90,51 @@
</el-col>
</el-row>
</el-form>
+ <div v-if="isPurchaseApproval" style="margin: 10px 0 18px;">
+ <el-divider content-position="left">閲囪喘璇︽儏</el-divider>
+ <el-skeleton :loading="purchaseLoading" animated>
+ <template #template>
+ <el-skeleton-item variant="h3" style="width: 30%" />
+ <el-skeleton-item variant="text" style="width: 100%" />
+ <el-skeleton-item variant="text" style="width: 100%" />
+ </template>
+ <template #default>
+ <el-empty v-if="!purchaseDetail || !purchaseDetail.purchaseContractNumber" description="鏈煡璇㈠埌瀵瑰簲閲囪喘璇︽儏" />
+ <template v-else>
+ <el-descriptions :column="2" border>
+ <el-descriptions-item label="閲囪喘鍚堝悓鍙�">{{ purchaseDetail.purchaseContractNumber }}</el-descriptions-item>
+ <el-descriptions-item label="渚涘簲鍟嗗悕绉�">{{ purchaseDetail.supplierName }}</el-descriptions-item>
+ <el-descriptions-item label="椤圭洰鍚嶇О">{{ purchaseDetail.projectName }}</el-descriptions-item>
+ <el-descriptions-item label="閿�鍞悎鍚屽彿">{{ purchaseDetail.salesContractNo }}</el-descriptions-item>
+ <el-descriptions-item label="绛捐鏃ユ湡">{{ purchaseDetail.executionDate }}</el-descriptions-item>
+ <el-descriptions-item label="褰曞叆鏃ユ湡">{{ purchaseDetail.entryDate }}</el-descriptions-item>
+ <el-descriptions-item label="浠樻鏂瑰紡">{{ purchaseDetail.paymentMethod }}</el-descriptions-item>
+ <el-descriptions-item label="鍚堝悓閲戦" :span="2">
+ <span style="font-size: 18px; color: #e6a23c; font-weight: bold;">
+ 楼{{ Number(purchaseDetail.contractAmount ?? 0).toFixed(2) }}
+ </span>
+ </el-descriptions-item>
+ </el-descriptions>
+
+ <div style="margin-top: 20px;">
+ <h4>浜у搧鏄庣粏</h4>
+ <el-table :data="purchaseProducts" border style="width: 100%">
+ <el-table-column prop="productCategory" label="浜у搧鍚嶇О" />
+ <el-table-column prop="specificationModel" label="瑙勬牸鍨嬪彿" />
+ <el-table-column prop="unit" label="鍗曚綅" />
+ <el-table-column prop="quantity" label="鏁伴噺" />
+ <el-table-column prop="taxInclusiveUnitPrice" label="鍚◣鍗曚环">
+ <template #default="scope">楼{{ Number(scope.row.taxInclusiveUnitPrice ?? 0).toFixed(2) }}</template>
+ </el-table-column>
+ <el-table-column prop="taxInclusiveTotalPrice" label="鍚◣鎬讳环">
+ <template #default="scope">楼{{ Number(scope.row.taxInclusiveTotalPrice ?? 0).toFixed(2) }}</template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </template>
+ </template>
+ </el-skeleton>
+ </div>
<el-form :model="{ activities }" ref="formRef" label-position="top">
<el-steps :active="getActiveStep()" finish-status="success" process-status="process" align-center direction="vertical">
<el-step
@@ -163,13 +208,14 @@
</template>
<script setup>
-import { getCurrentInstance, reactive, ref, toRefs } from "vue";
+import { computed, getCurrentInstance, reactive, ref, toRefs } from "vue";
import vueEsign from "vue-esign";
import {
approveProcessDetails,
getDept,
updateApproveNode
} from "@/api/collaborativeApproval/approvalProcess.js";
+import { getPurchaseByCode } from "@/api/procurementManagement/procurementLedger.js";
import useUserStore from "@/store/modules/user.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import { WarningFilled, Edit, Check, MoreFilled } from '@element-plus/icons-vue'
@@ -184,6 +230,14 @@
const userStore = useUserStore()
const productOptions = ref([]);
const userList = ref([])
+const purchaseLoading = ref(false)
+const currentPurchase = ref({})
+const isPurchaseApproval = computed(() => Number(props.approveType) === 5)
+const purchaseDetail = computed(() => currentPurchase.value?.data || currentPurchase.value || {})
+const purchaseProducts = computed(() => {
+ const detail = purchaseDetail.value || {}
+ return detail.productData || detail.products || detail.children || []
+})
const data = reactive({
form: {
approveTime: "",
@@ -242,11 +296,26 @@
const openDialog = (type, row) => {
operationType.value = type;
dialogFormVisible.value = true;
+ currentPurchase.value = {}
userListNoPageByTenantId().then((res) => {
userList.value = res.data;
});
form.value = {...row}
getProductOptions()
+ if (isPurchaseApproval.value) {
+ const purchaseContractNumber = row?.approveReason
+ if (purchaseContractNumber) {
+ purchaseLoading.value = true
+ getPurchaseByCode({ purchaseContractNumber }).then((res) => {
+ // 鍏煎鍚庣杩斿洖 {code,data} 鎴栫洿鎺ヨ繑鍥炶鎯呭璞′袱绉嶇粨鏋�
+ currentPurchase.value = res || {}
+ }).catch(() => {
+ proxy.$modal.msgError("鏌ヨ閲囪喘璇︽儏澶辫触")
+ }).finally(() => {
+ purchaseLoading.value = false
+ })
+ }
+ }
approveProcessDetails(row.approveId).then((res) => {
activities.value = res.data
// 澧炲姞isApproval瀛楁
@@ -353,6 +422,8 @@
const closeDia = () => {
proxy.resetForm("formRef");
dialogFormVisible.value = false;
+ purchaseLoading.value = false
+ currentPurchase.value = {}
emit('close')
};
defineExpose({
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 4299d22..abe5725 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -263,6 +263,7 @@
3: "鍑哄樊绠＄悊瀹℃壒琛�",
4: "鎶ラ攢绠＄悊瀹℃壒琛�",
5: "閲囪喘鐢宠瀹℃壒琛�",
+ 6: "閿�鍞鍗曞鎵硅〃",
}
const fileName = nameMap[type] || nameMap[0]
proxy.download(url, {}, `${fileName}.xlsx`)
diff --git a/src/views/collaborativeApproval/approvalProcess/index6.vue b/src/views/collaborativeApproval/approvalProcess/index6.vue
new file mode 100644
index 0000000..3b40d80
--- /dev/null
+++ b/src/views/collaborativeApproval/approvalProcess/index6.vue
@@ -0,0 +1,22 @@
+<template>
+ <div class="container">
+ <!-- 寮曞叆index.vue缁勪欢骞朵紶閫掑弬鏁� -->
+ <ApprovalProcessIndex :approveType="6" />
+ </div>
+</template>
+
+<script setup>
+ import ApprovalProcessIndex from "./index.vue";
+
+ // 瀹氫箟缁勪欢鍚嶇О
+ defineOptions({
+ name: "ApprovalProcessIndex1",
+ });
+</script>
+
+<style scoped>
+ .container {
+ width: 100%;
+ height: 100%;
+ }
+</style>
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 101e630..bb53a6b 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -302,6 +302,48 @@
</el-col>
</el-row>
<el-row>
+ <el-col :span="24">
+ <el-form-item>
+ <template #label>
+ <span>瀹℃壒浜洪�夋嫨锛�</span>
+ <el-button type="primary" @click="addApproverNode" style="margin-left: 8px;">鏂板鑺傜偣</el-button>
+ </template>
+ <div style="display: flex; align-items: flex-end; flex-wrap: wrap;">
+ <div
+ v-for="(node, index) in approverNodes"
+ :key="node.id"
+ style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
+ >
+ <div>
+ <span>瀹℃壒浜�</span>
+ 鈫�
+ </div>
+ <el-select
+ v-model="node.userId"
+ placeholder="閫夋嫨浜哄憳"
+ style="width: 140px; margin-bottom: 8px;"
+ >
+ <el-option
+ v-for="user in userList"
+ :key="user.userId"
+ :label="user.nickName"
+ :value="user.userId"
+ />
+ </el-select>
+ <div>
+ <el-button
+ type="danger"
+ size="small"
+ @click="removeApproverNode(index)"
+ v-if="approverNodes.length > 1"
+ >鍒犻櫎</el-button>
+ </div>
+ </div>
+ </div>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
<el-button type="primary" @click="openProductForm('add')"
>娣诲姞</el-button
@@ -832,6 +874,8 @@
});
const total = ref(0);
const fileList = ref([]);
+const approverNodes = ref([{ id: 1, userId: null }]);
+let nextApproverId = 2;
import useUserStore from "@/store/modules/user";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import dayjs from "dayjs";
@@ -879,6 +923,13 @@
});
const { form, rules } = toRefs(data);
const { form: searchForm } = useFormData(data.searchForm);
+
+const addApproverNode = () => {
+ approverNodes.value.push({ id: nextApproverId++, userId: null });
+};
+const removeApproverNode = (index) => {
+ approverNodes.value.splice(index, 1);
+};
// 浜у搧琛ㄥ崟寮规鏁版嵁
const productFormVisible = ref(false);
@@ -1033,6 +1084,8 @@
form.value = {};
productData.value = [];
fileList.value = [];
+ approverNodes.value = [{ id: 1, userId: null }];
+ nextApproverId = 2;
if (operationType.value == "add") {
createPurchaseNo().then((res) => {
form.value.purchaseContractNumber = res.data;
@@ -1054,6 +1107,17 @@
getPurchaseById({ id: row.id, type: 2 }).then((res) => {
form.value = { ...res };
productData.value = form.value.productData;
+ const approveUserIds = form.value.approveUserIds || form.value.approverIds;
+ if (approveUserIds) {
+ const ids = String(approveUserIds)
+ .split(",")
+ .map((id) => Number(id.trim()))
+ .filter((id) => !Number.isNaN(id));
+ if (ids.length > 0) {
+ approverNodes.value = ids.map((id, idx) => ({ id: idx + 1, userId: id }));
+ nextApproverId = ids.length + 1;
+ }
+ }
if (form.value.salesLedgerFiles) {
fileList.value = form.value.salesLedgerFiles;
} else {
@@ -1108,6 +1172,12 @@
const submitForm = () => {
proxy.$refs["formRef"].validate((valid) => {
if (valid) {
+ const hasEmptyApprover = approverNodes.value.some((node) => !node.userId);
+ if (hasEmptyApprover) {
+ proxy.$modal.msgWarning("璇蜂负鎵�鏈夊鎵硅妭鐐归�夋嫨瀹℃壒浜�");
+ return;
+ }
+ form.value.approveUserIds = approverNodes.value.map((node) => node.userId).join(",");
if (productData.value.length > 0) {
form.value.productData = proxy.HaveJson(productData.value);
} else {
--
Gitblit v1.9.3