From 0805c8f58834e70b2a654cfa9f54fdaeaa0ddda1 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 15:59:03 +0800
Subject: [PATCH] bug修改
---
src/views/procurementManagement/procurementLedger/index.vue | 2 +
src/views/salesManagement/invoiceLedger/index.vue | 22 ++++++++++
src/views/procurementManagement/invoiceEntry/index.vue | 22 +++++++++-
src/views/salesManagement/receiptPaymentLedger/index.vue | 12 +++---
src/views/salesManagement/salesLedger/index.vue | 5 ++
src/views/procurementManagement/paymentLedger/index.vue | 6 +-
6 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/src/views/procurementManagement/invoiceEntry/index.vue b/src/views/procurementManagement/invoiceEntry/index.vue
index d73b5cc..cce56ca 100644
--- a/src/views/procurementManagement/invoiceEntry/index.vue
+++ b/src/views/procurementManagement/invoiceEntry/index.vue
@@ -119,13 +119,13 @@
<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%"
+ <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" min="0" :step="0.1" :formatter="formattedNumber" @change="invoiceAmountBlur" width="170">
+ <el-table-column label="鏈鏉ョエ閲戦(鍏�)" prop="ticketsAmount" :min="0" :step="0.1" :formatter="formattedNumber" @change="invoiceAmountBlur" width="170">
<template #default="scope">
- <el-input-number v-model="scope.row.ticketsAmount" placeholder="璇烽�夋嫨" min="0" :step="0.1" clearable style="width: 100%"
+ <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>
@@ -412,6 +412,7 @@
row.futureTickets = row.tempFutureTickets - row.ticketsNum
// 璁＄畻鏈潵绁ㄩ噾棰�
row.futureTicketsAmount = row.tempFutureTicketsAmount - row.ticketsAmount
+ calculateinvoiceAmount()
}
// 鏈鏉ョエ閲戦澶辩劍鎿嶄綔
const invoiceAmountBlur = (row) => {
@@ -429,6 +430,7 @@
row.futureTickets = row.tempFutureTickets - row.ticketsNum
// 璁＄畻鏈潵绁ㄩ噾棰�
row.futureTicketsAmount = row.tempFutureTicketsAmount - row.ticketsAmount
+ calculateinvoiceAmount()
}
// 鑾峰彇褰撳墠鏃ユ湡鍑芥暟
@@ -441,6 +443,20 @@
if (strDate < 10) strDate = `0${strDate}` // 濡傛灉鏃ユ槸涓綅鏁帮紝鍦ㄥ墠闈㈣ˉ0
return `${year}-${month}-${strDate}`
}
+
+
+function calculateinvoiceAmount() {
+ console.log('productData',productData.value)
+ var invoiceAmountTotal = 0
+ productData.value.forEach(item => {
+ if(item.ticketsAmount){
+ invoiceAmountTotal += item.ticketsAmount
+ }
+ })
+ form.value.invoiceAmount = invoiceAmountTotal.toFixed(2)
+
+}
+
getList()
</script>
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index e2bdc8b..67ebcd0 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -150,7 +150,7 @@
prop: "happenTime",
},
{
- label: "鍙戠エ閲戦",
+ label: "鍙戠エ閲戦(鍏�)",
prop: "invoiceAmount",
formatData: (params) => {
return parseFloat(params).toFixed(2);
@@ -237,10 +237,10 @@
const handlePagination = ({ page, limit }) => {
sonPage.current = page;
sonPage.size = limit;
-
+
const start = (page - 1) * limit;
const end = start + limit;
-
+
originalTableDataSon.value = tableDataSon.value.slice(start, end);
}
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index a291c11..3431afd 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -562,8 +562,10 @@
const index = modelOptions.value.findIndex(item => item.id === value);
if (index !== -1) {
productForm.value.specificationModel = modelOptions.value[index].model;
+ productForm.value.unit = modelOptions.value[index].unit;
} else {
productForm.value.specificationModel = null;
+ productForm.value.unit = null
}
}
const findNodeById = (nodes, productId) => {
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index db08cab..473969a 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -90,7 +90,7 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="寮�绁ㄤ汉锛�" prop="invoicePerson">
- <el-input v-model="form.invoicePerson" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="form.invoicePerson" placeholder="璇疯緭鍏�" clearable disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -103,6 +103,7 @@
type="date"
placeholder="璇烽�夋嫨"
clearable
+ disabled
/>
</el-form-item>
</el-col>
@@ -194,6 +195,7 @@
commitFile,
registrationProductPage
} from "../../../api/salesManagement/invoiceLedger.js";
+import useUserStore from "@/store/modules/user.js";
const { proxy } = getCurrentInstance()
const tableData = ref([])
const productData = ref([])
@@ -235,6 +237,7 @@
})
const { searchForm, form, rules } = toRefs(data)
const currentId = ref('')
+const userStore = useUserStore()
const upload = reactive({
// 涓婁紶鐨勫湴鍧�
url: import.meta.env.VITE_APP_BASE_API + "/invoiceLedger/uploadFile",
@@ -282,9 +285,17 @@
productData.value = []
fileList.value = []
currentId.value = row.id;
+
invoiceLedgerProductInfo({id: row.id}).then(res => {
form.value = {...res.data}
fileList.value = res.data.fileList;
+ if(!form.value.invoicePerson){
+ form.value.invoicePerson = userStore.nickName
+ form.value.entryDate = getCurrentDate();
+ }
+ if(!form.value.invoiceDate){
+ form.value.invoiceDate = getCurrentDate();
+ }
})
dialogFormVisible.value = true
}
@@ -395,6 +406,15 @@
}
+// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
+function getCurrentDate() {
+ const today = new Date();
+ const year = today.getFullYear();
+ const month = String(today.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮�
+ const day = String(today.getDate()).padStart(2, '0');
+ return `${year}-${month}-${day}`;
+}
+
getList()
</script>
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index c4d5252..42f61f1 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -24,9 +24,9 @@
height="calc(100vh - 18.5em)">
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip/>
- <el-table-column label="寮�绁ㄩ噾棰�" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="鍥炴閲戦" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="鏈洖娆鹃噾棰�" prop="unReceiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="寮�绁ㄩ噾棰�(鍏�)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="鍥炴閲戦(鍏�)" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="鏈洖娆鹃噾棰�(鍏�)" prop="unReceiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
</el-table>
<pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current"
:limit="page.size" @pagination="paginationChange" />
@@ -39,9 +39,9 @@
height="calc(100vh - 18.5em)">
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="鍙戠敓鏃ユ湡" prop="receiptPaymentDate" show-overflow-tooltip/>
- <el-table-column label="鍥炴閲戦" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="寰呮敹閲戦" prop="noReceiptAmount" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="搴旀敹閲戦" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="鍥炴閲戦(鍏�)" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="寰呮敹閲戦(鍏�)" prop="noReceiptAmount" show-overflow-tooltip :formatter="formattedNumber"/>
+ <el-table-column label="搴旀敹閲戦(鍏�)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
</el-table>
<pagination v-show="recordTotal > 0" :total="recordTotal" layout="total, sizes, prev, pager, next, jumper" :page="recordPage.current"
:limit="recordPage.size" @pagination="recordPaginationChange" />
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index ad55ca7..13b72fe 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -56,7 +56,7 @@
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="180" show-overflow-tooltip :formatter="formattedNumber"/>
<el-table-column label="褰曞叆浜�" prop="entryPersonName" width="100" show-overflow-tooltip/>
<el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip/>
- <el-table-column label="褰曞叆鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip/>
+ <el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip/>
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
<el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
@@ -439,11 +439,14 @@
})
}
const getProductModel =(value) => {
+ console.log('value', value)
const index = modelOptions.value.findIndex(item => item.id === value);
if (index !== -1) {
productForm.value.specificationModel = modelOptions.value[index].model;
+ productForm.value.unit = modelOptions.value[index].unit;
} else {
productForm.value.specificationModel = null;
+ productForm.value.unit = null;
}
}
const findNodeById = (nodes, productId) => {
--
Gitblit v1.9.3