safecheck-client 3.1.1-gaomi-5 → 4.0.1

package/src/components/android/SafecheckOrderV.vue

@@ -2,23 +2,25 @@
   <!--<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 class="col-sm-12 col-xs-12" >
+  <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}"
-            v-if="$index < number+1 && $index < faultshow.number" >
-          <a href="#" style="background-color: #ffffff;color: #666666;font-size: 16px;font-family:SimSun" :class="row.class">
-            <span class="spanboder">{{row.header}}</span>
+            v-if="$index < number+1 && $index < faultshow.number">
+          <a href="#" style="background-color: #ffffff;color: #666666;font-size: 16px;font-family:SimSun"
+             :class="row.class">
+            <span class="spanboder">{{ row.header }}</span>
             <img class="butt2" :src="imgback(row.complete === componentName,row.header === header)"></a>
           <p></p>
         </li>
-        <div class="col-sm-12 col-xs-12 repair-bg"  v-show="routeShow">
+        <div class="col-sm-12 col-xs-12 repair-bg" v-show="routeShow">
           <route name='repair' :reuse="false"></route>
         </div>
         <li v-for="row in tabs" @click="tabSelect(row,$index)" :class="{active1: row.complete === componentName}"
             v-if="$index > number && $index < faultshow.number ">
-          <a href="#" style="background-color: #ffffff;color: #666666;font-size: 16px;font-family:SimSun" :class="row.class">
-            <span class="spanboder">{{row.header}}</span>
+          <a href="#" style="background-color: #ffffff;color: #666666;font-size: 16px;font-family:SimSun"
+             :class="row.class">
+            <span class="spanboder">{{ row.header }}</span>
             <img class="butt2" :src="imgback(row.complete === componentName,row.header === header)"></a>
           <p></p>
         </li>
@@ -36,23 +38,28 @@
                   <!--<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">
+                      <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">
+                    <div class="col-xs-3 col-sm-3 col-md-3" v-show="data.f_entry_status == '结案'">
+                      <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="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">
+                    <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>
                 </div>
               </div>
@@ -69,26 +76,21 @@
 // 户内维修
 import Vue from 'vue'
 import * as Util from '../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 { HttpResetClass } from 'vue-client'
