src/api/inventoryManagement/stockManage.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/inventoryManagement/dispatchLog/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/inventoryManagement/issueManagement/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/inventoryManagement/receiptManagement/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/inventoryManagement/stockManagement/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/inventoryManagement/stockManage.js
@@ -9,6 +9,14 @@ }); }; export const getStockManageOutPage = (params) => { return request({ url: "/stockmanagement/stockoutpage", method: "get", params, }); }; // 修改库存信息 export const updateStockManage = (data) => { return request({ @@ -44,4 +52,14 @@ method: 'post', data: data }) } } //根据id获取库存信息 export function getStockManageById(id) { return request({ url: '/stockmanagement/' + id, method: 'get' }) } // src/views/inventoryManagement/dispatchLog/index.vue
@@ -288,7 +288,8 @@ addStockOut, updateStockOut, delStockOut, exportStockOut exportStockOut, getStockManageById } from "@/api/inventoryManagement/stockOut.js"; const userStore = useUserStore(); @@ -320,18 +321,20 @@ supplierId: null, supplierName: '', productId: null, productCategory: '', specificationModel: '', productName: '', userId: userStore.userId, nickname: '', model: '', productModelId: null, unit: '', productrecordId: null, taxInclusiveUnitPrice: '', taxInclusiveTotalPrice: '', taxRate: '', taxExclusiveTotalPrice: '', inboundTime: '', inboundBatch: '', inboundQuantity: 0, taxInclusiveUnitPrice: 0, taxInclusiveTotalPrice: 0, taxRate: 0, taxExclusiveTotalPrice: 0, userId: null, nickname: '' inboundQuantity: '' }, rules: { supplierId: [{ required: true, message: '请选择供应商', trigger: 'change' }], src/views/inventoryManagement/issueManagement/index.vue
@@ -25,12 +25,12 @@ <el-table-column label="产品大类" prop="productName" width="100" show-overflow-tooltip /> <el-table-column label="规格型号" prop="model" width="160" show-overflow-tooltip /> <el-table-column label="单位" prop="unit" width="70" show-overflow-tooltip /> <el-table-column label="入库数量" prop="inboundQuantity" width="90" show-overflow-tooltip /> <el-table-column label="入库数量" prop="stockQuantity" width="90" show-overflow-tooltip /> <el-table-column label="含税单价" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip /> <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(scope.row);">出库</el-button> @@ -72,15 +72,10 @@ import useUserStore from '@/store/modules/user' import { userListNoPage } from "@/api/system/user.js"; import { ledgerListPage, customerList, addOrUpdateSalesLedger, getSalesLedgerWithProducts, delLedger } from "@/api/salesManagement/salesLedger.js"; import { getStockManagePage, delStockManage, stockOut stockOut, getStockManageOutPage } from "@/api/inventoryManagement/stockManage.js"; const userStore = useUserStore() @@ -106,20 +101,23 @@ }, form: { supplierId: null, productId: null, userId: null, supplierName: '', productId: null, productName: '', userId: userStore.userId, nickName: '', productModelId: null, model: '', unit: '', inboundTime: '', inboundBatch: '', inboundQuantity: '', productrecordId: null, taxInclusiveUnitPrice: '', taxInclusiveTotalPrice: '', taxRate: '', taxExclusiveTotalPrice: '', nickName: '', inboundTime: '', inboundBatch: '', stockQuantity: '', boundTime: '', }, rules: { supplierName: [{ required: true, message: "请输入", trigger: "blur" }], @@ -149,7 +147,7 @@ } const getList = () => { tableLoading.value = true getStockManagePage({ ...searchForm.value, ...page }).then(res => { getStockManageOutPage({ ...searchForm.value, ...page }).then(res => { tableLoading.value = false tableData.value = res.data.records console.log('res', res.data.records) 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> @@ -40,13 +40,14 @@ <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current" :limit="page.size" @pagination="paginationChange" /> </div> <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-form-item label="产品大类:" prop="productId"> <el-select v-model="form.productId" placeholder="请选择" clearable filterable @change="handleProductChange"> <el-option v-for="item in productList" :key="item.id" :label="item.productName" :value="item.id" /> </el-select> @@ -55,8 +56,9 @@ <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" <el-select v-model="form.productModelId" placeholder="请先选择产品大类" clearable filterable :disabled="!form.productId" @change="handleModelChange"> <el-option v-for="item in productModelList" :key="item.id" :label="item.model" :value="item.id" /> </el-select> </el-form-item> @@ -73,19 +75,12 @@ </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"> @@ -131,7 +126,7 @@ </el-col> <el-col :span="12"> <el-form-item label="入库人:" prop="entryPerson"> <el-select v-model="form.nickname" placeholder="请选择" clearable> <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> @@ -165,13 +160,16 @@ import {modelListPage, productTreeList} from "@/api/basicData/product.js"; const userStore = useUserStore() const { proxy } = getCurrentInstance() const tableData = ref([]) const selectedRows = ref([]) const userList = ref([]) const supplierLists = ref([]) const productTree = ref([]); // 产品树数据 const modelList = ref([]); // 规格型号列表 const currentProductId = ref(null); // 当前选中的产品ID const productList = ref([]); const productModelList = ref([]); const purchaseRecords = ref([]); const loadingProducts = ref(false); const loading = ref(false); const tableLoading = ref(false) const page = reactive({ @@ -189,62 +187,50 @@ 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 { searchForm, form, rules } = toRefs(data) // 查询列表 /** 搜索按钮操作 */ const handleQuery = () => { @@ -268,21 +254,208 @@ 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; // 正确的产品列表加载方法 const loadProductList = async () => { loadingProducts.value = true; try { const res = await productTreeList(); // 扁平化处理产品树 const flattenProducts = (nodes, parentId = null) => { let result = []; nodes.forEach(node => { // 只添加有id和label的节点 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; } }; // 加载规格型号列表 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和型号ID查询采购记录 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 // 加载必要数据 await Promise.all([ loadUserList(), loadSupplierList(), loadProductList() ]) 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) } } } // 提交表单 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 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.$refs.formRef.resetFields() dialogFormVisible.value = false } // 表格选择数据 const handleSelectionChange = (selection) => { // 过滤掉子数据 @@ -295,55 +468,6 @@ const summarizeMainTable = (param) => { return proxy.summarizeTable(param, ['contractAmount', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice']); }; // 打开弹框 const openForm = async (type, row) => { operationType.value = type dialogFormVisible.value = true let userLists = await userListNoPage() userList.value = userLists.data console.log('userList', userList.value) let supplierlists = await listSupplier() supplierLists.value = supplierlists.data.records console.log('supplierList', supplierLists.value) await getProductTree(); if (type === 'add') { // 新增时重置表单 form.value = { nickname: userStore.userId // 设置默认入库人为当前用户 } } else { // 编辑时填充表单数据 form.value = { ...row } } } // 提交表单 const submitForm = () => { proxy.$refs["formRef"].validate(valid => { if (valid) { const apiMethod = operationType.value === 'add' ? addSutockIn : updateStockIn apiMethod(form.value).then(res => { proxy.$modal.msgSuccess(operationType.value === 'add' ? "新增成功" : "修改成功") closeDia() getList() }) } }) } // 关闭弹框 const closeDia = () => { proxy.resetForm("formRef") dialogFormVisible.value = false } // 导出 const handleOut = () => { src/views/inventoryManagement/stockManagement/index.vue
@@ -22,15 +22,15 @@ <el-table-column label="库存日期" prop="boundTime" width="100" show-overflow-tooltip /> <el-table-column label="入库日期" prop="inboundTime" width="100" show-overflow-tooltip /> <el-table-column label="供应商名称" prop="supplierName" width="160" show-overflow-tooltip /> <el-table-column label="产品大类" prop="productCategory" width="100" show-overflow-tooltip /> <el-table-column label="规格型号" prop="specificationModel" width="100" show-overflow-tooltip /> <el-table-column label="产品大类" prop="productName" width="100" show-overflow-tooltip /> <el-table-column label="规格型号" prop="model" width="100" show-overflow-tooltip /> <el-table-column label="单位" prop="unit" width="80" show-overflow-tooltip /> <el-table-column label="出库数量" prop="stockQuantity" width="100" show-overflow-tooltip /> <el-table-column label="含税单价" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip /> <el-table-column label="含税总价" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip /> <el-table-column label="税率(%)" prop="taxRate" width="100" 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> @@ -46,22 +46,26 @@ <el-row :gutter="30"> <el-col :span="12"> <el-form-item label="供应商名称:" prop="supplierName"> <el-input v-model="form.salesContractNo" placeholder="请输入" clearable /> <el-input v-model="form.supplierName" placeholder="请输入" clearable /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="产品大类:" prop="productCategory"> <el-select v-model="form.productCategory" placeholder="请选择" clearable> <el-option v-for="item in userList" :key="item.productCategory" :label="item.productCategory" :value="item.productCategory" /> <el-form-item label="产品大类:" prop="productId"> <el-select v-model="form.productId" placeholder="请选择" clearable filterable @change="handleProductChange"> <el-option v-for="item in productList" :key="item.id" :label="item.productName" :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="specificationModel"> <el-input v-model="form.specificationModel" placeholder="请输入" clearable /> <el-form-item label="规格型号:" prop="productManageId"> <el-select v-model="form.productModelId" placeholder="请先选择产品大类" clearable filterable :disabled="!form.productId" @change="handleModelChange"> <el-option v-for="item in productModelList" :key="item.id" :label="item.model" :value="item.id" /> </el-select> </el-form-item> </el-col> <el-col :span="12"> @@ -79,7 +83,7 @@ </el-col> <el-col :span="12"> <el-form-item label="出库时间:" prop="projectName"> <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> @@ -88,7 +92,7 @@ </el-row> <el-row :gutter="30"> <el-col :span="12"> <el-form-item label="出库数量:" prop="customerContractNo"> <el-form-item label="库存数量:" prop="customerContractNo"> <el-input v-model="form.stockQuantity" placeholder="请输入" clearable /> </el-form-item> </el-col> @@ -123,7 +127,7 @@ <el-col :span="12"> <el-form-item label="出库人:" prop="entryPerson"> <el-select v-model="form.inboundPerson" placeholder="请选择" clearable> <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> @@ -175,22 +179,24 @@ supplierName: '', }, form: { productCategory: '', specificationModel: '', supplierId: null, supplierName: '', productId: null, productName: '', userId: userStore.userId, nickName: '', productModelId: null, model: '', unit: '', productrecordId: null, taxInclusiveUnitPrice: '', taxInclusiveTotalPrice: '', taxExclusiveTotalPrice: '', taxRate: '', stockQuantity: '', supplierName:'', customerId: '', boundTime: '', taxExclusiveTotalPrice: '', inboundTime: '', inboundPerson: '', userId: '', supplierId: '', productId: '', inboundBatch: '', stockQuantity: '', boundTime: '', }, rules: { supplierName: [{ required: true, message: '请输入供应商名称', trigger: 'blur' }], @@ -203,7 +209,7 @@ taxRate: [{ required: true, message: '请输入税率', trigger: 'blur' }], taxExclusiveTotalPrice: [{ required: true, message: '请输入不含税总价', trigger: 'blur' }], boundTime: [{ required: true, message: '请选择库存时间', trigger: 'change' }], inboundTime: [{ required: true, message: '请选择出库时间', trigger: 'change' }], inboundTime: [{ required: true, message: '请选择入库时间', trigger: 'change' }], inboundPerson: [{ required: true, message: '请选择出库人', trigger: 'change' }] } }) @@ -235,20 +241,6 @@ }) } // 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; // 没有找到节点,返回null // }; // 表格选择数据 const handleSelectionChange = (selection) => { @@ -284,12 +276,6 @@ 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 }