diff --git a/src/mycomponents/form/customerFrom.vue b/src/mycomponents/form/customerFrom.vue
index 32fb2a8..677faba 100644
--- a/src/mycomponents/form/customerFrom.vue
+++ b/src/mycomponents/form/customerFrom.vue
@@ -29,7 +29,7 @@
-
+
{{radio.name}}
@@ -73,7 +73,7 @@
-
+
{{radio.name}}
@@ -105,8 +105,6 @@
-
-
@@ -119,7 +117,7 @@
-
+
{{radio.name}}
@@ -166,7 +164,7 @@
-
+
{{radio.name}}
diff --git a/src/mycomponents/scan/winComScanNormal.vue b/src/mycomponents/scan/winComScanNormal.vue
index da7f04b..3d2aa25 100644
--- a/src/mycomponents/scan/winComScanNormal.vue
+++ b/src/mycomponents/scan/winComScanNormal.vue
@@ -107,14 +107,14 @@
hide() {
// #ifdef APP-PLUS
// 只是解决软键盘的闪现
- var interval = setInterval(function() {
- uni.hideKeyboard(); //隐藏软键盘
- console.log('刷新')
- }, 5);
- setTimeout(() => {
- clearInterval(interval);
- console.log('停止刷新')
- }, 1000);
+ // var interval = setInterval(function() {
+ // uni.hideKeyboard(); //隐藏软键盘
+ // console.log('刷新')
+ // }, 5);
+ // setTimeout(() => {
+ // clearInterval(interval);
+ // console.log('停止刷新')
+ // }, 1000);
// #endif
},
getValue() {
diff --git a/src/pages/foam/check.vue b/src/pages/foam/check.vue
index de18a08..9b7fafa 100644
--- a/src/pages/foam/check.vue
+++ b/src/pages/foam/check.vue
@@ -77,7 +77,7 @@
dateTime: "",
deviceCode: "",
deviceName: "",
- worker: this.$store.state.user.id,
+ worker: this.$store.state.user.name,
dataList: [],
formData: [{
type: "stateSelect",
@@ -260,10 +260,20 @@
return
}
this.$refs.customerFrom.submit(data => {
+ var groupName="";
+ var groupValue=""
+ data.forEach(res=>{
+ if(res.Type=="4"){
+ groupName=res.SelectName;
+ groupValue=res.SelectValue;
+ }
+ })
var commitData={
LoginUserID:this.$store.state.user.id,
UserName:this.$store.state.user.name,
createTime:getCurrDateTime(),
+ groupName:groupName,
+ groupValue:groupValue,
dataList:data
}
var param = commitData
diff --git a/src/pages/foam/input.vue b/src/pages/foam/input.vue
index c0bf4e2..e49c433 100644
--- a/src/pages/foam/input.vue
+++ b/src/pages/foam/input.vue
@@ -41,7 +41,8 @@
-
+
+
@@ -83,7 +84,15 @@
-
+