+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', 'item', 'role', 'buttonState'],
   // props: ['f_plan_id', 'role'],
   data() {
     return {
+      gps:{},
       //测试数据
       // f_plan_id:'',
       // role:'inspect',
@@ -108,36 +110,47 @@ export default {
 
       data: {
         f_devices: [],
-        f_defect_content:''
+        f_defect_content: '',
+        f_table_anomaly_path:'',
+        f_table_anomaly_remark:'',
+        f_repaired: '',
+        f_bigualu: '否',
+        f_reshuiqi: '否',
       },
-      updateuserphone:false, //安检时是否更新用户电话
-      beforephone:'',
-      isUpload:false,
-      onlySave:true, //判断保存还是保存并上传
-      livedispose:'',
-      startClick:false, //开始安检按钮是否可点击
+      classnodu: false,
+      showmodel: false, // 控制用户基本信息中的拉黑框
+      backlistisselect: false, // 是否选择拉黑用户
+      enabled: false,//控制限制购气是否可选
+      cause: '',      // 拉黑备注
+      buttonsty: true,
+      isUpload: false,
+      onlySave: true, //判断保存还是保存并上传
+      livedispose: '',
+      startClick: false, //开始安检按钮是否可点击
       isStrat: false, //是否开始安检
-      checkResult:{},//查询结果
-      newcheckResult:{},
+      checkResult: {},//查询结果
+      paper_f_repaired: '', // 安检单的f_repaired字段
+      newcheckResult: {},
       timer: null,
       showModal: false,
       pic_to_be_viewed: '',
-      showBack:true,
+      showBack: true,
       devices: [],
-      f_devices : [],
-      isToRepair:false,
-      clickBack:true, //是否点击返回按钮
-      isSafeCheckToRepair:false,//是否转维修
-      Url:this.$androidUtil.getProxyUrl(),
-      detail:{},
-      defectDevice:{},
-      user:{},
+      f_devices: [],
+      isToRepair: false,
+      clickBack: true, //是否点击返回按钮
+      isSafeCheckToRepair: false,//是否转维修
+      Url: this.$androidUtil.getProxyUrl(),
+      detail: {},
+      defectDevice: {},
+      user: {},
+      warnModalCount:1,
       model: {  //转维修数据
         // 一次派单
         serviceacitivity: [{
           f_service_acitivity_type: '派单'
         }],
-        f_source:'安检',
+        f_source: '安检',
         f_service_id: '',
         f_contact_phone: '',
         f_meetunit: '',
@@ -147,11 +160,11 @@ export default {
         f_repair_date: Util.toStandardTimeString(),
         f_card_id: '',
         // f_department: '', 站点选择
-        f_reciever:'',
+        f_reciever: '',
         f_remarks: '',
         f_user_type: '',
         f_area: '',
-        f_unit_name:'',
+        f_unit_name: '',
         f_street: '',
         f_residential_area: '',
         f_building: '',
@@ -160,32 +173,35 @@ export default {
         f_room: '',
         aState: null,
         f_repairtype: '',
-        f_repairitems:{},
+        f_repairitems: {},
       },
-      repairitems:[],
-      meading:'转站点',
+      repairitems: [],
+      tableAnomalyRecords:{},
+      meading: '转站点',
       config: {
-        "燃气表":{
-          "checkmust":true,
-          "index":1,
-          "items":{
+        "燃气表": {
+          "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": 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": true},//基表数
+            "已用金额": {"index": 8, "type": "number", "checkmust": true},
+            "剩余气量": {"index": 9, "type": "number", "checkmust": true},//累购-已用
             //显示屏数  --实际剩余气量
-            "剩余金额":{"index":9,"type":"number","checkmust": false},
-            "气量异常差值":{"index":10,"type":"number","readonly": true},
-            "金额异常差值":{"index":10,"type":"number","readonly": true},
-            "表箱号":{"index":11,"type":"string","readonly": true}
+            "剩余金额": {"index": 9, "type": "number", "checkmust": true},
+            "气量异常差值": {"index": 10, "type": "number", "readonly": true},
+            "金额异常差值": {"index": 10, "type": "number", "readonly": true},
+            "差值备注": {"index": 11, "type": "string", "readonly": false}
           }
           // 注意，配置项的index必须与上面的固定配置保持'顺序'
         },
@@ -205,12 +221,38 @@ export default {
         //   }
         // }
       },
+      config2: {
+        "燃气表": {
+          "checkmust": true,
+          "index": 1,
+          "items": {
+            "基表编号": {"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", "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": true},
+            "已用金额": {"index": 8, "type": "number", "checkmust": true},
+            "剩余气量": {"index": 9, "type": "number", "checkmust": true},
+            "剩余金额": {"index": 9, "type": "number", "checkmust": true},
+            "气量异常差值": {"index": 10, "type": "number", "readonly": true},
+            "金额异常差值": {"index": 10, "type": "number", "readonly": true},
+            "差值备注": {"index": 11, "type": "string", "readonly": false}
+          }
+        }
+      },
       // 维修项
-      isneedDate:'',
-      routeShow:true,
-      number:0,
-      shupingshow:false,
+      isneedDate: '',
+      routeShow: true,
+      number: 0,
+      shupingshow: false,
       pipeline: {},
+      warnModal:false,
+      bzisno:false,
       details: [],
       ids: '',
       savevalid: {
@@ -221,20 +263,24 @@ export default {
       doordetails: {},
       devicedetails: {},
       cookdetails: {},
+      valueInfo: {},
       componentName: 'safecheck-userinfo',
-      header:'客户信息',
+      header: '客户信息',
       tabs: [
 
         // 参数全部设置成空，在ready时，等model处理好了，再添加
         {
-          header: '客户信息',complete:'safecheck-userinfo',class: 'repair-info-class', props: null
+          header: '客户信息', complete: 'safecheck-userinfo', class: 'repair-info-class', props: null
+        },
+        {
+          header: '表具异常记录', complete: 'table-anomaly-records', class: 'repair-info-class', props: null
         },
         {
-          header: '拍照签名',complete:'paper-feedback', class: 'outlay-class', props: null
+          header: '拍照签名', complete: 'paper-feedback', class: 'outlay-class', props: null
         }
       ],
-      faultshow:{
-        number : 8
+      faultshow: {
+        number: 8
       }     // 控制 故障汇总 在 菜单里显示与否,
     }
   },
@@ -246,84 +292,106 @@ export default {
     }
   },
   methods: {
+
     saveNoclick() {
       // 禁用点击事件
       $("#savebut").addClass("noclickbut");
       console.log("进入禁用按钮事件")
 
       // 5秒后启用点击事件
-      setTimeout(function(){
+      setTimeout(function () {
         $("#savebut").removeClass("noclickbut");
-      },5000);
+      }, 10000);
     },
-    timeSet(val){
-      if (!val){
+
+    timeSet(val) {
+      if (!val) {
         return
       }
-      let time =new Date(val).getTime()
-      let time2=new Date().getTime()
-      if (time2>time) {
+      let time = new Date(val).getTime()
+      let time2 = new Date().getTime()
+      if (time2 > time) {
         return true
       }
     },
-    imgback(val,isheader){
-      if(val && this.routeShow && isheader){
+    imgback(val, isheader) {
+      if (val && this.routeShow && isheader) {
         return require('../../assets/xiangxia1.png')
-      }else{
+      } else {
         return require('../../assets/xiangyou1.png')
       }
     },
-    changediv(val){
+    changediv(val) {
       console.log(val)
       return val
     },
     // 选择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('跳转完成')
+    tabSelect(item, number) {
+      if (this.data.f_entry_status != '入户' && !(this.data.f_entry_status == '到访不遇' && (item.header == '燃气表' || item.header == '客户信息') && this.data.f_is_outdoor == '是')) {
+        this.$showMessage("非入户状态，拍完照后请直接进行上传！")
+      } else {
+        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
         }
-      }else{
-        console.log('页面跳转==》',this.tabs[number])
-        if(this.routeShow){
-          this.$goto(item.complete, {userinfo:this.data}, 'repair')
+        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('跳转完成')
+          }
+        } 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() {
@@ -331,18 +399,20 @@ export default {
         this.ids += this.model.serviceacitivity[0].imgs[i].imgid + ','
       }
       this.ids = this.ids.substring(0, this.ids.length - 1)
-      if(this.ids){
+      if (this.ids) {
         this.getImgGen();
       }
     },
-    getImgGen(){
+    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})`,
           orderitem: 'id'
-        }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then((res) => {
         for (let i = 0; i < res.data.length; i++) {
           for (let j = 0; j < this.model.serviceacitivity[0].imgs.length; j++) {
             console.log(res.data[i].id.toString())
@@ -356,7 +426,7 @@ export default {
       })
     },
 
-    sortDetails(){
+    sortDetails() {
       for (let i = 0; i < this.details.length; i++) {
         if (this.details[i].details.length) {
           for (let j = 0; j < this.details[i].details.length; j++) {
@@ -377,9 +447,9 @@ export default {
       }
     },
     // 复制数据
-    back () {
+    back() {
       let _this = this
-      if(this.issee){
+      if (this.issee) {
         _this.$back()
         return
       }
@@ -389,7 +459,7 @@ export default {
         }
       })
     },
-    confirm(){
+    confirm() {
       this.$dispatch('confirm')
     },
     tick() {
@@ -408,50 +478,115 @@ export default {
       this.data.f_repair_date = Util.toStandardTimeString()
       this.data.f_repaired = this.getRepairState() ? '已修' : '在修'
     },
+    verifyDevices2() {
+      for (let dev in this.config2) {
+        if (this.config2[dev].checkmust == true) {
+          let error = true
+          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) {
+                  error = false
+                }
+              }
+            }
+          }
+          if (error) {
+            return "请检查" + dev
+          }
+        }
+      }
+      for (let dev in this.config2) {
+        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) {
+                let idx = 0
+                for (let i in this.data[device][item].f_items) {
+                  if (idx != 0) {
+                    idx = idx - 1
+                    continue
+                  }
+                  for (let it in this.config2[dev].items) {
+                    if (it == this.data[device][item].f_items[i].f_item_name) {
+                      if (this.data[device][item].f_items[i].correlation) {
+                        for (let x = 0; x < this.data[device][item].f_items[i].options.length; x++) {
+                          if (this.data[device][item].f_items[i].options[x].value == this.data[device][item].f_items[i].f_item_value) {
+                            if (this.data[device][item].f_items[i].options[x].selcorrelation) {
+                              idx = this.data[device][item].f_items[i].correlationnum
+                            }
+                          }
+                        }
+                      }
+                      if (this.config2[dev].items[it].type == 'picture' && this.config2[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.config2[dev].items[it].type != 'picture' && this.config2[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 + "未检查"
+                      }
+                    }
+                  }
+                  if (this.data[device][item].f_items[i].type == 'selector' || this.data[device][item].f_items[i].type == 'radio') {
+                    if (this.data[device][item].f_items[i].f_is_defect == true && this.data[device][item].f_items[i].f_path == Vue.nopic) {
+                      return dev + (this.data[device].indexOf(this.data[device][item]) + 1) + this.data[device][item].f_items[i].f_item_name + this.data[device][item].f_items[i].f_item_value + "选中必须拍照"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     errorVerify() {
       let hasError = this.verifyState()
-      if(hasError)
+      if (hasError)
         return hasError
 
-      if(this.data.f_entry_status != '入户')
+      if (this.data.f_entry_status == '到访不遇' && this.data.f_is_outdoor == '是'){
+        hasError = this.verifyDevices2()
+        if (hasError)
+          return hasError
+      }
+      if (this.data.f_entry_status == '入户' && this.tableAnomalyRecords.warninfo && this.tableAnomalyRecords.warninfo.length > 0 ){
+        if (!this.data.f_table_anomaly_remark){
+          return `表具有异常记录，请查看`
+        }
+      }
+      if (this.data.f_entry_status != '入户')
         return null
       hasError = this.verifyUser()
-      if(hasError)
+      if (hasError)
         return hasError
       hasError = this.verifyDevices()
-      if(hasError)
+      if (hasError)
         return hasError
       hasError = this.verifyFeedback()
-      if(hasError)
+      if (hasError)
         return hasError
     },
     verifyState() {
-      if(Vue.android && this.data.f_entry_status == '未使用天然气' && this.data.f_nongasuser_path == Vue.nopic)
+      if (Vue.android && this.data.f_entry_status == '未使用天然气' && this.data.f_nongasuser_path == Vue.nopic)
         return '未使用天然气则必须拍照'
-      if(Vue.android && this.data.f_entry_status == '到访不遇' && this.data.f_noanswer_path == Vue.nopic)
-        return  '到访不遇必须拍照'
+      if (Vue.android && this.data.f_entry_status == '到访不遇' && this.data.f_noanswer_path == Vue.nopic)
+        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) {
         if (this.config[dev].checkmust == true) {
           let error = true
-          for(let device in this.data) {
+          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) {
@@ -467,15 +602,46 @@ export default {
       }
 
       for (let dev in this.config) {
-        for(let device in this.data) {
+        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) {
+                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 + "未检查"
                       }
                     }
@@ -493,23 +659,22 @@ 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 == '入户')
+      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_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
+      if (Vue.android && this.data.f_overall_imgs.length < 3 && this.data.f_entry_status == '入户')
+        return prefix + '总体安检照片低于3张照片禁止上传'
+      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)
+      if (Vue.android && this.data.f_defect_notified && this.data.f_notified_path == Vue.nopic)
         return prefix + '下发安检通知书则必须给通知书拍照'
-      if(Vue.android && this.data.f_blacklist && this.data.f_blocking_cause=='')
+      if (Vue.android && this.data.f_blacklist && this.data.f_blocking_cause == '')
         return prefix + '请填写拉黑原因'
-      if(!this.data.f_client_evaluation && this.data.f_entry_status == '入户')
-        return  prefix + '请选择服务评价'
+      if (!this.data.f_client_evaluation && this.data.f_entry_status == '入户')
+        return prefix + '请选择服务评价'
     },
-
     getAllDefect() {
       let checkResults = {
         result: '正常',
@@ -521,6 +686,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")) {
@@ -535,18 +701,16 @@ 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]))
-            for (let i = 0; i < codata[device][item].f_items.length ; i++) {
+            // 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'){
+              if (i == 'sum') {
                 continue
               }
               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))
@@ -588,6 +752,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) {
@@ -599,7 +764,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 = '有隐患'
@@ -608,10 +772,8 @@ export default {
                           console.log(`The ${f_item_name} initialized`)
                           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)
-
                       }
 
                       let items_list = {
@@ -642,12 +804,25 @@ 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)
+                if (f_item_name === '是否为热水器用户') {
+                  codata.f_reshuiqi = f_item_value
+                }
+                if (f_item_name === '是否为壁挂炉用户') {
+                  codata.f_bigualu = f_item_value
+                }
+                // && this.data.f_meter_classify.includes('卡表') 客户要求物联网表也生效
+                if (['气量异常差值', '表金额异常差值'].includes(f_item_name) && Math.abs(f_item_value)>=5 ) {
+                  this.warnModal = true
+                }
+                if (f_item_name === '差值备注' && this.warnModal === true && (f_item_value=='' || f_item_value==null) ){
+                  this.bzisno = true
+                }
                 let items_list = {
                   f_is_defect: f_is_defect,
                   f_item_value: f_item_value,
@@ -658,7 +833,9 @@ export default {
                   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] = []
@@ -688,6 +865,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)
@@ -698,6 +880,7 @@ export default {
             }
             console.log('安检结果checkResult' + JSON.stringify(this.checkResult))
             this.f_devices.push(codata[device][item])
+            // codata.f_devices.push(codata[device][item])
           }
         }
       }
@@ -718,38 +901,85 @@ export default {
       }
       console.log(`typeof-checkResults-->${typeof checkResults}`)
       console.log('checkResults ==> ' + JSON.stringify(checkResults))
+      if (checkResults.data.length > 0) {
+        let msg = ''
+        for (let a = 0; a < checkResults.data.length; a++) {
+          for (let datumKey in checkResults.data[a]) {
+            msg += datumKey + ':' + checkResults.data[a][datumKey] + ';'
+          }
+        }
+        this.data.f_defect_text = msg
+        codata.f_defect_text = msg
+      }
       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
+
+      return this.addPaperHiddens(codata)
+    },
+    addPaperHiddens(codata) {
+      const f_hiddens = [];
+      const f_devices = this.f_devices;
+      for (let i = 0; i < f_devices.length; i++) {
+        const f_items = f_devices[i].f_items;
+        for (let j = 0; j < f_items.length; j++) {
+          const f_item_lists = f_items[j].f_item_lists;
+          if (f_items[j].f_is_defect === true) {
+            for (let k = 0; k < f_item_lists.length; k++) {
+              const newDevice = {};
+              for (const key in f_devices[i]) {
+                if (key !== 'f_items') {
+                  newDevice[key] = f_devices[i][key];
+                }
+              }
+              const newItem = {};
+              for (const key in f_items[j]) {
+                if (key !== 'f_item_lists') {
+                  newItem[key] = f_items[j][key];
+                }
+              }
+              const newItemList = f_item_lists[k]
+              f_hiddens.push({
+                ...newDevice,
+                ...newItem,
+                ...newItemList
+              });
+            }
+          }
+        }
+      }
+      console.log("888899999", JSON.stringify({...codata, f_hiddens}))
+      return {...codata, f_hiddens}
     },
-    uploadCheckPaper(){
+    uploadCheckPaper() {
       this.saveNoclick()
-      console.log('禁用事件完成')
       console.log('进入上传')
       let errString = this.errorVerify()
       if (errString) {
         console.log(errString)
-        console.log('Vue.android',Vue.android)
-        console.log('this.isUpload',this.isUpload)
-        if (Vue.android){
+        console.log('Vue.android', Vue.android)
+        console.log('this.isUpload', this.isUpload)
+        if (Vue.android) {
           // if(this.isUpload){
           //   this.isUpload = false
           // }
           this.$showMessage(errString)
         }
+        $("#savebut").removeClass("noclickbut");
         return
       } else {
         this.$set('data.f_offsite_time', Util.toStandardTimeString())
         this.$set('data.f_upload_time', Util.toStandardTimeString())
         this.$set('data.f_upload_date', Util.toStandardTimeString())
-        console.log('赋值后',this.data)
+        console.log('赋值后', this.data)
         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()
+      let res = this.save()
       // if(res) {
       //   try {
       //     let codata = this.getAllDefect()
@@ -892,35 +1122,149 @@ export default {
       //   }
       // }
     },
-    save(type) {
+    saveZZ(reqdata) {
+      console.log(this.item.f_userinfoid)
+      console.log(this.item.f_plan_meters[0].f_userfiles_id)
+      console.log(reqdata)
+      new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/valueaddinfo`, {
+        data: {
+          f_userinfo_id: this.item.f_userinfoid,
+          f_userfiles_id: this.item.f_plan_meters[0].f_userfiles_id,
+        }
+      }).then((res) => {
+        this.oldvalueinfo = JSON.parse(JSON.stringify(res.data.valaddinfo))
+        this.valueinfo = JSON.parse(JSON.stringify(res.data.valaddinfo))
+        let isok = '否'
+        let buytime = ''
+        let type = ''
+        this.valueinfo.forEach(item => {
+          reqdata.f_devices.forEach(res1 => {
+            if (res1.f_device_type == '附属设备信息' || res1.f_device_type == '燃气器具信息' || res1.f_device_type == '保险服务') {
+              res1.f_items.forEach(res2 => {
+                if (res2.f_item_name.includes('连接管')) {
+                  if (res2.f_item_name == '连接管产品现状' && res2.f_item_lists[0].f_item_value == '有') {
+                    isok = '是'
+                  }
+                  if (res2.f_item_name == '连接管购买时间') {
+                    buytime = res2.f_item_lists[0].f_item_value
+                  }
+                  if (res2.f_item_name == '连接管产品类型') {
+                    type = res2.f_item_lists[0].f_item_value
+                  }
+                } else {
+                  if (item.value_type + '购买时间' == res2.f_item_name && res2.f_item_lists[0].f_item_value != '') {
+                    item.startDate = res2.f_item_lists[0].f_item_value
+                    item.startdate = res2.f_item_lists[0].f_item_value
+                    item.f_operator_date = Util.getNowDate()
+                  }
+                  if (item.value_type + '产品现状' == res2.f_item_name && res2.f_item_lists[0].f_item_value == '有') {
+                    item.isuse = '是'
+                  }
+                  if (item.value_type + '产品类型' == res2.f_item_name && res2.f_item_lists[0].f_item_value != '') {
+                    item.f_product_type = res2.f_item_lists[0].f_item_value
+                  }
+                  if (item.value_type + '熄火保护' == res2.f_item_name && res2.f_item_lists[0].f_item_value != '') {
+                    item.f_value_protect = res2.f_item_lists[0].f_item_value
+                  }
+                  if (item.value_type + '产品品牌' == res2.f_item_name && res2.f_item_lists[0].f_item_value != '') {
+                    item.f_value_brand = res2.f_item_lists[0].f_item_value
+                  }
+                  if (item.value_type + '是否正常' == res2.f_item_name && res2.f_item_lists[0].f_item_value != '') {
+                    item.f_normal_state = res2.f_item_lists[0].f_item_value
+                  }
+                  if (item.value_type + '安装位置是否合适' == res2.f_item_name && res2.f_item_lists[0].f_item_value != '') {
+                    item.f_position_is_suitable = res2.f_item_lists[0].f_item_value
+                  }
+                  if (item.value_type + '备注' == res2.f_item_name && res2.f_item_lists[0].f_item_value != '') {
+                    item.f_comments = res2.f_item_lists[0].f_item_value
+                  }
+                  if ('有无' + item.value_type == res2.f_item_name && res2.f_item_lists[0].f_item_value == '有') {
+                    item.isuse = '是'
+                  }
+                }
+              })
+            }
+          })
+        })
+        if (isok == '是') {
+          this.valueinfo.push({
+            "isuse": isok,
+            "value_type": type,
+            "enddate": "1990-01-01 00:00:00",
+            "endDate": "",
+            "f_operator_date": Util.getNowDate(),
+            "startdate": buytime,
+            "startDate": buytime
+          })
+        }
+        let commit_data = []
+        commit_data = this.valueinfo.filter(obj1 => {
+          return this.oldvalueinfo.findIndex(obj2 => JSON.stringify(obj1) === JSON.stringify(obj2)) === -1;
+        });
+        if (commit_data.length===0){
+          return false
+        }
+        new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/chargevaluesave`, {
+          data: {
+            oldvalueinfo: this.oldvalueinfo,
+            valueinfo: commit_data,
+            f_resource: '安检',
+            userinfo: {
+              f_userinfo_id: this.item.f_userinfoid,
+              f_user_name: this.item.f_user_name
+            },
+            f_operator: Vue.user.name,
+            f_operatorid: Vue.user.id,
+            f_orgid: Vue.user.orgid,
+            f_orgname: Vue.user.orgs,
+            f_depid: Vue.user.depids,
+            f_depname: Vue.user.deps,
+            f_zoneid: Vue.user.zoneid,
+            f_zones: Vue.user.zones
+          }
+        })
+      })
+    },
+    async save(type) {
       this.saveNoclick()
-      console.log('禁用事件完成')
+      this.classnodu = true
       console.log('进入保存')
-      if(type == 'temp'){
+      if (type == 'temp') {
         this.data.f_complete = '未完成'
         this.disableTimer()
-      }else {
+      } else {
         let errString = this.errorVerify()
         if (errString) {
           console.log(errString)
-          console.log('Vue.android',Vue.android)
-          console.log('this.isUpload',this.isUpload)
-          if (Vue.android){
+          console.log('Vue.android', Vue.android)
+          console.log('this.isUpload', this.isUpload)
+          if (Vue.android) {
             this.$showMessage(errString)
           }
+          $("#savebut").removeClass("noclickbut");
           return
         } else {
           this.data.f_complete = '已完成'
           this.$set('data.f_offsite_time', Util.toStandardTimeString())
           this.disableTimer()
         }
+        if (!this.data.valueAddedState && this.data.f_entry_status == '入户') {
+          return this.$showMessage("请检查增值业务信息！",['confirm'])
+        }
       }
-      console.log("是否被拉黑-"+this.data.f_blacklist)
-      if(this.data.f_blacklist!='是'){
+      console.log("是否被拉黑-" + this.data.f_blacklist)
+      if (this.data.f_blacklist != '是') {
         delete this.data.f_blocking_cause
       }
       // try {
       let codata = this.getAllDefect()
+      if(this.bzisno){
+        this.warnModal = false
+        this.bzisno = false
+        this.$showMessage("当前差值量超过5立方以上，请核对,并填写差值备注",['cancel', 'confirm'])
+        $("#savebut").removeClass("noclickbut");
+        return
+      }
       console.log(`codata类型-->${typeof codata}`)
       console.log(`codata内容-->${JSON.stringify(codata)}`)
       for (let key in codata) {
@@ -934,12 +1278,12 @@ export default {
       console.log('安卓环境？=》' + Vue.android)
       if (Vue.android) {
         console.log('Vue.android is true')
-        let value = this.$androidUtil.path({
+        /*let value = this.$androidUtil.path({
           alias: 'getUserinfomation',
           data: {condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan = '无计划安检'"}
         })
-        console.log('getUserinfomation value ==> ' + JSON.stringify(value))
-        if (this.item.f_no_checkplan == '无计划安检'  && this.item.f_no_checkplan != '打回') {
+        console.log('getUserinfomation value ==> ' + JSON.stringify(value))*/
+        if (this.item.f_no_checkplan == '无计划安检' && this.item.f_no_checkplan != '打回') {
           // let result = this.$androidUtil.bzLogic('SafeSaveNoPaper', {
           //   f_check_item_id: this.data.f_check_item_id,
           //   f_checker_id: this.data.f_checker_id,
@@ -1084,6 +1428,7 @@ export default {
                         // }
                         //TODO 失败后处理
                         this.$showMessage("保存失败!")
+                        this.classnodu = false
                         return false
                       }
                     })
@@ -1098,6 +1443,7 @@ export default {
               //   this.isUpload = false
               // }
               this.$showMessage("保存失败!")
+              this.classnodu = false
               return false
             }
           })
@@ -1130,6 +1476,7 @@ export default {
                         // }
                         //TODO 失败后处理
                         this.$showMessage("保存失败!")
+                        this.classnodu = false
                         return false
                       }
                     })
@@ -1144,6 +1491,7 @@ export default {
               //   this.isUpload = false
               // }
               this.$showMessage("保存失败!")
+              this.classnodu = false
               return false
             }
           })
@@ -1155,7 +1503,7 @@ export default {
       //   this.$showMessage("保存失败!")
       // }
     },
-    runSyncLogic(logic,callback,backresult){
+    runSyncLogic(logic, callback, backresult) {
       HostApp.runSyncLogic({
         // logic别名，key必须为logic
         'logic': logic,
@@ -1164,10 +1512,10 @@ export default {
         // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
         // 执行回调方法传入key为backresult
         // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
-        'backresult':backresult
+        'backresult': backresult
       })
     },
-    logicWithHint(logic,data,callback,backresult){
+    logicWithHint(logic, data, callback, backresult) {
       HostApp.logicWithHint({
         // logic别名，key必须为logic
         'logic': logic,
@@ -1178,38 +1526,39 @@ export default {
         // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
         // 执行回调方法传入key为backresult
         // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
-        'backresult':backresult
+        'backresult': backresult
       })
     },
-    saveCallBack(jo){
+    saveCallBack(jo) {
       console.log(JSON.stringify(jo))
-      if(jo.state == 'ok'){
+      if (jo.state == 'ok') {
         let res = JSON.parse(jo.result)
-        console.log('保存结果===》'+JSON.stringify(res))
-        if(res.code == 200){
-          console.log('onlySave=====>'+this.onlySave)
-          if(!this.onlySave){
+        console.log('保存结果===》' + JSON.stringify(res))
+        if (res.code == 200) {
+          console.log('onlySave=====>' + this.onlySave)
+          if (!this.onlySave) {
             let codata = this.getAllDefect()
+            this.saveZZ(codata)
             //获取微信推送内容
             // let WxResult = this.getWeixin(codata)
             let haslivedispose = this.$androidUtil.bzLogic('getLiveDispose', {
               f_check_item_id: this.data.f_check_item_id
             })
             //如果是转维修上传，则不做校验，上传完成后自动转维修
-            console.log('this.isToRepair=======》'+this.isToRepair)
-            console.log('this.livedispose=======》'+this.livedispose)
-            if(!this.isToRepair){
-              if(haslivedispose.data.length > 0 && (this.livedispose == 'true' || this.livedispose == true)){
+            console.log('this.isToRepair=======》' + this.isToRepair)
+            console.log('this.livedispose=======》' + this.livedispose)
+            if (!this.isToRepair) {
+              if (haslivedispose.data.length > 0 && (this.livedispose == 'true' || this.livedispose == true)) {
                 console.log('是否已转维修')
                 console.log(this.isSafeCheckToRepair)
-                if(!this.isSafeCheckToRepair){
+                if (!this.isSafeCheckToRepair) {
 
                 }
               }
             }
             console.log(`codata类型-->${typeof codata}`)
-            for (let key in codata){
-              if(key.startsWith("device")){
+            for (let key in codata) {
+              if (key.startsWith("device")) {
                 codata[key] = []
               }
             }
@@ -1260,27 +1609,29 @@ 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')
               //this.$back()
             }
           }
-        }else{
+        } else {
           this.$showMessage('保存失败！')
-          return
+          this.classnodu = false
+          this.onlySave = true
         }
-      }else{
-        this.$showMessage('服务器内部错误,保存失败！')
-        return
+      } else {
+        this.$showMessage('移动网络异常,请稍后再试,本地保存失败！'+jo.err_msg)
+        this.classnodu = false
+        this.onlySave = true
       }
     },
-    uploadCallBack(jo){
+    uploadCallBack(jo) {
       //获取微信推送路径
       let url = ""
-      if(Vue.config.safecheck != undefined) {
+      if (Vue.config.safecheck != undefined) {
         if (Vue.config.safecheck.ApproveConfig != undefined) {
           if (Vue.config.safecheck.ApproveConfig.weixinurl != undefined) {
             url = Vue.config.safecheck.ApproveConfig.weixinurl
@@ -1289,84 +1640,98 @@ export default {
       }
       console.log(JSON.stringify(jo))
       console.log('jo ===> ' + JSON.stringify(jo))
-      if(jo.state == 'ok'){
+      if (jo.state == 'ok') {
         let res = JSON.parse(jo.result)
-        console.log('上传结果===》'+JSON.stringify(res))
-        console.log('上传结果的f_paper_id===》'+JSON.stringify(res.id))
-        if(res.code == 200){
+        console.log('上传结果===》' + JSON.stringify(res))
+        console.log('上传结果的f_paper_id===》' + JSON.stringify(res.id))
+        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})
           }
-          console.log('this.isToRepair==============>'+this.isToRepair)
-          if(this.isToRepair){
-            for (let device in this.data){
-              if(device.startsWith("device")){
+          console.log('this.isToRepair==============>' + this.isToRepair)
+          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('上传成功!')
             console.log('上传结束back')
             this.$dispatch('confirm')
             // this.$back()
           }
-        }else if(res.code == 309){
-          this.$showMessage('该安检单已作废!')
-          console.log('该安检单已作废')
-          this.$dispatch('confirm')
-        }else{
+        } else if (res.code == 309) {
+          this.$showMessage('该安检单已作废，无法上传!')
+        } else if (res.code == 710) {
+          this.$showMessage('上传照片失败,请检查网络是否正常！'+res.msg)
+        } else if (res.code == 711) {
+          this.$showMessage('该安检单已被管理员调整，请联系管理员!')
+        } else if (res.code == 712) {
+          this.$showMessage('网络异常，请重新上传，多次上传失败请联系管理员!')
+        } else if (res.code == 308) {
+          this.$showMessage('上次安检是到访不遇,距离现在不超过1天，禁止提交')
+        } else {
+          this.classnodu = false
           this.$showMessage('上传失败！')
-          this.onlySave = true
         }
-      }else {
-        this.$showMessage('服务器内部错误,上传失败！')
+        this.in_save = false
+        this.onlySave = true
+        $("#savebut").removeClass("noclickbut");
+      } else {
+        this.$showMessage('移动网络异常,请稍后再试,上传失败！')
+        $("#savebut").removeClass("noclickbut");
+        this.classnodu = false
         this.onlySave = true
       }
     },
-    safecheckToRepairCallBack(jo){
+    safecheckToRepairCallBack(jo) {
       //获取微信推送路径
-      if(jo.state == 'ok'){
+      if (jo.state == 'ok') {
         let res = JSON.parse(jo.result)
-        console.log('安检转维修===》'+JSON.stringify(res))
-        if(res.code == 200){
+        console.log('安检转维修===》' + JSON.stringify(res))
+        if (res.code == 200) {
           console.log('安检转维修成功')
-          if(res.data.code == 200){
+          if (res.data.code == 200) {
             this.$showMessage('上传并转维修成功！')
-          }else{
+          } else {
             this.$showMessage('上传并转维修成功，回写安检单失败！')
+            this.classnodu = false
           }
           this.$dispatch('confirm')
           // this.$back()
-        }else{
+        } else {
           this.$showMessage('上传失败！')
+          this.classnodu = false
           this.onlySave = true
         }
-      }else{
-        this.$showMessage('服务器内部错误,上传失败！')
+      } else {
+        this.$showMessage('移动网络异常,请稍后再试,上传失败！')
+        this.classnodu = false
         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 = ''
@@ -1374,13 +1739,13 @@ export default {
       this.meading = '转站点'
     },
     disableTimer() {
-      if(this.timer) {
+      if (this.timer) {
         window.clearTimeout(this.timer)
         this.timer = null
       }
     },
     loaded(paper) {
-      if(!paper.hasOwnProperty('id')) {
+      if (!paper.hasOwnProperty('id')) {
         this.$showMessage("该安检单在手机上已经不存在，可能是卸载过程序。可以进入重新安检，或返回安检计划。")
         this.init()
       } else {
@@ -1389,7 +1754,7 @@ export default {
         HostApp.__this__.$goto('safecheck-userinfo', {}, 'paper-router')
         // 如果打回重检则重新计时
         console.log('HostApp.__this__.role' + HostApp.__this__.role + ' HostApp.__this__.f_approved:' + HostApp.__this__.data.f_approved)
-        if(HostApp.__this__.role == 'inspect'
+        if (HostApp.__this__.role == 'inspect'
           && HostApp.__this__.data.f_approved
           && HostApp.__this__.data.f_approved == '打回') {
           console.log('打回')
@@ -1401,7 +1766,7 @@ export default {
       HostApp.__this__ = null
     },
     S4() {
-      return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
+      return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
     },
     extend(initalObj, finalObj) {
       var obj = finalObj || {};
@@ -1424,7 +1789,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+"'"
     //     }
     //   })
@@ -1432,7 +1797,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) {
@@ -1450,50 +1815,140 @@ export default {
         console.log(Vue.config)
         console.log('Vue.config.safecheck.DevicesConfig=>' + JSON.stringify(Vue.config.safecheck.DevicesConfig))
         console.log('赋值前的config=>' + JSON.stringify(this.config))
-        console.log("当前用户类型"+this.item.f_user_type)
-        if(this.item.f_user_type == '民用'){
+        console.log("当前用户类型" + this.item.f_user_type)
+        if (this.item.f_user_type == '民用') {
           // 民用户
 
-          if (Vue.config.safecheck.DevicesConfig != undefined){
-            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
+          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)
-            }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.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 = Object.assign({}, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]],this.config)
               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.DevicesConfig)
           }
-        }else {
+        } else {
           // 非民用
-          if (Vue.config.safecheck.DevicesSetConfig != undefined){
-            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
+          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]])
+            } 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 = Object.assign({}, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]],this.config)
               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[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},
+            "差值备注": {"index": 12, "type": "string", "readonly": false}
+          }
+        }
+        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": 11, "type": "string", "readonly": false}
+          }
+          // 注意，配置项的index必须与上面的固定配置保持'顺序'
+        }
+        this.config["燃气表"] = rqb
+      }
       console.log('赋值后的config=>' + JSON.stringify(this.config))
       // 预留设备项位置
       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
-        console.log('type '+ typeof n)
+        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,
@@ -1501,14 +1956,16 @@ 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',
+          class: this.getClassimg(i),
           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) {
             //赋值下拉选项
@@ -1527,9 +1984,9 @@ 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: i, f_items: items}
             )
           }
         }
@@ -1541,8 +1998,9 @@ export default {
       console.log('tbs合并数组')
       this.faultshow.number = this.tabs.length
     },
-    init () {
-      console.log("123456789")
+    init() {
+      console.log("123456789" + JSON.stringify(this.item))
+      this.data.f_userfiles_id = this.item.f_plan_meters[0].f_userfiles_id    //给安检单传的表具编号
       // 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
@@ -1564,16 +2022,24 @@ 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[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_entry_status', '入户')
       this.$set('data.f_usegas', '已使用')
-      this.$set('data.f_state',this.item.f_state)
-      console.log('设置参数3')
+      this.$set('data.f_state', this.item.f_state)
+      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_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_is_outdoor', '否')
       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)
@@ -1584,10 +2050,12 @@ export default {
       this.$set('data.f_unit', this.item.f_unit)
       console.log('设置参数4')
       this.$set('data.f_floor', this.item.f_floor)
-      this.$set('data.f_residential_area' , this.item.f_residential_area)
+      this.$set('data.f_residential_area', this.item.f_residential_area)
       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)
@@ -1602,13 +2070,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("item.f_plan_meters",this.item.f_plan_meters)
-      if(this.item.f_plan_meters) {
+      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: "燃气表",
@@ -1657,20 +2126,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: "燃气表",
@@ -1719,48 +2178,132 @@ 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_balance_amount,
+                      f_path: "",
+                      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"
                     },
                     {
                       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: null,
                       f_path: "",
                       type: "string"
                     }
-                  ]
+                  )
+                  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))
                   /*
-                    "累购气量":{"index":8,"type":"number","readonly":true},
-                    "累购金额":{"index":8,"type":"number","readonly":true},
-                    "字轮读数":{"index":9,"type":"number","checkmust": true},
-                    "已用金额":{"index":9,"type":"number","checkmust": true},
-                    "剩余气量":{"index":10,"type":"number","checkmust": true},
-                    "剩余金额":{"index":10,"type":"number","checkmust": true},
-                    "气量异常差值":{"index":11,"type":"number","readonly": true},
-                    "金额异常差值":{"index":11,"type":"number","readonly": true}
-                  */
+                      "累购气量":{"index":8,"type":"number","readonly":true},
+                      "累购金额":{"index":8,"type":"number","readonly":true},
+                      "字轮读数":{"index":9,"type":"number","checkmust": true},
+                      "已用金额":{"index":9,"type":"number","checkmust": true},
+                      "剩余气量":{"index":10,"type":"number","checkmust": true},
+                      "剩余金额":{"index":10,"type":"number","checkmust": true},
+                      "气量异常差值":{"index":11,"type":"number","readonly": true},
+                      "金额异常差值":{"index":11,"type":"number","readonly": true}
+                    */
                   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"
                         },
@@ -1799,25 +2342,44 @@ export default {
                           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: "string"
                         }
                       )
-                      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"
                         },
@@ -1844,7 +2406,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "剩余气量",
-                          f_item_value: "",
+                          f_item_value: '',
                           f_path: "",
                           type: "number"
                         },
@@ -1856,34 +2418,43 @@ export default {
                           f_item_value: null,
                           f_path: "",
                           type: "number"
-                        }
-                      )
-                      console.log('this.config[\'燃气表\'][\'items\']  ---> ' + JSON.stringify(this.config['燃气表']['items']))
-                    }
-                  }
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "差值备注",
+                          f_item_value: null,
+                          f_path: "",
+                          type: "string"
+                        }
+                      )
+                      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: "",
-                        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_path: "",
+                          type: "number"
+                        },*/
                       {
                         f_defect_level: null,
                         f_device_id: "",
@@ -1916,39 +2487,535 @@ export default {
                         f_device_id: "",
                         f_is_defect: "",
                         f_item_name: "气量异常差值",
-                        isshow:false,
                         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: "string"
                       }
                     )
-                    console.log('this.config[\'燃气表\'][\'items\']  ---> ' + JSON.stringify(this.config['燃气表']['items']))
+                    console.log('this.config[\'燃气表\'][\'items\']  --->3 ' + JSON.stringify(this.config['燃气表']['items']))
                   }
                 })
               }
+
             }
           }
+          // continue
+          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: this.valueInfo.valaddinfo[t].f_comments,
+                          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: this.valueInfo.valaddinfo[t].f_comments,
+                          f_path: "",
+                          type: "string"
+                        }
+                      )
+                    }
+
+                  }
+
+                }
+              }
+            })
+            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].f_product_type,
+                          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].f_value_protect,
+                          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].f_value_brand,
+                          f_path: "",
+                          type: "selector"
+                        },
+                        {
+                          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].f_value_brand,
+                          f_path: "",
+                          type: "selector"
+                        },
+                        {
+                          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].f_value_brand,
+                          f_path: "",
+                          type: "selector"
+                        },
+                        {
+                          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"
+                        },
+                        {
+                          f_defect_level: null,
+                          f_device_id: "",
+                          f_is_defect: "",
+                          f_item_name: "报警器是否正常",
+                          isshow: true,
+                          f_item_value: this.valueInfo.valaddinfo[t].f_normal_state,
+                          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].f_position_is_suitable,
+                          f_path: "",
+                          type: "radio"
+                        },
+                      )
+                    } 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].f_normal_state,
+                          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].f_normal_state,
+                          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].f_normal_state,
+                          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.includes('管')) {
+                      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].value_type,
+                          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:'安检详情',
-        safe:true
+        _this: this,
+        tittle: '安检详情',
+        safe: true
       }
       // this.$dispatch('gotoson',pardate)
       console.log('页面跳转')
-      this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
-    }
+      this.$goto('safecheck-userinfo', {userinfo: this.data}, 'repair')
+    },
+    getModel() {
+      let http = new HttpResetClass()
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/getIotInfo`, {
+        data: {
+          f_userinfo_code: `${this.item.f_userinfo_code}`
+        }
+      }).then((res) => {
+        this.tableAnomalyRecords = res.data
+      })
+    },
   },
   watch: {
-    'row' () {
+    '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 () {
+  async ready() {
+    this.getModel()
+    this.gps = HostApp.getGpsDetailAddress()
     //送气超期功能
     //await this.isoverDate()
+    try{
+      let val = await new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/valueaddinfo`, {
+        f_userfiles_id: '',
+        f_userinfo_id: this.item.f_userinfoid,
+        f_olduserinfo_code: ''
+      })
+      if (val.data && val.data.valaddinfo) {
+        this.valueInfo = val.data
+      }
+    }catch (e) {
+      this.$showMessage(`获取当前用户增值业务信息失败！${e.data?e.data:''} 请及时联系营业厅或管理员核对！`)
+    }
+    console.log('------获取增值业务' + JSON.stringify(this.valueInfo))
     this.putDevices()
     //如果已检，则提取安检单
     if (this.item.f_state != '未检') {
@@ -1957,35 +3024,46 @@ export default {
         HostApp.__this__ = this
         let that = this
         let value = {}
-        console.log('this.item.f_no_checkplan',this.item.f_no_checkplan)
+        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_getPhoneCheckPaper', {condition: condition})
         } else {
           value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {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[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) {
@@ -2012,10 +3090,11 @@ 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]))
                   }
-
                 }
               }
               for (let de in that.devices) {
@@ -2033,7 +3112,7 @@ export default {
               Util.androidRatifyPics(that.picture, this.$androidUtil.getProxyUrl())
               Util.booleanFilter(that.data)
             }
-            console.log('回写数据完成后'+JSON.stringify(that.data))
+            console.log('回写数据完成后' + JSON.stringify(that.data))
           }
         } else {
           console.log("该安检单可能已不在本地!")
@@ -2041,22 +3120,23 @@ export default {
         }
         console.log('页面跳转')
         var pardate = {
-          _this:this,
-          tittle:'安检详情',
-          safe:true
+          _this: this,
+          tittle: '安检详情',
+          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', {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/logic/getUserinfomationLogic`, {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, [])
                 }
@@ -2073,10 +3153,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())
               }
               console.log("that.data:", that.data)
             } else {
@@ -2084,19 +3164,19 @@ export default {
               this.init()
             }
             var pardate = {
-              _this:this,
-              tittle:'安检详情',
-              safe:true
+              _this: this,
+              tittle: '安检详情',
+              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) => {
             alert('查找安检单失败')
           })
       }
-    }else{
+    } else {
       this.init()
     }
     // tbs合并数组
@@ -2131,9 +3211,13 @@ export default {
 </script>
 <style lang="less">
 @import "../../../src/bootstrap/less/variables.less";
+/*.divmask {*/
+/*pointer-events: none;*/
+/*}*/
 .noclickbut {
   pointer-events: none;
 }
+
 .tab-befor-img (@url) {
   content: '';
   background-image: url("@{url}");
@@ -2152,16 +3236,43 @@ export default {
     margin: 0.3em 0;
   }
 }
-.repair-details-class{
+
+.repair-details-class {
   &::before {
     .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");
   }
 }
+
 .repair-user-info-class {
   &::before {
     .tab-befor-img("../../assets/jibenxinxi1.png")
@@ -2200,7 +3311,7 @@ export default {
 
 .outlay-class {
   &::before {
-    .tab-befor-img("../../assets/feiyong1.png")
+    .tab-befor-img("../../assets/拍照签名.png")
   }
 }
 
@@ -2209,11 +3320,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")
@@ -2225,44 +3338,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;