From ca1cbb4d2ffb48095d5b2625788efd4e08a5eff8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 一月 2026 14:07:24 +0800
Subject: [PATCH] 湟水峡 1.采购模块不要项目名称 2.加一个有待回款登记的提示 3.回款登记、付款登记改成和销售订单价格关联，并且可以多个一起回款或付款 4.合同管理不要下载合同了，跟合同相关的字段可以去掉了
---
src/views/procurementManagement/invoiceEntry/components/Modal.vue | 112 ++++++++++++++------------------------------------------
1 files changed, 28 insertions(+), 84 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/components/Modal.vue b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
index 7960668..29bb812 100644
--- a/src/views/procurementManagement/invoiceEntry/components/Modal.vue
+++ b/src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -24,16 +24,6 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
- <el-input
- v-model="form.projectName"
- placeholder="鑷姩濉厖"
- clearable
- disabled
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
<el-form-item label="鍙戠エ鍙凤細" prop="invoiceNumber">
<el-input
v-model="form.invoiceNumber"
@@ -197,7 +187,6 @@
purchaseLedgerNo: undefined, // 閲囪喘鍚堝悓鍙�
salesContractNo: undefined, // 閿�鍞悎鍚屽彿
supplierName: undefined, // 渚涘簲鍟嗗悕绉�
- projectName: undefined, // 椤圭洰鍚嶇О
invoiceNumber: undefined, // 鍙戠エ鍙�
invoiceAmount: undefined, // 鍙戠エ閲戦(鍏�)
issUerId: userStore.id, // 褰曞叆浜�
@@ -370,7 +359,6 @@
id: contractId, // 鏄庣‘璁剧疆鍚堝悓ID
purchaseLedgerNo: contract.purchaseContractNumber, // 娣诲姞閲囪喘鍚堝悓鍙�
supplierName: contract.supplierName, // 娣诲姞渚涘簲鍟嗗悕绉�
- projectName: contract.projectName // 娣诲姞椤圭洰鍚嶇О
});
});
}
@@ -383,7 +371,6 @@
form.entryDate = dayjs().format("YYYY-MM-DD");
form.enterDate = dayjs().format("YYYY-MM-DD");
form.salesContractNo = results[0].data.salesContractNo;
- form.projectName = results[0].data.projectName;
form.supplierName = results[0].data.supplierName;
// 淇濈暀褰曞叆浜轰俊鎭�
form.issUerId = userStore.id;
@@ -507,58 +494,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 +513,32 @@
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, // 浣跨敤瀹為檯鐨勪緵搴斿晢鍚嶇О
// 浜у搧鏁版嵁
- 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 ? "鎵归噺鐧昏澶辫触" : "鐧昏澶辫触");
+ });
}
});
};
--
Gitblit v1.9.3