From 4d97a259f3069f9b18d87ac3fab710618f2c6087 Mon Sep 17 00:00:00 2001 From: lishenao <3065849776@qq.com> Date: 星期四, 03 七月 2025 15:19:31 +0800 Subject: [PATCH] 库存管理数据修改 --- src/views/inventoryManagement/receiptManagement/index.vue | 580 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 337 insertions(+), 243 deletions(-) diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue index 2691509..ad9a9d8 100644 --- a/src/views/inventoryManagement/receiptManagement/index.vue +++ b/src/views/inventoryManagement/receiptManagement/index.vue @@ -30,7 +30,7 @@ <el-table-column label="鍚◣鎬讳环" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip /> <el-table-column label="绋庣巼(%)" prop="taxRate" width="80" show-overflow-tooltip /> <el-table-column label="涓嶅惈绋庢�讳环" prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip /> - <el-table-column label="鍏ュ簱浜�" prop="nickname" width="80" show-overflow-tooltip /> + <el-table-column label="鍏ュ簱浜�" prop="nickName" width="80" 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> @@ -43,100 +43,51 @@ <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍏ュ簱' : '缂栬緫鍏ュ簱'" width="70%" @close="closeDia"> <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef"> - <el-row :gutter="30"> - <el-col :span="12"> - <el-form-item label="浜у搧鍚嶇О锛�" prop="productId"> - <el-select v-model="form.productId" placeholder="璇烽�夋嫨" clearable> - <el-option v-for="item in productList" :key="item.id" :label="item.productName" - :value="item.id" /> - </el-select> + <el-form-item label="閲囪喘璁㈠崟鍙�" prop="salesContractNo"> + <el-input v-model="form.salesContractNo" placeholder="璇疯緭鍏�" clearable /> </el-form-item> - </el-col> - - <el-col :span="12"> - <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="productManageId"> - <el-select v-model="form.productManageId" placeholder="璇烽�夋嫨" clearable> - <el-option v-for="item in productmodelList" :key="item.id" :label="item.model" - :value="item.id" /> - </el-select> - </el-form-item> - </el-col> - </el-row> - - <el-row :gutter="30"> - <el-col :span="12"> - <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="salesContractNo"> - <el-select v-model="form.supplierId" placeholder="璇烽�夋嫨" clearable> - <el-option v-for="item in supplierLists" :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="salesman"> - <el-input v-model="form.productCategory" placeholder="璇疯緭鍏�" clearable /> - </el-form-item> - </el-col> - </el-row> - <el-row :gutter="30"> - - <el-col :span="12"> - <el-form-item label="鍗曚綅锛�" prop="customerId"> - <el-input v-model="form.unit" placeholder="璇疯緭鍏�" clearable /> - </el-form-item> - </el-col> - </el-row> - <el-row :gutter="30"> - <el-col :span="12"> - <el-form-item label="鍏ュ簱鏃堕棿锛�" prop="projectName"> - <el-date-picker style="width: 100%" v-model="form.inboundTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD" - type="date" placeholder="璇烽�夋嫨" clearable /> - </el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item label="鍏ュ簱鎵规锛�" prop="entryPerson"> - <el-input v-model="form.inboundBatch" placeholder="璇疯緭鍏�" clearable /> - </el-form-item> - </el-col> - </el-row> - <el-row :gutter="30"> - <el-col :span="12"> - <el-form-item label="鍏ュ簱鏁伴噺锛�" prop="customerContractNo"> - <el-input v-model="form.inboundQuantity" placeholder="璇疯緭鍏�" clearable /> - </el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item label="鍚◣鍗曚环锛�" prop="customerId"> - <el-input v-model="form.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable /> - </el-form-item> - </el-col> - </el-row> - <el-row :gutter="30"> - <el-col :span="12"> - <el-form-item label="鍚◣鎬讳环锛�" prop="customerContractNo"> - <el-input v-model="form.taxInclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable /> - </el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item label="绋庣巼锛�" prop="customerId"> - <el-input v-model="form.taxRate" placeholder="璇疯緭鍏�" clearable /> - </el-form-item> - </el-col> - </el-row> - <el-row :gutter="30"> - <el-col :span="12"> - <el-form-item label="涓嶅惈绋庢�讳环锛�" prop="entryDate"> - <el-input v-model="form.taxExclusiveTotalPrice" placeholder="璇疯緭鍏�" clearable /> - </el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item label="鍏ュ簱浜猴細" prop="entryPerson"> - <el-select v-model="form.nickname" placeholder="璇烽�夋嫨" clearable> - <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" /> - </el-select> - </el-form-item> - </el-col> - </el-row> + <el-table + :data="productData" + border + @selection-change="productSelected" + > + <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" width="70" /> + <el-table-column label="閲囪喘鏁伴噺" prop="quantity" width="100" /> + <el-table-column label="寰呭叆搴撴暟閲�" prop="quantity0" width="100" /> + <el-table-column label="鏈鍏ュ簱鏁伴噺" prop="quantityStock" width="120"> + <template #default="scope"> + <el-input v-model="scope.row.quantityStock" type="number" :min="0" :max="scope.row.quantity0" /> + </template> + </el-table-column> + <el-table-column label="绋庣巼(%)" prop="taxRate" width="120" /> + <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> </el-form> <template #footer> <div class="dialog-footer"> @@ -169,9 +120,11 @@ const selectedRows = ref([]) const userList = ref([]) const supplierLists = ref([]) -const productTree = ref([]); // 浜у搧鏍戞暟鎹� -const modelList = ref([]); // 瑙勬牸鍨嬪彿鍒楄〃 -const currentProductId = ref(null); // 褰撳墠閫変腑鐨勪骇鍝両D +const productList = ref([]); +const productModelList = ref([]); +const purchaseRecords = ref([]); +const loadingProducts = ref(false); + const loading = ref(false); const tableLoading = ref(false) const page = reactive({ @@ -179,7 +132,6 @@ size: 100, }) const total = ref(0) -// const fileList = ref([]) // 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁 const operationType = ref('') @@ -189,62 +141,49 @@ supplierName: '', }, form: { - productManageId: null, supplierId: null, - productId: null, - userId: null, supplierName: '', + productId: null, productName: '', + userId: userStore.userId, + nickName: '', model: '', + productModelId: null, unit: '', - inboundTime: '', - inboundBatch: '', - inboundQuantity: '', + productrecordId: null, taxInclusiveUnitPrice: '', taxInclusiveTotalPrice: '', taxRate: '', taxExclusiveTotalPrice: '', - nickname: '' + inboundTime: '', + inboundBatch: '', + inboundQuantity: '' }, rules: { - supplierName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], - productName: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }], - model: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], + productId: [ + { required: true, message: "璇烽�夋嫨浜у搧澶х被", trigger: "change" } + ], + productModelId: [ + { required: true, message: "璇烽�夋嫨瑙勬牸鍨嬪彿", trigger: "change" } + ], + supplierId: [ + { required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" } + ], + inboundQuantity: [ + { required: true, message: "璇疯緭鍏ュ叆搴撴暟閲�", trigger: "blur" } + ], + userId: [ + { required: true, message: "璇烽�夋嫨鍏ュ簱浜�", trigger: "change" } + ], unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], inboundTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }], inboundBatch: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], - inboundQuantity: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], taxInclusiveUnitPrice: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], taxRate: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], - nickname: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }] } }) const { searchForm, form, rules } = toRefs(data) -// 3. 鑾峰彇浜у搧鏍戞柟娉� -const getProductTree = async () => { - try { - loading.value = true; - const res = await productTreeList(); - productTree.value = res.data; // 鏍规嵁瀹為檯API杩斿洖缁撴瀯璋冩暣 - } finally { - loading.value = false; - } -}; -// 4. 鑾峰彇瑙勬牸鍨嬪彿鏂规硶 -const getModelList = async (productId) => { - try { - loading.value = true; - const res = await modelListPage({ - id: productId, - current: 1, // 椤电爜 - size: 10 // 姣忛〉鏉℃暟 - }); - modelList.value = res.data.records; // 鏍规嵁瀹為檯API杩斿洖缁撴瀯璋冩暣 - } finally { - loading.value = false; - } -}; // 鏌ヨ鍒楄〃 /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { @@ -263,139 +202,294 @@ getStockInPage({ ...searchForm.value, ...page }).then(res => { tableLoading.value = false tableData.value = res.data.records - ttotal.value = res.data.total + total.value = res.data.total + console.log('tableData:', tableData.value) }).catch(() => { tableLoading.value = false }) } -const getProductTreeList = () => { - treeLoad.value = true; - productTreeList() - .then((res) => { - list.value = res; // 灏嗚繑鍥炵殑鏁版嵁璧嬬粰list - list.value.forEach((a) => { - expandedKeys.value.push(a.label); // 榛樿灞曞紑鎵�鏈夎妭鐐� - }); - treeLoad.value = false; - }) - .catch((err) => { - treeLoad.value = false; + +// 姝g‘鐨勪骇鍝佸垪琛ㄥ姞杞芥柟娉� +const loadProductList = async () => { + loadingProducts.value = true; + try { + const res = await productTreeList(); + + // 鎵佸钩鍖栧鐞嗕骇鍝佹爲 + const flattenProducts = (nodes, parentId = null) => { + let result = []; + nodes.forEach(node => { + // 鍙坊鍔犳湁id鍜宭abel鐨勮妭鐐� + if (node.id && node.label) { + result.push({ + id: node.id, + productName: node.label, + parentId: parentId + }); + } + // 閫掑綊澶勭悊瀛愯妭鐐� + if (node.children) { + result = result.concat(flattenProducts(node.children, node.id)); + } }); + return result; + }; + + productList.value = flattenProducts(res.data); + console.log('鍔犺浇鐨勪骇鍝佸垪琛�:', productList.value); + } catch (error) { + console.error('鍔犺浇浜у搧鍒楄〃澶辫触:', error); + proxy.$modal.msgError('鍔犺浇浜у搧鍒楄〃澶辫触'); + } finally { + loadingProducts.value = false; + } + return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull }; // 琛ㄦ牸閫夋嫨鏁版嵁 -const handleSelectionChange = (selection) => { - // 杩囨护鎺夊瓙鏁版嵁 - selectedRows.value = selection.filter(item => item.id); - console.log('selection', selectedRows.value) -} -const expandedRowKeys = ref([]) +// const handleSelectionChange = (selection) => { -// 涓昏〃鍚堣鏂规硶 -const summarizeMainTable = (param) => { - return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']); -}; +// 鍔犺浇瑙勬牸鍨嬪彿鍒楄〃 + const loadProductModels = async (productId) => { + if (!productId) { + productModelList.value = []; + return; + } + + try { + const res = await modelListPage({ + id: productId, + current: 1, + size: 100 + }); + + productModelList.value = res.data.records.map(item => ({ + id: item.id, + model: item.model, + unit: item.unit + })); + + } catch (error) { + console.error('鍔犺浇瑙勬牸鍨嬪彿澶辫触:', error); + proxy.$modal.msgError('鍔犺浇瑙勬牸鍨嬪彿澶辫触'); + } + }; + +// 浜у搧閫夋嫨鍙樺寲 + const handleProductChange = (productId) => { + form.value.productModelId = null + form.value.productrecordId = null + resetPurchaseFields() + if (productId) { + loadProductModels(productId) + } else { + productModelList.value = [] + } + } + +// 瑙勬牸鍨嬪彿閫夋嫨鍙樺寲 + const handleModelChange = async (modelId) => { + if (!form.value.productId || !modelId) return + + try { + // 鏍规嵁浜у搧ID鍜屽瀷鍙稩D鏌ヨ閲囪喘璁板綍 + const res = await getPurchaseRecords({ + productId: form.value.productId, + productModelId: form.value.productModelId, + type: 2 // 鍋囪2琛ㄧず宸叉壒鍑嗙殑閲囪喘璁板綍 + }) + + purchaseRecords.value = res.data.records + + if (purchaseRecords.value.length > 0) { + // 榛樿鍙栫涓�鏉¢噰璐褰� + const record = purchaseRecords.value[0] + fillFormFromPurchaseRecord(record) + } + } catch (error) { + console.error('鏌ヨ閲囪喘璁板綍澶辫触:', error) + proxy.$modal.msgError('鏌ヨ閲囪喘璁板綍澶辫触') + } + } + +// 浠庨噰璐褰曞~鍏呰〃鍗� + const fillFormFromPurchaseRecord = (record) => { + form.value.productrecordId = record.id + form.value.taxInclusiveUnitPrice = record.taxInclusiveUnitPrice + form.value.taxRate = record.taxRate + form.value.taxInclusiveTotalPrice = record.taxInclusiveTotalPrice + form.value.taxExclusiveTotalPrice = record.taxExclusiveTotalPrice + } + +// 閲嶇疆閲囪喘鐩稿叧瀛楁 + const resetPurchaseFields = () => { + form.value.productrecordId = null + form.value.unit = '' + form.value.taxInclusiveUnitPrice = null + form.value.taxRate = null + form.value.taxInclusiveTotalPrice = null + form.value.taxExclusiveTotalPrice = null + } + + const loadUserList = async () => { + try { + const res = await userListNoPage() + userList.value = res.data + } catch (error) { + console.error('鍔犺浇鐢ㄦ埛鍒楄〃澶辫触:', error) + } + } + + const loadSupplierList = async () => { + try { + const res = await listSupplier() + supplierLists.value = res.data.records + } catch (error) { + console.error('鍔犺浇渚涘簲鍟嗗垪琛ㄥけ璐�:', error) + } + } // 鎵撳紑寮规 -const openForm = async (type, row) => { - operationType.value = type - dialogFormVisible.value = true - let userLists = await userListNoPage() - userList.value = userLists.data - console.log('userList', userList.value) + const openForm = async (type, row) => { + operationType.value = type + dialogFormVisible.value = true + // 鍔犺浇蹇呰鏁版嵁 + await Promise.all([ + loadUserList(), + loadSupplierList(), + loadProductList() + ]) - let supplierlists = await listSupplier() - supplierLists.value = supplierlists.data.records - console.log('supplierList', supplierLists.value) - - await getProductTree(); - - - - - - - if (type === 'add') { - // 鏂板鏃堕噸缃〃鍗� - form.value = { - nickname: userStore.userId // 璁剧疆榛樿鍏ュ簱浜轰负褰撳墠鐢ㄦ埛 + if (type === 'add') { + // 鏂板鏃堕噸缃〃鍗� + form.value = { + userId: userStore.userId // 璁剧疆榛樿鍏ュ簱浜轰负褰撳墠鐢ㄦ埛 + } + } else { + // 缂栬緫鏃跺~鍏呰〃鍗曟暟鎹� + form.value = { + ...row, + supplierId: row.supplierId, + productId: row.productId, + productModelId: row.productModelId, + userId: row.userId + } + if (row.productId) { + await loadProductModels(row.productId) + } } - } else { - // 缂栬緫鏃跺~鍏呰〃鍗曟暟鎹� - form.value = { ...row } - } } // 鎻愪氦琛ㄥ崟 -const submitForm = () => { - proxy.$refs["formRef"].validate(valid => { - if (valid) { + const submitForm = async () => { + try { + await proxy.$refs.formRef.validate() + + if (!form.value.productrecordId) { + proxy.$modal.msgError('璇烽�夋嫨浜у搧澶х被鍜岃鏍煎瀷鍙蜂互鑾峰彇閲囪喘璁板綍') + return + } + + const submitData = { + productrecordId: form.value.productrecordId, + supplierId: form.value.supplierId, + inboundQuantity: form.value.inboundQuantity, + userId: form.value.userId, + } + const apiMethod = operationType.value === 'add' ? addSutockIn : updateStockIn - apiMethod(form.value).then(res => { - proxy.$modal.msgSuccess(operationType.value === 'add' ? "鏂板鎴愬姛" : "淇敼鎴愬姛") - closeDia() - getList() - }) + await apiMethod(submitData) + + proxy.$modal.msgSuccess(operationType.value === 'add' ? '鏂板鎴愬姛' : '淇敼鎴愬姛') + closeDia() + getList() + } catch (error) { + console.error('鎻愪氦澶辫触:', error) + if (!error.errors) { + proxy.$modal.msgError('鎿嶄綔澶辫触锛岃閲嶈瘯') + } } - }) -} + } // 鍏抽棴寮规 -const closeDia = () => { - proxy.resetForm("formRef") - dialogFormVisible.value = false -} + const closeDia = () => { + proxy.$refs.formRef.resetFields() + dialogFormVisible.value = false + } +// 琛ㄦ牸閫夋嫨鏁版嵁 + const handleSelectionChange = (selection) => { + // 杩囨护鎺夊瓙鏁版嵁 + selectedRows.value = selection.filter(item => item.id); + console.log('selection', selectedRows.value) + } + const expandedRowKeys = ref([]) + +// 涓昏〃鍚堣鏂规硶 + const summarizeMainTable = (param) => { + return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']); + }; // 瀵煎嚭 -const handleOut = () => { - ElMessageBox.confirm( - '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�', - '瀵煎嚭', { - confirmButtonText: '纭', - cancelButtonText: '鍙栨秷', - type: 'warning', - } - ).then(() => { - proxy.download("/stockin/export", {}, '鍏ュ簱鍙拌处.xlsx') - }).catch(() => { - proxy.$modal.msg("宸插彇娑�") - }) -} -// 鍒犻櫎 -const handleDelete = () => { - let ids = [] - if (selectedRows.value.length > 0) { - ids = selectedRows.value.map(item => item.id); - } else { - proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁') - return - } - ElMessageBox.confirm( - '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�', - '瀵煎嚭', { - confirmButtonText: '纭', - cancelButtonText: '鍙栨秷', - type: 'warning', - } - ).then(() => { - delStockIn(ids).then(res => { - proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛") - getList() + const handleOut = () => { + ElMessageBox.confirm( + '閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�', + '瀵煎嚭', { + confirmButtonText: '纭', + cancelButtonText: '鍙栨秷', + type: 'warning', + } + ).then(() => { + proxy.download("/stockin/export", {}, '鍏ュ簱鍙拌处.xlsx') + }).catch(() => { + proxy.$modal.msg("宸插彇娑�") }) - }).catch(() => { - proxy.$modal.msg("宸插彇娑�") + } +// 鍒犻櫎 + const handleDelete = () => { + let ids = [] + if (selectedRows.value.length > 0) { + ids = selectedRows.value.map(item => item.id); + } else { + proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁') + return + } + ElMessageBox.confirm( + '閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�', + '瀵煎嚭', { + confirmButtonText: '纭', + cancelButtonText: '鍙栨秷', + type: 'warning', + } + ).then(() => { + delStockIn(ids).then(res => { + proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛") + getList() + }) + }).catch(() => { + 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 productSelectedRows = ref([]) + const productSelected = (selectedRows) => { + productSelectedRows.value = selectedRows; + }; + + const formattedNumber = (row, column, cellValue) => { + return parseFloat(cellValue).toFixed(2); + }; + onMounted(() => { + getList() }) } -// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� 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}`; -} -onMounted(() => { - getList() -}) </script> <style scoped lang="scss"></style> -- Gitblit v1.9.3