From ece2dfeb926d728b10db38038e4d12e9e9851c24 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 17:38:10 +0800
Subject: [PATCH] 分页修改
---
src/views/salesManagement/invoiceRegistration/index.vue | 129 +++++++++++++++++++------------------------
1 files changed, 57 insertions(+), 72 deletions(-)
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 96cb793..b567396 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -15,7 +15,6 @@
</div>
<div>
<el-button type="primary" @click="openForm">鏂板鐧昏</el-button>
- <el-button @click="handleOut">瀵煎嚭</el-button>
</div>
</div>
<div class="table_list">
@@ -36,16 +35,16 @@
<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" />
- <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" />
- <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" />
+ <el-table-column label="鍗曚綅" prop="unit" width="70"/>
+ <el-table-column label="鏁伴噺" prop="quantity" width="70"/>
+ <el-table-column label="绋庣巼" prop="taxRate" width="70" />
+ <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="invoiceAmount" />
+ <el-table-column label="寮�绁ㄩ噾棰�(鍏�)" prop="invoiceAmount" :formatter="formattedNumber" />
<el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" />
- <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmount"/>
+ <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmount" :formatter="formattedNumber"/>
</el-table>
</template>
</el-table-column>
@@ -55,8 +54,8 @@
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip/>
<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/>
- <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmountTotal" show-overflow-tooltip/>
+ <el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" 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"
:limit="page.size" @pagination="paginationChange" />
@@ -96,19 +95,19 @@
<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" />
- <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" />
- <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" />
+ <el-table-column label="鏁伴噺" prop="quantity" width="70" />
+ <el-table-column label="绋庣巼" prop="taxRate" width="70" />
+ <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
+ <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" width="150" />
<el-table-column label="鏈寮�绁ㄦ暟" prop="currentInvoiceNum">
<template #default="scope">
- <el-input type="number" :step="1" min="0" v-model="scope.row.currentInvoiceNum" @blur="invoiceNumBlur(scope.row)"></el-input>
+ <el-input type="number" :step="0.1" min="0" v-model="scope.row.currentInvoiceNum" @blur="invoiceNumBlur(scope.row)"></el-input>
</template>
</el-table-column>
- <el-table-column label="鏈寮�绁ㄩ噾棰�(鍏�)" prop="currentInvoiceAmount" >
+ <el-table-column label="鏈寮�绁ㄩ噾棰�(鍏�)" prop="currentInvoiceAmount" width="150">
<template #default="scope">
- <el-input type="number" :step="0.01" min="0" v-model="scope.row.currentInvoiceAmount" disabled></el-input>
+ <el-input type="number" :step="0.01" min="0" v-model="scope.row.currentInvoiceAmount" @blur="invoiceAmountBlur(scope.row)" ></el-input>
</template>
</el-table-column>
<el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" >
@@ -116,9 +115,9 @@
<el-input type="number" min="0" disabled v-model="scope.row.noInvoiceNum"></el-input>
</template>
</el-table-column>
- <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmount" >
+ <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmount" width="150" >
<template #default="scope">
- <el-input type="number" min="0" disabled v-model="scope.row.noInvoiceAmount"></el-input>
+ <el-input type="number" min="0" disabled v-model="scope.row.noInvoiceAmount" :precision="2" :step="0.01"></el-input>
</template>
</el-table-column>
</el-table>
@@ -141,7 +140,7 @@
// import {userListNoPage} from "@/api/system/user.js";
import {
getSalesLedgerWithProducts,
- ledgerList,
+ ledgerListPage,
productList,
} from "@/api/salesManagement/salesLedger.js";
import {
@@ -177,22 +176,29 @@
})
const { searchForm, form, rules } = toRefs(data)
+const formattedNumber = (row, column, cellValue) => {
+ if (cellValue) {
+ return parseFloat(cellValue).toFixed(2);
+ } else {
+ return cellValue;
+ }
+};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
page.current = 1
getList()
}
-const paginationChange = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+const paginationChange = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
getList()
}
const getList = () => {
tableLoading.value = true
- ledgerList({...searchForm.value, ...page}).then(res => {
+ ledgerListPage({...searchForm.value, ...page}).then(res => {
tableLoading.value = false
- tableData.value = res.rows;
+ tableData.value = res.records;
total.value = res.total
expandedRowKeys.value = []
})
@@ -200,7 +206,7 @@
// 琛ㄦ牸閫夋嫨鏁版嵁
const handleSelectionChange = (selection) => {
console.log('selection', selection)
- selectedRows.value = selection
+ selectedRows.value = selection.filter(item => item.salesContractNo !== undefined);
}
const expandedRowKeys = ref([])
// 灞曞紑琛�
@@ -225,49 +231,11 @@
}
// 涓昏〃鍚堣鏂规硶
const summarizeMainTable = (param) => {
- const { columns, data } = param;
- const sums = [];
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '鍚堣';
- return;
- }
- const prop = column.property;
- if (['contractAmount'].includes(prop)) {
- const values = data.map(item => Number(item[prop]));
- if (!values.every(value => isNaN(value))) {
- sums[index] = values.reduce((acc, val) => (!isNaN(val) ? acc + val : acc), 0);
- } else {
- sums[index] = '';
- }
- } else {
- sums[index] = '';
- }
- })
- return sums;
+ return proxy.summarizeTable(param, ['contractAmount','noInvoiceAmountTotal']);
};
// 瀛愯〃鍚堣鏂规硶
const summarizeChildrenTable = (param) => {
- const { columns, data } = param;
- const sums = [];
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '鍚堣';
- return;
- }
- const prop = column.property;
- if (['taxInclusiveUnitPrice', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice','invoiceNum','invoiceAmount','noInvoiceNum','noInvoiceAmount'].includes(prop)) {
- const values = data.map(item => Number(item[prop]));
- if (!values.every(value => isNaN(value))) {
- sums[index] = values.reduce((acc, val) => (!isNaN(val) ? acc + val : acc), 0);
- } else {
- sums[index] = '';
- }
- } else {
- sums[index] = '';
- }
- });
- return sums;
+ return proxy.summarizeTable(param, ['taxInclusiveUnitPrice', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice','invoiceNum','invoiceAmount','noInvoiceNum','noInvoiceAmount']);
}
// 鎵撳紑寮规
const openForm = () => {
@@ -327,16 +295,33 @@
if(!row.currentInvoiceNum){
row.currentInvoiceNum = 0
}
- if(row.currentInvoiceNum > row.noInvoiceNum){
+ if(row.currentInvoiceNum > row.tempNoInvoiceNum){
proxy.$modal.msgWarning('鏈寮�绁ㄦ暟涓嶅緱澶т簬鏈紑绁ㄦ暟')
row.currentInvoiceNum = 0
}
// 璁＄畻鏈寮�绁ㄩ噾棰�
- row.currentInvoiceAmount = row.currentInvoiceNum * row.taxInclusiveUnitPrice
+ row.currentInvoiceAmount = (row.currentInvoiceNum * row.taxInclusiveUnitPrice).toFixed(2)
// 璁＄畻鏈紑绁ㄦ暟
- row.noInvoiceNum = row.noInvoiceNum - row.currentInvoiceNum
+ row.noInvoiceNum = row.originalNoInvoiceNum - row.currentInvoiceNum
// 璁＄畻鏈紑绁ㄩ噾棰�
- row.noInvoiceAmount = row.noInvoiceNum * row.taxInclusiveUnitPrice
+ row.noInvoiceAmount = row.tempnoInvoiceAmount - row.currentInvoiceAmount
+}
+// 鏈寮�绁ㄩ噾棰濆け鐒︽搷浣�
+const invoiceAmountBlur = (row) => {
+ if(!row.currentInvoiceAmount){
+ row.currentInvoiceAmount = 0
+ }
+ // 璁＄畻鏄惁瓒呰繃寮�绁ㄦ�婚噾棰�
+ if(row.currentInvoiceAmount > row.tempnoInvoiceAmount){
+ proxy.$modal.msgWarning('鏈寮�绁ㄩ噾棰濅笉寰楀ぇ浜庢湭寮�绁ㄩ噾棰�')
+ row.currentInvoiceAmount = 0
+ }
+ // 璁＄畻鏈寮�绁ㄦ暟
+ row.currentInvoiceNum = (row.currentInvoiceAmount / row.taxInclusiveUnitPrice).toFixed(2)
+ // 璁＄畻鏈紑绁ㄦ暟
+ row.noInvoiceNum = row.originalNoInvoiceNum - row.currentInvoiceNum
+ // 璁＄畻鏈紑绁ㄩ噾棰�
+ row.noInvoiceAmount = row.tempnoInvoiceAmount - row.currentInvoiceAmount
}
getList()
--
Gitblit v1.9.3