diff --git a/mycomponents/record/recordFilter.vue b/mycomponents/record/recordFilter.vue
index c3112443..710a59b4 100644
--- a/mycomponents/record/recordFilter.vue
+++ b/mycomponents/record/recordFilter.vue
@@ -8,7 +8,7 @@
只看当天
-
+
@@ -36,6 +36,7 @@
data() {
return {
dataContent: {},
+ checkedTodayModel:false,
}
},
props: {
@@ -43,10 +44,6 @@
type: Boolean,
default: false
},
- checkedWaitTask: {
- type: Boolean,
- default: false
- },
otherTitle: {
type: String,
default: ""
@@ -57,6 +54,13 @@
}
},
watch: {
+ checkedToday: {
+ handler(newName, oldName) {
+ this.checkedTodayModel = this.checkedToday
+ },
+ immediate: true,
+ deep: true
+ },
},
mounted() {
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index 36e7b708..0de659c4 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -239,10 +239,10 @@
r.batch == batch && r.fromLocationCode == result.fromLocationCode
})
if (itemDetail == undefined) {
- this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+ this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
} else {
if (itemDetail.scaned) {
- this.showMessage("箱码【" + packingNumber + "】已经扫描")
+ this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
} else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
diff --git a/pages/transfer/job/issueDetail.vue b/pages/transfer/job/issueDetail.vue
index 1e7824f4..bd19fe7c 100644
--- a/pages/transfer/job/issueDetail.vue
+++ b/pages/transfer/job/issueDetail.vue
@@ -258,13 +258,13 @@
} else {
var itemDetail = detail.subList.find(r => {
return r.packingNumber == packingNumber &&
- r.batch == batch
+ r.batch == batch && r.fromLocationCode == result.fromLocationCode
})
if (itemDetail == undefined) {
- this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
+ this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
} else {
if (itemDetail.scaned) {
- this.showMessage("箱码【" + packingNumber + "】已经扫描")
+ this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
} else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);