safecheck-client 4.0.2-65 → 4.0.2-67

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

@@ -240,36 +240,36 @@ export default {
       repairTypeOptions:this.$appdata.getParam('报修类型'),
       f_security_check_type_id: '',
       config: [
-          {
-            "itemname": "燃气表",
-            "checkmust": true,
-            "index": 1,
-            "items": [
-              {"itemname": "基表编号", "index": 1, "type": "string", "readonly": true},
-              {"itemname": "气表型号", "index": 2, "type": "string", "readonly": true},
-              {"itemname": "气表品牌", "index": 3, "type": "string", "readonly": true},
-              {"itemname": "表向", "index": 4, "type": "string", "readonly": true},
-              {"itemname": "初始表底", "index": 5, "type": "number", "readonly": true},
-              {"itemname": "上期表读数", "index": 6, "type": "number", "readonly": true},
+        {
+          "itemname": "燃气表",
+          "checkmust": true,
+          "index": 1,
+          "items": [
+            {"itemname": "基表编号", "index": 1, "type": "string", "readonly": true},
+            {"itemname": "气表型号", "index": 2, "type": "string", "readonly": true},
+            {"itemname": "气表品牌", "index": 3, "type": "string", "readonly": true},
+            {"itemname": "表向", "index": 4, "type": "string", "readonly": true},
+            {"itemname": "初始表底", "index": 5, "type": "number", "readonly": true},
+            {"itemname": "上期表读数", "index": 6, "type": "number", "readonly": true},
 
-              {"itemname": "累购气量", "index": 7, "type": "number", "readonly": true,unique: true,collectionType:"按气量"},
-              {"itemname": "已用气量", "index": 8, "type": "number", "checkmust": false,unique: true,collectionType:"按气量"},
-              {"itemname": "剩余气量", "index": 9, "type": "number", "checkmust": false,unique: true,collectionType:"按气量"},
-              {"itemname": "气量异常差值", "index": 10, "type": "number", "readonly": true,unique: true,collectionType:"按气量"},
+            {"itemname": "累购气量", "index": 7, "type": "number", "readonly": true,unique: true,collectionType:"按气量"},
+            {"itemname": "已用气量", "index": 8, "type": "number", "checkmust": false,unique: true,collectionType:"按气量"},
+            {"itemname": "剩余气量", "index": 9, "type": "number", "checkmust": false,unique: true,collectionType:"按气量"},
+            {"itemname": "气量异常差值", "index": 10, "type": "number", "readonly": true,unique: true,collectionType:"按气量"},
 
 
-              {"itemname": "累购金额", "index": 7, "type": "number", "readonly": true,unique: true,collectionType:"按金额"},
-              {"itemname": "已用金额", "index": 8, "type": "number", "checkmust": false,unique: true,collectionType:"按金额"},
-              {"itemname": "剩余金额", "index": 9, "type": "number", "checkmust": false,unique: true,collectionType:"按金额"},
-              {"itemname": "金额异常差值", "index": 10, "type": "number", "readonly": true,unique: true,collectionType:"按金额"},
+            {"itemname": "累购金额", "index": 7, "type": "number", "readonly": true,unique: true,collectionType:"按金额"},
+            {"itemname": "已用金额", "index": 8, "type": "number", "checkmust": false,unique: true,collectionType:"按金额"},
+            {"itemname": "剩余金额", "index": 9, "type": "number", "checkmust": false,unique: true,collectionType:"按金额"},
+            {"itemname": "金额异常差值", "index": 10, "type": "number", "readonly": true,unique: true,collectionType:"按金额"},
 
-              {"itemname": "系统余额", "index": 10, "type": "number", "readonly": true},
+            {"itemname": "系统余额", "index": 10, "type": "number", "readonly": true},
 
-              {"itemname": "表封号", "index": 11, "type": "string", "readonly": true},
-              {"itemname": "燃气表照片", "index": 12, "type": "picture", "checkmust": false}
-            ]
-          }
-        ],
+            {"itemname": "表封号", "index": 11, "type": "string", "readonly": true},
+            {"itemname": "燃气表照片", "index": 12, "type": "picture", "checkmust": false}
+          ]
+        }
+      ],
       // 维修项
       isneedDate:'',
       days: this.$appdata.getParam('截止天数'),
@@ -862,6 +862,23 @@ export default {
                       f_is_defect = configItems.options[k].isdefect
                       f_item_value = items.f_item_value[i]
                       f_defect_level = configItems.level
+                      let items_list = {
+                        f_is_defect: f_is_defect,
+                        f_item_value: f_item_value,
+                        f_defect_level: f_defect_level,
+                        f_is_eliminate: null,
+                        f_create_time: Util.toStandardTimeString()
+                      }
+                      if (!items.f_item_lists) {
+                        items.f_item_lists = []
+                        if (JSON.stringify(items_list) !== '{}') {
+                          items.f_item_lists.push(items_list)
+                        }
+                      } else {
+                        if (JSON.stringify(items_list) !== '{}') {
+                          items.f_item_lists.push(items_list)
+                        }
+                      }
                       if (f_is_defect) {
                         if (checkResults.result !== '有隐患') {
                           checkResults.result = '有隐患'
@@ -1011,7 +1028,7 @@ export default {
     save(type) {
       if (type == 'temp' || type == 'finish') {
         this.assemblyCodata()
-        }
+      }
       //禁用事件
       this.saveNoclick()
       if (type == 'temp') {
@@ -1390,7 +1407,7 @@ export default {
                         param = res.data[0]
                         param.f_new_tablebase = _this.data.f_new_tablebase
                         param.tabname="在线抄表",
-                        param.f_result_state="安检回量"
+                          param.f_result_state="安检回量"
                         var pardate = {
                           _this:this,
                           tittle:'抄表单信息',
@@ -1576,18 +1593,18 @@ export default {
         }
         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()
+            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()
+            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) {
           this.config = this.extend(JSON.parse(Vue.newConfig.data[0].f_json), this.config)
@@ -2171,7 +2188,7 @@ export default {
                 if (typeof item.f_items[i] == 'function') {
                   continue
                 }
-               let items = this.config.find(obj => obj.itemname === item.f_device_type).items;
+                let items = this.config.find(obj => obj.itemname === item.f_device_type).items;
                 for (let de in items) {
                   if (typeof items[de] == 'function') {
                     continue
@@ -2213,15 +2230,15 @@ export default {
           this.init()
         }
         if(this.parentPage && this.parentPage=='CurrentCreate'){
-        let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
-        if (isRecodr) {
-          if (isRecodr == 'true') {
+          let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
+          if (isRecodr) {
+            if (isRecodr == 'true') {
               this.$showMessage("为了保证服务质量，您的电话将会被全程录音！")
-            // 初始化录音
-            let resse = this.record()
+              // 初始化录音
+              let resse = this.record()
+            }
           }
         }
-        }
         this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
       } else {
         let that = this