diff --git a/src/mycomponents/common/comBlankView.vue b/src/mycomponents/common/comBlankView.vue
index fab084fe..96ded207 100644
--- a/src/mycomponents/common/comBlankView.vue
+++ b/src/mycomponents/common/comBlankView.vue
@@ -27,6 +27,7 @@
},
methods: {
goScan(content) {
+ console.log("点击")
this.$emit("goScan", '');
}
}
diff --git a/src/mycomponents/qty/numbeIntegerrBox.vue b/src/mycomponents/qty/numbeIntegerrBox.vue
new file mode 100644
index 00000000..4705aa9b
--- /dev/null
+++ b/src/mycomponents/qty/numbeIntegerrBox.vue
@@ -0,0 +1,219 @@
+
+
+
+ -
+
+
+
+ +
+
+
+
+
+
+
diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue
index badd9a84..710e652e 100644
--- a/src/pages/issue/request/issueScanRequest.vue
+++ b/src/pages/issue/request/issueScanRequest.vue
@@ -1,11 +1,12 @@
+ 说明: 扫描成功后,如果10秒钟不修改数量,自动提交,如果修改数量,需手动点击提交按钮
+
+
+
-
-
-
+
- 说明: 扫描成功后,如果10秒钟不修改数量,自动提交,如果修改数量,需手动点击提交按钮
@@ -32,7 +33,7 @@
物料代码 : {{item.itemCode}}
- 单位 : {{item.uom}}
+ 单位 : {{getUomInfo(item.uom)}}
包装规格 : {{item.packUnit}}
@@ -44,8 +45,8 @@
包装数量 :
-
-
+
+
@@ -79,6 +80,10 @@
issueRequestSubmit,
getCallmaterials
} from '@/api/request2.js';
+
+ import {
+ getUomInfo
+ } from '@/common/directory.js';
import {
calc
@@ -104,7 +109,7 @@
import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
import comIssueRequestCreator from '@/pages/issue/coms/comIssueRequestCreator.vue'
import winScanPackLevel from '@/mycomponents/scan/winScanPackLevel.vue'
- import numberBox from '@/mycomponents/qty/numberBox.vue'
+ import numbeIntegerrBox from '@/mycomponents/qty/numbeIntegerrBox.vue'
export default {
@@ -113,7 +118,7 @@
jobDetailPopup,
comIssueRequestCreator,
winScanPackLevel,
- numberBox
+ numbeIntegerrBox
},
data() {
return {
@@ -163,7 +168,16 @@
},
methods: {
+ getUomInfo(uom) {
+ let item = getUomInfo(uom);
+ if (item == '') {
+ return uom;
+ } else {
+ return item.label
+ }
+ },
goScan() {
+ this.stopRefresh();
this.subList=[]
this.detailSource={
subList: []
@@ -210,7 +224,6 @@
this.closeScanPopup()
this.$forceUpdate()
this.timerRefresh();
-
}else {
this.showErrorMessage("未获取到物料信息")
}
@@ -246,6 +259,10 @@
},
submit() {
+ if(this.subList[0].qty==0){
+ this.showErrorMessage("需求数量不能为0")
+ return
+ }
uni.showLoading({
title: "提交中....",
mask: true
@@ -253,7 +270,6 @@
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
issueRequestSubmit(params).then(res => {
-
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功\n生成发料申请[" + res.data + "]")
@@ -298,14 +314,15 @@
this.first=false
return;
}
- console.log("calcQty"+val);
this.stopRefresh()
- if (val == 0) {
- this.showErrorMessage("数量必须大于0")
- }else {
- this.subList[0].countQty=val
- this.subList[0].qty =this.subList[0].countQty*this.subList[0].callmaterialQty
- }
+ this.subList[0].countQty=val
+ this.subList[0].qty =this.subList[0].countQty*this.subList[0].callmaterialQty
+ // if (val == 0) {
+ // this.showErrorMessage("数量必须大于0")
+ // }else {
+ // this.subList[0].countQty=val
+ // this.subList[0].qty =this.subList[0].countQty*this.subList[0].callmaterialQty
+ // }
},
}
}