diff --git a/pages/productionReturn/coms/comReturnRequestPopup.vue b/pages/productionReturn/coms/comReturnRequestPopup.vue
index b5f64d18..344432cd 100644
--- a/pages/productionReturn/coms/comReturnRequestPopup.vue
+++ b/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -28,7 +28,7 @@
- 箱码:
+ 物料:
{{itemCode}}
@@ -46,10 +46,13 @@
数量 :
-
-
+
+
+
+ ()
+
@@ -63,7 +66,7 @@
-
+
@@ -82,6 +85,7 @@
checkDirectoryItemExist
} from '@/common/directory.js';
import uom from '@/mycomponents/qty/uom.vue'
+ import stdPackQty from '@/mycomponents/qty/stdPackQty.vue'
import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanItem from '@/mycomponents/scan/winScanItem.vue'
@@ -90,6 +94,7 @@
export default {
components: {
uom,
+ stdPackQty,
balanceStatus,
comMessage,
winScanItem
@@ -120,6 +125,8 @@
show: false,
isModifiedPosition: true,
positionList: [],
+ maxlength:10,
+ stdPackInfo:undefined,
list: [{
value: 1,
label: '车间1',
@@ -193,6 +200,21 @@
},
},
methods: {
+ checkNum(e) {
+ let value = e.detail.value;
+ let dot = value.indexOf('.'); //包含小数点
+ let reg = /^[0-9]+$/; //正整数
+ if (dot > -1) {
+ this.maxlength = dot + 7; //长度是小数点后两位
+ if (value.length > dot + 7) {
+
+ }
+ }
+ if (reg.test(value)) { //如果是正整数不包含小数点
+ this.maxlength = 10;
+ }
+ this.change(value)
+ },
openRequestPopup(editPosition) {
if (this.positionList.length == 0) {
getWorkShopLineStation().then(res => {
@@ -352,13 +374,14 @@
}
},
- getScanCode(code) {
+ getScanCode(code, scanResult) {
if (code == "") {
this.showErrorMessage('物料号不能为空')
return;
}
this.itemCode = "";
this.checkItemCode(code)
+ this.stdPackInfo = scanResult.package;
},
}