diff --git a/src/mycomponents/query/balanceQuery.vue b/src/mycomponents/query/balanceQuery.vue index 298e4538..6737c53b 100644 --- a/src/mycomponents/query/balanceQuery.vue +++ b/src/mycomponents/query/balanceQuery.vue @@ -105,80 +105,6 @@ current: 1, total: 18, tableData: [] - // tableData: [{ - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 1 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 2 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 3 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 4 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 3 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 4 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 3 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 4 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 3 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 4 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 3 - // }, - // { - // batch: "20240814", - // locationCode: "901", - // inventoryStatus: "OK", - // qty: 4 - // } - - // ] } }, props: { @@ -187,8 +113,8 @@ // default: {} // }, businessTypeCode: { - type: Boolean, - default: String + type: String, + default: "" } }, watch: { diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue index fe0fb212..f1ba1da2 100644 --- a/src/pages/issue/record/directIssue.vue +++ b/src/pages/issue/record/directIssue.vue @@ -255,7 +255,7 @@ }) if (checkData) { //提示已经扫描 - this.showErrorMessage("箱码[" + pack.number + "]批次[" + balance.batch + + this.showErrorMessage("扫描箱码[" + pack.number + "]批次[" + balance.batch + "]的父包装已经扫描") console.log("父包装已经扫描") } else { @@ -269,7 +269,6 @@ } item.subList.push(newDetail); } - } else { //扫描的是父包装 var checkData = item.subList.find(r => { @@ -307,10 +306,8 @@ } item.subList.push(newDetail); } - } - this.scanPopupGetFocus() } else { if (detail.scaned == true) { diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue index ad894bc2..00eec775 100644 --- a/src/pages/repleinsh/record/directRepleinshRecord.vue +++ b/src/pages/repleinsh/record/directRepleinshRecord.vue @@ -303,7 +303,7 @@ }) if (checkData) { //是否移除 - this.$refs.comMessage.showQuestionMessage("箱码[" + checkData.parentNumber+"]" + "批次[" + balance + this.$refs.comMessage.showQuestionMessage("扫描箱码[" + checkData.parentNumber+"]" + "批次[" + balance .batch + "]是父包装,是否移除子包装", res => { if (res) { item.subList = [];