diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index e6c18e50..01c6d0e1 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -233,27 +233,21 @@
if (e.content.text == "移除") {
this.$refs.comMessage.showQuestionMessage("是否要移除", res => {
if (res) {
- this.allList.splice(index, 1);
- this.initList()
+ this.showList.splice(index, 1);
+ this.calcFgQty();
+ //this.initList()
}
-
})
}
-
},
submit() {
- this.scanedQty = this.scanedQty + this.showList.length;
- this.showList = [];
- this.dataContent.handleQty = 0;
- return;
-
- if (this.allList.length == 0) {
+ if (this.showList.length == 0) {
this.showErrorMessage("请先扫描唯一码")
return;
}
- if (this.allList.length < this.dataContent.packQty) {
+ if (this.showList.length < this.dataContent.packQty) {
this.$refs.comMessage.showQuestionMessage("扫描数量小于包装规格数量,是否提交?", res => {
if (res) {
this.commit()
@@ -325,12 +319,12 @@
},
setParams() {
- this.allList.forEach(res => {
+ this.showList.forEach(res => {
res.outsideItemCode = res.itemCode
res.outsideProduceDate = null
res.outsideSerialNumber = res.order
})
- this.dataContent.subList = this.allList
+ this.dataContent.subList = this.showList
return this.dataContent
},
@@ -363,7 +357,7 @@
isCheckMesCode(result.content).then(res => {
if (res.data) {
if (that.dataContent) {
- var itemIndex = this.allList.findIndex(r =>
+ var itemIndex = this.showList.findIndex(r =>
r.content == result.content);
//不存在
if (itemIndex == -1) {
@@ -372,9 +366,9 @@
// return;
// }
result.countTime = new Date();
- this.allList.push(result);
- this.allList.sort(compare('countTime')); //按扫描信息排序
- this.initList()
+ this.showList.push(result);
+ this.showList.sort(compare('countTime')); //按扫描信息排序
+ //this.initList()
this.scanPopupGetFocus();
this.calcFgQty();
} else {
@@ -382,9 +376,9 @@
'】已经扫描,是否移除',
res => {
if (res) {
- this.allList.splice(itemIndex, 1)
- this.allList.sort(compare('countTime')); //按扫描信息排序
- this.initList()
+ this.showList.splice(itemIndex, 1)
+ this.showList.sort(compare('countTime')); //按扫描信息排序
+ //this.initList()
that.calcFgQty();
}
})
@@ -421,11 +415,16 @@
showCommitSuccessMessage(hint, pointData) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
if (pointData.length > 0) {
- uni.navigateTo({
- url: `/pages/point/index?points=${JSON.stringify(pointData)}`
- });
+ if (this.scanedQty + this.showList.length == this.dataContent.planQty) {
+ uni.redirectTo({
+ url: `/pages/point/index?points=${JSON.stringify(pointData)}`
+ });
+ } else {
+ uni.navigateTo({
+ url: `/pages/point/index?points=${JSON.stringify(pointData)}`
+ });
+ }
}
-
})
},
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index b8224301..90fbcb5a 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -25,7 +25,7 @@
+ @click="cancel">取消
@@ -159,6 +159,7 @@
this.getRecommendLocation(balance, res => {
itemp.toLocationCode = res.code;
itemp.expectinNumber = res.expectinNumber;
+ this.$forceUpdate();
})
let newDetail = createDetailInfo(balance, pack); //
newDetail.fromInventoryStatus = balance.inventoryStatus;
@@ -398,8 +399,6 @@
return that.dataContent;
},
-
-
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {}
@@ -450,6 +449,12 @@
this.detailSource.splice(i, 1)
}
}
+ },
+
+ cancel()
+ {
+ this.clearData();
+ this.openScanPopup();
}
}
}
diff --git a/src/pages/productPutaway/record/semiDirectPutaway.vue b/src/pages/productPutaway/record/semiDirectPutaway.vue
index 376b32cf..f8aebb9e 100644
--- a/src/pages/productPutaway/record/semiDirectPutaway.vue
+++ b/src/pages/productPutaway/record/semiDirectPutaway.vue
@@ -1,49 +1,48 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
\ No newline at end of file