safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/{filiale/wenxi/android/SafecheckOrderV.vue → components/outsideSafecheck/android/safecheckWaitWork/SafecheckOrderVTS.vue}

@@ -2,7 +2,7 @@
   <!--<div class="app-botton" @click="back()">-->
   <!--返回<span class="glyphicon glyphicon-menu-right"></span>-->
   <!--</div>-->
-  <div class="no-close row android-repair-order" style="background-color: #f9f9f9">
+  <div id="savebut" class="no-close row android-repair-order" style="background-color: #f9f9f9">
     <div class="col-sm-12 col-xs-12" >
       <ul class="nav nav-tabs" style="background:#ffffff;overflow-y: hidden">
         <li v-for="row in tabs" @click="tabSelect(row,$index)" :class="{active1: row.complete === componentName}"
@@ -36,27 +36,27 @@
                   <!--<label>请输入超期原因:</label><br/>-->
                   <!--<textarea style="width: 100%;" v-model=""></textarea>-->
                   <!--</div>-->
-                  <div id="savebut" class="col-xs-12 col-sm-12 col-md-12 flex-between" style="margin-top: 20px;">
-                    <div class="col-xs-3 col-sm-3 col-md-3">
-                      <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="save('temp')">
+                  <div  class="col-xs-12 col-sm-12 col-md-12 flex-between" style="margin-top: 20px;justify-content: space-around;">
+                    <div class="col-xs-3 col-sm-3 col-md-3"  v-if="buttonState" v-show="buttonsty">
+                      <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="save('temp')" >
                         临时保存
                       </button>
                     </div>
-                    <div class="col-xs-3 col-sm-3 col-md-3">
-                      <button class="col-sm-3 btn btn-primary" @click="save('finish')">
+                    <div class="col-xs-3 col-sm-3 col-md-3"  v-show="buttonsty">
+                      <button class="col-sm-3 btn btn-primary" @click="save('finish')" >
                         本地缓存
                       </button>
                     </div>
-                    <!--                    <div class="col-xs-3 col-sm-3 col-md-3">
-                                          <button class="col-sm-3 btn btn-primary" @click="closely()">
-                                            关闭录音
-                                          </button>
-                                        </div>-->
-                    <div class="col-xs-3 col-sm-3 col-md-3">
-                      <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="uploadCheckPaper">
+                    <div class="col-xs-3 col-sm-3 col-md-3"  v-show="buttonsty">
+                      <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="uploadCheckPaper" >
                         上传
                       </button>
                     </div>
+                    <!-- <div class="col-xs-3 col-sm-3 col-md-3" v-show="isdisable">
+                       <button type="button" name="button" class="col-sm-3 btn btn-primary">
+                         上传
+                       </button>
+                     </div>-->
                   </div>
                 </div>
               </div>
@@ -72,57 +72,38 @@
 <script>
 // 户内维修
 import Vue from 'vue'
-import * as Util from '../../../components/Util'
-// import DoorService from './DoorService'
-// import Pipeline from './Pipeline'
-// import DeviceService from './DeviceService'
-// import TroubleRemoval from './TroubleRemoval'
-// import FirstGasCheck from './FirstGasCheck'
-// import RepairMatterInfo from './RepairMatterInfo'
-// import TelChangeMatter from './TelChangeMatter'
+import * as Util from '../../../Util'
+import $ from 'jquery'
 import { HttpResetClass } from 'vue-client'
 import co from 'co'
-import $ from "jquery";
 let loadParamGem = async function (self) {
   await self.$LoadParams.loadParam()
 }
 
 export default {
   title: '安检单',
-  props: ['f_plan_id', 'item', 'role'],
-  // props: ['f_plan_id', 'role'],
+  props: ['f_plan_id', 'item', 'role','buttonState'],
   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:'',
-        f_recording1_path:''
+        f_repaired:''
       },
-      updateuserphone:false, //安检时是否更新用户电话
-      beforephone:'',
+      classnodu:false,
+      showmodel:false, // 控制用户基本信息中的拉黑框
+      backlistisselect:false, // 是否选择拉黑用户
+      enabled:false,//控制限制购气是否可选
+      cause:'',      // 拉黑备注
+      isdisable:false,
+      buttonsty:true,
       isUpload:false,
       onlySave:true, //判断保存还是保存并上传
       livedispose:'',
       startClick:false, //开始安检按钮是否可点击
       isStrat: false, //是否开始安检
       checkResult:{},//查询结果
+      paper_f_repaired: '', // 安检单的f_repaired字段
       newcheckResult:{},
       timer: null,
       showModal: false,
@@ -179,18 +160,19 @@ export default {
             "气表型号":{"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":5,"type":"number","isshow":false,"readonly":true},
+            "上期表读数":{"index":5,"type":"number","readonly":true,isshow:false},
+            "户累购气量":{"index":6,"type":"number","readonly":true},
+            "户累购金额":{"index":6,"type":"number","readonly":true},
             "累购气量":{"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":8,"type":"number","checkmust": true},//基表数
+            "已用金额":{"index":8,"type":"number","checkmust": true},
+            "剩余气量":{"index":9,"type":"number","checkmust": true},//累购-已用
             //显示屏数  --实际剩余气量
-            "剩余金额":{"index":9,"type":"number","checkmust": false},
+            "剩余金额":{"index":9,"type":"number","checkmust": true},
             "气量异常差值":{"index":10,"type":"number","readonly": true},
-            "金额异常差值":{"index":10,"type":"number","readonly": true},
-            "表箱号":{"index":11,"type":"string","readonly": true}
+            "金额异常差值":{"index":10,"type":"number","readonly": true}
           }
           // 注意，配置项的index必须与上面的固定配置保持'顺序'
         },
