From 30583c436b0f6943e7fde27f881259433051521d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 六月 2025 10:22:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/invoiceEntry/index.vue | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index df97099..bccf47f 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -107,26 +107,28 @@
<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
</el-form-item>
</el-row>
- <el-table :data="productData" border @selection-change="productSelected" show-summary
- :summary-method="summarizeChildrenTable">
+ <el-table :data="productData" border @selection-change="productSelected" show-summary style="width: 100%">
+ :summary-method="summarizeChildrenTable"
+ >
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
- <el-table-column label="鍗曚綅" prop="unit" />
- <el-table-column label="鏁伴噺" prop="quantity" />
- <el-table-column label="绋庣巼(%)" prop="taxRate" />
- <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="unit" width="70" />
+ <el-table-column label="鏁伴噺" prop="quantity" width="70"/>
+ <el-table-column label="绋庣巼(%)" prop="taxRate" width="80" />
+ <el-table-column label="鍚◣鍗曚环(鍏�)" width="150" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
+ <el-table-column label="鍚◣鎬讳环(鍏�)" width="150" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" width="150" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
<el-table-column label="鏈鏉ョエ鏁�" prop="ticketsNum" width="170">
<template #default="scope">
<el-input-number v-model="scope.row.ticketsNum" placeholder="璇烽�夋嫨" min="0" :step="0.1" clearable style="width: 100%"
@change="invoiceNumBlur(scope.row)" />
</template>
</el-table-column>
- <el-table-column label="鏈鏉ョエ閲戦(鍏�)" prop="ticketsAmount" :formatter="formattedNumber">
+ <el-table-column label="鏈鏉ョエ閲戦(鍏�)" prop="ticketsAmount" min="0" :step="0.1" :formatter="formattedNumber" @change="invoiceAmountBlur" width="170">
<template #default="scope">
- {{ scope.row.ticketsAmount || 0 }}
+ <el-input-number v-model="scope.row.ticketsAmount" placeholder="璇烽�夋嫨" min="0" :step="0.1" clearable style="width: 100%"
+ @change="invoiceAmountBlur(scope.row)" />
</template>
</el-table-column>
<el-table-column label="鏈潵绁ㄦ暟" prop="futureTickets"
@@ -356,13 +358,6 @@
proxy.resetForm("formRef")
dialogFormVisible.value = false
}
-// 濉啓鏁版嵁
-const openProductEdit = (row) => {
- const index = productData.value.findIndex(item => item.id === row.id);
- if (index > -1) {
- productData.value[index].editFlag = !productData.value[index].editFlag
- }
-}
// 瀵煎嚭
const handleOut = () => {
ElMessageBox.confirm(
@@ -403,7 +398,7 @@
proxy.$modal.msg("宸插彇娑�")
})
}
-//鏈寮�绁ㄥけ鐒︽搷浣�
+//鏈鏉ョエ鏁板け鐒︽搷浣�
const invoiceNumBlur = (row) => {
if (!row.ticketsNum || row.ticketsNum === '') {
row.ticketsNum = 0
@@ -413,11 +408,28 @@
row.ticketsNum = 0
return
}
- // 璁＄畻鏈寮�绁ㄩ噾棰�
+ // 璁＄畻鏈鏉ョエ閲戦
row.ticketsAmount = row.ticketsNum * row.taxInclusiveUnitPrice
- // 璁＄畻鏈紑绁ㄦ暟
+ // 璁＄畻鏈潵绁ㄦ暟
row.futureTickets = row.tempFutureTickets - row.ticketsNum
- // 璁＄畻鏈紑绁ㄩ噾棰�
+ // 璁＄畻鏈潵绁ㄩ噾棰�
+ row.futureTicketsAmount = row.tempFutureTicketsAmount - row.ticketsAmount
+}
+// 鏈鏉ョエ閲戦澶辩劍鎿嶄綔
+const invoiceAmountBlur = (row) => {
+ if(!row.ticketsAmount){
+ row.ticketsAmount = 0
+ }
+ // 璁＄畻鏄惁瓒呰繃鏉ョエ鎬婚噾棰�
+ if(row.ticketsAmount > row.tempFutureTicketsAmount){
+ proxy.$modal.msgWarning('鏈鏉ョエ閲戦涓嶅緱澶т簬鏈潵绁ㄩ噾棰�')
+ row.ticketsAmount = 0
+ }
+ // 璁＄畻鏈鏉ョエ鏁�
+ row.ticketsNum = (row.ticketsAmount / row.taxInclusiveUnitPrice).toFixed(2)
+ // 璁＄畻鏈潵绁ㄦ暟
+ row.futureTickets = row.tempFutureTickets - row.ticketsNum
+ // 璁＄畻鏈潵绁ㄩ噾棰�
row.futureTicketsAmount = row.tempFutureTicketsAmount - row.ticketsAmount
}
--
Gitblit v1.9.3