diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 4c4063eb9..58aa92a26 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -39,9 +39,11 @@ + { defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除 // 创建标签 - // { - // label: '创建标签', - // name: 'cjbq', - // hide: isShowMainButton(row,['3']), - // type: 'primary', - // icon: '', - // color: '', - // hasPermi: '', - // link: true, // 文本展现按钮 - // }, - // defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 + { + label: '创建标签', + name: 'cjbq', + hide: isShowMainButton(row,['3']), + type: 'primary', + icon: '', + color: '', + hasPermi: '', + link: true, // 文本展现按钮 + }, + defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 ] } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 8ac3f7a95..b95074348 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -328,6 +328,10 @@ const flag = ref() // 主子数据 提交 const submitForm = async (formType, submitData) => { let data = {...submitData} + if(data.fromWarehouseCode&&data.fromWarehouseCode == data.toWarehouseCode){ + message.error(`从库位代码和到库位代码不能相同!`) + return + } if(data.masterId){ data.id = data.masterId } @@ -339,7 +343,7 @@ const submitForm = async (formType, submitData) => { item.toInventoryStatus = data.toInventoryStatus if(item.qty == 0){ - message.error(`到数量不能为0!`) + message.error(`数量不能为0!`) flag.value = true return; }