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/procurementManagement/procurementLedger/index.vue | 266 +++++++++++++++++++++++++++++++----------------------
1 files changed, 156 insertions(+), 110 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 89144a3..51110b0 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -40,9 +40,9 @@
<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="taxInclusiveUnitPrice" :formatter="formattedNumber" />
+ <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
</el-table>
</template>
</el-table-column>
@@ -50,9 +50,8 @@
<el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" show-overflow-tooltip/>
<el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip/>
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" show-overflow-tooltip/>
- <el-table-column label="涓氬姟鍛�" prop="businessPerson" 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="contractAmount" show-overflow-tooltip :formatter="formattedNumber"/>
<el-table-column label="褰曞叆浜�" prop="recorderName" show-overflow-tooltip/>
<el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" show-overflow-tooltip/>
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
@@ -74,7 +73,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="閿�鍞悎鍚屽彿锛�" prop="salesLedgerId">
- <el-select v-model="form.salesLedgerId" placeholder="璇烽�夋嫨" clearable>
+ <el-select v-model="form.salesLedgerId" placeholder="璇烽�夋嫨" clearable @change="salesLedgerChange">
<el-option v-for="item in salesContractList" :key="item.id" :label="item.salesContractNo" :value="item.id"/>
</el-select>
</el-form-item>
@@ -82,27 +81,15 @@
</el-row>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierName">
- <el-input v-model="form.supplierName" placeholder="璇疯緭鍏�" clearable/>
+ <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierId">
+ <el-select v-model="form.supplierId" placeholder="璇烽�夋嫨" clearable>
+ <el-option v-for="item in supplierList" :key="item.id" :label="item.supplierName" :value="item.id"/>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="椤圭洰鍚嶇О锛�" prop="projectName">
<el-input v-model="form.projectName" placeholder="璇疯緭鍏�" clearable/>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="涓氬姟鍛橈細" prop="businessPersonId">
- <el-select v-model="form.businessPersonId" placeholder="璇烽�夋嫨" clearable @change="setPhone">
- <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鐢佃瘽锛�" prop="phoneNumber">
- <el-input v-model="form.phoneNumber" placeholder="璇疯緭鍏�" clearable/>
</el-form-item>
</el-col>
</el-row>
@@ -135,20 +122,20 @@
<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="summarizeProTable">
<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" />
<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" width="150"/>
+ <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" width="150"/>
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" width="150"/>
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
- <el-button link type="primary" size="small" @click="openProductForm('edit', scope.row);">缂栬緫</el-button>
+ <el-button link type="primary" size="small" @click="openProductForm('edit', scope.row, scope.$index);">缂栬緫</el-button>
</template>
</el-table-column>
</el-table>
@@ -196,18 +183,24 @@
<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">
- <el-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
- </el-select>
+ <el-form-item label="浜у搧澶х被锛�" prop="productId">
+ <el-tree-select
+ v-model="productForm.productId"
+ placeholder="璇烽�夋嫨" clearable
+ check-strictly
+ @change="getModels"
+ :data="productOptions"
+ :render-after-expand="false"
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="24">
- <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="specificationModel">
- <el-select v-model="productForm.specificationModel" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productModelId">
+ <el-select v-model="productForm.productModelId" placeholder="璇烽�夋嫨" clearable @change="getProductModel">
+ <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id"/>
</el-select>
</el-form-item>
</el-col>
@@ -220,19 +213,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-number v-model="productForm.taxInclusiveUnitPrice" :precision="2" :step="0.1" clearable style="width: 100%" @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"/>
@@ -243,12 +236,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-number v-model="productForm.taxInclusiveTotalPrice" :precision="2" :step="0.1" clearable style="width: 100%" 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" disabled/>
</el-form-item>
</el-col>
</el-row>
@@ -287,16 +280,19 @@
addOrEditPurchase,
delPurchase,
getSalesNo,
- purchaseList,
- productList, getPurchaseById
+ purchaseListPage,
+ productList, getPurchaseById, getOptions
} from "@/api/procurementManagement/procurementLedger.js";
const { proxy } = getCurrentInstance()
const tableData = ref([])
const productData = ref([])
const selectedRows = ref([])
const productSelectedRows = ref([])
+const modelOptions = ref([])
const userList = ref([])
+const productOptions = ref([])
const salesContractList = ref([])
+const supplierList = ref([])
const tableLoading = ref(false)
const page = reactive({
current: 1,
@@ -305,6 +301,7 @@
const total = ref(0)
const fileList = ref([])
import useUserStore from "@/store/modules/user"
+import {modelList, productTreeList} from "@/api/basicData/product.js";
const userStore = useUserStore()
@@ -322,27 +319,26 @@
recorderId: '',
entryDate: '',
productData: [],
- businessPersonId: '',
- phoneNumber: '',
supplierName: '',
+ supplierId: '',
},
rules: {
purchaseContractNumber: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- salesLedgerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
projectName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- businessPersonId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- phoneNumber: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- supplierName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ supplierId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
}
})
const { searchForm, form, rules } = toRefs(data)
// 浜у搧琛ㄥ崟寮规鏁版嵁
const productFormVisible = ref(false)
const productOperationType = ref('')
+const productOperationIndex = ref('')
const currentId = ref('')
const productFormData = reactive({
productForm: {
+ productId: '',
productCategory: '',
+ productModelId: '',
specificationModel: '',
unit: '',
quantity: '',
@@ -353,8 +349,8 @@
invoiceType: '',
},
productRules: {
- productCategory: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- specificationModel: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ productId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ productModelId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
taxInclusiveUnitPrice: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -372,23 +368,32 @@
headers: { Authorization: "Bearer " + getToken() },
})
-
+const formattedNumber = (row, column, cellValue) => {
+ return parseFloat(cellValue).toFixed(2);
+};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
page.current = 1
getList()
}
-const paginationChange = ({ current, limit }) => {
- page.current = current;
- page.size = limit;
+// 瀛愯〃鍚堣鏂规硶
+const summarizeChildrenTable = (param) => {
+ return proxy.summarizeTable(param, ['taxInclusiveUnitPrice', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice', 'ticketsNum', 'ticketsAmount', 'futureTickets', 'futureTicketsAmount'], {
+ ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ });
+};
+const paginationChange = (obj) => {
+ page.current = obj.page;
+ page.size = obj.limit;
getList()
}
const getList = () => {
tableLoading.value = true
- purchaseList({...searchForm.value, ...page}).then(res => {
+ purchaseListPage({...searchForm.value, ...page}).then(res => {
tableLoading.value = false
- tableData.value = res.rows
+ tableData.value = res.records
tableData.value.map(item => {
item.children = []
})
@@ -414,7 +419,7 @@
productList({salesLedgerId: row.id, type: 2}).then(res => {
const index = tableData.value.findIndex(item => item.id === row.id);
if (index > -1) {
- tableData.value[index].children = res.rows;
+ tableData.value[index].children = res;
}
expandedRowKeys.value.push(row.id)
})
@@ -427,50 +432,12 @@
}
// 涓昏〃鍚堣鏂规硶
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']);
};
// 瀛愯〃鍚堣鏂规硶
-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;
-}
+const summarizeProTable = (param) => {
+ return proxy.summarizeTable(param, ['taxInclusiveUnitPrice', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']);
+};
// 鎵撳紑寮规
const openForm = (type, row) => {
operationType.value = type
@@ -482,6 +449,9 @@
})
getSalesNo().then(res => {
salesContractList.value = res
+ })
+ getOptions().then(res => {
+ supplierList.value = res.data
})
form.value.recorderId = userStore.id
form.value.entryDate = getCurrentDate();
@@ -499,14 +469,10 @@
}
dialogFormVisible.value = true
}
-// 璧嬪�肩數璇�
-const setPhone = (id) => {
- form.value.phoneNumber = userList.value.find(u => u.userId === id)?.phonenumber || '';
-}
// 涓婁紶鍓嶆牎妫�
function handleBeforeUpload(file) {
// 鏍℃鏂囦欢澶у皬
- if (file.size > 1024 * 1024) {
+ if (file.size > 1024 * 1024 * 10) {
proxy.$modal.msgError('涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!')
return false
}
@@ -570,14 +536,65 @@
dialogFormVisible.value = false
}
// 鎵撳紑浜у搧寮规
-const openProductForm = (type, row) => {
+const openProductForm = (type, row, index) => {
productOperationType.value = type
+ productOperationIndex.value = index
productForm.value = {}
proxy.resetForm("productFormRef")
if (type === 'edit') {
productForm.value = {...row}
}
productFormVisible.value = true
+ getProductOptions()
+}
+const getProductOptions = () => {
+ productTreeList().then(res => {
+ productOptions.value = convertIdToValue(res)
+ })
+}
+const getModels =(value) => {
+ productForm.value.productCategory = findNodeById(productOptions.value, value)
+ modelList({id: value}).then(res => {
+ modelOptions.value = res
+ })
+}
+const getProductModel =(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) => {
+ for (let i = 0; i < nodes.length; i++) {
+ if (nodes[i].value === productId) {
+ return nodes[i].label; // 鎵惧埌鑺傜偣锛岃繑鍥炶鑺傜偣
+ }
+ if (nodes[i].children && nodes[i].children.length > 0) {
+ const foundNode = findNodeById(nodes[i].children, productId);
+ if (foundNode) {
+ return foundNode.label; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖璇ヨ妭鐐�
+ }
+ }
+ }
+ return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
+};
+function convertIdToValue(data) {
+ return data.map(item => {
+ const { id, children, ...rest } = item;
+ const newItem = {
+ ...rest,
+ value: id // 灏� id 鏀逛负 value
+ };
+ if (children && children.length > 0) {
+ newItem.children = convertIdToValue(children);
+ }
+
+ return newItem;
+ });
}
// 鎻愪氦浜у搧琛ㄥ崟
const submitProduct = () => {
@@ -586,7 +603,12 @@
if (operationType.value === "edit") {
submitProductEdit()
} else {
- productData.value.push({...productForm.value})
+ if (productOperationType.value === 'add') {
+ productData.value.push({...productForm.value})
+ console.log('productData.value---', productData.value)
+ } else {
+ productData.value[productOperationIndex.value] = {...productForm.value}
+ }
closeProductDia()
}
}
@@ -639,7 +661,7 @@
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
-
+
}
}
// 鍏抽棴浜у搧寮规
@@ -695,9 +717,33 @@
const day = String(today.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
}
+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)
+ }
+}
+// 閿�鍞悎鍚岄�夋嫨鏀瑰彉鏂规硶
+const salesLedgerChange = (row) => {
+ console.log('row',row)
+ var index = salesContractList.value.findIndex(item => item.id == row);
+ console.log('index',index)
+ if(index > -1){
+ form.value.projectName = salesContractList.value[index].projectName
+ }
+}
getList()
</script>
<style scoped lang="scss">
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3