diff --git a/src/components/heavyTable/index.vue b/src/components/heavyTable/index.vue index a265e0b..5e73e44 100644 --- a/src/components/heavyTable/index.vue +++ b/src/components/heavyTable/index.vue @@ -477,7 +477,7 @@ export default { }, // 过滤改变事件 sortChange(val) { - console.log(val) + // console.log(val) this.sortdata = val this.$emit('sortChange', val) }, diff --git a/src/views/libraryManage/inventory/InventoryEntry.vue b/src/views/libraryManage/inventory/InventoryEntry.vue index 2c5fa30..1838be8 100644 --- a/src/views/libraryManage/inventory/InventoryEntry.vue +++ b/src/views/libraryManage/inventory/InventoryEntry.vue @@ -13,12 +13,14 @@ clearable > - - + + + 明盘 + 盲盘 + { diff --git a/src/views/libraryManage/inventory/config.js b/src/views/libraryManage/inventory/config.js index a377b47..1be65a1 100644 --- a/src/views/libraryManage/inventory/config.js +++ b/src/views/libraryManage/inventory/config.js @@ -117,16 +117,16 @@ export function tableConfig() { return getDictLabel(value, _that.dict.type.inv_type_dict); }, }, - { - label: "显示货位", - prop: "locationName", - istrue: true, - }, - { - label: "库别", - prop: "storageName", - istrue: true, - }, + // { + // label: "显示货位", + // prop: "locationName", + // istrue: true, + // }, + // { + // label: "库别", + // prop: "storageName", + // istrue: true, + // }, // { // label: "区域编号", // prop: "areaCode", @@ -152,14 +152,14 @@ export function tableConfig() { // prop: "specifications", // istrue: true, // }, - { - label: "包装单位", - prop: "unit", - istrue: true, - // filter(row, value) { - // return getDictLabel(value, _that.dict.type.goods_unit); - // }, - }, + // { + // label: "包装单位", + // prop: "unit", + // istrue: true, + // // filter(row, value) { + // // return getDictLabel(value, _that.dict.type.goods_unit); + // // }, + // }, // { // label: "包装数量", // prop: "packageQty", @@ -175,16 +175,16 @@ export function tableConfig() { // prop: "waster", // istrue: true, // }, - { - label: "件数", - prop: "caseQty", - istrue: true, - }, - { - label: "零散数", - prop: "pieceQty", - istrue: true, - }, + // { + // label: "件数", + // prop: "caseQty", + // istrue: true, + // }, + // { + // label: "零散数", + // prop: "pieceQty", + // istrue: true, + // }, // { // label: "数量", // prop: "qty", @@ -212,6 +212,65 @@ export function tableConfig() { // type: "slot", // slotName: "invQty", // }, + { + label: "显示货位", + prop: "locationName", + istrue: true, + }, + { + label: "库别", + prop: "storageName", + istrue: true, + }, + { + label: "区域编号", + prop: "areaCode", + istrue: true, + }, + { + label: "商品编号", + prop: "goodNo", + istrue: true, + }, + { + label: "商品名称", + prop: "goodName", + istrue: true, + }, + { + label: "货位分组", + prop: "locationGroup", + istrue: true, + }, + { + label: "深位", + prop: "isDeep", + istrue: true, + }, + { + label: "批号", + prop: "batchNo", + istrue: true, + }, + { + label: "商品规格", + prop: "specifications", + istrue: true, + }, + { + label: "库存数量", + prop: "quantity", + istrue: true, + }, + { + label: "单位", + prop: "unit", + istrue: true, + "min-width": 100, + // filter(row, value) { + // return getDictLabel(value, _that.dict.type.goods_unit); + // }, + }, ], rulesEntry: { invCase: [ diff --git a/src/views/libraryManage/inventory/inventory.vue b/src/views/libraryManage/inventory/inventory.vue index 5b18c5a..eeecc7d 100644 --- a/src/views/libraryManage/inventory/inventory.vue +++ b/src/views/libraryManage/inventory/inventory.vue @@ -161,7 +161,7 @@ export default { storageId: '', areaId: '', locationCode: '', - invWay: '', + invWay: 'open', invType: '' }, options: [], @@ -246,7 +246,7 @@ export default { // 表格的数据 queryTable() { // if (!this.enterForm.consignorId) return this.$message('业主名称必填!') - // if (!this.enterForm.invWay) return this.$message('盘点方式必选!') + if (!this.enterForm.invWay) return this.$message('盘点方式必选!') // if (!this.enterForm.invType) return this.$message('盘点类型必选!') this.loading = true queryGoods({ diff --git a/src/views/libraryManage/lockOutStore/index.vue b/src/views/libraryManage/lockOutStore/index.vue index 4839a4c..d3b91cf 100644 --- a/src/views/libraryManage/lockOutStore/index.vue +++ b/src/views/libraryManage/lockOutStore/index.vue @@ -433,7 +433,8 @@ export default { id: tempRow.id, batch: tempRow.batch, ptPart: tempRow.ptPart, - lockNo: tempRow.lockNo + lockNo: tempRow.lockNo, + containerCode: tempRow.tempRow } this.form = data this.open = true