From 188eb07cbc0717ccee654290ec641a79d96713e4 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期一, 16 六月 2025 17:04:14 +0800 Subject: [PATCH] feat: 客户 供应商导入 --- src/views/salesManagement/salesLedger/index.vue | 302 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 205 insertions(+), 97 deletions(-) diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue index 04bc2c2..d9e5747 100644 --- a/src/views/salesManagement/salesLedger/index.vue +++ b/src/views/salesManagement/salesLedger/index.vue @@ -9,7 +9,7 @@ placeholder="璇疯緭鍏�" @change="handleQuery" clearable - :prefix-icon="Search" + prefix-icon="Search" /> <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button> </div> @@ -25,6 +25,7 @@ :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary + style="width: 100%" :summary-method="summarizeMainTable" @expand-change="expandChange" height="calc(100vh - 18.5em)"> @@ -35,26 +36,27 @@ show-summary :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="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" /> + <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> </template> </el-table-column> <el-table-column align="center" label="搴忓彿" type="index" width="60" /> - <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" show-overflow-tooltip/> - <el-table-column label="瀹㈡埛鍚堝悓鍙�" prop="customerContractNo" show-overflow-tooltip/> - <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="entryPerson" show-overflow-tooltip/> - <el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" show-overflow-tooltip/> + <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" show-overflow-tooltip/> + <el-table-column label="瀹㈡埛鍚堝悓鍙�" prop="customerContractNo" width="180" show-overflow-tooltip/> + <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="300" show-overflow-tooltip/> + <el-table-column label="涓氬姟鍛�" prop="salesman" width="100" show-overflow-tooltip/> + <el-table-column label="椤圭洰鍚嶇О" prop="projectName" width="180" show-overflow-tooltip/> + <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 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,8 +106,8 @@ </el-col> <el-col :span="12"> <el-form-item label="褰曞叆浜猴細" prop="entryPerson"> - <el-select v-model="form.entryPerson" placeholder="璇烽�夋嫨" clearable> - <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/> + <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> </el-col> @@ -121,6 +123,20 @@ type="date" placeholder="璇烽�夋嫨" clearable + disabled + /> + </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> @@ -131,7 +147,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" /> @@ -139,9 +155,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-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> @@ -157,7 +173,7 @@ </el-row> <el-row :gutter="30"> <el-col :span="24"> - <el-form-item label="闄勪欢鏉愭枡路锛�" prop="remark"> + <el-form-item label="闄勪欢鏉愭枡锛�" prop="remark"> <el-upload v-model:file-list="fileList" :action="upload.url" @@ -168,6 +184,7 @@ :before-upload="handleBeforeUpload" :on-error="handleUploadError" :on-success="handleUploadSuccess" + :on-remove="handleRemove" > <el-button type="primary">涓婁紶</el-button> <template #tip> @@ -188,21 +205,35 @@ </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"> - <el-select v-model="productForm.productCategory" placeholder="璇烽�夋嫨" clearable> + <!-- <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-select> --> + <el-tree-select + v-model="productForm.productCategory" + 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> @@ -215,19 +246,19 @@ </el-col> <el-col :span="12"> <el-form-item label="鏁伴噺锛�" prop="quantity"> - <el-input v-model="productForm.quantity" placeholder="璇疯緭鍏�" clearable/> + <el-input type="number" :step="0.1" :min="0" 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"/> @@ -238,12 +269,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> @@ -272,16 +303,18 @@ 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"; import { - ledgerList, + ledgerListPage, productList, customerList, addOrUpdateSalesLedger, - getSalesLedgerWithProducts, delLedger, addOrUpdateSalesLedgerProduct, delProduct + getSalesLedgerWithProducts, delLedger, addOrUpdateSalesLedgerProduct, delProduct, delLedgerFile } from "@/api/salesManagement/salesLedger.js"; +import {modelList, productTreeList} from "@/api/basicData/product.js"; +const userStore = useUserStore() const { proxy } = getCurrentInstance() const tableData = ref([]) const productData = ref([]) @@ -289,10 +322,12 @@ const productSelectedRows = ref([]) const userList = ref([]) const customerOption = ref([]) +const productOptions = ref([]) +const modelOptions = ref([]) const tableLoading = ref(false) const page = reactive({ current: 1, - size: 10, + size: 100, }) const total = ref(0) const fileList = ref([]) @@ -313,7 +348,8 @@ entryPerson: '', entryDate: '', maintenanceTime: '', - productData: [] + productData: [], + executionDate:'' }, rules: { salesman: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }], @@ -322,6 +358,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) @@ -367,25 +404,85 @@ 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 tableData.value.map(item => { item.children = [] }) total.value = res.total + }).catch(() => { + tableLoading.value = false }) +} +// 鑾峰彇浜у搧澶х被tree鏁版嵁 +const getProductOptions = () => { + productTreeList().then(res => { + productOptions.value = convertIdToValue(res) + }) +} +const formattedNumber = (row, column, cellValue) => { + return parseFloat(cellValue).toFixed(2); +}; +// 鑾峰彇tree瀛愭暟鎹� +const getModels =(value) => { + productForm.value.productCategory = findNodeById(productOptions.value, value) + modelList({id: value}).then(res => { + modelOptions.value = res + }) +} +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) => { + 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 handleSelectionChange = (selection) => { - selectedRows.value = selection + + // 杩囨护鎺夊瓙鏁版嵁 + selectedRows.value = selection.filter(item => item.children !== undefined); + console.log('selection',selectedRows.value) } const productSelected = (selectedRows) => { productSelectedRows.value = selectedRows @@ -396,10 +493,10 @@ if (expandedRows.length > 0) { expandedRowKeys.value = [] try { - productList({salesLedgerId: row.id}).then(res => { + productList({salesLedgerId: row.id, type: 1}).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) }) @@ -412,74 +509,49 @@ } // 涓昏〃鍚堣鏂规硶 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 = (type, row) => { +const openForm = async (type, row) => { operationType.value = type form.value = {} productData.value = [] - userListNoPage().then(res => { - userList.value = res.data - }) + let userLists = await userListNoPage() + userList.value = userLists.data 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}).then(res => { + 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 // 璁剧疆榛樿涓氬姟鍛樹负褰撳墠鐢ㄦ埛 + // } + // }); + form.value.entryDate = getCurrentDate() // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈� dialogFormVisible.value = true +} +function changs(val){ + console.log(val); } // 涓婁紶鍓嶆牎妫� function handleBeforeUpload(file) { // 鏍℃鏂囦欢澶у皬 - if (file.size > 1024 * 1024) { + if (file.size > 1024 * 1024 * 10) { proxy.$modal.msgError('涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃10MB!') return false } @@ -502,6 +574,16 @@ proxy.$refs.fileUpload.handleRemove(file) } } +// 绉婚櫎鏂囦欢 +function handleRemove (file) { + if (operationType.value === 'edit') { + let ids = [] + ids.push(file.id) + delLedgerFile(ids).then(res => { + proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛") + }) + } +} // 鎻愪氦琛ㄥ崟 const submitForm = () => { proxy.$refs["formRef"].validate(valid => { @@ -517,6 +599,7 @@ tempFileIds = fileList.value.map(item => item.tempId) } form.value.tempFileIds = tempFileIds + form.value.type = 1 addOrUpdateSalesLedger(form.value).then(res => { proxy.$modal.msgSuccess("鎻愪氦鎴愬姛") closeDia() @@ -539,6 +622,7 @@ productForm.value = {...row} } productFormVisible.value = true + getProductOptions() } // 鎻愪氦浜у搧琛ㄥ崟 const submitProduct = () => { @@ -558,7 +642,7 @@ addOrUpdateSalesLedgerProduct(productForm.value).then(res => { proxy.$modal.msgSuccess("鎻愪氦鎴愬姛") closeProductDia() - getSalesLedgerWithProducts({id: currentId.value}).then(res => { + getSalesLedgerWithProducts({id: currentId.value, type: 1}).then(res => { productData.value = res.productData }) }) @@ -592,14 +676,14 @@ delProduct(ids).then(res => { proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛") closeProductDia() - getSalesLedgerWithProducts({id: currentId.value}).then(res => { + getSalesLedgerWithProducts({id: currentId.value, type: 1}).then(res => { productData.value = res.productData }) }) }).catch(() => { proxy.$modal.msg("宸插彇娑�") }) - + } } // 鍏抽棴浜у搧寮规 @@ -647,9 +731,33 @@ proxy.$modal.msg("宸插彇娑�") }) } +// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� 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}`; +} + +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> <style scoped lang="scss"> -</style> \ No newline at end of file +</style> -- Gitblit v1.9.3