diff --git a/src/mycomponents/item/itemFilter.vue b/src/mycomponents/item/itemFilter.vue
index 16200aee..17a5275c 100644
--- a/src/mycomponents/item/itemFilter.vue
+++ b/src/mycomponents/item/itemFilter.vue
@@ -17,6 +17,12 @@
库存状态 :
+
+
+ 库区
+
+
+
@@ -72,7 +78,7 @@
type: Boolean,
default: false
},
- isShowProductionLineCode: {
+ isShowLocationArea: {
type: Boolean,
default: false
},
@@ -88,7 +94,8 @@
checkedWaitModel: false,
stateList: [],
state:[],
- locationCode:""
+ locationCode:"",
+ locationAreaCode:""
}
},
watch: {
@@ -130,7 +137,7 @@
},
confirm() {
- this.$emit("onConfirmClick", this.locationCode,this.state)
+ this.$emit("onConfirmClick", this.locationCode,this.state,this.locationAreaCode)
this.closeScanPopup();
},
diff --git a/src/pages/query/item.vue b/src/pages/query/item.vue
index 8be5faee..72df1c70 100644
--- a/src/pages/query/item.vue
+++ b/src/pages/query/item.vue
@@ -1,7 +1,9 @@
-
+
@@ -88,7 +90,8 @@
locationCode: "",
inventoryStatus: "",
pageSize:10,
- topHeight:115
+ topHeight:115,
+ locationAreaCode:""
}
},
//返回首页
@@ -190,6 +193,14 @@
value: this.locationCode
})
}
+
+ if (this.locationAreaCode) {
+ filters.push({
+ column: "areaCode",
+ action: "==",
+ value: this.locationAreaCode
+ })
+ }
if (this.inventoryStatus) {
filters.push({
@@ -256,6 +267,14 @@
value: this.locationCode
})
}
+
+ if (this.locationAreaCode) {
+ filters.push({
+ column: "areaCode",
+ action: "==",
+ value: this.locationAreaCode
+ })
+ }
if (this.inventoryStatus) {
filters.push({
@@ -320,7 +339,6 @@
mask: true
});
-
this.loadingType = "loading";
if (type === "refresh") {
this.pageNo = 1;
@@ -340,7 +358,7 @@
value: this.locationCode
})
}
-
+
if (this.inventoryStatus) {
filters.push({
column: "inventoryStatus",
@@ -409,7 +427,7 @@
value: this.locationCode
})
}
-
+
if (this.inventoryStatus) {
filters.push({
column: "inventoryStatus",
@@ -469,9 +487,10 @@
this.getContentByTab(index, this.pageNo, this.pageSize, "refresh")
},
- confirm(locationCode, status) {
+ confirm(locationCode, status,locationAreaCode) {
if(this.itemCode){
this.locationCode = locationCode;
+ this.locationAreaCode=locationAreaCode;
if(status.length>0){
var arrayItems = status.join(',')
this.inventoryStatus = arrayItems
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 8a983675..71cec1f1 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -255,16 +255,17 @@
});
return
}
- if (result.package.packUnit !== item.packUnit) {
- this.$refs.comMessage.showQuestionMessage(
- `扫描物料包装【${result.package.packUnit}】与任务推荐包装规格【${item.packUnit}】不一致.是否要继续发料?`, res => {
- if (res) {
- this.getToLocationBalance(result)
- }
- });
- } else {
- this.getToLocationBalance(result)
- }
+ this.getToLocationBalance(result)
+ // if (result.package.packUnit !== item.packUnit) {
+ // this.$refs.comMessage.showQuestionMessage(
+ // `扫描物料包装【${result.package.packUnit}】与任务推荐包装规格【${item.packUnit}】不一致.是否要继续发料?`, res => {
+ // if (res) {
+ // this.getToLocationBalance(result)
+ // }
+ // });
+ // } else {
+ // this.getToLocationBalance(result)
+ // }
}
},