From 179ad4be14f3e8910db9b159a2b916a289614c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Thu, 24 Jul 2025 09:25:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E3=80=81=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/warehouse/inventoryPart.js | 6 + src/api/warehouse/location.js | 3 +- src/api/warehouse/warehouse.js | 2 - src/views/modules/warehouse/InventoryPart.vue | 678 +++++++++++++++++ src/views/modules/warehouse/PurchasePart.vue | 687 ++++++++++++++++++ src/views/modules/warehouse/location.vue | 348 ++++++++- src/views/modules/warehouse/warehouse.vue | 24 +- 7 files changed, 1705 insertions(+), 43 deletions(-) create mode 100644 src/api/warehouse/inventoryPart.js create mode 100644 src/views/modules/warehouse/InventoryPart.vue create mode 100644 src/views/modules/warehouse/PurchasePart.vue diff --git a/src/api/warehouse/inventoryPart.js b/src/api/warehouse/inventoryPart.js new file mode 100644 index 0000000..25d06bf --- /dev/null +++ b/src/api/warehouse/inventoryPart.js @@ -0,0 +1,6 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +export const getInventoryStockList = data => createAPI(`warehouse/getInventoryStockList`,'POST',data) + + +export const getPurchasePartList = data => createAPI(`warehouse/getPurchasePartList`,'POST',data) diff --git a/src/api/warehouse/location.js b/src/api/warehouse/location.js index 265447a..d0c3861 100644 --- a/src/api/warehouse/location.js +++ b/src/api/warehouse/location.js @@ -12,6 +12,7 @@ export const delLocation = data => createAPI(`warehouse/delLocation`,'POST',data // 获取库房信息 export const getWarehouseList = data => createAPI(`warehouse/getWarehouseList`,'POST',data) - +// 获取位置组信息 +export const queryAllLocationGruopList = data => createAPI(`warehouse/queryAllLocationGruopList`,'POST',data) diff --git a/src/api/warehouse/warehouse.js b/src/api/warehouse/warehouse.js index 121180a..92c9ae8 100644 --- a/src/api/warehouse/warehouse.js +++ b/src/api/warehouse/warehouse.js @@ -9,8 +9,6 @@ export const saveWarehouse = data => createAPI(`warehouse/saveWarehouse`,'POST', // 删除库房信息 export const delWarehouse = data => createAPI(`warehouse/delWarehouse`,'POST',data) - -// 删除库房类型信息 export const getWareHouseTypeList = data => createAPI(`factory/tblbasedata/getTblBaseList`,'POST',data) diff --git a/src/views/modules/warehouse/InventoryPart.vue b/src/views/modules/warehouse/InventoryPart.vue new file mode 100644 index 0000000..c0b8b86 --- /dev/null +++ b/src/views/modules/warehouse/InventoryPart.vue @@ -0,0 +1,678 @@ + + + + + diff --git a/src/views/modules/warehouse/PurchasePart.vue b/src/views/modules/warehouse/PurchasePart.vue new file mode 100644 index 0000000..acbdd85 --- /dev/null +++ b/src/views/modules/warehouse/PurchasePart.vue @@ -0,0 +1,687 @@ + + + + + diff --git a/src/views/modules/warehouse/location.vue b/src/views/modules/warehouse/location.vue index 9fe6a2d..aee56fe 100644 --- a/src/views/modules/warehouse/location.vue +++ b/src/views/modules/warehouse/location.vue @@ -7,11 +7,10 @@ - {{buttons.search}} - {{buttons.add}} - {{buttons.defaultTable}} - - {{ buttons.settingTable}} + 查询 + 新增 + + - {{buttons.download}} + 导出 + :label="操作"> @@ -122,8 +121,7 @@ :title="inputLabel.headerInput.label5" :visible.sync="setUp.reviewFlag" width="325px"> - + @@ -131,7 +129,7 @@ - + - + + + + + + + + + + + + + + + 位置组编码 + + + + + + + + 确定 @@ -158,6 +178,48 @@ + + +
+ + + + + + + + + 查询 + + + + + + + +
+ + 关闭 + + + @@ -192,6 +254,7 @@ getLocationList, saveLocation, delLocation, + queryAllLocationGruopList } from '@/api/warehouse/location.js' export default { @@ -205,13 +268,29 @@ locationName: '', warehouseId: '', active: '', + locationGroupId: '', + locationGroupDesc: '', + locationType:'', + hold:'', + row:'', + storey:'', + box:'', + }, + locationGruopModalData: { + locationGroupId: '', + locationGroupDesc: '' }, + locationGruopDataList: [], + localtionGruopFlag: false, queryHeaderData: { site: this.$store.state.user.site, locationId: '', locationName: '', warehouseId: '', active: '', + page:1, + size:5, + totalCount:0 }, setUp: { reviewFlag: false, @@ -226,6 +305,13 @@ label3: '仓库名称', label4: '状态', label5: '库位信息', + label6: '位置组编码', + label7: '位置组描述', + label8: '货舱', + label9: '行', + label10: '层', + label11: '箱', + label12: '库位类型' }, }, selectList: { @@ -273,6 +359,56 @@ // 用户table 配置集合 userColumnList: [], // 展示列集 + locationGruop_colum:[ + { + userId: this.$store.state.user.name, + serialNumber: 'location2601locationGroupId', + tableId: this.$route.meta.menuId + 'LOTI01', + tableName: "locationGruopTable", + columnProp: "locationGroupId", + headerAlign: "center", + align: "center", + columnLabel: "位置组编码", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + serialNumber: 'location2601locationGroupDesc', + tableId: this.$route.meta.menuId + 'LOTI01', + tableName: "locationGruopTable", + columnProp: "locationGroupDesc", + headerAlign: "center", + align: "center", + columnLabel: "位置组描述", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + serialNumber: 'location2601locationType', + tableId: this.$route.meta.menuId + 'LOTI01', + tableName: "locationGruopTable", + columnProp: "locationType", + headerAlign: "center", + align: "center", + columnLabel: "位置组描述", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + } + ], columnList: [ { userId: this.$store.state.user.name, @@ -338,12 +474,108 @@ status: true, fixed: '', }, + { + userId: this.$store.state.user.name, + serialNumber: 'location2601StrlocationGroupDesc', + tableId: this.$route.meta.menuId + 'LOTI01', + tableName: "locationTable", + columnProp: "locationGroupDesc", + headerAlign: "center", + align: "center", + columnLabel: "位置组描述", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + serialNumber: 'location2601StrlocationGroupDesc', + tableId: this.$route.meta.menuId + 'LOTI01', + tableName: "locationTable", + columnProp: "locationType", + headerAlign: "center", + align: "center", + columnLabel: "库房类型", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + serialNumber: 'location2601StrActive', + tableId: this.$route.meta.menuId + 'LOTI01', + tableName: "locationTable", + columnProp: "hold", + headerAlign: "center", + align: "center", + columnLabel: "货舱", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, { userId: this.$store.state.user.name, serialNumber: 'location2601StrActive', tableId: this.$route.meta.menuId + 'LOTI01', tableName: "locationTable", - columnProp: "strActive", + columnProp: "row", + headerAlign: "center", + align: "center", + columnLabel: "行", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + serialNumber: 'location2601StrActive', + tableId: this.$route.meta.menuId + 'LOTI01', + tableName: "locationTable", + columnProp: "storey", + headerAlign: "center", + align: "center", + columnLabel: "层", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + serialNumber: 'location2601StrActive', + tableId: this.$route.meta.menuId + 'LOTI01', + tableName: "locationTable", + columnProp: "box", + headerAlign: "center", + align: "center", + columnLabel: "箱", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + serialNumber: 'location2601StrActive', + tableId: this.$route.meta.menuId + 'LOTI01', + tableName: "locationTable", + columnProp: "active", headerAlign: "center", align: "center", columnLabel: "状态", @@ -581,6 +813,7 @@ let jsonData = { site: row.site, locationId: row.locationId, + warehouseId: row.warehouseId } delLocation(jsonData).then(({data}) => { if (data.code == 0) { @@ -609,6 +842,31 @@ this.setUp.saveButton = false return } + if (!this.saveHeaderData.hold) { + this.$message.warning('请输入货舱!!') + this.setUp.saveButton = false + return + } + if (!this.saveHeaderData.row) { + this.$message.warning('请输入行!') + this.setUp.saveButton = false + return + } + if (!this.saveHeaderData.storey) { + this.$message.warning('请输入层!') + this.setUp.saveButton = false + return + } + if (!this.saveHeaderData.box) { + this.$message.warning('请输入箱!') + this.setUp.saveButton = false + return + } + if (!this.saveHeaderData.locationGroupId) { + this.$message.warning('请选择位置组编码!') + this.setUp.saveButton = false + return + } saveLocation(this.saveHeaderData).then(({data}) => { this.setUp.saveButton = false if (data.code == 0) { @@ -636,6 +894,14 @@ this.saveHeaderData.locationName = '' this.saveHeaderData.warehouseId = '' this.saveHeaderData.active = 'Y' + this.saveHeaderData.hide = 'Y' + this.saveHeaderData.locationGroupId = '' + this.saveHeaderData.locationGroupDesc = '' + this.saveHeaderData.hold = '' + this.saveHeaderData.row = '' + this.saveHeaderData.storey = '' + this.saveHeaderData.box = '' + this.saveHeaderData.locationType = '' if (row) { console.log("2 =" + row) this.setUp.readonlyFlag = true @@ -644,7 +910,18 @@ this.saveHeaderData.locationName = row.locationName this.saveHeaderData.warehouseId = row.warehouseId this.saveHeaderData.active = row.active - + this.saveHeaderData.hold = row.hold + this.saveHeaderData.row = row.row + this.saveHeaderData.storey = row.storey + this.saveHeaderData.box = row.box + this.saveHeaderData.locationGroupId = row.locationGroupId + for (let i = 0; i{ + if (data.code==0){ + this.$message.success(data.rows) + this.locationGruopDataList = data.rows + this.localtionGruopFlag = true + } + }) + }, + getRowData(row){ + this.saveHeaderData.locationGroupId = row.locationGroupId + this.saveHeaderData.locationGroupDesc = row.locationGroupDesc + this.saveHeaderData.locationType = row.locationType + this.localtionGruopFlag = false + }, // 校验用户是否收藏 favoriteIsOk() { let userFavorite = { @@ -822,27 +1114,27 @@ // 获取数据列表 getDataList() { this.dataListLoading = true - this.queryHeaderData.limit = this.pageSize - this.queryHeaderData.page = this.pageIndex this.dataList = [] - this.totalPage = 0 + // this.totalPage = 0 getLocationList(this.queryHeaderData).then(({data}) => { if (data && data.code === 0) { - this.dataList = data.rows.list - this.totalPage = data.rows.totalCount + this.dataList = data.page.list + this.queryHeaderData.page = data.page.currPage + this.queryHeaderData.size = data.page.pageSize + this.queryHeaderData.totalCount = data.page.totalCount } this.dataListLoading = false }) }, // 每页数 sizeChangeHandle(val) { - this.pageSize = val - this.pageIndex = 1 + this.queryHeaderData.size = val + this.queryHeaderData.page = 1 this.getDataList() }, // 当前页 - currentChangeHandle(val) { - this.pageIndex = val + currentChangeHandle (val) { + this.queryHeaderData.page = val this.getDataList() }, // 多选 diff --git a/src/views/modules/warehouse/warehouse.vue b/src/views/modules/warehouse/warehouse.vue index ffe8014..828af65 100644 --- a/src/views/modules/warehouse/warehouse.vue +++ b/src/views/modules/warehouse/warehouse.vue @@ -24,11 +24,11 @@ - {{buttons.search}} + 查询 - {{buttons.add}} - {{ buttons.settingTable}} + 新增 + - {{buttons.download}} + 导出 + :label="操作"> - + @@ -122,9 +122,9 @@ - 取消 - 确定 - + 取消 + 确定 + @@ -348,7 +348,7 @@ import { serialNumber: 'wareHouse2501StrActive', tableId: this.$route.meta.menuId + 'WAHO01', tableName: "wareHouseTable", - columnProp: "strActive", + columnProp: "active", headerAlign: "center", align: "center", columnLabel: "状态",