@@ -226,15 +208,17 @@ export default {
       doordetails: {},
       devicedetails: {},
       cookdetails: {},
-      componentName: 'safecheck-userinfo',
+      valueInfo:{},
+      componentName: 'safecheck-userinfo-ts',
       header:'客户信息',
       tabs: [
+
         // 参数全部设置成空，在ready时，等model处理好了，再添加
         {
-          header: '客户信息',complete:'safecheck-userinfo',class: 'repair-info-class', props: null
+          header: '客户信息',complete:'safecheck-userinfo-ts',class: 'repair-info-class', props: null
         },
         {
-          header: '拍照签名',complete:'paper-feedback', class: 'outlay-class', props: null
+          header: '拍照签名',complete:'paper-feedback-ts', class: 'outlay-class', props: null
         }
       ],
       faultshow:{
@@ -250,34 +234,7 @@ export default {
     }
   },
   methods: {
-    closely(){
-      console.log("关闭录音方法，")
-      this.$androidUtil.setPreference("audioClipShouldStop","true");
-    },
-    // 录音方法
-    record() {
-      console.log("进入开始录音record方法")
-      if (this.role != 'inspect') {
-        if (this.data.f_recording1_path != '') {
-          window.location = "/rs/file"+this.data.f_recording1_path
-        }
-      } else {
-        console.log("录音 record的 else")
-        let fileName
-        if (!this.data.f_recording1_path) {
-          fileName = Util.guid() + '.amr'
-        } else {
-          fileName = Util.getFileName(this.data.f_recording1_path)
-        }
-        //HostApp.__this__ = this
-        /*调用无限制录音模块*/
-        let startOrStopState = HostApp.startOrStopAudioClip(fileName)
-        console.log("录音返回"+JSON.stringify(startOrStopState))
-        if (startOrStopState.code==200){
-          this.data.f_recording1_path =  "file:///storage/emulated/0/safecheck/" + fileName
-        }
-      }
-    },
+
     saveNoclick() {
       // 禁用点击事件
       $("#savebut").addClass("noclickbut");
@@ -286,8 +243,9 @@ export default {
       // 5秒后启用点击事件
       setTimeout(function(){
         $("#savebut").removeClass("noclickbut");
-      },5000);
+      },10000);
     },
+
     timeSet(val){
       if (!val){
         return
@@ -300,9 +258,9 @@ export default {
     },
     imgback(val,isheader){
       if(val && this.routeShow && isheader){
-        return require('../../../assets/xiangxia1.png')
+        return require('../../../../assets/xiangxia1.png')
       }else{
-        return require('../../../assets/xiangyou1.png')
+        return require('../../../../assets/xiangyou1.png')
       }
     },
     changediv(val){
@@ -311,51 +269,72 @@ export default {
     },
     // 选择tab
     tabSelect (item,number) {
-      this.header = item.header
-      console.log('item',item)
-      console.log('number',number)
-      console.log('this.routeShow',this.routeShow)
-      console.log('this.number',this.number)
-      // 处理关闭/显示 内容
-      if(this.number == number && !this.routeShow ){
-        this.routeShow = true
-      }else if(this.number == number && this.routeShow){
-        this.routeShow = false
-      }else if(this.number != item.complete){
-        this.routeShow = true
-      }
-      this.number = number
-      this.componentName = item.complete
-      console.log('跳转前this.routeShow',this.routeShow)
-      if(item.complete == 'safecheck-devices'){
-        console.log('this.data', this.data)
-        if(item.header != '燃气表' && this.data['device'+item.number].length == 0){
-          this.data['device' + item.number].push({})
-        }
-        console.log('length', this.data['device' + item.number])
-        console.log('this.data[\'device\' + item.number] ===> ' + JSON.stringify(this.data['device' + item.number]))
-        let idx=this.data['device' + item.number].length - 1
-        let itemprops = {
-          config:this.config,
-          device:this.devices[item.number-1],
-          idx:idx,
-          role:'inspect'
-        }
-        console.log('tabSelect函数中赋值')
-        console.log(JSON.stringify(itemprops))
-        console.log('itemprops.device ===> ' + JSON.stringify(itemprops.device))
-        console.log('item.complete',item.complete)
-        if(this.routeShow){
-          this.$goto(item.complete, itemprops, 'repair')
-          console.log('跳转完成')
-        }
+      if(this.data.f_entry_status != '入户'){
+        this.$showMessage("非入户状态，拍完照后请直接进行上传！")
+        return
       }else{
-        console.log('页面跳转==》',this.tabs[number])
-        if(this.routeShow){
-          this.$goto(item.complete, {userinfo:this.data}, 'repair')
+        this.header = item.header
+        console.log('item',item)
+        console.log('number',number)
+        console.log('this.routeShow',this.routeShow)
+        console.log('this.number',this.number)
+        // 处理关闭/显示 内容
+        if(this.number == number && !this.routeShow ){
+          this.routeShow = true
+        }else if(this.number == number && this.routeShow){
+          this.routeShow = false
+        }else if(this.number != item.complete){
+          this.routeShow = true
         }
+        this.number = number
+        this.componentName = item.complete
+        console.log('跳转前this.routeShow',this.routeShow)
+        if(item.complete == 'safecheck-devices-ts'){
+          console.log('this.data', this.data)
+          if(item.header != '燃气表' && this.data['device'+item.number].length == 0){
+            this.data['device' + item.number].push({})
+          }
+          console.log('length', this.data['device' + item.number])
+          console.log('this.data[\'device\' + item.number] ===> ' + JSON.stringify(this.data['device' + item.number]))
+          let idx=this.data['device' + item.number].length - 1
+          let itemprops = {
+            config:this.config,
+            device:this.devices[item.number-1],
+            idx:idx,
+            role:'inspect'
+          }
+          console.log('tabSelect函数中赋值')
+          console.log(JSON.stringify(itemprops))
+          console.log('itemprops.device ===> ' + JSON.stringify(itemprops.device))
+          console.log('item.complete',item.complete)
+          if(this.routeShow){
+            this.$goto(item.complete, itemprops, 'repair')
+            console.log('跳转完成')
+          }
+        }else{
+          console.log('页面跳转==》',this.tabs[number])
+          if(this.routeShow){
+            this.$goto(item.complete, {userinfo:this.data}, 'repair')
+          }
+        }
+        this.shupingshow = true
+      }
+
+    },
+    getClassimg(val){
+      if (val=='保险服务'){
+        return 'baoxian-details-class'
       }
-      this.shupingshow = true
+      if (val=='燃气表'){
+        return 'ranqibiao-details-class'
+      }
+      if (val=='燃气器具信息'){
+        return 'ranqiqiju-details-class'
+      }
+      if (val=='附属设备信息'){
+        return 'fushushebei-details-class'
+      }
+      return 'repair-details-class'
     },
     // 给组件添加参数
     getImgPath() {
@@ -369,7 +348,7 @@ export default {
     },
     getImgGen(){
       let http = new HttpResetClass()
-      http.load('POST','rs/sql/tel_singleTable_OrderBy', {data: {
+      http.load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy', {data: {
           items: '*',
           tablename: 't_files',
           condition: `id in (${this.ids})`,
@@ -417,7 +396,6 @@ export default {
       }
       this.$showMessage('所填写内容将不可恢复！', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
-          this.closely()
           _this.$back()
         }
       })
@@ -465,20 +443,15 @@ export default {
         return  '到访不遇必须拍照'
     },
     verifyUser() {
-      console.log('走了校验')
-      console.log(this.data.f_user_phone)
-      console.log(/^\d{11}$/.test(this.data.f_user_phone))
       let prefix = '用户基本信息：'
-      if(Util.required(this.data.f_user_name))
-        return prefix + '用户名必须输入'
-      if(!(/^\d{11}$/.test(this.data.f_user_phone))) {
-
-        return '请输入正确的电话号码'
-      }
+      // if(Util.required(this.data.f_user_name))
+      //   return prefix + '用户名必须输入'
+      if(Util.required(this.data.f_user_phone))
+        return prefix + '用户电话必须输入'
       // if(Util.required(this.data.f_residential_area))
       //   return prefix + '小区名称必须输入'
-      if(Util.required(this.data.f_address))
-        return prefix + '地址必须输入'
+      // if(Util.required(this.data.f_address))
+      //   return prefix + '地址必须输入'
     },
     verifyDevices() {
       for (let dev in this.config) {
@@ -505,10 +478,41 @@ export default {
             for (let item in this.data[device]) {
               //检查每一条安检结果
               if (this.data[device].length != 0 && this.data[device][item].f_device_type == dev) {
+                let idx=0
                 for (let i in this.data[device][item].f_items) {
+                  console.log("idx---------------------------------"+idx)
+                  if(idx!=0){
+                    idx=idx-1
+                    console.log("idx---"+idx)
+                    continue
+                  }
                   for (let it in this.config[dev].items) {
                     if (it == this.data[device][item].f_items[i].f_item_name) {
-                      if (this.config[dev].items[it].checkmust == true && !this.data[device][item].f_items[i].f_item_value) {
+                      console.log("-----this.data[device][item].f_items[i].f_item_name-----"+this.data[device][item].f_items[i].f_item_name)
+                      console.log("-----it-----"+it)
+                      console.log("-----this.config[dev].items[it]-----"+JSON.stringify(this.config[dev].items[it]))
+                      console.log("-----this.data[device][item].f_items[i]-----"+JSON.stringify(this.data[device][item].f_items[i]))
+                      if(this.data[device][item].f_items[i].correlation){
+                        console.log("----1--"+this.data[device][item].f_items[i].correlation)
+                        console.log("----1--"+JSON.stringify(this.data[device][item].f_items[i].options))
+                        for(let x=0 ;x<this.data[device][item].f_items[i].options.length;x++){
+                          console.log("---2---"+this.data[device][item].f_items[i].options[x].value)
+                          console.log("---2---"+this.data[device][item].f_items[i].f_item_value)
+                          if(this.data[device][item].f_items[i].options[x].value==this.data[device][item].f_items[i].f_item_value){
+                            console.log("---2---"+this.data[device][item].f_items[i].options[x].selcorrelation)
+                            console.log("---2---"+JSON.stringify(this.data[device][item].f_items[i].options[x]))
+                            if(this.data[device][item].f_items[i].options[x].selcorrelation){
+                              console.log("跳过子项非空判断")
+                              idx=this.data[device][item].f_items[i].correlationnum
+                              console.log("进入"+idx)
+                            }
+                          }
+                        }
+                      }
+                      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 && !this.data[device][item].f_items[i].f_item_value) {
                         return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + "未检查"
                       }
                     }
@@ -526,13 +530,13 @@ export default {
         }
       }
     },
-
-
     verifyFeedback() {
       let prefix = '拍照签名：'
       console.log('this.data.f_overall_imgs==>'+JSON.stringify(this.data.f_overall_imgs))
       if(Vue.android && (!this.data.f_overall_imgs || this.data.f_overall_imgs.length == 0) && this.data.f_entry_status == '入户')
         return prefix + '必须有安检总体照片'
+      if(Vue.android && this.data.f_overall_imgs.length<5 && this.data.f_entry_status == '入户')
+        return prefix + '总体安检照片低于5张照片禁止上传'
       if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
         return prefix + '必须有用户签名'
       if(Vue.android && this.data.f_defect_notified && this.data.f_notified_path == Vue.nopic)
@@ -542,7 +546,6 @@ export default {
       if(!this.data.f_client_evaluation && this.data.f_entry_status == '入户')
         return  prefix + '请选择服务评价'
     },
-
     getAllDefect() {
       let checkResults = {
         result: '正常',
@@ -554,6 +557,7 @@ export default {
       console.log('codata =====> ' + JSON.stringify(codata))
       codata.f_devices = []
       this.f_devices = []
+      this.paper_f_repaired = '' //默认安检单(t_check_paper)的f_repaired为未修（当这个安检单的每条安检项(t_device_items)的f_is_repaired有一条是需转维修，则安检单整体为未修，否则为''空串）
       for (let device in codata) {
         let f_device_type
         if (device.startsWith("device")) {
@@ -568,10 +572,7 @@ export default {
             // } else {
             //     f_device_type = codata[device][item].f_device_type
             // }
-            console.log("aaaaaaaaa"+device)
-            console.log("bbbbbbbbbb"+item)
-            console.log("ccccccccccc"+JSON.stringify(codata[device]))
-            console.log('codata[device][item]=>',JSON.stringify(codata[device][item]))
+            // console.log('codata[device][item]=>',codata[device][item])
             for (let i = 0; i < codata[device][item].f_items.length ; i++) {
               console.log('i' + i)
               if(i == 'sum'){
@@ -580,6 +581,7 @@ export default {
               console.log('codata[device][item].f_items' + JSON.stringify(codata[device][item].f_items))
               var items = codata[device][item].f_items[i]
               items.f_create_time = Util.toStandardTimeString()
+
               console.log('之前items' + JSON.stringify(items))
               items.f_item_lists = []
               console.log('之后items' + JSON.stringify(items))
@@ -621,6 +623,7 @@ export default {
                 for (let i in items.f_item_value) {
                   let configItems = this.config[codata[device][item].f_device_type].items[f_item_name]
                   console.log('configItems=====>' + JSON.stringify(configItems))
+
                   for (let k in configItems.options) {
                     console.log('configItems.options[k]==>' + JSON.stringify(configItems.options[k]))
                     if (items.f_item_value[i] === configItems.options[k].data) {
@@ -632,7 +635,6 @@ export default {
                       console.log('f_is_defect=====>' + f_is_defect)
                       console.log('f_item_value=====>' + f_item_value)
                       console.log('f_defect_level=====>' + f_defect_level)
-
                       if (f_is_defect) {
                         if (checkResults.result !== '有隐患') {
                           checkResults.result = '有隐患'
@@ -642,6 +644,7 @@ export default {
                           this.checkResult[f_item_name] = []
                         }
 
+
                         console.log(`The ${f_item_name} was pushed ${f_item_value}`)
                         this.checkResult[f_item_name].push(f_item_value)
 
@@ -675,12 +678,13 @@ export default {
               } else {
                 let configItems = this.config[codata[device][item].f_device_type].items[items.f_item_name]
                 console.log('configItems===>' + JSON.stringify(configItems))
-                f_is_defect = configItems.isdefect
-                f_defect_level = configItems.level
+                f_is_defect = items.f_is_defect
+                f_defect_level = items.f_defect_level
                 f_item_value = items.f_item_value
                 console.log('else f_is_defect=====>' + f_is_defect)
                 console.log('else f_defect_level=====>' + f_defect_level)
                 console.log('items.f_item_value==>' + items.f_item_value)
+
                 let items_list = {
                   f_is_defect: f_is_defect,
                   f_item_value: f_item_value,
@@ -689,9 +693,12 @@ export default {
                 }
                 if (f_is_defect && f_item_value) {
                   items.f_is_defect = true
+
                   if (checkResults.result !== '有隐患') {
                     checkResults.result = '有隐患'
+
                   }
+
                   if (!this.checkResult.hasOwnProperty(items.f_item_name)) {
                     console.log(`The ${items.f_item_name} initialized`)
                     this.checkResult[items.f_item_name] = []
@@ -721,6 +728,11 @@ export default {
                   }
                 }
               }
+              // 无隐患
+              if ( this.paper_f_repaired != '未修' && items.f_is_repaired == '需转维修' && (items.f_is_defect && (items.f_is_defect == true || items.f_is_defect == 'true')) ) {
+                //默认安检单(t_check_paper)的f_repaired为空串（当这个安检单的每条安检项(t_device_items)的f_is_repaired有一条是需转维修，则安检单整体为未修，否则为''空串）
+                this.paper_f_repaired = '未修'
+              }
               if (hasOther !== '' && otherValue !== null) {
                 console.log(`The other value was pushed.`)
                 this.checkResult[hasOther].push(otherValue)
@@ -752,14 +764,17 @@ export default {
       console.log(`typeof-checkResults-->${typeof checkResults}`)
       console.log('checkResults ==> ' + JSON.stringify(checkResults))
       codata.f_defect_content = JSON.stringify(checkResults)
+      codata.f_repaired = this.paper_f_repaired  //
       this.data.f_defect_content = JSON.stringify(checkResults)
+      this.data.f_repaired = this.paper_f_repaired
       console.log('f_defect_content' + codata.f_defect_content)
       return codata
     },
     uploadCheckPaper(){
       this.saveNoclick()
-      console.log('禁用事件完成')
       console.log('进入上传')
+      // 进入上传后，设置上传按钮显示值 isdisable
+      this.isdisable = true
       let errString = this.errorVerify()
       if (errString) {
         console.log(errString)
@@ -770,7 +785,10 @@ export default {
           //   this.isUpload = false
           // }
           this.$showMessage(errString)
+          this.isdisable = false
         }
+        this.isdisable = false
+        $("#savebut").removeClass("noclickbut");
         return
       } else {
         this.$set('data.f_offsite_time', Util.toStandardTimeString())
@@ -780,7 +798,7 @@ export default {
         this.data.f_complete = '已完成'
         this.disableTimer()
       }
-      console.log('uploadCheckPaper-->isUpload'+this.isUpload)
+      console.log('uploadCheckrr-->isUpload'+this.isUpload)
       this.onlySave = false
       let res =  this.save()
       // if(res) {
@@ -926,11 +944,8 @@ export default {
       // }
     },
     save(type) {
-      // 关闭录音方法
-      this.closely()
-      //禁用事件
       this.saveNoclick()
-      console.log('禁用事件完成')
+      this.classnodu = true
       console.log('进入保存')
       if(type == 'temp'){
         this.data.f_complete = '未完成'
@@ -944,6 +959,7 @@ export default {
           if (Vue.android){
             this.$showMessage(errString)
           }
+          $("#savebut").removeClass("noclickbut");
           return
         } else {
           this.data.f_complete = '已完成'
@@ -951,6 +967,7 @@ export default {
           this.disableTimer()
         }
       }
+
       console.log("是否被拉黑-"+this.data.f_blacklist)
       if(this.data.f_blacklist!='是'){
         delete this.data.f_blocking_cause
@@ -971,7 +988,7 @@ export default {
       if (Vue.android) {
         console.log('Vue.android is true')
         let value = this.$androidUtil.path({
-          alias: 'getUserinfomation',
+          alias: 'getUserinfomationTS',
           data: {condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan = '无计划安检'"}
         })
         console.log('getUserinfomation value ==> ' + JSON.stringify(value))
@@ -1020,7 +1037,7 @@ export default {
           HostApp.__this__ = this
           HostApp.syncLogic({
             // logic别名，key必须为logic
-            'logic': 'SafeSaveNoPaper',
+            'logic': 'SafeSaveNoPaperTS',
             // 回调执行方法名，key必须为callback
             'callback': 'javascript:HostApp.__this__.saveCallBack()',
             // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
@@ -1074,7 +1091,7 @@ export default {
           HostApp.__this__ = this
           HostApp.syncLogic({
             // logic别名，key必须为logic
-            'logic': '保存安检单信息',
+            'logic': '保存安检单信息TS',
             // 回调执行方法名，key必须为callback
             'callback': 'javascript:HostApp.__this__.saveCallBack()',
             // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
@@ -1087,12 +1104,12 @@ export default {
       } else {
         console.log("保存的值", codata)
         let value = this.$androidUtil.path({
-          alias: 'getUserinfomation',
+          alias: 'getUserinfomationTS',
           data: {condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan = '无计划安检'"}
         })
 
         if (this.item.f_no_checkplan == '无计划安检' && value.data.length == 0 && this.item.f_no_checkplan != '打回') {
-          this.$androidUtil.bzLogic('SafeSaveNoPaper', {
+          this.$androidUtil.bzLogic('SafeSaveNoPaperTS', {
             f_check_item_id: this.data.f_check_item_id,
             f_checker_id: this.data.f_checker_id,
             f_upload_state: '未传',
@@ -1100,7 +1117,7 @@ export default {
           }).then((res) => {
             if (res.data.code == 200) {
               //保存devices
-              this.$androidUtil.bzLogic('getPaperInfo', {
+              this.$androidUtil.bzLogic('getPaperInfoTS', {
                 f_check_item_id: this.data.f_check_item_id
               }).then((res) => {
                 console.log(`查询paper结果res======${res}`)
@@ -1110,7 +1127,7 @@ export default {
                   for (let device of this.f_devices) {
                     device.f_paper_id = f_paper_id
                     console.log('设备信息device======', device)
-                    this.$androidUtil.bzLogic('saveDevice', {
+                    this.$androidUtil.bzLogic('saveDeviceTS', {
                       row: device
                     }).then((ret) => {
                       console.log(`保存设备信息结果res======`, ret)
@@ -1120,6 +1137,7 @@ export default {
                         // }
                         //TODO 失败后处理
                         this.$showMessage("保存失败!")
+                        this.classnodu = false
                         return false
                       }
                     })
@@ -1134,11 +1152,12 @@ export default {
               //   this.isUpload = false
               // }
               this.$showMessage("保存失败!")
+              this.classnodu = false
               return false
             }
           })
         } else {
-          this.$androidUtil.bzLogic('保存安检单信息', {
+          this.$androidUtil.bzLogic('保存安检单信息TS', {
             f_check_item_id: this.data.f_check_item_id,
             f_checker_id: this.data.f_checker_id,
             row: codata
@@ -1146,7 +1165,7 @@ export default {
             console.log('asdddddddddddddddddddddddddddddd')
             if (res.data.code == 200) {
               //保存devices
-              this.$androidUtil.bzLogic('getPaperInfo', {
+              this.$androidUtil.bzLogic('getPaperInfoTS', {
                 f_check_item_id: this.data.f_check_item_id
               }).then((res) => {
                 console.log(`查询paper结果res======${res}`)
@@ -1156,7 +1175,7 @@ export default {
                   for (let device of this.f_devices) {
                     device.f_paper_id = f_paper_id
                     console.log(`设备信息device======${device}`)
-                    this.$androidUtil.bzLogic('saveDevice', {
+                    this.$androidUtil.bzLogic('saveDeviceTS', {
                       row: device
                     }).then((ret) => {
                       console.log(`保存设备信息结果res======${ret}`)
@@ -1166,6 +1185,7 @@ export default {
                         // }
                         //TODO 失败后处理
                         this.$showMessage("保存失败!")
+                        this.classnodu = false
                         return false
                       }
                     })
@@ -1180,6 +1200,7 @@ export default {
               //   this.isUpload = false
               // }
               this.$showMessage("保存失败!")
+              this.classnodu = false
               return false
             }
           })
@@ -1218,6 +1239,7 @@ export default {
       })
     },
     saveCallBack(jo){
+      this.isdisable = false
       console.log(JSON.stringify(jo))
       if(jo.state == 'ok'){
         let res = JSON.parse(jo.result)
@@ -1228,7 +1250,7 @@ export default {
             let codata = this.getAllDefect()
             //获取微信推送内容
             // let WxResult = this.getWeixin(codata)
-            let haslivedispose = this.$androidUtil.bzLogic('getLiveDispose', {
+            let haslivedispose = this.$androidUtil.bzLogic('getLiveDisposeTS', {
               f_check_item_id: this.data.f_check_item_id
             })
             //如果是转维修上传，则不做校验，上传完成后自动转维修
@@ -1288,7 +1310,7 @@ export default {
             HostApp.__this__ = this
             HostApp.syncLogic({
               // logic别名，key必须为logic
-              'logic': '上传安检信息',
+              'logic': '上传安检信息TS',
               // 回调执行方法名，key必须为callback
               'callback': 'javascript:HostApp.__this__.uploadCallBack()',
               // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
@@ -1306,10 +1328,12 @@ export default {
           }
         }else{
           this.$showMessage('保存失败！')
+          this.classnodu = false
           return
         }
       }else{
-        this.$showMessage('服务器内部错误,保存失败！')
+        this.$showMessage('移动网络异常,请稍后再试,保存失败！')
+        this.classnodu = false
         return
       }
     },
@@ -1363,15 +1387,27 @@ export default {
             // this.$back()
           }
         }else if(res.code == 309){
-          this.$showMessage('该安检单已作废!')
-          console.log('该安检单已作废')
-          this.$dispatch('confirm')
-        }else{
+          this.$showMessage('该安检单已作废，无法上传!')
+          return
+        }else if(res.code == 710){
+          this.$showMessage('用户签名或安检照片缺失，请检查用户签名及安检照片!')
+          return
+        }else if(res.code == 711){
+          this.$showMessage('该安检单已被管理员调整，请联系管理员!')
+          return
+        }else if(res.code == 712){
+          this.$showMessage('网络异常，请重新上传，多次上传失败请联系管理员!')
+          return
+        }else if(res.code == 308) {
+          return this.$showMessage('上次安检是到访不遇,距离现在不超过1天，禁止提交')
+        }else {
+          this.classnodu = false
           this.$showMessage('上传失败！')
           this.onlySave = true
         }
       }else {
-        this.$showMessage('服务器内部错误,上传失败！')
+        this.$showMessage('移动网络异常,请稍后再试,上传失败！')
+        this.classnodu = false
         this.onlySave = true
       }
     },
@@ -1386,15 +1422,18 @@ export default {
             this.$showMessage('上传并转维修成功！')
           }else{
             this.$showMessage('上传并转维修成功，回写安检单失败！')
+            this.classnodu = false
           }
           this.$dispatch('confirm')
           // this.$back()
         }else{
           this.$showMessage('上传失败！')
+          this.classnodu = false
           this.onlySave = true
         }
       }else{
-        this.$showMessage('服务器内部错误,上传失败！')
+        this.$showMessage('移动网络异常,请稍后再试,上传失败！')
+        this.classnodu = false
         this.onlySave = true
       }
     },
@@ -1422,7 +1461,7 @@ export default {
       } else {
         Util.booleanFilter(paper)
         HostApp.__this__.$set('data', paper)
-        HostApp.__this__.$goto('safecheck-userinfo', {}, 'paper-router')
+        HostApp.__this__.$goto('safecheck-userinfo-ts', {}, 'paper-router')
         // 如果打回重检则重新计时
         console.log('HostApp.__this__.role' + HostApp.__this__.role + ' HostApp.__this__.f_approved:' + HostApp.__this__.data.f_approved)
         if(HostApp.__this__.role == 'inspect'
@@ -1460,7 +1499,7 @@ export default {
       return obj;
     },
     // async isoverDate(){
-    //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
+    //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
     //       condition:"f_plan_item_id='"+this.item.id+"'"
     //     }
     //   })
@@ -1468,7 +1507,7 @@ export default {
     // },
     putDevices() {
       console.log('Vue.config => ' + JSON.stringify(Vue.config))
-      console.log('Vue.config.DevicesConfig => ' + JSON.stringify(Vue.config.DevicesConfig))
+      console.log('Vue.config.safecheck.DevicesConfig => ' + JSON.stringify(Vue.config.safecheck.DevicesConfig))
       this.$set('data.approve', "true")
       this.$set('data.writeback', "false")
       if (Vue.config.safecheck != undefined) {
@@ -1492,31 +1531,78 @@ export default {
 
           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 = Object.assign({}, Vue.config.safecheck.DevicesConfig,this.config)
               this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
+              // this.config=this.extend({},this.config,Vue.config.safecheck.DevicesConfig)
             }else{
-              console.log("看看数据Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]------"+Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type])
-              console.log("当前用户类型-Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]"+Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type])
-              console.log("当前用户类型"+Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
-              this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
+              // 客户需要区分外部安检项 并且后续不会变动 将此项放到SafeDevicesVersion的TS中
+              this.config = this.extend(this.config, Vue.config.safecheck.SafeDevicesVersion.TS[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
             }
-            // this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
           }
         }else {
-          // 非民用
+          // 非民用说不动 后续如果需要的话也可以将此项放到SafeDevicesVersion的TS中
           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 = Object.assign({}, Vue.config.safecheck.DevicesSetConfig,this.config)
               this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
             }else{
-              console.log("看看数据Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]------"+Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type])
-              console.log("当前用户类型-Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]"+Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type])
-              console.log("当前用户类型"+Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
               this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
             }
-            //this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
           }
         }
 
       }
+      if(this.item.f_plan_meters.length > 0 && this.item.f_plan_meters[0].f_meter_type=='物联网表'){
+        console.log("是物联网表")
+        let rqb={
+          "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":5,"type":"number","readonly":true,isshow:false},
+            "表读数":{"index":6,"type":"number","readonly":true},
+            "表剩余金额":{"index":7,"type":"number","readonly":true},
+            "字轮数":{"index":8,"type":"number","checkmust": this.item.f_user_type == '民用'? true: false,"readonly": this.item.f_user_type == '民用'? false: true},//基表数
+            "表余额":{"index":9,"type":"number","checkmust": this.item.f_user_type == '民用'? true: false,"readonly": this.item.f_user_type == '民用'? false: true},
+            //显示屏数  --实际剩余气量
+            "表数异常差值":{"index":10,"type":"number","readonly": true},
+            "表金额异常差值":{"index":11,"type":"number","readonly": true}
+          }
+        }
+        this.config["燃气表"]=rqb
+      }else{
+        let rqb={
+          "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":5,"type":"number","readonly":true,isshow:false},
+            "户累购气量":{"index":6,"type":"number","readonly":true},
+            "户累购金额":{"index":6,"type":"number","readonly":true},
+            "累购气量":{"index":7,"type":"number","readonly":true},
+            "累购金额":{"index":7,"type":"number","readonly":true},
+            "已用气量":{"index":8,"type":"number","checkmust": this.item.f_user_type == '民用'? true: false,"readonly": this.item.f_user_type == '民用'? false: true},//基表数
+            "已用金额":{"index":8,"type":"number","checkmust": this.item.f_user_type == '民用'? true: false,"readonly": this.item.f_user_type == '民用'? false: true},
+            "剩余气量":{"index":9,"type":"number","checkmust": this.item.f_user_type == '民用'? true: false,"readonly": this.item.f_user_type == '民用'? false: true},//累购-已用
+            //显示屏数  --实际剩余气量
+            "剩余金额":{"index":9,"type":"number","checkmust": this.item.f_user_type == '民用'? true: false,"readonly": this.item.f_user_type == '民用'? false: true},
+            "气量异常差值":{"index":10,"type":"number","readonly": true},
+            "金额异常差值":{"index":10,"type":"number","readonly": true}
+          }
+          // 注意，配置项的index必须与上面的固定配置保持'顺序'
+        }
+        this.config["燃气表"]=rqb
+      }
       console.log('赋值后的config=>' + JSON.stringify(this.config))
       // 预留设备项位置
       for (let i in this.config) {
@@ -1529,7 +1615,7 @@ export default {
         console.log('type '+ typeof n)
         this.devices[n - 1] = {device: i, n: n, checkmust: this.config[i].checkmust}
         this.$set('data.' + 'device' + n, [])
-        console.log('data.device'+ n,this.data)
+        console.log('data.device'+ n,JSON.stringify(this.data))
         // this.tabs.splice(2 + n - 1, 0,
         //   {
         //     header:i,
@@ -1537,10 +1623,12 @@ export default {
         //     class:'repair-details-class',
         //     number:n
         //   })
+        let aa='device'+n
+        console.log(i)
         this.tabs[n] = {
           header: i,
-          complete: 'safecheck-devices',
-          class: 'repair-details-class',
+          complete: 'safecheck-devices-ts',
+          class: this.getClassimg(i),
           number: n
         }
 
@@ -1578,7 +1666,7 @@ export default {
       this.faultshow.number = this.tabs.length
     },
     init () {
-      console.log("123456789aaaaaaaaaaaaaaaaaaaa")
+      console.log("123456789"+JSON.stringify(this.item))
       // this.data.f_noplan_item_id =  this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()
       this.data.ename = Vue.user.ename
       this.data.f_outlets = Vue.user.f_parentname
@@ -1600,16 +1688,23 @@ export default {
       this.data.f_filialeid = this.item.f_filialeid
       this.data.f_orgstr = this.item.f_orgstr
       this.data.version = this.item.version
+      this.data.f_check_version = this.item.f_check_version
+      this.data.f_year_plan_id = this.item.f_year_plan_id
+      this.data.f_meter_classify = this.item.f_plan_meters.length > 0 ? this.item.f_plan_meters[0].f_meter_type : ''
       this.$set('data.f_meters', this.item.f_plan_meters)
       this.$set('data.f_userinfo_code', this.item.f_userinfo_code)
+      // this.$set('data.f_airintake_seal_no',this.item.f_plan_meters[0].f_airintake_seal_no)
+      // this.$set('data.f_airouttake_seal_no',this.item.f_plan_meters[0].f_airouttake_seal_no)
       // 安检状态
       this.$set('data.f_entry_status', '入户')
       this.$set('data.f_usegas', '已使用')
       this.$set('data.f_state',this.item.f_state)
-      console.log('设置参数3')
+      this.$set('data.f_novisit_reason',null)//到访不遇备注
+      console.log('设置参数3'+this.data.f_check_version)
       // 用户信息
       this.$set('data.f_user_name', this.item.f_user_name)
       this.$set('data.f_user_phone', this.item.f_user_phone)
+      this.$set('data.f_user_phone2', this.item.f_user_phone2)
       this.$set('data.f_userinfoid', this.item.f_userinfoid)
       this.$set('data.f_address', this.item.f_address)
       this.$set('data.f_card_id', this.item.f_card_id)
@@ -1624,6 +1719,8 @@ export default {
       this.$set('data.f_idnumber', this.item.f_idnumber)
       this.$set('data.f_comments', this.item.f_comments)
       this.$set('data.f_userproperties', this.item.f_userproperties)
+      this.$set('data.f_remark', this.item.f_remark)
+      this.$set('data.f_open_date', this.item.f_open_date)
       // this.$set('data.f_user_inhome_time', this.item.f_user_inhome_time)
       // this.$set('data.f_user_check_time', this.item.f_user_check_time)
       // this.$set('data.f_user_spare_phone', this.item.f_user_spare_phone)
@@ -1638,13 +1735,14 @@ export default {
       if (this.data.f_check_item_id == '' && this.item.f_no_checkplan == '无计划安检') {
         this.data.f_check_item_id = this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4() + "" + this.S4()
       }
+      console.log("this.config------11111"+JSON.stringify(this.config))
       console.log("item.f_plan_meters",this.item.f_plan_meters)
       if(this.item.f_plan_meters) {
         for (let de in this.devices) {
           this.$set('data.device' + this.devices[de].n, [])
           for (let i = 0; i < this.item.f_plan_meters.length; i++) {
             if (this.item.f_plan_meters[i].f_meter_type) {
-              console.log('this.item.f_plan_meters[i] ===> ' + JSON.stringify(this.item.f_plan_meters[i]))
+              console.log('this.item.f_plan_meters[i] ===>1 ' + JSON.stringify(this.item.f_plan_meters[i]))
               if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') > 0) {
                 this.data['device' + this.devices[de].n].push({
                   f_device_type: "燃气表",
@@ -1693,20 +1791,10 @@ export default {
                       f_item_value: this.item.f_plan_meters[i].f_prior_reading,
                       f_path: "",
                       type: "number"
-                    },
-                    {
-                      f_defect_level: null,
-                      f_device_id: "",
-                      f_is_defect: "",
-                      f_item_name: "表箱号",
-                      f_item_value: this.item.f_plan_meters[i].f_metertitles,
-                      f_path: "",
-                      type: "string"
                     }
                   ]
                 })
-              }
-              else if (this.devices[de].device == "燃气表") {
+              } else if (this.devices[de].device == "燃气表") {
                 // delete this.config['燃气表']['items']['表底数']
                 this.data['device' + this.devices[de].n].push({
                   f_device_type: "燃气表",
@@ -1755,20 +1843,85 @@ export default {
                       f_item_value: this.item.f_plan_meters[i].f_prior_reading,
                       f_path: "",
                       type: "number"
+                    }
+                  ]
+                })
+              }
+              console.log("this.config-----xxxxx-"+i+"----"+JSON.stringify(this.config))
+              console.log("当前表类型--------------"+this.item.f_plan_meters[i].f_meter_type)
+              if(this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type=='物联网表'){
+                console.log("没有this.item.f_plan_meters[i].f_collection_type")
+                this.data['device' + this.devices[de].n].forEach(device => {
+                  console.log('device ===> ' + JSON.stringify(device))
+                  this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
+                  device.f_items.push(
+                    /*{
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "初始表底",
+                      isshow: true,
+                      f_item_value: this.item.f_plan_meters[i].f_initial_base,
+                      f_path: "",
+                      type: "number"
+                    },*/
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "表读数",
+                      f_item_value: this.item.f_plan_meters[i].f_meter_base,
+                      f_path: "",
+                      type: "number"
                     },
                     {
                       f_defect_level: null,
                       f_device_id: "",
                       f_is_defect: "",
-                      f_item_name: "表箱号",
-                      f_item_value: this.item.f_plan_meters[i].f_metertitles,
+                      f_item_name: "表剩余金额",
+                      f_item_value: this.item.f_plan_meters[i].f_balance_amount,
                       f_path: "",
-                      type: "string"
+                      type: "number"
+                    },
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "字轮数",
+                      f_item_value: '',
+                      f_path: "",
+                      type: "number"
+                    },
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "表余额",
+                      f_item_value: null,
+                      f_path: "",
+                      type: "number"
+                    },{
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "表数异常差值",
+                      f_item_value: null,
+                      f_path: "",
+                      type: "number"
+                    },
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "表金额异常差值",
+                      f_item_value: null,
+                      f_path: "",
+                      type: "number"
                     }
-                  ]
+                  )
+                  console.log('this.config[\'燃气表\'][\'items\']  --->0 ' + JSON.stringify(this.config['燃气表']['items']))
                 })
-              }
-              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 => {
                   console.log('device ===> ' + JSON.stringify(device))
                   console.log('this.item.f_plan_meters[i].f_collection_type ===> ' + JSON.stringify(this.item.f_plan_meters[i].f_collection_type))
@@ -1785,18 +1938,28 @@ 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']['气量异常差值']
                       device.f_items.push(
+                        // {
+                        //   f_defect_level: null,
+                        //   f_device_id: "",
+                        //   f_is_defect: "",
+                        //   f_item_name: "初始表底",
+                        //   isshow: false,
+                        //   f_item_value: '',
+                        //   f_path: "",
+                        //   type: "number"
+                        // },
                         {
                           f_defect_level: null,
                           f_device_id: "",
                           f_is_defect: "",
-                          f_item_name: "初始表底",
-                          isshow: false,
-                          f_item_value: '',
+                          f_item_name: "户累购金额",
+                          f_item_value: this.item.f_plan_meters[i].f_history_fee,
                           f_path: "",
                           type: "number"
                         },
@@ -1837,23 +2000,33 @@ export default {
                           type: "number"
                         }
                       )
-                      console.log('this.config[\'燃气表\'][\'items\']  ===> ' + JSON.stringify(this.config['燃气表']['items']))
+                      console.log('this.config[\'燃气表\'][\'items\']  ===>1 ' + JSON.stringify(this.config['燃气表']['items']))
                     }
                   } 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']['金额异常差值']
                       device.f_items.push(
+                        // {
+                        //   f_defect_level: null,
+                        //   f_device_id: "",
+                        //   f_is_defect: "",
+                        //   f_item_name: "初始表底",
+                        //   isshow: true,
+                        //   f_item_value: this.item.f_plan_meters[i].f_initial_base,
+                        //   f_path: "",
+                        //   type: "number"
+                        // },
                         {
                           f_defect_level: null,
                           f_device_id: "",
                           f_is_defect: "",
-                          f_item_name: "初始表底",
-                          isshow: true,
-                          f_item_value: this.item.f_plan_meters[i].f_initial_base,
+                          f_item_name: "户累购气量",
+                          f_item_value: this.item.f_plan_meters[i].f_history_gas,
                           f_path: "",
                           type: "number"
                         },
@@ -1880,7 +2053,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "剩余气量",
-                          f_item_value: "",
+                          f_item_value: '',
                           f_path: "",
                           type: "number"
                         },
@@ -1894,23 +2067,23 @@ export default {
                           type: "number"
                         }
                       )
-                      console.log('this.config[\'燃气表\'][\'items\']  ---> ' + JSON.stringify(this.config['燃气表']['items']))
+                      console.log('this.config[\'燃气表\'][\'items\']  --->2 ' + JSON.stringify(this.config['燃气表']['items']))
                     }
                   }
                 })
-              }
-              else if(this.devices[de].device == "燃气表"){
+              }else if(this.devices[de].device == "燃气表"){
                 console.log("没有this.item.f_plan_meters[i].f_collection_type")
                 this.data['device' + this.devices[de].n].forEach(device => {
                   console.log('device ===> ' + JSON.stringify(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']['金额异常差值']
                     device.f_items.push(
-                      {
+                      /*{
                         f_defect_level: null,
                         f_device_id: "",
                         f_is_defect: "",
@@ -1919,7 +2092,7 @@ export default {
                         f_item_value: this.item.f_plan_meters[i].f_initial_base,
                         f_path: "",
                         type: "number"
-                      },
+                      },*/
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -1952,20 +2125,343 @@ export default {
                         f_device_id: "",
                         f_is_defect: "",
                         f_item_name: "气量异常差值",
-                        isshow:false,
                         f_item_value: null,
                         f_path: "",
                         type: "number"
                       }
                     )
-                    console.log('this.config[\'燃气表\'][\'items\']  ---> ' + JSON.stringify(this.config['燃气表']['items']))
+                    console.log('this.config[\'燃气表\'][\'items\']  --->3 ' + JSON.stringify(this.config['燃气表']['items']))
                   }
                 })
               }
+
             }
           }
+          if(this.devices[de].device == "保险服务"){
+            console.log('保险服务111111111')
+            console.log("this.data['device' + this.devices[de].n]"+JSON.stringify(this.data['device' + this.devices[de].n]))
+            console.log("this.devices[de]"+JSON.stringify(this.devices[de]))
+            this.data['device' + this.devices[de].n].push({
+              f_device_type: "保险服务",
+              f_items: []
+            })
+            this.data['device' + this.devices[de].n].forEach((device)=>{
+              if(this.valueInfo.valaddinfo){
+                for (let t=0;t<this.valueInfo.valaddinfo.length;t++){
+                  if(this.valueInfo.valaddinfo[t].isuse=='是'){
+                    let d1=new Date(this.valueInfo.valaddinfo[t].startDate)
+                    if(this.valueInfo.valaddinfo[t].value_type=='有无燃气险'){
+                      device.f_items.push(
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "有无燃气险",
+                          isshow:true,
+                          f_item_value: '有',
+                          f_path: "",
+                          type: "radio"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "燃气险购买时间",
+                          isshow:true,
+                          f_item_value: this.valueInfo.valaddinfo[t].startDate,
+                          f_path: "",
+                          type: "date"
+                        }
+                      )
+                    }else if(this.valueInfo.valaddinfo[t].value_type=='有无家财险'){
+                      device.f_items.push(
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "有无家财险",
+                          isshow:true,
+                          f_item_value: '有',
+                          f_path: "",
+                          type: "radio"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "家财险购买时间",
+                          isshow:true,
+                          f_item_value: this.valueInfo.valaddinfo[t].startDate,
+                          f_path: "",
+                          type: "date"
+                        }
+                      )
+                    }
+
+                  }
+
+                }
+              }
+            })
+            console.log("123this.data['device' + this.devices[de].n]"+JSON.stringify(this.data['device' + this.devices[de].n]))
+          }else if(this.devices[de].device == "燃气器具信息"){
+            console.log('增值业务111111111')
+            console.log("this.data['device' + this.devices[de].n]"+JSON.stringify(this.data['device' + this.devices[de].n]))
+            console.log("this.devices[de]"+JSON.stringify(this.devices[de]))
+            this.data['device' + this.devices[de].n].push({
+              f_device_type: "燃气器具信息",
+              f_items: []
+            })
+            this.data['device' + this.devices[de].n].forEach((device)=>{
+              if(this.valueInfo.valaddinfo){
+                for (let t=0;t<this.valueInfo.valaddinfo.length;t++){
+                  if(this.valueInfo.valaddinfo[t].isuse=='是'){
+                    let d1=new Date(this.valueInfo.valaddinfo[t].startDate)
+                    if(this.valueInfo.valaddinfo[t].value_type=='燃气灶'){
+                      device.f_items.push(
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "燃气灶产品现状",
+                          isshow:true,
+                          f_item_value: '有',
+                          f_path: "",
+                          type: "radio"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "燃气灶购买时间",
+                          isshow:true,
+                          f_item_value: this.valueInfo.valaddinfo[t].startDate,
+                          f_path: "",
+                          type: "date"
+                        }/*,
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "燃气灶到期剩余",
+                            isshow:true,
+                            f_item_value: (d1.getFullYear()+8)+'-'+(d1.getMonth()+1),
+                            f_path: "",
+                            type: "string"
+                          }*/
+                      )
+                    }else if(this.valueInfo.valaddinfo[t].value_type=='热水器'){
+                      device.f_items.push(
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "热水器产品现状",
+                          isshow:true,
+                          f_item_value: '有',
+                          f_path: "",
+                          type: "radio"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "热水器购买时间",
+                          isshow:true,
+                          f_item_value: this.valueInfo.valaddinfo[t].startDate,
+                          f_path: "",
+                          type: "date"
+                        }/*,
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "热水器到期剩余",
+                            isshow:true,
+                            f_item_value: (d1.getFullYear()+8)+'-'+(d1.getMonth()+1),
+                            f_path: "",
+                            type: "string"
+                          }*/
+                      )
+                    }else if(this.valueInfo.valaddinfo[t].value_type=='壁挂炉'){
+                      device.f_items.push(
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "壁挂炉产品现状",
+                          isshow:true,
+                          f_item_value: '有',
+                          f_path: "",
+                          type: "radio"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "壁挂炉购买时间",
+                          isshow:true,
+                          f_item_value: this.valueInfo.valaddinfo[t].startDate,
+                          f_path: "",
+                          type: "date"
+                        }
+                        /*{
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "壁挂炉到期剩余",
+                          isshow:true,
+                          f_item_value: (d1.getFullYear()+8)+'-'+(d1.getMonth()+1),
+                          f_path: "",
+                          type: "string"
+                        }*/
+                      )
+                    }/*else {
+                        device.f_items.push(
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "*"+this.valueInfo.valaddinfo[t].value_type+"*",
+                            isshow:true,
+                            f_item_value: '有',
+                            f_path: "",
+                            type: "radio"
+                          },
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: this.valueInfo.valaddinfo[t].value_type+"购买年份",
+                            isshow:true,
+                            f_item_value: this.valueInfo.valaddinfo[t].startDate,
+                            f_path: "",
+                            type: "date"
+                          }
+                        )
+                      }*/
+                  }
+
+                }
+              }
+            })
+            console.log("123this.data['device' + this.devices[de].n]"+JSON.stringify(this.data['device' + this.devices[de].n]))
+          }else if(this.devices[de].device == "附属设备信息"){
+            console.log('增值业务111111111')
+            console.log("this.data['device' + this.devices[de].n]"+JSON.stringify(this.data['device' + this.devices[de].n]))
+            console.log("this.devices[de]"+JSON.stringify(this.devices[de]))
+            this.data['device' + this.devices[de].n].push({
+              f_device_type: "附属设备信息",
+              f_items: []
+            })
+            this.data['device' + this.devices[de].n].forEach((device)=>{
+              if(this.valueInfo.valaddinfo){
+                for (let t=0;t<this.valueInfo.valaddinfo.length;t++){
+                  if(this.valueInfo.valaddinfo[t].isuse=='是'){
+                    let d1=new Date(this.valueInfo.valaddinfo[t].startDate)
+                    if(this.valueInfo.valaddinfo[t].value_type=='报警器'){
+                      device.f_items.push(
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "报警器产品现状",
+                          isshow:true,
+                          f_item_value: '有',
+                          f_path: "",
+                          type: "radio"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "报警器购买时间",
+                          isshow:true,
+                          f_item_value: this.valueInfo.valaddinfo[t].startDate,
+                          f_path: "",
+                          type: "date"
+                        }
+                      )
+                    }else if(this.valueInfo.valaddinfo[t].value_type=='切断阀'){
+                      device.f_items.push(
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "切断阀产品现状",
+                          isshow:true,
+                          f_item_value: '有',
+                          f_path: "",
+                          type: "radio"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "切断阀购买时间",
+                          isshow:true,
+                          f_item_value: this.valueInfo.valaddinfo[t].startDate,
+                          f_path: "",
+                          type: "date"
+                        }
+                      )
+                    }else if(this.valueInfo.valaddinfo[t].value_type=='自闭阀'){
+                      device.f_items.push(
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "自闭阀产品现状",
+                          isshow:true,
+                          f_item_value: '有',
+                          f_path: "",
+                          type: "radio"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "自闭阀购买时间",
+                          isshow:true,
+                          f_item_value: this.valueInfo.valaddinfo[t].startDate,
+                          f_path: "",
+                          type: "date"
+                        }
+                      )
+                    }else if(this.valueInfo.valaddinfo[t].value_type=='连接管'){
+                      device.f_items.push(
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "连接管产品现状",
+                          isshow:true,
+                          f_item_value: '有',
+                          f_path: "",
+                          type: "radio"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "连接管购买时间",
+                          isshow:true,
+                          f_item_value: this.valueInfo.valaddinfo[t].startDate,
+                          f_path: "",
+                          type: "date"
+                        }
+                      )
+                    }
+                  }
+
+                }
+              }
+            })
+            console.log("123this.data['device' + this.devices[de].n]"+JSON.stringify(this.data['device' + this.devices[de].n]))
+          }
         }
       }
+
       var pardate = {
         _this:this,
         tittle:'安检详情',
@@ -1973,18 +2469,33 @@ export default {
       }
       // this.$dispatch('gotoson',pardate)
       console.log('页面跳转')
-      this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
+      this.$goto('safecheck-userinfo-ts', {userinfo:this.data}, 'repair')
     }
   },
   watch: {
     'row' () {
       console.log('row changed')
       this.copy()
-    }
+    },
+    'backlistisselect'(val){
+      console.log(`backlistisselect发生改变:${val}`)
+      if(val == undefined || val == ''){
+        return
+      }
+      if(val == true){
+        this.showmodel=true
+      }
+    },
   },
   async ready () {
+
     //送气超期功能
     //await this.isoverDate()
+    /*    let val=await new HttpResetClass().load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/valueaddinfo`,{f_userfiles_id:'',f_userinfo_id:this.item.f_userinfoid,f_olduserinfo_code:''})
+        if(val.data){
+          this.valueInfo=val.data
+        }
+        console.log('------获取增值业务'+JSON.stringify(this.valueInfo))*/
     this.putDevices()
     //如果已检，则提取安检单
     if (this.item.f_state != '未检') {
@@ -1996,32 +2507,43 @@ export default {
         console.log('this.item.f_no_checkplan',this.item.f_no_checkplan)
         if (this.role == 'inspect') {
           console.log('this.item.f_no_checkplan', this.item.f_no_checkplan)
+          let condition=` f_check_item_id ='${this.item.id}'`
           if (this.item.f_no_checkplan == '无计划安检') {
-            value = this.$androidUtil.path({
-              alias: 'getUserinfomation',
-              data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan = '无计划安检'"}
-            })
-          } else {
-            value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+            condition += ` and f_no_checkplan = '无计划安检'`
           }
+          value = this.$androidUtil.bzLogic('path_getPhoneCheckPaperTS', {condition: condition})
         } else {
-          value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
+          value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomationTS`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
+        }
+        /*let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_OrderBy', 'criteria': {items:'f_open_date ',tablename:'t_check_plan_item ',condition:`id='${value.data[0].f_check_item_id}'  `,orderitem:'id'}, count: false, pageNo: 1, pageSize: 5}})
+        console.log("查询开户日期结束---:" + JSON.stringify(result))
+        if(result.code == 200) {
+          value.data[0].f_open_date=result.data.rows[0].f_open_date
+        }*/
+        //value.data[0].f_open_date=this.item.f_open_date
+        if(this.item.f_last_check_state=='入户' && this.item.f_upload_state=='已传') {
+          this.buttonsty=false
         }
         Util.replaceFalse(value)
         console.log("value:" + JSON.stringify(value))
         if (value.data.length != 0) {
           that.$set('data', value.data[0])
           console.log("this.data.f_collection_type:" + JSON.stringify(this.data.f_collection_type))
-          if (this.data.f_collection_type == '按气量') {
-            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']['气量异常差值']
+          if(this.item.f_plan_meters.length > 0 && this.item.f_plan_meters[0].f_meter_type!='物联网表'){
+            console.log("不是物联网表！")
+            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']['气量异常差值']
+            }
           }
           console.log("f_devices:" + JSON.stringify(value.data[0].f_devices))
           if (value.data[0].f_devices) {
@@ -2048,8 +2570,10 @@ export default {
                   console.log('回写数据item.f_items.f_item_lists[j]=======>' + JSON.stringify(item.f_items[i].f_item_lists[j]))
                   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)
+                    console.log('回写数据2222222item.f_items[i]=======>' + JSON.stringify(item.f_items[i]))
                   } else {
                     item.f_items[i].f_item_value = item.f_items[i].f_item_lists[j].f_item_value
+                    console.log('回写数据111111item.f_items[i]=======>' + JSON.stringify(item.f_items[i]))
                   }
 
                 }
@@ -2082,14 +2606,15 @@ export default {
           safe:true
         }
         // this.$dispatch('gotoson',pardate)getImgPath
-        this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
+        this.$set('data.f_open_date',this.item.f_open_date)
+        this.$goto('safecheck-userinfo-ts', {userinfo:this.data}, 'repair')
       } else {
         let that = this
         let id
         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/getUserinfomationTS`, {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) {
@@ -2125,7 +2650,7 @@ export default {
               safe:true
             }
             // this.$dispatch('gotoson',pardate)
-            this.$goto('safecheck-userinfo', {userinfo:this.data}, 'paper-router')
+            //this.$goto('safecheck-userinfo', {userinfo:this.data}, 'paper-router')
           }
         ).catch(
           (respanse) => {
@@ -2133,11 +2658,7 @@ export default {
           })
       }
     }else{
-      this.$showMessage("为了保证服务质量，您的电话可能会被录音！")
-      this.record()
       this.init()
-      // 初始化录音
-
     }
     // tbs合并数组
     // if( this.model.serviceacitivity[0].servicerepair.length > 0){
@@ -2170,10 +2691,14 @@ export default {
 }
 </script>
 <style lang="less">
-@import "../../../bootstrap/less/variables.less";
+@import "../../../../../src/bootstrap/less/variables.less";
+/*.divmask {*/
+/*pointer-events: none;*/
+/*}*/
 .noclickbut {
   pointer-events: none;
 }
+
 .tab-befor-img (@url) {
   content: '';
   background-image: url("@{url}");
@@ -2194,75 +2719,96 @@ export default {
 }
 .repair-details-class{
   &::before {
-    .tab-befor-img("../../../assets/huneiweixiu1.png");
+    .tab-befor-img("../../../../assets/huneiweixiu1.png");
+  }
+}
+.baoxian-details-class{
+  &::before {
+    .tab-befor-img("../../../../assets/保险服务.png");
   }
 }
+.ranqibiao-details-class{
+  &::before {
+    .tab-befor-img("../../../../assets/燃气表.png");
+  }
+}
+.ranqiqiju-details-class{
+  &::before {
+    .tab-befor-img("../../../../assets/燃气器具信息.png");
+  }
+}
+.fushushebei-details-class{
+  &::before {
+    .tab-befor-img("../../../../assets/附属设备信息.png");
+  }
+}
+
 .repair-info-class {
   &::before {
-    .tab-befor-img("../../../assets/baoxiuxinxi1.png");
+    .tab-befor-img("../../../../assets/baoxiuxinxi1.png");
   }
 }
 .repair-user-info-class {
   &::before {
-    .tab-befor-img("../../../assets/jibenxinxi1.png")
+    .tab-befor-img("../../../../assets/jibenxinxi1.png")
   }
 }
 
 .door-service-class {
   &::before {
-    .tab-befor-img("../../../assets/huneiweixiu1.png")
+    .tab-befor-img("../../../../assets/huneiweixiu1.png")
   }
 }
 
 .pipeline-class {
   &::before {
-    .tab-befor-img("../../../assets/guandao1.png")
+    .tab-befor-img("../../../../assets/guandao1.png")
   }
 }
 
 .device-service-class {
   &::before {
-    .tab-befor-img("../../../assets/shebeiweixiu1.png")
+    .tab-befor-img("../../../../assets/shebeiweixiu1.png")
   }
 }
 
 .trouble-removal-class {
   &::before {
-    .tab-befor-img("../../../assets/shiguchuli.png")
+    .tab-befor-img("../../../../assets/shiguchuli.png")
   }
 }
 
 .cooking-utensils-class {
   &::before {
-    .tab-befor-img("../../../assets/zaoju1.png")
+    .tab-befor-img("../../../../assets/zaoju1.png")
   }
 }
 
 .outlay-class {
   &::before {
-    .tab-befor-img("../../../assets/feiyong1.png")
+    .tab-befor-img("../../../../assets/拍照签名.png")
   }
 }
 
 .fault-all-class {
   &::before {
-    .tab-befor-img("../../../assets/guzhanghuizong1.png")
+    .tab-befor-img("../../../../assets/guzhanghuizong1.png")
   }
 }
 .photo-write-class {
   &::before {
-    .tab-befor-img("../../../assets/zaoju.png")
+    .tab-befor-img("../../../../assets/zaoju.png")
   }
 }
 .delay-apply-class {
   &::before {
-    .tab-befor-img("../../../assets/yonghubaoxiu.png")
+    .tab-befor-img("../../../../assets/yonghubaoxiu.png")
   }
 }
 
 .repair-back-class {
   &::before {
-    .tab-befor-img("../../../assets/fanhui.png")
+    .tab-befor-img("../../../../assets/fanhui.png")
   }
 }
 .butt2 {