From 61c5d5c0d8d75fdd35d134e3e5276b7b1c36cbf1 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 05 六月 2025 09:51:49 +0800
Subject: [PATCH] 付款登记功能修改
---
src/views/salesManagement/salesLedger/index.vue | 113 +++++++++++++++++++++++++++-----------------------------
1 files changed, 55 insertions(+), 58 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 3c2ff8e..d474bad 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -55,6 +55,7 @@
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip/>
<el-table-column label="褰曞叆浜�" prop="entryPersonName" show-overflow-tooltip/>
<el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" show-overflow-tooltip/>
+ <el-table-column label="褰曞叆鏃ユ湡" prop="executionDate" 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>
@@ -104,7 +105,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="褰曞叆浜猴細" prop="entryPerson">
- <el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable @change="changs">
+ <el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable @change="changs" disabled>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
</el-select>
</el-form-item>
@@ -125,6 +126,19 @@
/>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="绛捐鏃ユ湡锛�" prop="executionDate">
+ <el-date-picker
+ style="width: 100%"
+ v-model="form.executionDate"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="date"
+ placeholder="璇烽�夋嫨"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
@@ -132,7 +146,7 @@
<el-button plain type="danger" @click="deleteProduct">鍒犻櫎</el-button>
</el-form-item>
</el-row>
- <el-table :data="productData" border @selection-change="productSelected">
+ <el-table :data="productData" border @selection-change="productSelected" show-summary :summary-method="summarizeMainTable">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
@@ -190,7 +204,11 @@
</template>
</el-dialog>
<el-dialog v-model="productFormVisible" :title="productOperationType === 'add' ? '鏂板浜у搧' : '缂栬緫浜у搧'" width="40%" @close="closeProductDia">
- <el-form :model="productForm" label-width="140px" label-position="top" :rules="productRules" ref="productFormRef">
+ <el-form :model="productForm"
+ label-width="140px"
+ label-position="top"
+ :rules="productRules"
+ ref="productFormRef">
<el-row :gutter="30">
<el-col :span="24">
<el-form-item label="浜у搧澶х被锛�" prop="productCategory">
@@ -227,19 +245,19 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏁伴噺锛�" prop="quantity">
- <el-input v-model="productForm.quantity" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="productForm.quantity" placeholder="璇疯緭鍏�" clearable @change="mathNum" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍚◣鍗曚环(鍏�)锛�" prop="taxInclusiveUnitPrice">
- <el-input v-model="productForm.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="productForm.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable @change="mathNum" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="绋庣巼(%)锛�" prop="taxRate">
- <el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable>
+ <el-select v-model="productForm.taxRate" placeholder="璇烽�夋嫨" clearable @change="mathNum">
<el-option label="1" value="1"/>
<el-option label="6" value="6"/>
<el-option label="13" value="13"/>
@@ -250,12 +268,12 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="鍚◣鎬讳环(鍏�)锛�" prop="taxInclusiveTotalPrice">
- <el-input v-model="productForm.taxInclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="productForm.taxInclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="涓嶅惈绋庢�讳环(鍏�)锛�" prop="taxExclusiveTotalPrice">
- <el-input v-model="productForm.taxExclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable/>
+ <el-input v-model="productForm.taxExclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable disabled />
</el-form-item>
</el-col>
</el-row>
@@ -284,7 +302,6 @@
import { getToken } from "@/utils/auth"
import pagination from '@/components/PIMTable/Pagination.vue'
import { ref } from 'vue'
-import {Search} from "@element-plus/icons-vue";
import {ElMessageBox } from "element-plus";
import useUserStore from '@/store/modules/user'
import {userListNoPage} from "@/api/system/user.js";
@@ -330,7 +347,8 @@
entryPerson: '',
entryDate: '',
maintenanceTime: '',
- productData: []
+ productData: [],
+ executionDate:''
},
rules: {
salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
@@ -339,6 +357,7 @@
projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
}
})
const { searchForm, form, rules } = toRefs(data)
@@ -483,49 +502,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','taxInclusiveTotalPrice','taxExclusiveTotalPrice']);
};
// 瀛愯〃鍚堣鏂规硶
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'].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']);
}
// 鎵撳紑寮规
const openForm = async (type, row) => {
@@ -537,20 +518,23 @@
customerList().then(res => {
customerOption.value = res
})
+ console.log('userStore.id',userStore.id)
+ form.value.entryPerson = userStore.id
if (type === 'edit') {
currentId.value = row.id;
getSalesLedgerWithProducts({id: row.id, type: 1}).then(res => {
form.value = {...res}
+ form.value.entryPerson = Number(res.entryPerson)
productData.value = form.value.productData
fileList.value = form.value.salesLedgerFiles
})
}
- let userAll = await userStore.getInfo()
- userList.value.forEach(element => {
- if(userAll.user.nickName === element.nickName && userAll.user.userName === element.userName) {
- form.value.entryPerson = userAll.user.userId // 璁剧疆榛樿涓氬姟鍛樹负褰撳墠鐢ㄦ埛
- }
- });
+ // let userAll = await userStore.getInfo()
+ // userList.value.forEach(element => {
+ // if(userAll.user.nickName === element.nickName && userAll.user.userName === element.userName) {
+ // form.value.entryPerson = userAll.user.userId // 璁剧疆榛樿涓氬姟鍛樹负褰撳墠鐢ㄦ埛
+ // }
+ // });
form.value.entryDate = getCurrentDate() // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈�
dialogFormVisible.value = true
}
@@ -748,8 +732,21 @@
const day = String(today.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
}
-const mathNum = (val) => {
- productForm.value.taxExclusiveTotalPrice = proxy.calculateTaxExclusiveTotalPrice(val, productForm.value.taxRate)
+
+const mathNum = () => {
+ console.log('productForm.value',productForm.value)
+ if(!productForm.value.taxInclusiveUnitPrice){
+ return
+ }
+ if(!productForm.value.quantity){
+ return
+ }
+ // 鍚◣鎬讳环璁＄畻
+ productForm.value.taxInclusiveTotalPrice = proxy.calculateTaxIncludeTotalPrice(productForm.value.taxInclusiveUnitPrice, productForm.value.quantity)
+ if(productForm.value.taxRate){
+ // 涓嶅惈绋庢�讳环璁＄畻
+ productForm.value.taxExclusiveTotalPrice = proxy.calculateTaxExclusiveTotalPrice(productForm.value.taxInclusiveTotalPrice, productForm.value.taxRate)
+ }
}
getList()
</script>
--
Gitblit v1.9.3