safecheck-client 4.0.1-4 → 4.0.1-41

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

@@ -115,13 +115,7 @@
                     v-on:change="daychange" style="width: 60%"></v-select>
         </div>
         <div class="row" style="margin-top: 10px">
-          <label class="font_normal_body">截止时间</label>
-          <datepicker placeholder="请选择截至时间"
-                      :value.sync="selectData.f_finish_date"
-                      v-model="selectData.f_finish_date"
-                      :format="'yyyy-MM-dd HH:mm:ss'"
-                      style="width: 60%"
-                      :disabled="true"></datepicker>
+          <label class="font_normal_body">截止时间&nbsp;&nbsp;&nbsp;&nbsp;{{selectData.f_finish_date}}</label>
         </div>
         <div class="row" style="margin-top: 10px">
           <label  class="font_normal_body" >备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
@@ -155,23 +149,6 @@ export default {
   // props: ['f_plan_id', 'role'],
   data() {
     return {
-      //测试数据
-      // f_plan_id:'',
-      // role:'inspect',
-      // item:{"f_approved_time":null,"f_user_family_remarks":null,"f_street":"测试街道","f_repair_approved_time":null,
-      //   "f_user_type":null,"f_approved_by":null,"f_card_id":null,"f_remark":null,"f_building":"1","f_batch_number":null,
-      //   "f_idnumber":null,"f_state":"未检","id":"0EFE0EE2-B155-46F9-8DE0-38C022664A4D","f_complete":null,"f_check_state":null,"f_last_check_state":"拒检",
-      //   "f_user_inhome_time":null,"f_residential_area":"测试小区1","version":1,"f_processid":null,"f_last_check_result":"{\"result\":\"正常\",\"data\":[]}",
-      //   "f_area":null,"f_usegas":null,"f_user_phone":"16566546548","f_slice_area":"营业大区","f_approved":"未审核","f_upload_state":"未传","f_user_check_time":null,
-      //   "f_unit":"1","f_user_spare_phone":null,"f_last_check_date":null,"f_userproperties":null,"f_userfile_id":null,"f_prearranged_date":null,"f_filialeid":"453",
-      //   "f_branch":null,"f_orgstr":null,"f_plan_year":2020,"f_orgid":null,"f_approval_notified":null,"f_plan_month":4,"f_approved_note":null,"f_filialeids":null,
-      //   "f_floor":"1","f_flag":null,"f_repair_approved_note":null,"f_userinfo_code":"00000002","f_create_time":"2020-05-10 18:56:03","f_meter_no":"","f_station":null,
-      //   "f_repair_approved":"未审核","f_no_checkplan":"有计划安检","f_plan_name":"关于","f_repair_approved_by":null,"f_room":"1","f_office":null,"f_comments":null,
-      //   "f_address":"兰山街道泰盛小区1栋1单元1层1室","id_back":null,"f_userinfoid":"2","f_subcompany":null,"f_addressid":null,"f_user_phone2":null,
-      //   "f_user_equipment_remarks":null,"f_plan_id":"0819ea6707ad4d9dad217c06a87f4227","f_user_name":"用户二",
-      //   "f_plan_meters":[{"f_weizhi":null,"f_flow_direction":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2119035714","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":3,"f_maker":null,"f_metergasnums":0,"f_total_fee":100,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663},{"f_weizhi":null,"f_flow_direction":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2118999901","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":1,"f_maker":null,"f_metergasnums":0,"f_total_fee":0,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663}]
-      // },
-
       data: {
         f_devices: [],
         f_defect_content:'',
@@ -227,6 +204,7 @@ export default {
         f_meetunit:'维修站',
         f_outlets:'维修站'
       },
+      serverConfig: undefined,
       model: {  //转维修数据
         // 一次派单
         serviceacitivity: [{
@@ -260,49 +238,38 @@ export default {
       repairitems:[],
       meading:'转站点',
       repairTypeOptions:this.$appdata.getParam('报修类型'),
-      config: {
-        "燃气表":{
-          "checkmust":true,
-          "index":1,
-          "items":{
-            //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
-            "基表编号":{"index":1,"type":"string","readonly":true},
-            "气表型号":{"index":2,"type":"string","readonly":true},
-            "气表品牌":{"index":3,"type":"string","readonly":true},
-            "表向":{"index":4,"type":"string","readonly":true},
-            "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
-            "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
-            "累购气量":{"index":7,"type":"number","readonly":true},
-            "累购金额":{"index":7,"type":"number","readonly":true},
-            "已用气量":{"index":8,"type":"number","checkmust": false},//基表数
-            "已用金额":{"index":8,"type":"number","checkmust": false},
-            "剩余气量":{"index":9,"type":"number","checkmust": false},//累购-已用
-            //显示屏数  --实际剩余气量
-            "剩余金额":{"index":9,"type":"number","checkmust": false},
-            "气量异常差值":{"index":10,"type":"number","readonly": true},
-            "金额异常差值":{"index":10,"type":"number","readonly": true},
-            "系统余额":{"index":10,"type":"number","readonly": true},
-            "表封号":{"index":11,"type":"string","readonly": true},
-            "燃气表照片":{"index":12,"type":"picture","checkmust": false}
+      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": "累购气量", "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": 11, "type": "string", "readonly": true},
+              {"itemname": "燃气表照片", "index": 12, "type": "picture", "checkmust": false}
+            ]
           }
-          // 注意，配置项的index必须与上面的固定配置保持'顺序'
-        },
-        // "燃气表2":{
-        //   "checkmust":true,
-        //   "index":2,src
-        //   "items":{
-        //     "燃气表照片":{"index":1,"type":"picture"},
-        //     "表品牌":{"index":2,"type":"string","readonly":true},
-        //     "表号":{"index":3,"type":"string","readonly":true},
-        //     "表封号":{"index":4,"type":"number","readonly":true},
-        //     "表型号":{"index":5,"type":"string","readonly":true},
-        //     "位置":{"index":6,"type":"string","readonly":true},
-        //     "表底数":{"index":7,"type":"number","readonly":true},
-        //     "累购气量":{"index":8,"type":"number","readonly":true},
-        //     "累购金额":{"index":8,"type":"number","readonly":true}
-        //   }
-        // }
-      },
+        ],
       // 维修项
       isneedDate:'',
       days: this.$appdata.getParam('截止天数'),
@@ -348,36 +315,39 @@ export default {
   },
   methods: {
     getDays(val){
+      if (!val){
+        return
+      }
       console.log(val)
       this.days = this.$appdata.getParam(val+'截止天数')
       this.selectData.day = this.$appdata.getSingleValue(val+'默认截止天数') || 1
     },
     daychange(val) {
+      if (!val){
+        return
+      }
       this.selectData.day = val
       if (val == '其他') {
         this.flag = false
       } else {
         if(val){
           this.flag = true
-          this.selectData.f_finish_date = this.getSecondDay(val)
+          this.$set('selectData.f_finish_date',this.getSecondDay(val))
         }else {
-          this.selectData.f_finish_date = this.getSecondDay(1)
+          this.$set('selectData.f_finish_date',this.getSecondDay(1))
         }
-
       }
     },
-    getSecondDay(val){
-      let t = new Date();
-      let t1 = t.getTime()
-      val = val * 1000
-      t.setTime(t1 + val * 60 * 60 * 24);
-      let Y = t.getFullYear() + '-'
-      let M = (t.getMonth() + 1 < 10 ? '0' + (t.getMonth() + 1) : t.getMonth() + 1) + '-'
-      let D = (t.getDate() < 10 ? '0' + t.getDate() : t.getDate()) + ' '
-      let h = (t.getHours() < 10 ? '0' + t.getHours() : t.getHours()) + ':'
-      let m = (t.getMinutes() < 10 ? '0' + t.getMinutes() : t.getMinutes()) + ':'
-      let s = t.getSeconds() < 10 ? '0' + t.getSeconds() : t.getSeconds()
-      return Y + M + D + h + m + s
+    getSecondDay(val) {
+      const addMs = val * 1000 * 86400; // 86400 = 60*60*24
+      const targetDate = new Date(Date.now() + addMs);
+      const year = targetDate.getFullYear();
+      const month = String(targetDate.getMonth() + 1).padStart(2, '0');
+      const day = String(targetDate.getDate()).padStart(2, '0');
+      const hours = String(targetDate.getHours()).padStart(2, '0');
+      const minutes = String(targetDate.getMinutes()).padStart(2, '0');
+      const seconds = String(targetDate.getSeconds()).padStart(2, '0');
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
     },
     showmod(){
       // this.saveNoclick()
@@ -419,6 +389,7 @@ export default {
         f_meetunit:f_meetunit,
         f_outlets:f_meetunit,
       }
+      this.getDays(f_repairtype)
     },
     cancel1(){
       this.showModal2=false
@@ -755,14 +726,14 @@ export default {
           for(let device in this.data) {
             if (device.startsWith("device")) {
               for (let item in this.data[device]) {
-                if (this.data[device].length != 0 && this.data[device][item].f_device_type == dev) {
+                if (this.data[device].length != 0 && this.data[device][item].f_device_type == this.config[dev].itemname) {
                   error = false
                 }
               }
             }
           }
           if (error) {
-            return "请检查" + dev
+            return "请检查" + this.config[dev].itemname
           }
         }
       }
@@ -772,23 +743,22 @@ export default {
           if (device.startsWith("device")) {
             for (let item in this.data[device]) {
               //检查每一条安检结果
-              if (this.data[device].length != 0 && this.data[device][item].f_device_type == dev) {
+              if (this.data[device].length != 0 && this.data[device][item].f_device_type == this.config[dev].itemname) {
                 for (let i in this.data[device][item].f_items) {
                   for (let it in this.config[dev].items) {
-                    if (it == this.data[device][item].f_items[i].f_item_name) {
-                      let check=false
-                      if (!this.data[device][item].f_items[i].f_item_value){
-                        check=true
-                      }else if (Array.isArray(this.data[device][item].f_items[i].f_item_value)){
-                        if (this.data[device][item].f_items[i].f_item_value.length==0){
-                          check=true
+                    if (this.config[dev].items[it].itemname == this.data[device][item].f_items[i].f_item_name) {
+                      let check = false
+                      if (!this.data[device][item].f_items[i].f_item_value) {
+                        check = true
+                      } else if (Array.isArray(this.data[device][item].f_items[i].f_item_value)) {
+                        if (this.data[device][item].f_items[i].f_item_value.length == 0) {
+                          check = true
                         }
                       }
-
-                      if(this.config[dev].items[it].type=='picture' && this.config[dev].items[it].checkmust == true && !this.data[device][item].f_items[i].f_path){
+                      if (this.config[dev].items[it].type == 'picture' && this.config[dev].items[it].checkmust == true && !this.data[device][item].f_items[i].f_path) {
                         return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + "未检查"
                       }
-                      if (this.config[dev].items[it].type !='picture' && this.config[dev].items[it].checkmust == true && check) {
+                      if (this.config[dev].items[it].type != 'picture' && this.config[dev].items[it].checkmust == true && check) {
                         return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + "未检查"
                       }
                     }
@@ -834,7 +804,7 @@ export default {
           let hasOther = ''
           let otherValue = null
           for (let item in codata[device]) {
-            if(typeof codata[device][item]=='function'){
+            if (typeof codata[device][item] == 'function') {
               continue
             }
             codata[device][item].f_create_time = Util.toStandardTimeString()
@@ -844,17 +814,18 @@ export default {
             } else {
               f_device_type = codata[device][item].f_device_type
             }
-            if(item == 'sum' || item == 'removeEmpty'){
+            if (item == 'sum' || item == 'removeEmpty') {
               continue
             }
-            for (let i = 0; i < codata[device][item].f_items.length ; i++) {
+            for (let i = 0; i < codata[device][item].f_items.length; i++) {
               //tag
-              if(i == 'sum' || i == 'removeEmpty'){
+              if (i == 'sum' || i == 'removeEmpty') {
                 continue
               }
               var items = codata[device][item].f_items[i]
               items.f_create_time = Util.toStandardTimeString()
               items.f_item_lists = []
+
               if (items.type == 'selector') {
                 items.selected = []
               } else if (items.type == 'inputSelector') {
@@ -867,62 +838,74 @@ export default {
               let f_item_value
               if (items.type == 'selector' || items.type == 'checkbox' || items.type == 'radio') {
                 for (let i in items.f_item_value) {
-                  if(typeof items.f_item_value[i]=='function'){
+                  if (typeof items.f_item_value[i] == 'function') {
                     continue
                   }
-                  let configItems = this.config[codata[device][item].f_device_type].items[f_item_name]
+                  // let configItems = this.config[codata[device][item].f_device_type].items[f_item_name]
+                  let configItems = ''
+                  this.config.forEach(e => {
+                    if (e.itemname == f_device_type)
+                      e.items.forEach(item => {
+                        if (item.itemname == f_item_name) {
+                          configItems = item
+                        }
+                      })
+                  })
+                  items.f_defect_level = configItems.level
                   //tag)
                   for (let k in configItems.options) {
-                    if(typeof configItems.options[k]=='function'){
+                    if (typeof configItems.options[k] == 'function') {
                       continue
                     }
                     //tag)
                     if (items.f_item_value[i] === configItems.options[k].data) {
-
                       f_is_defect = configItems.options[k].isdefect
                       f_item_value = items.f_item_value[i]
-                      f_defect_level = configItems.options[k].level
+                      f_defect_level = configItems.level
                       if (f_is_defect) {
                         if (checkResults.result !== '有隐患') {
                           checkResults.result = '有隐患'
                         }
-                        console.log('items'+items)
-                        if(items.f_deal_dispose=='报修'){
+                        console.log('items' + items)
+                        if (items.f_deal_dispose == '报修') {
                           console.log("检测到需要转维修++++++++++++")
-                          this.repairDefect.result='未处理'
+                          this.repairDefect.result = '未处理'
                           this.repairDefect.data.push(`${f_item_name} : ${f_item_value}`)
                         }
-                        if (!this.checkResult.hasOwnProperty(f_device_type+'-'+f_item_name)) {
-                          this.checkResult[f_device_type+'-'+f_item_name] = []
+                        if (!this.checkResult.hasOwnProperty(f_device_type + '-' + f_item_name)) {
+                          this.checkResult[f_device_type + '-' + f_item_name] = []
                         }
-                        this.checkResult[f_device_type+'-'+f_item_name].push(f_item_value)
+                        this.checkResult[f_device_type + '-' + f_item_name].push(f_item_value)
 
                       }
 
-                      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)
-                        }
+                      let f_selected = f_item_value
+                      if (!items.f_selected) {
+                        items.f_selected = []
+                        items.f_selected.push(f_item_value)
                       } else {
-                        if (JSON.stringify(items_list) !== '{}') {
-                          items.f_item_lists.push(items_list)
-                        }
+                        items.f_selected.push(f_item_value)
                       }
                     }
                   }
                 }
+                //
+                items.f_selected = JSON.stringify(items.f_selected);
+                items.f_item_value = items.f_item_value ? items.f_item_value.toString() : undefined
               } else {
-                let configItems = this.config[codata[device][item].f_device_type].items[items.f_item_name]
+                // let configItems = this.config[codata[device][item].f_device_type].items[items.f_item_name]
+                let configItems = ''
+                this.config.forEach(e => {
+                  if (e.itemname == f_device_type)
+                    e.items.forEach(item => {
+                      if (item.itemname == f_item_name) {
+                        configItems = item
+                      }
+                    })
+                })
+
                 f_is_defect = items.f_is_defect
-                f_defect_level = items.level
+                f_defect_level = configItems.level
                 f_item_value = items.f_item_value
                 let items_list = {
                   f_is_defect: f_is_defect,
@@ -966,7 +949,7 @@ export default {
       }
       if (this.checkResult) {
         for (let key in this.checkResult) {
-          if(typeof this.checkResult[key]=='function'){
+          if (typeof this.checkResult[key] == 'function') {
             continue
           }
           // 上次安检结果数据组织
@@ -1012,7 +995,6 @@ export default {
         return this.$showMessage('有隐患的处理方式为转维修,请点击转维修')
       }
       this.save()
-
     },
     //将数据组装提出
     assemblyCodata(){
@@ -1031,21 +1013,21 @@ export default {
     save(type) {
       if (type == 'temp' || type == 'finish') {
         this.assemblyCodata()
-      }
+        }
       //禁用事件
       this.saveNoclick()
-      if(type == 'temp'){
+      if (type == 'temp') {
         this.data.f_complete = '未完成'
         this.rowCodata.f_complete = '未完成'
         // 关闭录音方法
         this.closely(true) //临时保存，删除录音文件并暂停录音
         this.disableTimer()
-      }else {
+      } else {
         // 关闭录音方法
         this.closely(false) // 保存本地，不删除录音文件暂停录音
         let errString = this.errorVerify()
         if (errString) {
-          if (Vue.android){
+          if (Vue.android) {
             this.$showMessage(errString)
           }
           return
@@ -1057,7 +1039,7 @@ export default {
           this.disableTimer()
         }
       }
-      if(this.data.f_blacklist!='是'){
+      if (this.data.f_blacklist != '是') {
         delete this.data.f_blocking_cause
       }
       if (this.data.f_entry_status == '入户') {
@@ -1065,17 +1047,17 @@ export default {
         this.data.f_rejectcheck_path = null
         this.data.f_rejectcheck1_path = null
         this.data.f_rejectcheck2_path = null
-        this.data.f_noanswers_path=[]
+        this.data.f_noanswers_path = []
         this.data.f_noanswer_path = null
         this.data.f_noanswer1_path = null
         this.data.f_noanswer2_path = null
-      }else if (this.data.f_entry_status == '到访不遇') {
+      } else if (this.data.f_entry_status == '到访不遇') {
         this.data.f_rejectchecks_path = []
         this.data.f_rejectcheck_path = null
         this.data.f_rejectcheck1_path = null
         this.data.f_rejectcheck2_path = null
-      }else if (this.data.f_entry_status == '拒检') {
-        this.data.f_noanswers_path=[]
+      } else if (this.data.f_entry_status == '拒检') {
+        this.data.f_noanswers_path = []
         this.data.f_noanswer_path = null
         this.data.f_noanswer1_path = null
         this.data.f_noanswer2_path = null
@@ -1094,8 +1076,8 @@ export default {
         })
         if ((this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检')  && this.item.f_no_checkplan != '打回') {
           codata.f_devices = this.f_devices
-          if (this.rowCodata && this.rowCodata.istoRepair=='转维修') {
-            this.rowCodata = Object.assign({},this.rowCodata,codata)
+          if (this.rowCodata && this.rowCodata.istoRepair == '转维修') {
+            this.rowCodata = Object.assign({}, this.rowCodata, codata)
           } else {
             this.rowCodata = codata
           }
@@ -1160,8 +1142,8 @@ export default {
           alias: 'getUserinfomation',
           data: {condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan in ('无计划安检','复检')"}
         })
-        if (this.rowCodata && this.rowCodata.istoRepair=='转维修') {
-          this.rowCodata = Object.assign({},this.rowCodata,codata)
+        if (this.rowCodata && this.rowCodata.istoRepair == '转维修') {
+          this.rowCodata = Object.assign({}, this.rowCodata, codata)
         } else {
           this.rowCodata = codata
         }
@@ -1178,6 +1160,7 @@ export default {
                 f_check_item_id: this.data.f_check_item_id
               }).then((res) => {
                 if (res.data.code == 200) {
+
                   let f_paper_id = res.data.data[0].id
                   for (let device of this.f_devices) {
                     device.f_paper_id = f_paper_id
@@ -1200,8 +1183,7 @@ export default {
               return false
             }
           })
-        }
-        else {
+        } else {
           this.$androidUtil.bzLogic('保存安检单信息', {
             f_check_item_id: this.data.f_check_item_id,
             f_checker_id: this.data.f_checker_id,
@@ -1318,23 +1300,23 @@ export default {
               // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
               'backresult': 1
             })
-          }else{
+          } else {
             this.$showMessage('保存成功！')
-            if(this.clickBack){
+            if (this.clickBack) {
               this.isStrat = false
               this.$dispatch('confirm')
             }
           }
-        }else{
+        } else {
           this.$showMessage('保存失败！')
           return
         }
-      }else{
+      } else {
         this.$showMessage('服务器内部错误,保存失败！')
         return
       }
     },
-    uploadCallBack(jo){
+    uploadCallBack(jo) {
       //获取微信推送路径
       let url = ""
       if(Vue.config.safecheck != undefined) {
@@ -1344,13 +1326,13 @@ export default {
           }
         }
       }
-      if(jo.state == 'ok'){
+      if (jo.state == 'ok') {
         let res = JSON.parse(jo.result)
-        if(res.code == 200){
+        if (res.code == 200) {
           this.$set('data.f_paper_id', res.id)
-          this.isStrat=false
-          if(url != ""){
-            this.$resetpost(`${url}`,{data:WxResult})
+          this.isStrat = false
+          if (url != "") {
+            this.$resetpost(`${url}`, {data: WxResult})
           }
           // 预约安检回更预约安检单
           if(this.data.isupdateplanitem == 'true' && this.data.f_SafeToRepair_id){
@@ -1364,27 +1346,27 @@ export default {
               }
             })
           }
-          if(this.isToRepair){
-            for (let device in this.data){
-              if(device.startsWith("device")){
+          if (this.isToRepair) {
+            for (let device in this.data) {
+              if (device.startsWith("device")) {
                 this.data[device] = []
-                if(res.data.length > 0){
-                  for(let i in res.data[0].f_devices){
-                    if(this.data[device].length > 0){
-                      if(this.data[device][0].f_device_type == res.data[0].f_devices[i].f_device_type){
+                if (res.data.length > 0) {
+                  for (let i in res.data[0].f_devices) {
+                    if (this.data[device].length > 0) {
+                      if (this.data[device][0].f_device_type == res.data[0].f_devices[i].f_device_type) {
                         this.data[device].push(res.data[0].f_devices[i])
-                        res.data[0].f_devices.splice(i,1)
+                        res.data[0].f_devices.splice(i, 1)
                       }
-                    }else{
+                    } else {
                       this.data[device].push(res.data[0].f_devices[i])
-                      res.data[0].f_devices.splice(i,1)
+                      res.data[0].f_devices.splice(i, 1)
                     }
                   }
                 }
               }
             }
             this.todo()
-          }else{
+          } else {
             this.$showMessage('安检上传成功!')
             if (this.data.f_userinfoid){
               let http = new HttpResetClass()
@@ -1409,7 +1391,8 @@ export default {
                         let param = {}
                         param = res.data[0]
                         param.f_new_tablebase = _this.data.f_new_tablebase
-                        param.tabname="在线抄表"
+                        param.tabname="在线抄表",
+                        param.f_result_state="安检回量"
                         var pardate = {
                           _this:this,
                           tittle:'抄表单信息',
@@ -1448,8 +1431,7 @@ export default {
           this.$showMessage('网络异常，请缓存后重新尝试上传，多次上传失败请联系管理员!')
           this.onlySave = true
           return
-        }
-        else{
+        } else {
           this.$showMessage('上传失败！')
         }
       }else {
@@ -1457,31 +1439,31 @@ export default {
       }
       this.onlySave = true
     },
-    safecheckToRepairCallBack(jo){
+    safecheckToRepairCallBack(jo) {
       //获取微信推送路径
-      if(jo.state == 'ok'){
+      if (jo.state == 'ok') {
         let res = JSON.parse(jo.result)
-        if(res.code == 200){
-          if(res.data.code == 200){
+        if (res.code == 200) {
+          if (res.data.code == 200) {
             this.$showMessage('上传并转维修成功！')
-          }else{
+          } else {
             this.$showMessage('上传并转维修成功，回写安检单失败！')
           }
           this.$dispatch('confirm')
-        }else{
+        } else {
           this.$showMessage('上传失败！')
           this.onlySave = true
         }
-      }else{
+      } else {
         this.$showMessage('网络异常,上传失败！')
         this.onlySave = true
       }
     },
-    todo(){
+    todo() {
       let gen = getRepairParam(this)
       co(gen)
     },
-    undo(){
+    undo() {
       this.showCheckToRepair = !this.showCheckToRepair
       this.model.serviceacitivity[0].f_reciever = ''
       this.model.serviceacitivity[0].f_meetunit = ''
@@ -1517,26 +1499,60 @@ export default {
       return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
     },
     extend(initalObj, finalObj) {
-      var obj = finalObj || {};
-      for (var i in initalObj) {
-        var prop = initalObj[i];
+      initalObj.forEach(item2 => {
+        const item1 = finalObj.find(item => item.itemname === item2.itemname);
 
-        // 避免相互引用对象导致死循环，如initalObj.a = initalObj的情况
-        if (prop === obj) {
-          continue;
+        if (!item1) {
+          finalObj.push(item2);
+        } else {
+          // 对 item2 的 items 进行逆序遍历
+          item2.items.slice().forEach(subItem2 => {
+            const subItem1Index = item1.items.findIndex(subItem => subItem.itemname === subItem2.itemname);
+
+            if (subItem1Index > -1) {
+              // 如果找到匹配的 subItem1，用 subItem2 替换它
+              item1.items[subItem1Index] = subItem2;
+            } else {
+              // 如果没有找到，将 subItem2 插入到 item1.items 的前面
+              item1.items.push(subItem2);
+            }
+          });
         }
+      });
 
-        if (typeof prop === 'object') {
-          if (obj[i]) {
-            this.extend(obj[i], prop)
-          } else {
-            obj[i] = prop;
-          }
+      return finalObj;
+    },
+    removeNestedItem(arr, itemname1, itemname2) {
+      // 创建一个新数组以避免修改原始数组
+      const newArr = arr.map(item => {
+        // 复制每个项目以避免直接修改它们
+        const newItem = { ...item };
+
+        // 检查外层itemname是否匹配
+        if (newItem.itemname === itemname1 && Array.isArray(newItem.items)) {
+          // 过滤掉匹配的内层itemname
+          newItem.items = newItem.items.filter(subItem => subItem.itemname !== itemname2);
         }
-      }
-      return obj;
+        return newItem;
+      });
+      return newArr;
     },
-    putDevices() {
+    removeByCollectionType(arr, collectionType) {
+      // 创建一个新数组以避免修改原始数组
+      const newArr = arr.map(item => {
+        // 复制每个项目以避免直接修改它们
+        const newItem = {...item};
+
+        // 检查外层itemname是否匹配
+        if (newItem.itemname === '燃气表' && Array.isArray(newItem.items)) {
+          // 过滤掉匹配的内层itemname
+          newItem.items = newItem.items.filter(subItem => !subItem.unique || subItem.collectionType == collectionType);
+        }
+        return newItem;
+      });
+      return newArr;
+    },
+    async putDevices() {
       this.$set('data.approve', "true")
       this.$set('data.writeback', "false")
       if (Vue.config.safecheck != undefined) {
@@ -1560,46 +1576,60 @@ export default {
             this.refuseinspection = Vue.config.safecheck.ApproveConfig.refuseinspection
           }
         }
-        if(this.item.f_user_type == '非民用'){
-          // 非民用
-          if (Vue.config.safecheck.DevicesSetConfig != undefined){
-            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
-              this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
-            }else{
-              this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
-            }
-          }
 
-        }else{
-          // 民用户
-          if (Vue.config.safecheck.DevicesConfig != undefined){
-            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
-              this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
-            }else{
-              this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type?this.item.f_user_type:'民用']])
-            }
+        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('获取配置文件失败，请返回后重新进入！多次失败请联系管理员')
+          }
+          this.config = this.extend(JSON.parse(this.serverConfig.data.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('获取配置文件失败，请返回后重新进入！多次失败请联系管理员')
           }
         }
-
       }
-      // 预留设备项位置
+    },
+    async getSecurityCheckType(url, data) {
+      let res = await new HttpResetClass().http('POST', url,
+        data,
+        {resolveMsg: null, rejectMsg: '网络异常'})
+      if (typeof res === 'object') {
+        this.serverConfig = res
+      } else {
+        this.serverConfig = JSON.parse(res)
+      }
+    },
+    initConfig() {
       for (let i in this.config) {
-        this.tabs.splice(1,0,null)
+        this.tabs.splice(1, 0, null)
       }
-      //遍历安检项配置
       for (let i in this.config) {
         //取得安检项索引值
-        let n = this.config[i].index
-        this.devices[n - 1] = {device: i, n: n, checkmust: this.config[i].checkmust}
+        let n = parseInt(i) + 1
+        //tag
+        this.devices[n - 1] = {device: parseInt(i), n: n, checkmust: this.config[i].checkmust}
         this.$set('data.' + 'device' + n, [])
         this.tabs[n] = {
-          header: i,
+          header: this.config[i].itemname,
           complete: 'safecheck-devices',
           class: 'repair-details-class',
           number: n
         }
 
-        if(this.config[i].quantity &&  this.config[i].quantity >0){
+        if (this.config[i].quantity && this.config[i].quantity > 0) {
+
           let items = []
           for (let it in this.config[i].items) {
             //赋值下拉选项
@@ -1607,9 +1637,9 @@ export default {
               for (let op in this.config[i].items[it].options) {
                 if (this.config[i].items[it].options[op].isdefault == true) {
                   items.push({
-                    f_defect_level: this.config[i].items[it].options[op].level,
+                    f_defect_level: this.config[i].items[it].level,
                     f_is_defect: this.config[i].items[it].options[op].isdefect,
-                    f_item_name: it,
+                    f_item_name: this.config[i].items[it].itemname,
                     f_item_value: this.config[i].items[it].options[op].data,
                     f_path: "",
                     type: "selector"
@@ -1618,9 +1648,11 @@ export default {
               }
             }
           }
-          for(let q =0;q<this.config[i].quantity;q++) {
+          for (let q = 0; q < this.config[i].quantity; q++) {
             this.data['device' + n].push(
-              {f_device_type: i, f_items:items}
+              {
+                f_device_type: this.config[i].itemname, f_items: items
+              }
             )
           }
         }
@@ -1708,7 +1740,7 @@ export default {
             if (this.item.f_plan_meters[i].f_meter_type) {
               this.data.f_meter_type=this.item.f_plan_meters[i].f_meter_type
               //tag)
-              if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') >= 0) {
+              if (this.config[this.devices[de].device].itemname == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') > 0) {
                 this.data['device' + this.devices[de].n].push({
                   f_device_type: "燃气表",
                   f_items: [
@@ -1768,8 +1800,7 @@ export default {
                     }
                   ]
                 })
-              }
-              else if (this.devices[de].device == "燃气表") {
+              } else if (this.config[this.devices[de].device].itemname == "燃气表") {
                 this.data['device' + this.devices[de].n].push({
                   f_device_type: "燃气表",
                   f_items: [
@@ -1830,15 +1861,15 @@ export default {
                   ]
                 })
               }
-              if(this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('物联网表') >= 0){
+              if(this.config[this.devices[de].device].itemname == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('物联网表') >= 0){
                 this.data['device' + this.devices[de].n].forEach(device => {
                   if (!this.data.f_collection_type) {
                     this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
-                    delete this.config['燃气表']['items']['累购气量']
-                    delete this.config['燃气表']['items']['已用金额']
-                    delete this.config['燃气表']['items']['剩余气量']
-                    delete this.config['燃气表']['items']['气量异常差值']
-                    delete this.config['燃气表']['items']['金额异常差值']
+                    this.config = this.removeNestedItem(this.config, '燃气表', '累购气量')
+                    this.config = this.removeNestedItem(this.config, '燃气表', '已用金额')
+                    this.config = this.removeNestedItem(this.config, '燃气表', '剩余气量')
+                    this.config = this.removeNestedItem(this.config, '燃气表', '气量异常差值')
+                    this.config = this.removeNestedItem(this.config, '燃气表', '金额异常差值')
                     device.f_items.push(
                       {
                         f_defect_level: null,
@@ -1889,7 +1920,8 @@ export default {
                     )
                   }
                 })
-              } else if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
+              }
+              else if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
                 this.data['device' + this.devices[de].n].forEach(device => {
                   /*
                     "累购气量":{"index":8,"type":"number","readonly":true},
@@ -1904,11 +1936,8 @@ export default {
                   if (this.item.f_plan_meters[i].f_collection_type == '按金额') {
                     if (!this.data.f_collection_type) {
                       this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
-                      delete this.config['燃气表']['items']['累购气量']
-                      delete this.config['燃气表']['items']['已用气量']
-                      delete this.config['燃气表']['items']['剩余气量']
-                      delete this.config['燃气表']['items']['气量异常差值']
-                      delete this.config['燃气表']['items']['系统余额']
+                      this.config = this.removeNestedItem(this.config, '燃气表', '系统余额')
+                      this.config = this.removeByCollectionType(this.config, this.data.f_collection_type)
                       device.f_items.push(
                         {
                           f_defect_level: null,
@@ -1957,16 +1986,14 @@ export default {
                           type: "number"
                         }
                       )
+                      //tag)
                     }
                   } else
                   if (this.item.f_plan_meters[i].f_collection_type == '按气量') {
                     if (!this.data.f_collection_type) {
                       this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
-                      delete this.config['燃气表']['items']['累购金额']
-                      delete this.config['燃气表']['items']['已用金额']
-                      delete this.config['燃气表']['items']['剩余金额']
-                      delete this.config['燃气表']['items']['金额异常差值']
-                      delete this.config['燃气表']['items']['系统余额']
+                      this.config = this.removeNestedItem(this.config, '燃气表', '系统余额')
+                      this.config = this.removeByCollectionType(this.config, this.data.f_collection_type)
                       device.f_items.push(
                         {
                           f_defect_level: null,
@@ -2018,15 +2045,12 @@ export default {
                     }
                   }
                 })
-              } else if(this.devices[de].device == "燃气表"){
+              } else if(this.config[this.devices[de].device].itemname == "燃气表"){
                 this.data['device' + this.devices[de].n].forEach(device => {
                   if (!this.data.f_collection_type) {
                     this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
-                    delete this.config['燃气表']['items']['累购金额']
-                    delete this.config['燃气表']['items']['已用金额']
-                    delete this.config['燃气表']['items']['剩余金额']
-                    delete this.config['燃气表']['items']['金额异常差值']
-                    delete this.config['燃气表']['items']['系统余额']
+                    this.config = this.removeNestedItem(this.config, '燃气表', '系统余额')
+                    this.config = this.removeByCollectionType(this.config, this.data.f_collection_type)
                     device.f_items.push(
                       {
                         f_defect_level: null,
@@ -2087,12 +2111,12 @@ export default {
     }
   },
   watch: {
-    'row' () {
+    'row'() {
       //tag
       this.copy()
     }
   },
-  async ready () {
+  async ready() {
     try {
       if (this.item.f_userinfoid){
         let http = new HttpResetClass()
@@ -2118,7 +2142,7 @@ export default {
     }
     //送气超期功能
     //await this.isoverDate()
-    this.putDevices()
+    await this.putDevices()
     //如果已检，则提取安检单
     if (this.item.f_state != '未检') {
       if (this.role == 'inspect' || this.role == 'androidview') {
@@ -2138,61 +2162,39 @@ export default {
         Util.replaceFalse(value)
         if (value.data.length != 0) {
           that.$set('data', value.data[0])
-          if (this.data.f_collection_type == '按气量') {
-            delete this.config['燃气表']['items']['累购金额']
-            delete this.config['燃气表']['items']['已用金额']
-            delete this.config['燃气表']['items']['剩余金额']
-            delete this.config['燃气表']['items']['金额异常差值']
-            delete this.config['燃气表']['items']['系统余额']
-          } else if (this.data.f_collection_type == '按金额') {
-            delete this.config['燃气表']['items']['累购气量']
-            delete this.config['燃气表']['items']['已用气量']
-            delete this.config['燃气表']['items']['剩余气量']
-            delete this.config['燃气表']['items']['气量异常差值']
-            delete this.config['燃气表']['items']['系统余额']
-          }
-          //tag)
+          this.config = this.removeByCollectionType(this.config, this.data.f_collection_type)
           if (value.data[0].f_devices) {
             for (let da in that.devices) {
-              if(typeof that.devices[da]=='function'){
+              if (typeof that.devices[da] == 'function') {
                 continue
               }
               that.$set('data.device' + that.devices[da].n, [])
             }
             value.data[0].f_devices.forEach((item) => {
               for (let i in item.f_items) {
-                if(typeof item.f_items[i]=='function'){
+                if (typeof item.f_items[i] == 'function') {
                   continue
                 }
-                for (let de in that.config[item.f_device_type].items) {
-                  if(typeof that.config[item.f_device_type].items[de]=='function'){
+               let items = this.config.find(obj => obj.itemname === item.f_device_type).items;
+                for (let de in items) {
+                  if (typeof items[de] == 'function') {
                     continue
                   }
-                  if (item.f_items[i].f_item_name == de) {
-                    if (that.config[item.f_device_type].items[de].type == 'selector' || that.config[item.f_device_type].items[de].type == 'checkbox') {
+                  if (item.f_items[i].f_item_name == items[de].itemname) {
+                    if (items[de].type == 'selector' || items[de].type == 'checkbox') {
                       item.f_items[i].f_item_value = []
-                    } else {
-                      item.f_items[i].f_item_value = ''
                     }
                   }
                 }
-                for (let j in item.f_items[i].f_item_lists) {
-                  if(typeof item.f_items[i].f_item_lists[j]=='function'){
-                    continue
-                  }
-                  if (item.f_items[i].f_item_value instanceof Array) {
-                    item.f_items[i].f_item_value.push(item.f_items[i].f_item_lists[j].f_item_value)
-                  } else {
-                    item.f_items[i].f_item_value = item.f_items[i].f_item_lists[j].f_item_value
-                  }
+                if (item.f_items[i].f_item_value instanceof Array) {
+                  item.f_items[i].f_item_value = JSON.parse(item.f_items[i].f_selected)
                 }
-
               }
               for (let de in that.devices) {
-                if(typeof that.devices[de]=='function'){
+                if (typeof that.devices[de] == 'function') {
                   continue
                 }
-                if (that.devices[de].device == item.f_device_type) {
+                if (this.config[that.devices[de].device].itemname == item.f_device_type) {
                   that.data['device' + that.devices[de].n].push({
                     f_device_type: item.f_device_type,
                     f_items: item.f_items
@@ -2212,15 +2214,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
@@ -2228,10 +2230,10 @@ export default {
         if (this.role == 'view') {
           id = this.item.id
         }
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data:{condition:`id = '${id}'`}}).then((respanse)=> {
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
             if (respanse.data.length != 0) {
-              that.data = Object.assign(that.data,respanse.data[0])
-              if(respanse.data[0].f_devices) {
+              that.data = Object.assign(that.data, respanse.data[0])
+              if (respanse.data[0].f_devices) {
                 for (let da in that.devices) {
                   that.$set('data.device' + that.devices[da].n, [])
                 }
@@ -2248,10 +2250,10 @@ export default {
               }
               Util.replaceFalse(that.data)
               Util.booleanFilter(that.data)
-              if(this.role == 'view'){
+              if (this.role == 'view') {
                 Util.ratifyPics(that.data)
-              }else{
-                Util.androidRatifyPics(that.data,this.$androidUtil.getProxyUrl())
+              } else {
+                Util.androidRatifyPics(that.data, this.$androidUtil.getProxyUrl())
               }
             } else {
               alert("该安检单可能已不在本地!")
@@ -2292,6 +2294,7 @@ export default {
 .noclickbut {
   pointer-events: none;
 }
+
 .tab-befor-img (@url) {
   content: '';
   background-image: url("@{url}");
@@ -2310,16 +2313,19 @@ export default {
     margin: 0.3em 0;
   }
 }
-.repair-details-class{
+
+.repair-details-class {
   &::before {
     .tab-befor-img("../../../assets/huneiweixiu1.png");
   }
 }
+
 .repair-info-class {
   &::before {
     .tab-befor-img("../../../assets/baoxiuxinxi1.png");
   }
 }
+
 .repair-user-info-class {
   &::before {
     .tab-befor-img("../../../assets/jibenxinxi1.png")
@@ -2371,11 +2377,13 @@ export default {
     .tab-befor-img("../../../assets/guzhanghuizong1.png")
   }
 }
+
 .photo-write-class {
   &::before {
     .tab-befor-img("../../../assets/zaoju.png")
   }
 }
+
 .delay-apply-class {
   &::before {
     .tab-befor-img("../../../assets/yonghubaoxiu.png")
@@ -2387,44 +2395,49 @@ export default {
     .tab-befor-img("../../../assets/fanhui.png")
   }
 }
+
 .butt2 {
   display: inline;
   float: right;
   width: 10px;
   text-align: center;
-  align-items:center;
+  align-items: center;
   position: absolute;
-  top:50%;
+  top: 50%;
 
-  left:90%;
-  transform: translate(-50%,-50%);
+  left: 90%;
+  transform: translate(-50%, -50%);
 }
-.linesty{
+
+.linesty {
   display: inline-block;
-  height:1px;
-  width:100%;
-  background:#d0d0d0;
-  overflow:hidden;
+  height: 1px;
+  width: 100%;
+  background: #d0d0d0;
+  overflow: hidden;
   vertical-align: middle;
 }
-.spanboder{
-  border-bottom:2px solid #499edf;
+
+.spanboder {
+  border-bottom: 2px solid #499edf;
   padding-bottom: 8px
 }
+
 .app-botton {
-  position:fixed;
+  position: fixed;
   background: #87b2dd;
-  right:8px;
+  right: 8px;
   color: #FFF;
   padding: 8px;
   text-align: center;
   font-size: 1.2em;
   z-index: 10;
-  opacity:0.5;
+  opacity: 0.5;
   bottom: 50px;
   margin-top: -10px;
   height: 40px;
 }
+
 .android-repair-order > div > ul a {
   font-size: 12px;
   color: #333333;