diff --git a/fe/PDA/mycomponents/common/comMessage.vue b/fe/PDA/mycomponents/common/comMessage.vue
index 4400afb69..e83f5cb27 100644
--- a/fe/PDA/mycomponents/common/comMessage.vue
+++ b/fe/PDA/mycomponents/common/comMessage.vue
@@ -103,6 +103,7 @@
},
closeMessage() {
+ this.confirmResult = false;
clearInterval(this.timer) //清空timer
this.$refs['popupMessage'].close();
this.afterClose();
diff --git a/fe/PDA/mycomponents/common/comNumberBox.vue b/fe/PDA/mycomponents/common/comNumberBox.vue
index 519427fc4..10e729e60 100644
--- a/fe/PDA/mycomponents/common/comNumberBox.vue
+++ b/fe/PDA/mycomponents/common/comNumberBox.vue
@@ -138,6 +138,9 @@
},
_onFocus(event) {
this.$emit('focus', event)
+ },
+ setValue(value){
+ this.inputValue =value;
}
}
};
diff --git a/fe/PDA/pages/index/index.vue b/fe/PDA/pages/index/index.vue
index 4a5ddd3bb..51a8cadf1 100644
--- a/fe/PDA/pages/index/index.vue
+++ b/fe/PDA/pages/index/index.vue
@@ -299,7 +299,7 @@
that.timer = setInterval(async function() {
await that.refreshJobMenu(that.userMenus);
console.log('刷新菜单');
- }, 3000)
+ }, 60000)
},
// test() {
diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue
index 9bf1905a7..ee69fd32f 100644
--- a/fe/PDA/pages/task/issue_detail.vue
+++ b/fe/PDA/pages/task/issue_detail.vue
@@ -35,9 +35,13 @@
{{item.recommendQty}}({{item.uom}})
-
+
+
+
+
{{item.handledQty}}({{item.uom}})
+ class="text_black" >({{item.uom}})
@@ -118,6 +122,7 @@
import comBalance from '@/mycomponents/common/comBalance.vue'
import comJobScanDetail from '@/mycomponents/comjob/comJobScanDetail.vue'
import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue'
+ import comNumberBox from '@/mycomponents/common/comNumberBox.vue';
export default {
components: {
@@ -126,7 +131,8 @@
winMulitScan,
comBalance,
comJobScanDetail,
- winScanByPack
+ winScanByPack,
+ comNumberBox
},
data() {
return {
@@ -413,9 +419,9 @@
item.handledPackingCode = balanceItem.packingCode;
item.handledBatch = balanceItem.batch;
item.handledLot = balanceItem.lot;
-
+
+ item.defaultHandleQty =balanceItem.qty;
item.handledQty = balanceItem.qty;
-
item.handledFromLocationCode = balanceItem.locationCode;
item.handledFromLocationArea = balanceItem.locationArea;
item.handledFromLocationGroup = balanceItem.locationErpCode;
@@ -628,6 +634,17 @@
// console.log(e)
this.old.scrollTop = e.detail.scrollTop;
},
+ qtyChanged(value, item,index) {
+ if (value <= 0) {
+ this.showMessage('发料数量不能小于或等于0')
+ item.handledQty =item.defaultHandleQty
+ this.$refs['comNumberBox_'+index][0].setValue(item.handledQty);
+ }else if(value>item.defaultHandleQty){
+ item.handledQty = item.defaultHandleQty
+ this.showMessage('发料数量不能大于库存数量:'+item.handledQty)
+ this.$refs['comNumberBox_'+index][0].setValue(item.handledQty);
+ }
+ },
}
}