From 550525734289a34a85b35de09ed41d0c5eabeed2 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 25 三月 2026 13:23:47 +0800
Subject: [PATCH] fix: 新增销售台账需要发起审批
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 90 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 1 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 7d34424..f0c43ae 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 v-if="!isPurchaseApproval">
+ <el-row v-if="!isPurchaseApproval && !isSalesApproval">
<el-col :span="24">
<el-form-item label="瀹℃壒浜嬬敱锛�" prop="approveReason">
<el-input v-model="form.approveReason" placeholder="璇疯緭鍏�" clearable type="textarea" disabled/>
@@ -119,6 +119,53 @@
<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>
+ <div v-if="isSalesApproval" style="margin: 10px 0 18px;">
+ <el-divider content-position="left">閿�鍞鎯�</el-divider>
+ <el-skeleton :loading="salesLoading" 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="!salesDetail || !salesDetail.salesContractNo" description="鏈煡璇㈠埌瀵瑰簲閿�鍞鎯�" />
+ <template v-else>
+ <el-descriptions :column="2" border>
+ <el-descriptions-item label="閿�鍞悎鍚屽彿">{{ salesDetail.salesContractNo }}</el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛鍚堝悓鍙�">{{ salesDetail.customerContractNo }}</el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛鍚嶇О">{{ salesDetail.customerName }}</el-descriptions-item>
+ <el-descriptions-item label="涓氬姟鍛�">{{ salesDetail.salesman }}</el-descriptions-item>
+ <el-descriptions-item label="椤圭洰鍚嶇О">{{ salesDetail.projectName }}</el-descriptions-item>
+ <el-descriptions-item label="浠樻鏂瑰紡">{{ salesDetail.paymentMethod }}</el-descriptions-item>
+ <el-descriptions-item label="褰曞叆浜�">{{ salesEntryPersonDisplay }}</el-descriptions-item>
+ <el-descriptions-item label="褰曞叆鏃ユ湡">{{ salesDetail.entryDate }}</el-descriptions-item>
+ <el-descriptions-item label="绛捐鏃ユ湡">{{ salesDetail.executionDate }}</el-descriptions-item>
+ <el-descriptions-item label="鍚堝悓閲戦" :span="2">
+ <span style="font-size: 18px; color: #e6a23c; font-weight: bold;">
+ 楼{{ Number(salesDetail.contractAmount ?? 0).toFixed(2) }}
+ </span>
+ </el-descriptions-item>
+ </el-descriptions>
+
+ <div style="margin-top: 20px;">
+ <h4>浜у搧鏄庣粏</h4>
+ <el-table :data="salesProducts" border style="width: 100%">
<el-table-column prop="productCategory" label="浜у搧鍚嶇О" />
<el-table-column prop="specificationModel" label="瑙勬牸鍨嬪彿" />
<el-table-column prop="unit" label="鍗曚綅" />
@@ -216,6 +263,7 @@
updateApproveNode
} from "@/api/collaborativeApproval/approvalProcess.js";
import { getPurchaseByCode } from "@/api/procurementManagement/procurementLedger.js";
+import { getSalesByCode } from "@/api/salesManagement/salesLedger.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'
@@ -233,10 +281,34 @@
const purchaseLoading = ref(false)
const currentPurchase = ref({})
const isPurchaseApproval = computed(() => Number(props.approveType) === 5)
+const salesLoading = ref(false)
+const currentSales = ref({})
+const isSalesApproval = computed(() => Number(props.approveType) === 6)
const purchaseDetail = computed(() => currentPurchase.value?.data || currentPurchase.value || {})
const purchaseProducts = computed(() => {
const detail = purchaseDetail.value || {}
return detail.productData || detail.products || detail.children || []
+})
+const salesDetail = computed(() => currentSales.value?.data || currentSales.value || {})
+const salesProducts = computed(() => {
+ const detail = salesDetail.value || {}
+ return detail.productData || detail.products || detail.children || []
+})
+/** 閿�鍞鎯咃細褰曞叆浜猴紙鎺ュ彛鍙兘鍙繑 entryPerson 鐢ㄦ埛ID锛岄渶鐢� userList 鍙嶆煡鏄电О锛� */
+const salesEntryPersonDisplay = computed(() => {
+ const d = salesDetail.value || {}
+ if (d.entryPersonName) return d.entryPersonName
+ if (d.recorderName) return d.recorderName
+ if (d.createByName) return d.createByName
+ if (d.createUserName) return d.createUserName
+ const id = d.entryPerson
+ if (id != null && id !== "" && userList.value?.length) {
+ const u = userList.value.find(
+ (x) => x.userId == id || String(x.userId) === String(id)
+ )
+ if (u) return u.nickName
+ }
+ return id != null && id !== "" ? String(id) : "-"
})
const data = reactive({
form: {
@@ -297,6 +369,7 @@
operationType.value = type;
dialogFormVisible.value = true;
currentPurchase.value = {}
+ currentSales.value = {}
userListNoPageByTenantId().then((res) => {
userList.value = res.data;
});
@@ -313,6 +386,19 @@
proxy.$modal.msgError("鏌ヨ閲囪喘璇︽儏澶辫触")
}).finally(() => {
purchaseLoading.value = false
+ })
+ }
+ }
+ if (isSalesApproval.value) {
+ const salesContractNo = row?.approveReason
+ if (salesContractNo) {
+ salesLoading.value = true
+ getSalesByCode({ salesContractNo }).then((res) => {
+ currentSales.value = res || {}
+ }).catch(() => {
+ proxy.$modal.msgError("鏌ヨ閿�鍞鎯呭け璐�")
+ }).finally(() => {
+ salesLoading.value = false
})
}
}
@@ -424,6 +510,8 @@
dialogFormVisible.value = false;
purchaseLoading.value = false
currentPurchase.value = {}
+ salesLoading.value = false
+ currentSales.value = {}
emit('close')
};
defineExpose({
--
Gitblit v1.9.3