diff --git a/src/views/exWarehouse/dispatchDistribute/waveArrangement.vue b/src/views/exWarehouse/dispatchDistribute/waveArrangement.vue index fff5f0e..7ae9bf0 100644 --- a/src/views/exWarehouse/dispatchDistribute/waveArrangement.vue +++ b/src/views/exWarehouse/dispatchDistribute/waveArrangement.vue @@ -360,16 +360,16 @@ export default { prop: 'orderDate', istrue: true }, - { - label: '整件数', - prop: 'totalCaseQry', - istrue: true - }, - { - label: '折合件数', - prop: 'combineNumber', - istrue: true - }, + // { + // label: '整件数', + // prop: 'totalCaseQry', + // istrue: true + // }, + // { + // label: '折合件数', + // prop: 'combineNumber', + // istrue: true + // }, // { // label: '出库优先级', // prop: 'priority', diff --git a/src/views/exWarehouse/dispatchDistribute/waveDistribution.vue b/src/views/exWarehouse/dispatchDistribute/waveDistribution.vue index 425541c..ad50464 100644 --- a/src/views/exWarehouse/dispatchDistribute/waveDistribution.vue +++ b/src/views/exWarehouse/dispatchDistribute/waveDistribution.vue @@ -113,12 +113,12 @@ export default { label: '件数', prop: 'caseNumber', istrue: true - }, - { - label: '折合件数', - prop: 'combineNumber', - istrue: true } + // { + // label: '折合件数', + // prop: 'combineNumber', + // istrue: true + // } ], tableData2: [], loading2: false, @@ -165,16 +165,16 @@ export default { prop: 'orderDate', istrue: true }, - { - label: '整件数', - prop: 'totalCaseQry', - istrue: true - }, - { - label: '折合件数', - prop: 'combineNumber', - istrue: true - }, + // { + // label: '整件数', + // prop: 'totalCaseQry', + // istrue: true + // }, + // { + // label: '折合件数', + // prop: 'combineNumber', + // istrue: true + // }, { label: '品规数', prop: 'goodsNumber', diff --git a/src/views/libraryManage/inventory/InventoryEntry.vue b/src/views/libraryManage/inventory/InventoryEntry.vue index 36668ae..687da2c 100644 --- a/src/views/libraryManage/inventory/InventoryEntry.vue +++ b/src/views/libraryManage/inventory/InventoryEntry.vue @@ -211,11 +211,15 @@ export default { this.disabledFlag = false this.selectData = val this.handleSelect = val.map((ele) => ele.id) + val.forEach((item) => { if (item.invStatus !== 'init') { this.disabledFlag = true } }) + if (val.length === 0) { + this.disabledFlag = true + } }, // 重置 resetQuery() { diff --git a/src/views/libraryManage/inventory/config.js b/src/views/libraryManage/inventory/config.js index b9458c6..6a82dad 100644 --- a/src/views/libraryManage/inventory/config.js +++ b/src/views/libraryManage/inventory/config.js @@ -326,7 +326,6 @@ export function tableConfig() { prop: "invType", istrue: true, filter(row, value) { - console.log(row); return getDictLabel(value, _that.dict.type.inv_type_dict); }, }, @@ -502,45 +501,45 @@ export function tableConfig() { prop: "goodName", istrue: true, }, - { - label: "批号", - prop: "batchNo", - istrue: true, - }, + // { + // label: "批号", + // prop: "batchNo", + // istrue: true, + // }, - { - label: "包装单位", - prop: "unit", - istrue: true, - // filter(row, value) { - // return getDictLabel(value, _that.dict.type.goods_unit); - // }, - }, - { - label: "包装数量", - prop: "packageQty", - istrue: true, - }, - { - label: "生产厂家", - prop: "factory", - istrue: true, - }, - { - label: "产地", - prop: "waster", - istrue: true, - }, + // { + // label: "包装单位", + // prop: "unit", + // istrue: true, + // filter(row, value) { + // return getDictLabel(value, _that.dict.type.goods_unit); + // }, + // }, + // { + // label: "包装数量", + // prop: "packageQty", + // istrue: true, + // }, + // { + // label: "生产厂家", + // prop: "factory", + // istrue: true, + // }, + // { + // label: "产地", + // prop: "waster", + // istrue: true, + // }, { label: "件数", prop: "caseQty", istrue: true, }, - { - label: "零散数", - prop: "pieceQty", - istrue: true, - }, + // { + // label: "零散数", + // prop: "pieceQty", + // istrue: true, + // }, { label: "数量", prop: "quantity", @@ -551,11 +550,11 @@ export function tableConfig() { prop: "invCase", istrue: true, }, - { - label: "实盘零散数", - prop: "invPiece", - istrue: true, - }, + // { + // label: "实盘零散数", + // prop: "invPiece", + // istrue: true, + // }, { label: "实盘数量", prop: "invQty", @@ -595,7 +594,6 @@ export function tableConfig() { prop: "invType", istrue: true, //inv_type_dict filter(row, value) { - console.log(row); return getDictLabel(value, _that.dict.type.inv_type_dict); }, }, diff --git a/src/views/wcs/base/AGV/index.vue b/src/views/wcs/base/AGV/index.vue index 91466f8..c9133de 100644 --- a/src/views/wcs/base/AGV/index.vue +++ b/src/views/wcs/base/AGV/index.vue @@ -1,6 +1,51 @@