safecheck-client 4.0.2-5 → 4.0.2-51

package/src/filiale/meihekou/android/SafecheckDevices.vue

@@ -632,9 +632,12 @@ export default {
                   continue
                 }
                 let type = this.config[this.device.device].items[item].type
-                let multiple = this.config[this.device.device].items[item].multiple?this.config[this.device.device].items[item].multiple:false
+                let multiple = false
+                if(this.config[this.device.device].items[item].multiple){
+                  multiple = this.config[this.device.device].items[item].multiple === 'true' || this.config[this.device.device].items[item].multiple === true
+                }
                 let options = this.config[this.device.device].items[item].options
-                if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && item == this.f_items[n].f_item_name) {
+                if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && this.config[this.device.device].items[item].itemname == this.f_items[n].f_item_name) {
                   for (let i in options) {
                     if(typeof options[i]=='function'){
                       continue
@@ -1043,7 +1046,7 @@ export default {
         verification_text:'',
         verification_state:'',// ai验证是否通过 npass(未通过)/pass(通过)
         f_is_defect: '',
-        multiple:this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
+        multiple:this.config[this.device.device].items[item].multiple === 'true' || this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
         isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
         readonly: this.config[this.device.device].items[item].readonly == true?true:false,
         remark: this.config[this.device.device].items[item].remark ? this.config[this.device.device].items[item].remark : '',

package/src/filiale/meihekou/android/SafecheckOrderV.vue

@@ -876,16 +876,12 @@ export default {
                           this.checkResult[f_device_type + '-' + f_item_name] = []
                         }
                         this.checkResult[f_device_type + '-' + f_item_name].push(f_item_value)
-
                       }
-
                       let f_selected = f_item_value
-                      if (!items.f_selected) {
+                      if (!items.f_selected || !(items.f_selected instanceof Array)){
                         items.f_selected = []
-                        items.f_selected.push(f_item_value)
-                      } else {
-                        items.f_selected.push(f_item_value)
                       }
+                      items.f_selected.push(f_item_value)
                     }
                   }
                 }
@@ -994,6 +990,8 @@ export default {
       if (this.repairDefect.result != '正常') {
         return this.$showMessage('有隐患的处理方式为转维修,请点击转维修')
       }
+      //先临时保存
+      this.save('temp')
       this.save()
     },
     //将数据组装提出
@@ -1328,7 +1326,7 @@ export default {
       }
       if (jo.state == 'ok') {
         let res = JSON.parse(jo.result)
-        if (res.code == 200) {
+        if (res.code == 200 || res.code == 310 || res.code == 311) {
           this.$set('data.f_paper_id', res.id)
           this.isStrat = false
           if (url != "") {
@@ -1576,28 +1574,26 @@ export default {
             this.refuseinspection = Vue.config.safecheck.ApproveConfig.refuseinspection
           }
         }
-
-        if (this.item.f_security_check_type_id && this.item.f_security_check_type_id != null) {
-          try {
-            await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeHistoryById`, {id: this.item.f_security_check_type_id})
-            this.f_security_check_type_id = this.serverConfig.data.id
-          } catch (e) {
-            return this.$showMessage('获取配置文件失败，请返回后重新进入！多次失败请联系管理员')
+        try {
+          if (this.item.f_security_check_type_id && this.item.f_security_check_type_id != null) {
+              await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeHistoryById`, {id: this.item.f_security_check_type_id})
+              this.f_security_check_type_id = this.serverConfig.data.id
+              this.config = this.extend(JSON.parse(this.serverConfig.data.f_json), this.config)
+              this.initConfig()
+          } else {
+              await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeByType`, {
+                f_safecheck_type: this.item.f_safecheck_type || '年度普检',
+                f_user_type: this.item.f_user_type
+              })
+              this.f_security_check_type_id = this.serverConfig.data[0].id
+              this.config = this.extend(JSON.parse(this.serverConfig.data[0].f_json), this.config)
+              this.initConfig()
           }
-          this.config = this.extend(JSON.parse(this.serverConfig.data.f_json), this.config)
+        }catch (e) {
+          this.config = this.extend(JSON.parse(Vue.newConfig.data[0].f_json), this.config)
           this.initConfig()
-        } else {
-          try {
-            await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeByType`, {
-              f_safecheck_type: this.item.f_safecheck_type || '年度普检',
-              f_user_type: this.item.f_user_type
-            })
-            this.f_security_check_type_id = this.serverConfig.data[0].id
-            this.config = this.extend(JSON.parse(this.serverConfig.data[0].f_json), this.config)
-            this.initConfig()
-          } catch (e) {
-            return this.$showMessage('获取配置文件失败，请返回后重新进入！多次失败请联系管理员')
-          }
+          console.log(('离线'))
+          console.log(e)
         }
       }
     },
@@ -2186,9 +2182,12 @@ export default {
                     }
                   }
                 }
-                if (item.f_items[i].f_item_value instanceof Array) {
+                if (item.f_items[i].f_selected) {
                   item.f_items[i].f_item_value = JSON.parse(item.f_items[i].f_selected)
                 }
+                if (item.f_items[i].f_item_lists.length > 0){
+                  item.f_items[i].f_item_value = item.f_items[i].f_item_lists[0].f_item_value
+                }
               }
               for (let de in that.devices) {
                 if (typeof that.devices[de] == 'function') {