diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index c7e63c87..6351b05c 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -47,7 +47,6 @@
updateTitle,
navigateBack,
getRemoveOption,
- getISODateTime,
getCurrDateTime,
getDirectoryItemArray,
getPackingNumberAndBatch,
diff --git a/pages/repleinsh/record/repleinshRecord.vue b/pages/repleinsh/record/repleinshRecord.vue
index dac6914e..2aed1aa1 100644
--- a/pages/repleinsh/record/repleinshRecord.vue
+++ b/pages/repleinsh/record/repleinshRecord.vue
@@ -26,7 +26,7 @@
-
+
@@ -51,7 +51,8 @@
import {
goHome,
updateTitle,
- getCurrDateTime
+ getCurrDateTime,
+ getPackingNumberAndBatch
} from '@/common/basic.js';
import {
@@ -322,7 +323,9 @@
},
closeScanPopup() {
- this.$refs.scanPopup.closeScanPopup();
+ if(this.$refs.scanPopup!=undefined){
+ this.$refs.scanPopup.closeScanPopup();
+ }
},
scanPopupGetFocus() {
@@ -331,11 +334,6 @@
}
},
- scanLocationCode(location, code) {
- this.toLocationCode = code
- this.toLocationCode = location;
-
- },
submit() {
uni.showLoading({
title: "提交中....",
@@ -390,17 +388,18 @@
fromLocation.Batchs.forEach(batch => {
let subItem = batch.detail;
subItem.recordList = [];
+
if (batch.Records.length > 0) {
batch.Records.forEach(r => {
let record = {};
record.handleQty = r.qty;
-
+
record.fromPackingNumber = r
.packingNumber;
record.fromBatch = r.batch;
record.fromContainerNumber = r
.ContainerNumber;
-
+
record.toContainerNumber = r
.ContainerNumber;
record.toInventoryStatus = r
@@ -409,15 +408,16 @@
.toLocationCode;
record.fromLocationCode = fromLocation.fromLocationCode
record.supplierCode = r.supplierCode;
-
- var info = getPackingNumberAndBatch(
- this.managementList, r
- .itemCode,
- r.packingNumber, r
- .batch);
- record.toPackingNumber = info
- .packingNumber;
- record.toBatch = info.batch;
+
+ //使用在途库不改变管理模式
+ var info = getPackingNumberAndBatch(
+ this.managementList, r
+ .itemCode,
+ r.packingNumber, r
+ .batch);
+ record.toPackingNumber = info
+ .packingNumber;
+ record.toBatch = info.batch;
subItem.recordList.push(record);
})
subList.push(subItem);
@@ -426,7 +426,7 @@
})
})
})
-
+
this.dataContent.subList = subList
this.dataContent.createTime = createTime;
this.dataContent.creator = creator;