From 306660c86f86cc92a725db3cc1c2f324cf6eaf96 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 13:54:11 +0800
Subject: [PATCH] fix:所有采购合同号改为采购单号。销售合同号改为销售单号。
---
src/views/salesManagement/invoiceRegistration/index.vue | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 44e1c4e..a4ecc8b 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -30,9 +30,9 @@
<div class="flex justify-between">
<div></div>
<div>
- <el-button
- type="primary"
- @click="openForm"
+ <el-button
+ type="primary"
+ @click="openForm"
style="margin-bottom: 8px"
:disabled="!canInvoice"
>
@@ -116,7 +116,7 @@
</el-table-column>
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column
- label="閿�鍞悎鍚屽彿"
+ label="閿�鍞崟鍙�"
prop="salesContractNo"
show-overflow-tooltip
/>
@@ -137,7 +137,7 @@
prop="contractAmount"
show-overflow-tooltip
:formatter="formattedNumber"
-
+
/>
<el-table-column
label="宸插紑绁ㄩ噾棰�(鍏�)"
@@ -184,7 +184,7 @@
>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="閿�鍞悎鍚屽彿锛�" prop="salesContractNo">
+ <el-form-item label="閿�鍞崟鍙凤細" prop="salesContractNo">
<el-input v-model="form.salesContractNo" disabled placeholder="澶氬悎鍚屾壒閲忓鐞嗭紙鍏蜂綋鍚堝悓鍙疯浜у搧鍒楄〃锛�"></el-input>
</el-form-item>
</el-col>
@@ -250,7 +250,7 @@
/>
</el-form-item>
</el-col>
-
+
</el-row>
<el-row>
<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate"> </el-form-item>
@@ -301,9 +301,9 @@
/>
<el-table-column label="鏈寮�绁ㄦ暟" prop="currentInvoiceNum" width="180">
<template #default="scope">
- <el-input-number
- :step="0.1"
- :min="0"
+ <el-input-number
+ :step="0.1"
+ :min="0"
style="width: 100%"
:precision="2"
v-model="scope.row.currentInvoiceNum"
@@ -318,9 +318,9 @@
width="180"
>
<template #default="scope">
- <el-input-number
- :step="0.01"
- :min="0"
+ <el-input-number
+ :step="0.01"
+ :min="0"
style="width: 100%"
:precision="2"
v-model="scope.row.currentInvoiceAmount"
@@ -562,28 +562,28 @@
proxy.$modal.msgError("璇疯嚦灏戦�夋嫨涓�鏉″悎鍚�");
return;
}
-
+
// 妫�鏌ユ墍鏈夐�夋嫨鐨勫悎鍚屾槸鍚﹀叿鏈夌浉鍚岀殑瀹㈡埛鍚嶇О
const firstRow = selectedRows.value[0];
const isSameCustomer = selectedRows.value.every(row =>
row.customerName === firstRow.customerName
);
-
+
if (!isSameCustomer) {
proxy.$modal.msgError("璇烽�夋嫨鐩稿悓瀹㈡埛鍚嶇О鐨勫悎鍚�");
return;
}
-
- // 鍏佽涓嶅悓鐨勯攢鍞悎鍚屽彿鎵归噺澶勭悊锛屾棤闇�妫�鏌ラ噸澶�
-
+
+ // 鍏佽涓嶅悓鐨勯攢鍞崟鍙锋壒閲忓鐞嗭紝鏃犻渶妫�鏌ラ噸澶�
+
form.value = {};
productData.value = [];
-
+
// 鍔犺浇鎵�鏈夐�変腑鍚堝悓鐨勪骇鍝佹暟鎹�
const promises = selectedRows.value.map(row =>
getSalesLedgerWithProducts({ id: row.id })
);
-
+
Promise.all(promises).then(results => {
// 鍚堝苟鎵�鏈夊悎鍚岀殑浜у搧鏁版嵁锛屽苟涓烘瘡涓骇鍝佹坊鍔犲搴旂殑鍚堝悓淇℃伅
const allProductData = [];
@@ -595,24 +595,24 @@
allProductData.push({
...item,
// id: contractId, // 鏄庣‘璁剧疆鍚堝悓ID
- salesContractNo: contract.salesContractNo, // 娣诲姞閿�鍞悎鍚屽彿
+ salesContractNo: contract.salesContractNo, // 娣诲姞閿�鍞崟鍙�
customerName: contract.customerName, // 娣诲姞瀹㈡埛鍚嶇О
customerContractNo: contract.customerContractNo // 娣诲姞瀹㈡埛鍚堝悓鍙�
});
});
}
});
-
- // 璁剧疆琛ㄥ崟鏁版嵁锛堜娇鐢ㄧ涓�涓悎鍚岀殑鍩烘湰淇℃伅锛岄攢鍞悎鍚屽彿鐣欑┖锛�
+
+ // 璁剧疆琛ㄥ崟鏁版嵁锛堜娇鐢ㄧ涓�涓悎鍚岀殑鍩烘湰淇℃伅锛岄攢鍞崟鍙风暀绌猴級
form.value = { ...results[0] };
form.value.createTime = dayjs().format("YYYY-MM-DD");
form.value.issueDate = dayjs().format("YYYY-MM-DD");
form.value.createUer = userStore.nickName;
form.value.selectedContractIds = selectedRows.value.map(row => row.id); // 瀛樺偍鎵�鏈夐�変腑鐨勫悎鍚孖D
- form.value.salesContractNo = ""; // 閿�鍞悎鍚屽彿鐣欑┖锛屽洜涓轰細鍦ㄤ骇鍝佽〃鏍间腑鍒嗗埆鏄剧ず
-
+ form.value.salesContractNo = ""; // 閿�鍞崟鍙风暀绌猴紝鍥犱负浼氬湪浜у搧琛ㄦ牸涓垎鍒樉绀�
+
productData.value = allProductData;
-
+
// 瀵逛簬涓嶈兘寮�绁ㄧ殑浜у搧锛屽皢寮�绁ㄦ暟鍜屽紑绁ㄩ噾棰濊缃负0
productData.value.forEach(item => {
if (isProductInvoiceDisabled(item)) {
@@ -620,7 +620,7 @@
item.currentInvoiceAmount = 0;
}
});
-
+
dialogFormVisible.value = true;
console.log("productData.value ", productData.value);
});
@@ -637,32 +637,32 @@
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, // 浣跨敤瀹為檯鐨勯攢鍞悎鍚屽彿
+ 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
};
});
-
+
// 鍙皟鐢ㄤ竴娆℃帴鍙ｏ紝浼犻�掑寘鍚墍鏈夊悎鍚屾暟鎹殑鏁扮粍
invoiceRegistrationSave(batchData).then(() => {
proxy.$modal.msgSuccess("鎵归噺鏂板鎴愬姛");
@@ -679,19 +679,19 @@
createTime: form.value.createTime,
createUer: form.value.createUer,
invoiceNo: form.value.invoiceNo,
-
+
// 鍚堝悓瀹為檯淇℃伅
id: singleContract.id, // 浣跨敤id浣滀负瀛楁鍚嶏紝鍊间负salesLedgerId
- salesContractNo: singleContract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞悎鍚屽彿
+ salesContractNo: singleContract.salesContractNo, // 浣跨敤瀹為檯鐨勯攢鍞崟鍙�
customerName: singleContract.customerName, // 浣跨敤瀹為檯鐨勫鎴峰悕绉�
customerId: singleContract.customerId, // 娣诲姞瀹㈡埛ID
customerContractNo: singleContract.customerContractNo, // 浣跨敤瀹為檯鐨勫鎴峰悎鍚屽彿
projectName: singleContract.projectName, // 浣跨敤瀹為檯鐨勯」鐩悕绉�
salesman: singleContract.salesman, // 浣跨敤瀹為檯鐨勪笟鍔″憳
-
+
// 浜у搧鏁版嵁
productData: proxy.HaveJson(productData.value),
-
+
// 鎵归噺鏍囪瘑
isBatch: false
}
--
Gitblit v1.9.3