diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue
index 6a018045..e575b476 100644
--- a/src/pages/fg/coms/comReceiptPopup.vue
+++ b/src/pages/fg/coms/comReceiptPopup.vue
@@ -171,7 +171,9 @@
workStationCode: "",
planDate: '',
showDateSelect:false,
- planDateList:[]
+ planDateList:[],
+ fgLocationCode:"",
+ rawLocationCode:""
}
},
props: {
@@ -216,6 +218,8 @@
this.planDate=""
this.showDateSelect =false
this.planDateList=[]
+ this.fgLocationCode=""
+ this.rawLocationCode=""
},
@@ -269,8 +273,9 @@
planQty: this.planQty,
goodQty: this.goodQty,
planNumber: this.planNumber,
- workStationCode: this.workStationCode
-
+ workStationCode: this.workStationCode,
+ fgLocationCode:this.fgLocationCode,
+ rawLocationCode:this.rawLocationCode
};
this.closeRequestPopup();
this.$emit("confirm", item);
@@ -289,6 +294,9 @@
this.productionLineName = data[0].label + "—" + data[1].label
this.productionLineCode = data[0].value
this.workStationCode = data[1].value
+ var parent =this.productLineList.filter(res=>res.value==this.productionLineCode)
+ var fgLocation =parent[0].children.filter(children=>children.value==this.workStationCode)
+ this.fgLocationCode= fgLocation[0].fgLocationCode;
this.clearItemCode()
this.clearPackUnit()
@@ -360,8 +368,7 @@
uni.hideLoading()
if (res.data && res.data.length > 0) {
res.data.forEach(item => {
- item.label = item.itemCode + "(" + item.planQty + this.getUomInfo(item.uom) + ")" + "(" +
- dateFormatData(item.planDate) + ")"
+ item.label = item.itemCode + "(" + item.planQty + this.getUomInfo(item.uom) + ")"
item.value = item
})
this.itemCodeList = res.data
@@ -385,6 +392,26 @@
//清除其他数据
this.clearPackUnit();
+ uni.showLoading({
+ title: "加载中",
+ mask: true
+ })
+ getPackUnitByItemCode(this.itemCode).then(res => {
+ uni.hideLoading()
+ if (res.data && res.data.list.length > 0) {
+ res.data.list.forEach(item => {
+ item.value = item.packUnit
+ item.label = getPackUnitName(item.packUnit) + "(" + item.packQty + this
+ .getUomInfo(item.uom) + ")";
+ })
+ this.packUnitList = res.data.list
+ var defaultData =res.data.list.filter(item=>item.defaultPackageunit=="TRUE")
+ this.confirmSelectPackUnit(defaultData)
+ }
+
+ }).catch(error => {
+ uni.hideLoading()
+ })
},
clearPackUnit(){
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index 3433fa4a..f7938f02 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -12,6 +12,12 @@
+
+ 成品库位
+ {{dataContent.fgLocationCode}}
+
+
+
计划数
{{dataContent.planQty}}{{dataContent.uom}}
@@ -202,6 +208,7 @@
batch: result.batch,
packUnit: result.packUnit,
workStationCode: result.workStationCode,
+ fgLocationCode:result.fgLocationCode,
subList: []
}
},