From 5c30f301d6d4a5b8fc1183e06aaea8dc366d3540 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 17:56:25 +0800
Subject: [PATCH] feat: 调整
---
src/views/procurementManagement/invoiceEntry/components/Modal.vue | 214 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 146 insertions(+), 68 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/components/Modal.vue b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
index efd4a4e..65580e0 100644
--- a/src/views/procurementManagement/invoiceEntry/components/Modal.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -9,12 +9,12 @@
>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="閲囪喘鍚堝悓鍙凤細" prop="purchaseLedgerNo">
+ <el-form-item label="閲囪喘鍗曞彿锛�" prop="purchaseLedgerNo">
<el-input v-model="form.purchaseLedgerNo" disabled placeholder="澶氬悎鍚屾壒閲忓鐞嗭紙鍏蜂綋鍚堝悓鍙疯浜у搧鍒楄〃锛�" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞悎鍚屽彿锛�" prop="salesContractNo">
+ <el-form-item label="閿�鍞崟鍙凤細" prop="salesContractNo">
<el-input
v-model="form.salesContractNo"
placeholder="鑷姩濉厖"
@@ -96,7 +96,7 @@
/>
</el-form-item>
</el-col>
-
+
</el-row>
<el-form-item label="浜у搧淇℃伅锛�"> </el-form-item>
<el-table
@@ -133,10 +133,15 @@
/>
<el-table-column label="鏈寮�绁ㄦ暟" prop="ticketsNum" width="180">
<template #default="scope">
- <el-input-number :step="0.1" :min="0" :max="scope.row.tempFutureTickets || 0" style="width: 100%"
- :precision="2"
- v-model="scope.row.ticketsNum"
- @change="invoiceNumBlur(scope.row)"
+ <el-input-number
+ :step="0.1"
+ :min="0"
+ :max="scope.row.tempFutureTickets || 0"
+ style="width: 100%"
+ :precision="2"
+ v-model="scope.row.ticketsNum"
+ :disabled="isProductDisabled(scope.row)"
+ @change="invoiceNumBlur(scope.row)"
/>
</template>
</el-table-column>
@@ -146,10 +151,14 @@
width="180"
>
<template #default="scope">
- <el-input-number :step="0.01" :min="0" style="width: 100%"
- :precision="2"
- v-model="scope.row.ticketsAmount"
- @change="invoiceAmountBlur(scope.row)"
+ <el-input-number
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ :precision="2"
+ v-model="scope.row.ticketsAmount"
+ :disabled="isProductDisabled(scope.row)"
+ @change="invoiceAmountBlur(scope.row)"
/>
</template>
</el-table-column>
@@ -206,8 +215,8 @@
const formRef = ref();
const { proxy } = getCurrentInstance();
const { form } = useFormData({
- purchaseLedgerNo: undefined, // 閲囪喘鍚堝悓鍙�
- salesContractNo: undefined, // 閿�鍞悎鍚屽彿
+ purchaseLedgerNo: undefined, // 閲囪喘鍗曞彿
+ salesContractNo: undefined, // 閿�鍞崟鍙�
supplierName: undefined, // 渚涘簲鍟嗗悕绉�
projectName: undefined, // 椤圭洰鍚嶇О
invoiceNumber: undefined, // 鍙戠エ鍙�
@@ -347,14 +356,14 @@
const isSameSupplier = selectedRows.every(row =>
row.supplierName === firstRow.supplierName
);
-
+
if (!isSameSupplier) {
proxy.$modal.msgError("璇烽�夋嫨鐩稿悓渚涘簲鍟嗗悕绉扮殑鍚堝悓");
return;
}
-
- // 鍏佽涓嶅悓鐨勯噰璐悎鍚屽彿鎵归噺澶勭悊锛屾棤闇�妫�鏌ラ噸澶�
-
+
+ // 鍏佽涓嶅悓鐨勯噰璐崟鍙锋壒閲忓鐞嗭紝鏃犻渶妫�鏌ラ噸澶�
+
// 娓呯┖琛ㄥ崟鏁版嵁
Object.keys(form).forEach(key => {
if (key !== 'productData') {
@@ -362,12 +371,12 @@
}
});
form.productData = [];
-
+
// 鍔犺浇鎵�鏈夐�変腑鍚堝悓鐨勪骇鍝佹暟鎹�
const promises = selectedRows.map(row =>
getInfo({ id: row.id })
);
-
+
Promise.all(promises).then(results => {
// 鍚堝苟鎵�鏈夊悎鍚岀殑浜у搧鏁版嵁锛屽苟涓烘瘡涓骇鍝佹坊鍔犲搴旂殑鍚堝悓淇℃伅
const allProductData = [];
@@ -379,7 +388,7 @@
allProductData.push({
...item,
purchaseLedgerId: contractId, // 娣诲姞鍚堝悓ID鐢ㄤ簬绛涢��
- purchaseLedgerNo: contract.purchaseContractNumber, // 娣诲姞閲囪喘鍚堝悓鍙�
+ purchaseLedgerNo: contract.purchaseContractNumber, // 娣诲姞閲囪喘鍗曞彿
supplierName: contract.supplierName, // 娣诲姞渚涘簲鍟嗗悕绉�
projectName: contract.projectName // 娣诲姞椤圭洰鍚嶇О
// 淇濈暀浜у搧鏈韩鐨刬d锛屼笉瑕嗙洊
@@ -387,9 +396,9 @@
});
}
});
-
- // 璁剧疆琛ㄥ崟鏁版嵁锛堜娇鐢ㄧ涓�涓悎鍚岀殑鍩烘湰淇℃伅锛岄噰璐悎鍚屽彿鐣欑┖锛�
- form.purchaseLedgerNo = ""; // 閲囪喘鍚堝悓鍙风暀绌猴紝鍥犱负浼氬湪浜у搧琛ㄦ牸涓垎鍒樉绀�
+
+ // 璁剧疆琛ㄥ崟鏁版嵁锛堜娇鐢ㄧ涓�涓悎鍚岀殑鍩烘湰淇℃伅锛岄噰璐崟鍙风暀绌猴級
+ form.purchaseLedgerNo = ""; // 閲囪喘鍗曞彿鐣欑┖锛屽洜涓轰細鍦ㄤ骇鍝佽〃鏍间腑鍒嗗埆鏄剧ず
form.invoiceNumber = "";
form.entryDate = dayjs().format("YYYY-MM-DD");
form.enterDate = dayjs().format("YYYY-MM-DD");
@@ -399,10 +408,10 @@
// 淇濈暀褰曞叆浜轰俊鎭�
form.issUerId = userStore.id;
form.issUer = userStore.nickName;
-
+
// 璁剧疆浜у搧鏁版嵁锛屽苟鍒濆鍖栧紑绁ㄦ暟閲忓拰閲戦
allProductData.forEach(item => {
- // 淇濆瓨鈥滃師濮嬫湭鏉ョエ鏁�/閲戦鈥濓紙鐢ㄤ簬鏍￠獙涓庤绠楋級
+ // 淇濆瓨"鍘熷鏈潵绁ㄦ暟/閲戦"锛堢敤浜庢牎楠屼笌璁＄畻锛�
// 浼樺厛浣跨敤鍚庣杩斿洖鐨� futureTickets/futureTicketsAmount锛涙病鏈夊垯鍥為��鍒� quantity/taxInclusiveTotalPrice
item.tempFutureTickets = Number(
item.futureTickets !== undefined ? item.futureTickets : (item.quantity || 0)
@@ -411,37 +420,77 @@
item.futureTicketsAmount !== undefined ? item.futureTicketsAmount : (item.taxInclusiveTotalPrice || 0)
);
- // 鏂板鏃讹細鏈寮�绁ㄩ粯璁や笉濉紙0锛夛紝閬垮厤涓�鎵撳紑灏辨妸鈥滄湭鏉ョエ鏁扳�濇墸鎴� 0
- item.ticketsNum = 0;
- item.ticketsAmount = 0;
-
- // 椤甸潰灞曠ず鐨勨�滄湭鏉ョエ鏁�/鏈潵绁ㄩ噾棰濃�濋粯璁ゅ睍绀哄師濮嬫湭鏉ュ��
- item.futureTickets = item.tempFutureTickets;
- item.futureTicketsAmount = item.tempFutureTicketsAmount;
+ // 濡傛灉鏈潵绁ㄩ噾棰濅负0锛屽垯鏈寮�绁ㄦ暟鍜岄噾棰濋兘璁剧疆涓�0
+ if (item.tempFutureTicketsAmount <= 0) {
+ item.ticketsNum = 0;
+ item.ticketsAmount = 0;
+ item.futureTickets = Number(item.tempFutureTickets || 0);
+ item.futureTicketsAmount = 0;
+ } else {
+ // 鏂板鏃讹細鏈寮�绁ㄦ暟榛樿 = 鏈潵绁ㄦ暟锛堜笖涓嶈兘澶т簬鏈潵绁ㄦ暟锛�
+ item.ticketsNum = Number(item.tempFutureTickets || 0);
+ // 鑱斿姩璁＄畻鏈寮�绁ㄩ噾棰濄�佹湭鏉ョエ鏁般�佹湭鏉ョエ閲戦
+ const unitPrice = Number(item.taxInclusiveUnitPrice || 0);
+ item.ticketsAmount = Number((item.ticketsNum * unitPrice).toFixed(2));
+ item.futureTickets = Number((item.tempFutureTickets - item.ticketsNum).toFixed(2));
+ item.futureTicketsAmount = Number(
+ (item.tempFutureTicketsAmount - item.ticketsAmount).toFixed(2)
+ );
+ }
});
-
+
form.productData = allProductData;
-
+
// 璁＄畻鍙戠エ閲戦锛氭墍鏈変骇鍝佺殑鏈寮�绁ㄩ噾棰濅箣鍜岋紙鏂板榛樿 0锛�
const totalAmount = allProductData.reduce((sum, item) => {
return sum + (Number(item.ticketsAmount) || 0);
}, 0);
- form.invoiceAmount = totalAmount.toFixed(2);
-
+ form.invoiceAmount = Number(totalAmount.toFixed(2));
+
// 瀛樺偍閫変腑鐨勫悎鍚屾暟鎹�
selectedContracts.value = selectedRows;
});
} else if (type == "edit") {
const id = Array.isArray(selectedRows) ? selectedRows[0].id : selectedRows;
- const data = await getPurchaseById({ id, type: 2 });
- form.purchaseLedgerNo = data.purchaseContractNumber;
+ const response = await getPurchaseById({ id, type: 2 });
+ // 鍏煎涓嶅悓鐨勮繑鍥炴牸寮忥細鍙兘鏄� { code, data } 鎴栫洿鎺ヨ繑鍥炴暟鎹�
+ const data = response.data || response;
+
+ // 鍏煎涓嶅悓鐨勫瓧娈靛悕锛歱urchaseContractNumber 鎴� purchaseLedgerNo
+ form.purchaseLedgerNo = data.purchaseContractNumber || data.purchaseLedgerNo || "";
form.invoiceAmount = data.invoiceAmount;
form.invoiceNumber = data.invoiceNumber;
form.salesContractNo = data.salesContractNo;
form.projectName = data.projectName;
form.supplierName = data.supplierName;
form.entryDate = data.entryDate;
- form.productData = data.productData;
+ form.enterDate = data.enterDate || dayjs().format("YYYY-MM-DD");
+
+ // 缂栬緫鏃朵篃闇�瑕佸垵濮嬪寲浜у搧鏁版嵁鐨� tempFutureTickets 鍜� tempFutureTicketsAmount
+ // 鍚屾椂涓烘瘡涓骇鍝佹坊鍔犲悎鍚屽彿绛変俊鎭�
+ const contractNumber = data.purchaseContractNumber || data.purchaseLedgerNo || "";
+ if (data.productData && Array.isArray(data.productData)) {
+ data.productData.forEach(item => {
+ // 淇濆瓨"鍘熷鏈潵绁ㄦ暟/閲戦"锛堢敤浜庢牎楠屼笌璁＄畻锛�
+ // 浼樺厛浣跨敤鍚庣杩斿洖鐨� futureTickets/futureTicketsAmount锛涙病鏈夊垯鍥為��鍒� quantity/taxInclusiveTotalPrice
+ item.tempFutureTickets = Number(
+ item.futureTickets !== undefined ? item.futureTickets : (item.quantity || 0)
+ );
+ item.tempFutureTicketsAmount = Number(
+ item.futureTicketsAmount !== undefined ? item.futureTicketsAmount : (item.taxInclusiveTotalPrice || 0)
+ );
+
+ // 纭繚姣忎釜浜у搧閮芥湁鍚堝悓鍙凤紝鐢ㄤ簬鏄剧ず鍦�"鎵�灞炲悎鍚�"鍒�
+ if (!item.purchaseLedgerNo) {
+ item.purchaseLedgerNo = contractNumber;
+ }
+ });
+ }
+
+ form.productData = data.productData || [];
+
+ // 缂栬緫妯″紡涓嬶紝鏍规嵁浜у搧鏁版嵁涓殑鏈寮�绁ㄩ噾棰濊嚜鍔ㄨ绠楀彂绁ㄩ噾棰�
+ calculateinvoiceAmount();
}
};
// 瀛愯〃鍚堣鏂规硶
@@ -467,11 +516,11 @@
row.ticketsNum = Number(row.tempFutureTickets || 0);
}
// 璁＄畻鏈鏉ョエ閲戦
- row.ticketsAmount = (row.ticketsNum * row.taxInclusiveUnitPrice).toFixed(2)
+ row.ticketsAmount = Number((Number(row.ticketsNum) * Number(row.taxInclusiveUnitPrice || 0)).toFixed(2));
// 璁＄畻鏈潵绁ㄦ暟
- row.futureTickets = (row.tempFutureTickets - row.ticketsNum).toFixed(2)
+ row.futureTickets = Number((Number(row.tempFutureTickets || 0) - Number(row.ticketsNum || 0)).toFixed(2));
// 璁＄畻鏈潵绁ㄩ噾棰�
- row.futureTicketsAmount = (row.tempFutureTicketsAmount - row.ticketsAmount).toFixed(2)
+ row.futureTicketsAmount = Number((Number(row.tempFutureTicketsAmount || 0) - Number(row.ticketsAmount || 0)).toFixed(2));
calculateinvoiceAmount();
};
@@ -494,12 +543,12 @@
proxy.$modal.msgWarning("鏈寮�绁ㄦ暟涓嶈兘澶т簬鏈潵绁ㄦ暟");
row.ticketsNum = Number(row.tempFutureTickets || 0);
// 閲嶆柊璁＄畻鏈鏉ョエ閲戦
- row.ticketsAmount = (row.ticketsNum * row.taxInclusiveUnitPrice).toFixed(2);
+ row.ticketsAmount = Number((Number(row.ticketsNum) * Number(row.taxInclusiveUnitPrice || 0)).toFixed(2));
}
// 璁＄畻鏈潵绁ㄦ暟
- row.futureTickets = (row.tempFutureTickets - row.ticketsNum).toFixed(2)
+ row.futureTickets = Number((Number(row.tempFutureTickets || 0) - Number(row.ticketsNum || 0)).toFixed(2));
// 璁＄畻鏈潵绁ㄩ噾棰�
- row.futureTicketsAmount = (row.tempFutureTicketsAmount - row.ticketsAmount).toFixed(2)
+ row.futureTicketsAmount = Number((Number(row.tempFutureTicketsAmount || 0) - Number(row.ticketsAmount || 0)).toFixed(2));
calculateinvoiceAmount();
};
@@ -510,25 +559,54 @@
invoiceAmountTotal += Number(item.ticketsAmount);
}
});
- form.invoiceAmount = invoiceAmountTotal.toFixed(2);
+ form.invoiceAmount = Number(invoiceAmountTotal.toFixed(2));
+};
+
+// 鍒ゆ柇浜у搧鏄惁鍙互缁х画鏉ョエ鎿嶄綔锛氬鏋滄湭鏉ョエ鏁板拰鏈潵绁ㄩ噾棰濋兘涓�0鎴栧皬浜庣瓑浜�0锛屽垯绂佺敤
+const isProductDisabled = (row) => {
+ // 浼樺厛浣跨敤 tempFutureTickets锛堝師濮嬫湭鏉ョエ鏁帮級锛屽鏋滄病鏈夊垯浣跨敤 futureTickets
+ const futureTickets = Number(row.tempFutureTickets !== undefined
+ ? row.tempFutureTickets
+ : (row.futureTickets !== undefined ? row.futureTickets : 0));
+
+ // 浼樺厛浣跨敤 tempFutureTicketsAmount锛堝師濮嬫湭鏉ョエ閲戦锛夛紝濡傛灉娌℃湁鍒欎娇鐢� futureTicketsAmount
+ const futureAmount = Number(row.tempFutureTicketsAmount !== undefined
+ ? row.tempFutureTicketsAmount
+ : (row.futureTicketsAmount !== undefined ? row.futureTicketsAmount : 0));
+
+ // 鍙湁褰撴湭鏉ョエ鏁板拰鏈潵绁ㄩ噾棰濋兘涓�0鎴栧皬浜庣瓑浜�0鏃讹紝鎵嶇鐢�
+ return futureTickets <= 0 && futureAmount <= 0;
};
const open = async (type, selectedRows) => {
- visible.value = true;
-
- // 濡傛灉鏄壒閲忔搷浣滐紝璁剧疆鏍囬
- if (Array.isArray(selectedRows) && selectedRows.length > 1) {
- modalOptions.title = `鎵归噺鏂板 (${selectedRows.length}鏉�)`;
- } else {
- modalOptions.title = type === "add" ? "鏂板" : "缂栬緫";
+ // 纭繚 modalOptions.value 鏄璞�
+ if (!modalOptions.value || typeof modalOptions.value !== 'object') {
+ modalOptions.value = {};
}
-
+
+ // 鏍规嵁鎿嶄綔绫诲瀷鍜岄�変腑鏁版嵁璁剧疆鏍囬
+ if (Array.isArray(selectedRows) && selectedRows.length > 1) {
+ // 鎵归噺鎿嶄綔
+ modalOptions.value.title = type === "add" ? `鎵归噺鏂板 (${selectedRows.length}鏉�)` : `鎵归噺缂栬緫 (${selectedRows.length}鏉�)`;
+ } else {
+ // 鍗曚釜鎿嶄綔 - 鏄庣‘鍒ゆ柇 type 鐨勫��
+ if (type === "add" || type === "鏂板") {
+ modalOptions.value.title = "鏂板";
+ } else if (type === "edit" || type === "缂栬緫") {
+ modalOptions.value.title = "缂栬緫";
+ } else {
+ modalOptions.value.title = "鏉ョエ鐧昏"; // 榛樿鏍囬
+ }
+ }
+
+ visible.value = true;
+
// 濡傛灉鏄崟涓搷浣滐紝鑾峰彇id
if (!Array.isArray(selectedRows) || selectedRows.length === 1) {
const idValue = Array.isArray(selectedRows) ? selectedRows[0].id : selectedRows;
id.value = idValue;
}
-
+
await getTableData(type, selectedRows);
};
@@ -549,7 +627,7 @@
const contractProductData = form.productData.filter(item =>
item.purchaseLedgerId === contract.id
);
-
+
// 涓烘瘡涓噰璐悎鍚屽垱寤虹嫭绔嬬殑瀵硅薄
return {
// 鍩虹琛ㄥ崟鏁版嵁
@@ -559,23 +637,23 @@
enterDate: form.enterDate,
issUerId: form.issUerId, // 褰曞叆浜篿d
issUer: form.issUer, // 褰曞叆浜�
-
+
// 鍚堝悓瀹為檯淇℃伅
purchaseLedgerId: contract.id, // 浣跨敤id浣滀负瀛楁鍚嶏紝鍊间负purchaseLedgerId
- purchaseContractNumber: contract.purchaseContractNumber, // 浣跨敤瀹為檯鐨勯噰璐悎鍚屽彿
- salesContractNo: contract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞悎鍚屽彿
+ purchaseContractNumber: contract.purchaseContractNumber, // 浣跨敤瀹為檯鐨勯噰璐崟鍙�
+ salesContractNo: contract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞崟鍙�
supplierName: contract.supplierName, // 浣跨敤瀹為檯鐨勪緵搴斿晢鍚嶇О
projectName: contract.projectName, // 浣跨敤瀹為檯鐨勯」鐩悕绉�
-
+
// 浜у搧鏁版嵁
productData: proxy.HaveJson(contractProductData),
-
+
// 鎵归噺鏍囪瘑
isBatch: true,
type: 4
};
});
-
+
// 鍙皟鐢ㄤ竴娆℃帴鍙ｏ紝浼犻�掑寘鍚墍鏈夊悎鍚屾暟鎹殑鏁扮粍
modalLoading.value = true;
addOrUpdateRegistration(batchData).then((res) => {
@@ -599,22 +677,22 @@
enterDate: form.enterDate,
issUerId: form.issUerId, // 褰曞叆浜篿d
issUer: form.issUer, // 褰曞叆浜�
-
+
// 鍚堝悓瀹為檯淇℃伅
purchaseLedgerId: singleContract.id, // 浣跨敤id浣滀负瀛楁鍚嶏紝鍊间负purchaseLedgerId
- purchaseContractNumber: singleContract.purchaseContractNumber, // 浣跨敤瀹為檯鐨勯噰璐悎鍚屽彿
- salesContractNo: singleContract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞悎鍚屽彿
+ purchaseContractNumber: singleContract.purchaseContractNumber, // 浣跨敤瀹為檯鐨勯噰璐崟鍙�
+ salesContractNo: singleContract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞崟鍙�
supplierName: singleContract.supplierName, // 浣跨敤瀹為檯鐨勪緵搴斿晢鍚嶇О
projectName: singleContract.projectName, // 浣跨敤瀹為檯鐨勯」鐩悕绉�
-
+
// 浜у搧鏁版嵁
productData: proxy.HaveJson(form.productData),
-
+
// 鎵归噺鏍囪瘑
isBatch: false,
type: 4
}];
-
+
modalLoading.value = true;
addOrUpdateRegistration(singleFormArray).then((res) => {
modalLoading.value = false;
--
Gitblit v1.9.3