diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
index 171b48f0..5a5c1777 100644
--- a/src/mycomponents/detail/comDetailCard.vue
+++ b/src/mycomponents/detail/comDetailCard.vue
@@ -111,8 +111,7 @@
this.detailOptions = getDetailOption();
}
if (this.scanOptions.length == 0) {
- this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
- .allowModifyLocation)
+ this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
}
},
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 2312fa0e..0917c4f7 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -338,9 +338,8 @@
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】已经扫描")
} else {
- itemDetail.cancleScanedHiht=false;
- this.addDetail(itemDetail, result);
- return;
+ // this.addDetail(itemDetail, result);
+ // return;
//暂时先不判断状态
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
@@ -350,11 +349,15 @@
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,是否继续上架?', res => {
if (res) {
+ itemDetail.cancleScanedHiht=false;
this.addDetail(itemDetail, result);
} else {
this.scanPopupGetFocus();
}
});
+ }else {
+ itemDetail.cancleScanedHiht=false;
+ this.addDetail(itemDetail, result);
}
// } else {
// this.addDetail(itemDetail, result);
diff --git a/src/pages/purchaseReturn/coms/comReturnJobCard.vue b/src/pages/purchaseReturn/coms/comReturnJobCard.vue
index 216deb18..2495e1fa 100644
--- a/src/pages/purchaseReturn/coms/comReturnJobCard.vue
+++ b/src/pages/purchaseReturn/coms/comReturnJobCard.vue
@@ -1,6 +1,6 @@
-
+
@@ -21,6 +21,10 @@
type: Object,
default: {}
},
+ isShowToLocation: {
+ type: Boolean,
+ default: true
+ },
},
methods: {
diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index 124e1399..fbeae3e2 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -258,7 +258,10 @@
itemDetail.handleQty = Number(result.label.qty);
itemDetail.toInventoryStatus = itemDetail.inventoryStatus;
-
+ itemDetail.balance={
+ packQty:Number(result.package.packQty),
+ uom:result.package.uom
+ }
// itemDetail.balance = result.balance;
// itemDetail.balance.balanceQty = Number(result.balance.qty);
// itemDetail.balance.packQty = Number(result.package.packQty)
diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue
index 393840ef..a8e88f2a 100644
--- a/src/pages/purchaseReturn/job/returnJob.vue
+++ b/src/pages/purchaseReturn/job/returnJob.vue
@@ -11,7 +11,7 @@
-
+