From 80b320f5711c87556bf066de48181d556eb5fb4d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 24 四月 2026 16:23:07 +0800
Subject: [PATCH] 天津宝东 1.发货的时候加一个金额字段，需要在财库管理显示出来，因为会有发票
---
src/views/salesManagement/deliveryLedger/index.vue | 37 +++---------------
src/views/basicData/customerFile/index.vue | 20 ----------
src/views/basicData/customerFileOpenSea/index.vue | 30 ---------------
src/views/collaborativeApproval/approvalManagement/index.vue | 22 +++++-----
4 files changed, 17 insertions(+), 92 deletions(-)
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index 28302c5..8f0194c 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -672,11 +672,6 @@
width: 220,
},
{
- label: "绾崇◣浜鸿瘑鍒爜",
- prop: "taxpayerIdentificationNumber",
- width: 220,
- },
- {
label: "鍦板潃鍙婅仈绯绘柟寮�",
prop: "companyAddress",
width: 250,
@@ -694,21 +689,6 @@
label: "鑱旂郴浜哄矖浣�",
prop: "contactPosition",
width: 140,
- },
- {
- label: "閾惰鍩烘湰鎴�",
- prop: "basicBankAccount",
- width: 220,
- },
- {
- label: "閾惰璐﹀彿",
- prop: "bankAccount",
- width: 220,
- },
- {
- label: "寮�鎴疯鍙�",
- prop: "bankCode",
- width: 220,
},
{
label: "缁存姢浜�",
diff --git a/src/views/basicData/customerFileOpenSea/index.vue b/src/views/basicData/customerFileOpenSea/index.vue
index 2332d04..f779a21 100644
--- a/src/views/basicData/customerFileOpenSea/index.vue
+++ b/src/views/basicData/customerFileOpenSea/index.vue
@@ -762,11 +762,6 @@
width: 220,
},
{
- label: "绾崇◣浜鸿瘑鍒爜",
- prop: "taxpayerIdentificationNumber",
- width: 220,
- },
- {
label: "鍦板潃鍙婅仈绯绘柟寮�",
prop: "addressPhone",
width: 250,
@@ -784,31 +779,6 @@
label: "鑱旂郴浜哄矖浣�",
prop: "contactPosition",
width: 140,
- },
- // {
- // label: "璺熻繘杩涘害",
- // prop: "followUpLevel",
- // width: 120,
- // },
- // {
- // label: "璺熻繘鏃堕棿",
- // prop: "followUpTime",
- // width: 120,
- // },
- {
- label: "閾惰鍩烘湰鎴�",
- prop: "basicBankAccount",
- width: 220,
- },
- {
- label: "閾惰璐﹀彿",
- prop: "bankAccount",
- width: 220,
- },
- {
- label: "寮�鎴疯鍙�",
- prop: "bankCode",
- width: 220,
},
{
label: "缁存姢浜�",
diff --git a/src/views/collaborativeApproval/approvalManagement/index.vue b/src/views/collaborativeApproval/approvalManagement/index.vue
index 4638392..f91ed8d 100644
--- a/src/views/collaborativeApproval/approvalManagement/index.vue
+++ b/src/views/collaborativeApproval/approvalManagement/index.vue
@@ -40,7 +40,7 @@
</el-tag>
</div>
</div>
- <div class="header-actions" v-if="approverList.length > 0">
+ <div class="header-actions">
<el-button @click="handleReset" size="default">
<el-icon><RefreshLeft /></el-icon>
閲嶇疆
@@ -175,7 +175,7 @@
<!-- 搴曢儴鎻愮ず -->
<div class="bottom-tips">
<el-icon><InfoFilled /></el-icon>
- <span>鎻愮ず锛氭瘡涓祦绋嬭嚦灏戦厤缃竴涓鎵逛汉锛屽鎵规寜椤哄簭娴佽浆锛屽彲閫氳繃绠ご璋冩暣椤哄簭</span>
+ <span>鎻愮ず锛氬彲涓嶉厤缃鎵逛汉锛涜嫢閰嶇疆澶氫汉锛屽鎵瑰皢鎸夐『搴忔祦杞紝鍙�氳繃绠ご璋冩暣椤哄簭</span>
</div>
</div>
</template>
@@ -387,18 +387,14 @@
// 淇濆瓨閰嶇疆
const handleSave = async () => {
- if (approverList.value.length === 0) {
- ElMessage.warning('璇疯嚦灏戦厤缃竴涓鎵逛汉');
- return;
- }
-
- const hasEmptyApprover = approverList.value.some((item) => !item.approverId);
+ const configuredApprovers = approverList.value.filter((item) => item.approverId);
+ const hasEmptyApprover = false;
if (hasEmptyApprover) {
ElMessage.warning('璇烽�夋嫨鎵�鏈夊鎵逛汉');
return;
}
- const approverIds = approverList.value.map((item) => item.approverId);
+ const approverIds = configuredApprovers.map((item) => item.approverId);
const uniqueIds = [...new Set(approverIds)];
if (uniqueIds.length !== approverIds.length) {
ElMessage.warning('瀹℃壒浜轰笉鑳介噸澶�');
@@ -407,17 +403,21 @@
saveLoading.value = true;
try {
- const payload = approverList.value.map((item, index) => ({
+ const approveProcessConfigNodes = configuredApprovers.map((item, index) => ({
approveType: currentApproveType.value,
nodeOrder: index + 1,
approverId: item.approverId,
approverName: item.approverName,
}));
+ const payload = {
+ approveType: currentApproveType.value,
+ approveProcessConfigNodes,
+ };
await addApproveProcessConfigNode(payload);
ElMessage.success('淇濆瓨鎴愬姛');
await loadData();
} catch (error) {
- ElMessage.error('淇濆瓨澶辫触');
+ console.log('淇濆瓨澶辫触')
} finally {
saveLoading.value = false;
}
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index 3150819..d8fc265 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -30,7 +30,7 @@
<el-table-column label="閿�鍞鍗�" prop="salesContractNo" show-overflow-tooltip />
<el-table-column label="鍙戣揣璁㈠崟鍙�" prop="shippingNo" show-overflow-tooltip />
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip />
- <el-table-column label="浜у搧鍚嶇О" prop="productName" show-overflow-tooltip />
+ <el-table-column label="浜у搧鍚嶇О" prop="productCategory" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
<el-table-column label="鍙戣揣杩涘害" align="center" width="150">
<template #default="scope">
@@ -127,10 +127,6 @@
<div class="summary-value shipped">{{ currentShippingOrder.shippingSuccessTotal || 0 }}</div>
</div>
<div class="summary-item">
- <div class="summary-label">宸查��璐ф暟閲�</div>
- <div class="summary-value returned">{{ currentShippingOrder.returnTotal || 0 }}</div>
- </div>
- <div class="summary-item">
<div class="summary-label">寰呭彂璐ф暟閲�</div>
<div class="summary-value waiting">{{ currentShippingOrder.waitShippingTotal || 0 }}</div>
</div>
@@ -184,12 +180,8 @@
<span class="info-value quantity">{{ record.shippingNum }}</span>
</div>
<div class="info-row">
- <span class="info-label">鍙戣揣閲戦</span>
+ <span class="info-label">杩愯垂</span>
<span class="info-value">{{ Number(record.shippingAmount || 0).toFixed(2) }}</span>
- </div>
- <div class="info-row">
- <span class="info-label">閫�璐ф暟閲�</span>
- <span class="info-value returned">{{ record.returnTotal || 0 }}</span>
</div>
<div class="info-row" v-if="record.type === '璐ц溅'">
<span class="info-label">杞︾墝鍙�</span>
@@ -217,10 +209,6 @@
/>
</div>
</div>
- <div class="info-row">
- <span class="info-label">搴撲綅</span>
- <span class="info-value">{{ record.stockLocation || '--' }}</span>
- </div>
<div class="record-actions" v-if="canRevokeShipping(record)">
<el-button
type="danger"
@@ -268,13 +256,13 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍙戣揣閲戦" prop="shippingAmount">
+ <el-form-item label="杩愯垂" prop="shippingAmount">
<el-input-number
v-model="shippingForm.shippingAmount"
:min="0"
:precision="2"
:step="0.01"
- placeholder="璇疯緭鍏ュ彂璐ч噾棰�"
+ placeholder="璇疯緭鍏ヨ繍璐�"
style="width: 100%"
/>
</el-form-item>
@@ -285,13 +273,6 @@
<el-radio label="璐ц溅">璐ц溅</el-radio>
<el-radio label="蹇��">蹇��</el-radio>
</el-radio-group>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="24">
- <el-form-item label="搴撲綅" prop="stockLocation">
- <el-input v-model="shippingForm.stockLocation" placeholder="璇疯緭鍏ュ簱浣�" clearable/>
</el-form-item>
</el-col>
</el-row>
@@ -411,12 +392,10 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
- stockLocation: "",
});
const shippingRules = {
- shippingAmount: [{ required: true, message: "璇疯緭鍏ュ彂璐ч噾棰�", trigger: "blur" }],
+ shippingAmount: [{ required: true, message: "璇疯緭鍏ヨ繍璐�", trigger: "blur" }],
shippingNum: [{ required: true, message: "璇疯緭鍏ュ彂璐ф暟閲�", trigger: "blur" }],
- stockLocation: [{ required: true, message: "璇疯緭鍏ュ簱浣�", trigger: "blur" }],
type: [{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }],
shippingDate: [{ required: true, message: "璇烽�夋嫨鍙戣揣鏃ユ湡", trigger: "change" }],
shippingCarNumber: [
@@ -516,7 +495,6 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
- stockLocation: "",
};
shippingFileList.value = [];
@@ -553,7 +531,6 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
- stockLocation: "",
};
shippingFileList.value = [];
};
@@ -569,7 +546,6 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
- stockLocation: "",
};
shippingFileList.value = [];
};
@@ -595,7 +571,7 @@
return shippingNum > 0 && returnNum > 0 && shippingNum === returnNum;
};
-// 璁＄畻鏈鍙戣揣閲戦锛堟寜鍙戣揣鏁伴噺鍗犳瘮鍒嗘憡鏁村崟鍙戣揣閲戦锛�
+// 璁＄畻鏈杩愯垂锛堟寜鍙戣揣鏁伴噺鍗犳瘮鍒嗘憡鏁村崟杩愯垂锛�
// 鎾ら攢鍙戣揣
const handleRevokeShipping = (record) => {
@@ -631,7 +607,6 @@
shippingAmount: Number(shippingForm.value.shippingAmount) || 0,
type: shippingForm.value.type,
shippingDate: shippingForm.value.shippingDate,
- stockLocation: shippingForm.value.stockLocation,
shippingCarNumber: shippingForm.value.type === "璐ц溅" ? shippingForm.value.shippingCarNumber : "",
expressCompany: shippingForm.value.type === "蹇��" ? shippingForm.value.expressCompany : "",
expressNumber: shippingForm.value.type === "蹇��" ? shippingForm.value.expressNumber : "",
--
Gitblit v1.9.3