From 4f2c8ee38607730ed7561cd814e26b91c6dd53f5 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 17 六月 2025 09:07:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/invoiceRegistration/index.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 4995938..77596d7 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -41,9 +41,9 @@
<el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
<el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
<el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
- <el-table-column label="寮�绁ㄦ暟" prop="invoiceNum" />
+ <el-table-column label="寮�绁ㄦ暟" prop="invoiceNum" :formatter="formattedNumber" />
<el-table-column label="寮�绁ㄩ噾棰�(鍏�)" prop="invoiceAmount" :formatter="formattedNumber" />
- <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" />
+ <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" :formatter="formattedNumber" />
<el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmount" :formatter="formattedNumber"/>
</el-table>
</template>
@@ -55,6 +55,7 @@
<el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip/>
<el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip/>
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="宸插紑绁ㄩ噾棰�(鍏�)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
<el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmountTotal" show-overflow-tooltip :formatter="formattedNumber"/>
</el-table>
<pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current"
@@ -177,6 +178,9 @@
const { searchForm, form, rules } = toRefs(data)
const formattedNumber = (row, column, cellValue) => {
+ if (cellValue == 0) {
+ return parseFloat(cellValue).toFixed(2);
+ }
if (cellValue) {
return parseFloat(cellValue).toFixed(2);
} else {
@@ -231,7 +235,7 @@
}
// 涓昏〃鍚堣鏂规硶
const summarizeMainTable = (param) => {
- return proxy.summarizeTable(param, ['contractAmount','noInvoiceAmountTotal']);
+ return proxy.summarizeTable(param, ['contractAmount','noInvoiceAmountTotal','invoiceTotal']);
};
// 瀛愯〃鍚堣鏂规硶
const summarizeChildrenTable = (param) => {
@@ -302,9 +306,9 @@
// 璁＄畻鏈寮�绁ㄩ噾棰�
row.currentInvoiceAmount = (row.currentInvoiceNum * row.taxInclusiveUnitPrice).toFixed(2)
// 璁＄畻鏈紑绁ㄦ暟
- row.noInvoiceNum = row.originalNoInvoiceNum - row.currentInvoiceNum
+ row.noInvoiceNum = (row.originalNoInvoiceNum - row.currentInvoiceNum).toFixed(2)
// 璁＄畻鏈紑绁ㄩ噾棰�
- row.noInvoiceAmount = row.tempnoInvoiceAmount - row.currentInvoiceAmount
+ row.noInvoiceAmount = (row.tempnoInvoiceAmount - row.currentInvoiceAmount).toFixed(2)
}
// 鏈寮�绁ㄩ噾棰濆け鐒︽搷浣�
const invoiceAmountBlur = (row) => {
@@ -318,10 +322,12 @@
}
// 璁＄畻鏈寮�绁ㄦ暟
row.currentInvoiceNum = (row.currentInvoiceAmount / row.taxInclusiveUnitPrice).toFixed(2)
+ console.log('row.currentInvoiceNum ',row.currentInvoiceNum )
+ console.log(' row.originalNoInvoiceNum ', row.originalNoInvoiceNum )
// 璁＄畻鏈紑绁ㄦ暟
- row.noInvoiceNum = row.originalNoInvoiceNum - row.currentInvoiceNum
+ row.noInvoiceNum = (row.originalNoInvoiceNum - row.currentInvoiceNum).toFixed(2)
// 璁＄畻鏈紑绁ㄩ噾棰�
- row.noInvoiceAmount = row.tempnoInvoiceAmount - row.currentInvoiceAmount
+ row.noInvoiceAmount = (row.tempnoInvoiceAmount - row.currentInvoiceAmount).toFixed(2)
}
getList()
--
Gitblit v1.9.3