From 02e9c39e8ec8d4a57e874b62907934bc9b605ccf Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 一月 2026 10:13:20 +0800
Subject: [PATCH] 湟水峡 1.开票和来票传参修改
---
src/views/procurementManagement/invoiceEntry/components/Modal.vue | 100 +++++++-----------------
src/views/salesManagement/invoiceRegistration/index.vue | 83 ++++++--------------
2 files changed, 54 insertions(+), 129 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/components/Modal.vue b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
index 7960668..76e753a 100644
--- a/src/views/procurementManagement/invoiceEntry/components/Modal.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -507,58 +507,15 @@
const submitForm = () => {
proxy.$refs["formRef"].validate((valid) => {
if (valid) {
- // 濡傛灉鏄壒閲忔搷浣滐紝灏嗘墍鏈夊悎鍚岀殑鏁版嵁鏀惧湪涓�涓暟缁勯噷锛屽彧璋冪敤涓�娆℃帴鍙�
- if (selectedContracts.value.length > 1) {
- // 鍒涘缓鍖呭惈鎵�鏈夊悎鍚屾暟鎹殑鏁扮粍
- const batchData = selectedContracts.value.map(contract => {
- // 绛涢�夊嚭灞炰簬褰撳墠鍚堝悓鐨勪骇鍝佹暟鎹�
- const contractProductData = form.productData.filter(item =>
- item.id === contract.id
- );
-
- // 涓烘瘡涓噰璐悎鍚屽垱寤虹嫭绔嬬殑瀵硅薄
- return {
- // 鍩虹琛ㄥ崟鏁版嵁
- invoiceNumber: form.invoiceNumber,
- invoiceAmount: form.invoiceAmount,
- entryDate: form.entryDate,
- enterDate: form.enterDate,
- issUerId: form.issUerId, // 褰曞叆浜篿d
- issUer: form.issUer, // 褰曞叆浜�
- tempFileIds: form.tempFileIds,
-
- // 鍚堝悓瀹為檯淇℃伅
- purchaseLedgerId: contract.id, // 浣跨敤id浣滀负瀛楁鍚嶏紝鍊间负purchaseLedgerId
- purchaseContractNumber: contract.purchaseContractNumber, // 浣跨敤瀹為檯鐨勯噰璐悎鍚屽彿
- salesContractNo: contract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞悎鍚屽彿
- supplierName: contract.supplierName, // 浣跨敤瀹為檯鐨勪緵搴斿晢鍚嶇О
- projectName: contract.projectName, // 浣跨敤瀹為檯鐨勯」鐩悕绉�
-
- // 浜у搧鏁版嵁
- productData: proxy.HaveJson(contractProductData),
-
- // 鎵归噺鏍囪瘑
- isBatch: true,
- type: 4
- };
- });
+ // 缁熶竴灏嗘墍鏈夊悎鍚岀殑鏁版嵁鏀惧湪涓�涓暟缁勯噷锛屽崟涓拰鎵归噺閮戒娇鐢ㄦ暟缁勬牸寮�
+ const submitData = selectedContracts.value.map(contract => {
+ // 绛涢�夊嚭灞炰簬褰撳墠鍚堝悓鐨勪骇鍝佹暟鎹�
+ const contractProductData = form.productData.filter(item =>
+ item.id === contract.id
+ );
- // 鍙皟鐢ㄤ竴娆℃帴鍙ｏ紝浼犻�掑寘鍚墍鏈夊悎鍚屾暟鎹殑鏁扮粍
- modalLoading.value = true;
- addOrUpdateRegistration(batchData).then((res) => {
- modalLoading.value = false;
- if (res.code === 200) {
- proxy.$modal.msgSuccess("鎵归噺鐧昏鎴愬姛");
- closeAndRefresh();
- }
- }).catch(() => {
- modalLoading.value = false;
- proxy.$modal.msgError("鎵归噺鐧昏澶辫触");
- });
- } else {
- // 鍗曚釜鍚堝悓鎻愪氦閫昏緫
- const singleContract = selectedContracts.value[0];
- const singleForm = {
+ // 涓烘瘡涓噰璐悎鍚屽垱寤虹嫭绔嬬殑瀵硅薄
+ return {
// 鍩虹琛ㄥ崟鏁版嵁
invoiceNumber: form.invoiceNumber,
invoiceAmount: form.invoiceAmount,
@@ -569,32 +526,33 @@
tempFileIds: form.tempFileIds,
// 鍚堝悓瀹為檯淇℃伅
- purchaseLedgerId: singleContract.id, // 浣跨敤id浣滀负瀛楁鍚嶏紝鍊间负purchaseLedgerId
- purchaseContractNumber: singleContract.purchaseContractNumber, // 浣跨敤瀹為檯鐨勯噰璐悎鍚屽彿
- salesContractNo: singleContract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞悎鍚屽彿
- supplierName: singleContract.supplierName, // 浣跨敤瀹為檯鐨勪緵搴斿晢鍚嶇О
- projectName: singleContract.projectName, // 浣跨敤瀹為檯鐨勯」鐩悕绉�
+ purchaseLedgerId: contract.id, // 浣跨敤id浣滀负瀛楁鍚嶏紝鍊间负purchaseLedgerId
+ purchaseContractNumber: contract.purchaseContractNumber, // 浣跨敤瀹為檯鐨勯噰璐悎鍚屽彿
+ salesContractNo: contract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞悎鍚屽彿
+ supplierName: contract.supplierName, // 浣跨敤瀹為檯鐨勪緵搴斿晢鍚嶇О
+ projectName: contract.projectName, // 浣跨敤瀹為檯鐨勯」鐩悕绉�
// 浜у搧鏁版嵁
- productData: proxy.HaveJson(form.productData),
+ productData: proxy.HaveJson(contractProductData),
// 鎵归噺鏍囪瘑
- isBatch: false,
+ isBatch: selectedContracts.value.length > 1,
type: 4
};
-
- modalLoading.value = true;
- addOrUpdateRegistration(singleForm).then((res) => {
- modalLoading.value = false;
- if (res.code === 200) {
- proxy.$modal.msgSuccess("鐧昏鎴愬姛");
- closeAndRefresh();
- }
- }).catch(() => {
- modalLoading.value = false;
- proxy.$modal.msgError("鐧昏澶辫触");
- });
- }
+ });
+
+ // 缁熶竴璋冪敤鎺ュ彛锛屼紶閫掓暟缁勬牸寮忕殑鏁版嵁
+ modalLoading.value = true;
+ addOrUpdateRegistration(submitData).then((res) => {
+ modalLoading.value = false;
+ if (res.code === 200) {
+ proxy.$modal.msgSuccess(selectedContracts.value.length > 1 ? "鎵归噺鐧昏鎴愬姛" : "鐧昏鎴愬姛");
+ closeAndRefresh();
+ }
+ }).catch(() => {
+ modalLoading.value = false;
+ proxy.$modal.msgError(selectedContracts.value.length > 1 ? "鎵归噺鐧昏澶辫触" : "鐧昏澶辫触");
+ });
}
});
};
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index bdacb18..fc97095 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -628,50 +628,15 @@
const submitForm = () => {
proxy.$refs["formRef"].validate((valid) => {
if (valid) {
- // 濡傛灉鏄壒閲忔搷浣滐紝灏嗘墍鏈夊悎鍚岀殑鏁版嵁鏀惧湪涓�涓暟缁勯噷锛屽彧璋冪敤涓�娆℃帴鍙�
- if (selectedRows.value.length > 1) {
- // 鍒涘缓鍖呭惈鎵�鏈夊悎鍚屾暟鎹殑鏁扮粍
- const batchData = selectedRows.value.map(contract => {
- // 绛涢�夊嚭灞炰簬褰撳墠鍚堝悓鐨勪骇鍝佹暟鎹�
- const contractProductData = productData.value.filter(item =>
- item.salesLedgerId === contract.id
- );
-
- // 涓烘瘡涓攢鍞悎鍚屽彿鍒涘缓鐙珛鐨勫璞�
- return {
- // 鍩虹琛ㄥ崟鏁版嵁
- issueDate: form.value.issueDate,
- createTime: form.value.createTime,
- createUer: form.value.createUer,
- invoiceNo: form.value.invoiceNo,
-
- // 鍚堝悓瀹為檯淇℃伅
- id: contract.id, // 浣跨敤id浣滀负瀛楁鍚嶏紝鍊间负salesLedgerId
- salesContractNo: contract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞悎鍚屽彿
- customerName: contract.customerName, // 浣跨敤瀹為檯鐨勫鎴峰悕绉�
- customerId: contract.customerId, // 娣诲姞瀹㈡埛ID
- customerContractNo: contract.customerContractNo, // 浣跨敤瀹為檯鐨勫鎴峰悎鍚屽彿
- projectName: contract.projectName, // 浣跨敤瀹為檯鐨勯」鐩悕绉�
- salesman: contract.salesman, // 浣跨敤瀹為檯鐨勪笟鍔″憳
-
- // 浜у搧鏁版嵁
- productData: proxy.HaveJson(contractProductData),
-
- // 鎵归噺鏍囪瘑
- isBatch: true
- };
- });
+ // 缁熶竴灏嗘墍鏈夊悎鍚岀殑鏁版嵁鏀惧湪涓�涓暟缁勯噷锛屽崟涓拰鎵归噺閮戒娇鐢ㄦ暟缁勬牸寮�
+ const submitData = selectedRows.value.map(contract => {
+ // 绛涢�夊嚭灞炰簬褰撳墠鍚堝悓鐨勪骇鍝佹暟鎹�
+ const contractProductData = productData.value.filter(item =>
+ item.salesLedgerId === contract.id
+ );
- // 鍙皟鐢ㄤ竴娆℃帴鍙ｏ紝浼犻�掑寘鍚墍鏈夊悎鍚屾暟鎹殑鏁扮粍
- invoiceRegistrationSave(batchData).then(() => {
- proxy.$modal.msgSuccess("鎵归噺鏂板鎴愬姛");
- closeDia();
- getList();
- });
- } else {
- // 鍗曚釜鍚堝悓鎻愪氦閫昏緫
- const singleContract = selectedRows.value[0];
- const singleForm = {
+ // 涓烘瘡涓攢鍞悎鍚屽彿鍒涘缓鐙珛鐨勫璞�
+ return {
// 鍩虹琛ㄥ崟鏁版嵁
issueDate: form.value.issueDate,
createTime: form.value.createTime,
@@ -679,26 +644,28 @@
invoiceNo: form.value.invoiceNo,
// 鍚堝悓瀹為檯淇℃伅
- id: singleContract.id, // 浣跨敤id浣滀负瀛楁鍚嶏紝鍊间负salesLedgerId
- salesContractNo: singleContract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞悎鍚屽彿
- customerName: singleContract.customerName, // 浣跨敤瀹為檯鐨勫鎴峰悕绉�
- customerId: singleContract.customerId, // 娣诲姞瀹㈡埛ID
- customerContractNo: singleContract.customerContractNo, // 浣跨敤瀹為檯鐨勫鎴峰悎鍚屽彿
- projectName: singleContract.projectName, // 浣跨敤瀹為檯鐨勯」鐩悕绉�
- salesman: singleContract.salesman, // 浣跨敤瀹為檯鐨勪笟鍔″憳
+ id: contract.id, // 浣跨敤id浣滀负瀛楁鍚嶏紝鍊间负salesLedgerId
+ salesContractNo: contract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞悎鍚屽彿
+ customerName: contract.customerName, // 浣跨敤瀹為檯鐨勫鎴峰悕绉�
+ customerId: contract.customerId, // 娣诲姞瀹㈡埛ID
+ customerContractNo: contract.customerContractNo, // 浣跨敤瀹為檯鐨勫鎴峰悎鍚屽彿
+ projectName: contract.projectName, // 浣跨敤瀹為檯鐨勯」鐩悕绉�
+ salesman: contract.salesman, // 浣跨敤瀹為檯鐨勪笟鍔″憳
// 浜у搧鏁版嵁
- productData: proxy.HaveJson(productData.value),
+ productData: proxy.HaveJson(contractProductData),
// 鎵归噺鏍囪瘑
- isBatch: false
+ isBatch: selectedRows.value.length > 1
};
- invoiceRegistrationSave(singleForm).then((res) => {
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- closeDia();
- getList();
- });
- }
+ });
+
+ // 缁熶竴璋冪敤鎺ュ彛锛屼紶閫掓暟缁勬牸寮忕殑鏁版嵁
+ invoiceRegistrationSave(submitData).then(() => {
+ proxy.$modal.msgSuccess(selectedRows.value.length > 1 ? "鎵归噺鏂板鎴愬姛" : "鎻愪氦鎴愬姛");
+ closeDia();
+ getList();
+ });
}
});
};
--
Gitblit v1.9.3