safecheck-client 3.0.35-5 → 3.0.35-51

package/src/components/android/SafecheckOrderV.vue

@@ -1,7 +1,4 @@
 <template>
-  <!--<div class="app-botton" @click="back()">-->
-  <!--返回<span class="glyphicon glyphicon-menu-right"></span>-->
-  <!--</div>-->
   <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">
@@ -125,16 +122,8 @@
 </template>
 
 <script>
-  // 户内维修
   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 co from 'co'
   import $ from "jquery";
@@ -519,16 +508,11 @@
         }
       },
       changediv(val){
-        //tag
         return val
       },
       // 选择tab
       tabSelect (item,number) {
         this.header = item.header
-        //tag
-        //tag
-        //tag
-        //tag
         // 处理关闭/显示 内容
         if(this.number == number && !this.routeShow ){
           this.routeShow = true
@@ -539,14 +523,10 @@
         }
         this.number = number
         this.componentName = item.complete
-        //tag
         if(item.complete == 'safecheck-devices'){
-          //tag
           if(item.header != '燃气表' && this.data['device'+item.number].length == 0){
             this.data['device' + item.number].push({})
           }
-          //tag
-          //tag)
           let idx=this.data['device' + item.number].length - 1
           let itemprops = {
             config:this.config,
@@ -554,16 +534,10 @@
             idx:idx,
             role:'inspect'
           }
-          //tag
-          //tag)
-          //tag)
-          //tag
           if(this.routeShow){
             this.$goto(item.complete, itemprops, 'repair')
-            //tag
           }
         }else{
-          //tag
           if(this.routeShow){
             this.$goto(item.complete, {userinfo:this.data}, 'repair')
           }
@@ -590,8 +564,6 @@
           }}, {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++) {
-              //tag)
-              //tag
               if (res.data[i].id.toString() === this.model.serviceacitivity[0].imgs[j].imgid) {
                 this.model.serviceacitivity[0].imgs[j] = Object.assign({}, res.data[i], this.model.serviceacitivity[0].imgs[j])
               }
@@ -680,9 +652,6 @@
           return  '拒捡必须拍照'
       },
       verifyUser() {
-        //tag
-        //tag
-        //tag)
         let prefix = '用户基本信息：'
         if(Util.required(this.data.f_user_name))
           return prefix + '用户名必须输入'
@@ -757,7 +726,6 @@
       },
       verifyFeedback() {
         let prefix = '拍照签名：'
-        //tag)
         if(Vue.android && (!this.data.f_overall_imgs || this.data.f_overall_imgs.length < this.imgsnum) && this.data.f_entry_status == '入户')
           return prefix + `必须有${this.imgsnum}安检总体照片`
         if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
@@ -776,14 +744,11 @@
         }
         let value = ''
         let codata = JSON.parse(JSON.stringify(this.data))
-        //tag)
-        //tag)
         codata.f_devices = []
         this.f_devices = []
         for (let device in codata) {
           let f_device_type
           if (device.startsWith("device")) {
-            //tag)
             let hasOther = ''
             let otherValue = null
             for (let item in codata[device]) {
@@ -797,10 +762,6 @@
               } else {
                 f_device_type = codata[device][item].f_device_type
               }
-              //tag
-              //tag
-              //tag)
-              //tag)
               if(item == 'sum' || item == 'removeEmpty'){
                 continue
               }
@@ -809,31 +770,9 @@
                 if(i == 'sum' || i == 'removeEmpty'){
                   continue
                 }
-                //tag)
                 var items = codata[device][item].f_items[i]
                 items.f_create_time = Util.toStandardTimeString()
-                //tag)
                 items.f_item_lists = []
-                //tag)
-                // //tag)
-                // //tag} name => ${JSON.stringify(items.f_item_name)} value => ${JSON.stringify(items.f_item_value)}`)
-                // console.log(`f_is_defect => ${this.config[codata[device][item]
-                //     .f_device_type]
-                //     .items[items.f_item_name]
-                //     .options
-                //     .find((option)=>option.data === items.f_item_value)
-                //     .map((option)=>option.f_is_defect)}`)
-                // if (items.f_is_defect && (items.f_is_defect == true || items.f_is_defect == 'true')) {
-                //     //tag
-                //     checkResults.result = '有隐患'
-                //     //tag)
-                //     //tag)
-                //     // this.$set('checkResult.' + items.f_item_name, items.f_item_value)
-                //       this.checkResult[items.f_item_name] = items.f_item_value
-                //     //tag)
-                //     // this.$set('checkResultsss.' + items.f_item_name, `${f_device_type}${items.f_item_value}`)
-                //     // //tag)
-                // }
                 if (items.type == 'selector') {
                   items.selected = []
                 } else if (items.type == 'inputSelector') {
@@ -844,11 +783,6 @@
                 let f_defect_level   //是否是隐患
                 let f_item_name = items.f_item_name
                 let f_item_value
-                let f_is_eliminate //隐患是否消除
-                let f_meternumber = ''
-                let f_user_defects = [] // 用户所有隐患
-                //tag
-                //tag
                 if (items.type == 'selector' || items.type == 'checkbox' || items.type == 'radio') {
                   for (let i in items.f_item_value) {
                     if(typeof items.f_item_value[i]=='function'){
@@ -866,11 +800,6 @@
                         f_is_defect = configItems.options[k].isdefect
                         f_item_value = items.f_item_value[i]
                         f_defect_level = configItems.options[k].level
-
-                        //tag
-                        //tag
-                        //tag
-
                         if (f_is_defect) {
                           if (checkResults.result !== '有隐患') {
                             checkResults.result = '有隐患'
@@ -882,11 +811,8 @@
                             this.repairDefect.data.push(`${f_item_name} : ${f_item_value}`)
                           }
                           if (!this.checkResult.hasOwnProperty(f_device_type+'-'+f_item_name)) {
-                            //tag
                             this.checkResult[f_device_type+'-'+f_item_name] = []
                           }
-
-                          //tag
                           this.checkResult[f_device_type+'-'+f_item_name].push(f_item_value)
 
                         }
@@ -899,17 +825,12 @@
                           f_create_time: Util.toStandardTimeString()
                         }
                         if (!items.f_item_lists) {
-                          //tag
                           items.f_item_lists = []
-                          //tag)
                           if (JSON.stringify(items_list) !== '{}') {
-                            //tag
                             items.f_item_lists.push(items_list)
                           }
                         } else {
-                          //tag)
                           if (JSON.stringify(items_list) !== '{}') {
-                            //tag
                             items.f_item_lists.push(items_list)
                           }
                         }
@@ -933,43 +854,30 @@
                       checkResults.result = '有隐患'
                     }
                     if (!this.checkResult.hasOwnProperty(items.f_item_name)) {
-                      //tag
                       this.checkResult[items.f_item_name] = []
                     }
 
-                    //tag
                     this.checkResult[items.f_item_name].push(f_item_value)
 
                   }
-                  //tag)
-                  //tag)
                   if (!items.f_item_lists) {
-                    //tag
                     items.f_item_lists = []
                     if (JSON.stringify(items_list) != '{}') {
-                      //tag
                       items.f_item_lists.push(items_list)
                     }
                   } else {
-                    // items.f_item_lists[0].f_item_value = f_item_value
                     if (JSON.stringify(items_list) != '{}') {
-                      //tag
-                      //tag)
-                      //tag)
-                      //tag
                       items.f_item_lists.push(items_list)
                     }
                   }
                 }
                 if (hasOther !== '' && otherValue !== null) {
-                  //tag
                   this.checkResult[hasOther].push(otherValue)
                   hasOther = ''
                   otherValue = null
                 }
                 items.f_item_value = ''
               }
-              //tag)
               this.f_devices.push(codata[device][item])
             }
           }
@@ -980,15 +888,9 @@
               continue
             }
             // 上次安检结果数据组织
-            //tag
-            //tag
             let temp = {}
             temp[key] = this.checkResult[key].join(',')
             checkResults.data.push(temp)
-            // this.newcheckResult[key] = this.checkResult[key]
-            // checkResults.data.push(this.newcheckResult)
-            //tag)
-            // this.newcheckResult = {}
           }
           this.checkResult = {}
         }
@@ -1004,7 +906,6 @@
         }
         codata.f_defect_content = JSON.stringify(checkResults)
         this.data.f_defect_content = JSON.stringify(checkResults)
-        //tag
         return codata
       },
       uploadCheckPaper(){
@@ -1020,158 +921,16 @@
           this.$set('data.f_offsite_time', Util.toStandardTimeString())
           this.$set('data.f_upload_time', Util.toStandardTimeString())
           this.$set('data.f_upload_date', Util.toStandardTimeString())
-          //tag
           this.data.f_complete = '已完成'
           this.disableTimer()
         }
-        //tag
         this.onlySave = false
         this.assemblyCodata()
         if (this.repairDefect.result != '正常') {
           return this.$showMessage('有隐患的处理方式为转维修,请点击转维修')
         }
-        let res =  this.save()
-        // if(res) {
-        //   try {
-        //     let codata = this.getAllDefect()
-        //     //获取微信推送内容
-        //     let WxResult = this.getWeixin(codata)
-        //     let haslivedispose = this.$androidUtil.bzLogic('getLiveDispose', {
-        //       f_check_item_id: this.data.f_check_item_id
-        //     })
-        //     //如果是转维修上传，则不做校验，上传完成后自动转维修
-        //     //tag
-        //     //tag
-        //     if(!this.isToRepair){
-        //       if(haslivedispose.data.length > 0 && (this.livedispose == 'true' || this.livedispose == true)){
-        //         //tag
-        //         //tag
-        //         if(!this.isSafeCheckToRepair){
-        //           this.$showMessage('有未处理的隐患，请前往拍照上传中将安检转为维修单！')
-        //           return
-        //         }
-        //       }
-        //     }
-        //     //tag
-        //     for (let key in codata){
-        //       if(key.startsWith("device")){
-        //         codata[key] = []
-        //       }
-        //     }
-        //     //tag}`)
-        //
-        //     //tag
-        //     let isStart = true
-        //     let res
-        //     for (let i in this.f_devices){
-        //       res = HostApp.organizeJSON({isStart:isStart,isDevice:true,device:this.f_devices[i]})
-        //       if(res.code == 200){
-        //         isStart = false
-        //       }else{
-        //         this.$showMessage("保存失败!")
-        //       }
-        //     }
-        //     let result = HostApp.organizeJSON({
-        //       isStart:false,
-        //       isJSON:true,
-        //       jsonstr:{
-        //         f_check_item_id: this.data.f_check_item_id,
-        //         f_checker_id: this.data.f_checker_id,
-        //         row: codata
-        //       }
-        //     })
-        //     if(result.code == 200){
-        //       HostApp.__this__ = this
-        //       this.runSyncLogic('上传安检信息','javascript:HostApp.__this__.uploadCallBack()',1)
-        //     }
-        //
-        //
-        //     // let response = this.$androidUtil.bzLogic('上传安检信息', {
-        //     //   f_check_item_id: this.data.f_check_item_id,
-        //     //   f_checker_id: this.data.f_checker_id,
-        //     //   row: codata
-        //     // })
-        //     // if (response.code == 200) {
-        //     //   //tag
-        //     //   //tag)
-        //     //   let f_paper_id
-        //     //   if(response.data != '' && response.data != null){
-        //     //     f_paper_id = JSON.parse(response.data).id
-        //     //   }
-        //     //   this.$set('data.f_paper_id', f_paper_id)
-        //     //   //tag
-        //     //   //tag)
-        //     //   //tag
-        //     //   //tag)
-        //     //   for (let device in this.data){
-        //     //     //tag
-        //     //     //tag)
-        //     //     if(device.startsWith("device")){
-        //     //       for(let devices of this.data[device]) {
-        //     //         devices.f_paper_id = f_paper_id
-        //     //         let ret = this.$androidUtil.bzLogic('UpCheckPaperDevices', {
-        //     //           row: devices
-        //     //         })
-        //     //         //tag}`)
-        //     //         if(ret.code == 200){
-        //     //           //tag
-        //     //           devices.f_device_id = JSON.parse(ret.data.f_device_id).id
-        //     //         }
-        //     //         //tag
-        //     //         //tag)
-        //     //         if (ret.code != 200) {
-        //     //           //TODO 失败后处理
-        //     //           // this.isUpload = false
-        //     //           this.$showMessage("上传失败!")
-        //     //           return false
-        //     //         }
-        //     //       }
-        //     //     }
-        //     //   }
-        //     //   // for (let device of this.f_devices) {
-        //     //   //   device.f_paper_id = f_paper_id
-        //     //   //   //tag
-        //     //   //   //tag)
-        //     //   //   let ret = this.$androidUtil.bzLogic('UpCheckPaperDevices', {
-        //     //   //     row: device
-        //     //   //   })
-        //     //   //   //tag
-        //     //   //   if (ret.code != 200) {
-        //     //   //     //TODO 失败后处理
-        //     //   //     HostApp.alert("上传失败!")
-        //     //   //     return false
-        //     //   //   }
-        //     //   // }
-        //     //   let result = this.$androidUtil.bzLogic('FinishUpload',
-        //     //     {
-        //     //       f_check_item_id: this.data.f_check_item_id,
-        //     //       f_userinfo_id: codata.f_userinfoid,
-        //     //       f_last_check_result: codata.f_defect_content
-        //     //     })
-        //     //   if(result.code == 200){
-        //     //     // this.$showAlert('上传成功!', 'success', 2000)
-        //     //     this.$showMessage('上传成功!')
-        //     //     this.isStrat=false
-        //     //     if(url != "" ){
-        //     //       this.$resetpost(`${url}`,{data:WxResult})
-        //     //     }
-        //     //     return true
-        //     //   }else{
-        //     //     // this.isUpload = false
-        //     //     this.$showMessage("上传失败!")
-        //     //     return false
-        //     //   }
-        //     // }else{
-        //     //   // this.isUpload = false
-        //     //   this.$showMessage("上传失败!")
-        //     //   return false
-        //     // }
-        //   }catch (e) {
-        //     //tag)
-        //     // this.isUpload = false
-        //     this.$showMessage("上传失败!")
-        //   }
-        // }
+        this.save()
+
       },
       //将数据组装提出
       assemblyCodata(){
@@ -1193,8 +952,6 @@
         }
         //禁用事件
         this.saveNoclick()
-        //tag
-        //tag
         if(type == 'temp'){
           this.data.f_complete = '未完成'
           this.rowCodata.f_complete = '未完成'
@@ -1206,9 +963,6 @@
           this.closely(false) // 保存本地，不删除录音文件暂停录音
           let errString = this.errorVerify()
           if (errString) {
-            //tag
-            //tag
-            //tag
             if (Vue.android){
               this.$showMessage(errString)
             }
@@ -1221,7 +975,6 @@
             this.disableTimer()
           }
         }
-        //tag
         if(this.data.f_blacklist!='是'){
           delete this.data.f_blocking_cause
         }
@@ -1245,55 +998,19 @@
           this.data.f_noanswer1_path = null
           this.data.f_noanswer2_path = null
         }
-        // try {
         let codata = this.rowCodata
-        //tag
-        //tag}`)
         for (let key in codata) {
           if (key.startsWith("device")) {
-            //tag)
             codata[key] = []
           }
         }
         codata.f_complete = this.data.f_complete
-        //tag}`)
-        //tag}`)
-        //tag
         if (Vue.android) {
-          //tag
           let value = this.$androidUtil.path({
             alias: 'getUserinfomation',
             data: {condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan in ('无计划安检','复检')"}
           })
-          //tag)
           if ((this.item.f_no_checkplan == '无计划安检' || 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,
-            //   f_upload_state:'未传',
-            //   row: codata
-            // })
-            //tag
-            let isStart = true
-            // let res
-            // for (let i in this.f_devices) {
-            //   res = HostApp.organizeJSON({isStart: isStart, isDevice: true, device: this.f_devices[i]})
-            //   if (res.code == 200) {
-            //     isStart = false
-            //   } else {
-            //     this.$showMessage("保存失败!")
-            //   }
-            // }
-            // let result = HostApp.organizeJSON({
-            //   isStart: false,
-            //   isJSON: true,
-            //   jsonstr: {
-            //     f_check_item_id: this.data.f_check_item_id,
-            //     f_checker_id: this.data.f_checker_id,
-            //     f_upload_state: '未传',
-            //     row: codata
-            //   }
-            // })
             codata.f_devices = this.f_devices
             if (this.rowCodata && this.rowCodata.istoRepair=='转维修') {
               this.rowCodata = Object.assign({},this.rowCodata,codata)
@@ -1304,10 +1021,8 @@
               f_check_item_id: this.data.f_check_item_id,
               f_checker_id: this.data.f_checker_id,
               f_upload_state: '未传',
-              // row: codata
               row: this.rowCodata
             }
-            //tag)
             let paramStr = JSON.stringify(param)
             // 多长截断一次
             let subLength = 800
@@ -1326,36 +1041,6 @@
               'backresult': 1
             })
           } else {
-            // console.log("dddddddd")
-            //tag
-            let isStart = true
-            let res
-            //tag)
-            // for (let i in this.f_devices) {
-            //   //tag)
-            //   for (let j = 0; j < this.f_devices[i].f_items.length; j++) {
-            //     //tag)
-            //   }
-            //   res = HostApp.organizeJSON({isStart: isStart, isDevice: true, device: this.f_devices[i]})
-            //   //tag)
-            //   if (res.code == 200) {
-            //     isStart = false
-            //   } else {
-            //     this.$showMessage("保存失败!")
-            //   }
-            // }
-            //tag)
-            //tag)
-            //tag)
-            // let result = HostApp.organizeJSON({
-            //   isStart: false,
-            //   isJSON: true,
-            //   jsonstr: {
-            //     f_check_item_id: this.data.f_check_item_id,
-            //     f_checker_id: this.data.f_checker_id,
-            //     row: codata
-            //   }
-            // })
             codata.f_devices = this.f_devices
             if (this.rowCodata && this.rowCodata.istoRepair=='转维修') {
               this.rowCodata = Object.assign({},this.rowCodata,codata)
@@ -1365,11 +1050,8 @@
             let param = {
               f_check_item_id: this.data.f_check_item_id,
               f_checker_id: this.data.f_checker_id,
-              // row: codata
               row: this.rowCodata
             }
-            //tag)
-            // console.log("ni"+JSON.stringify(param))
             let paramStr = JSON.stringify(param)
             // 多长截断一次
             let subLength = 800
@@ -1390,7 +1072,6 @@
           }
 
         } else {
-          //tag
           let value = this.$androidUtil.path({
             alias: 'getUserinfomation',
             data: {condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan in ('无计划安检','复检')"}
@@ -1405,7 +1086,6 @@
               f_check_item_id: this.data.f_check_item_id,
               f_checker_id: this.data.f_checker_id,
               f_upload_state: '未传',
-              // row: codata
               row: this.rowCodata
             }).then((res) => {
               if (res.data.code == 200) {
@@ -1413,21 +1093,14 @@
                 this.$androidUtil.bzLogic('getPaperInfo', {
                   f_check_item_id: this.data.f_check_item_id
                 }).then((res) => {
-                  //tag
                   if (res.data.code == 200) {
-
                     let f_paper_id = res.data.data[0].id
                     for (let device of this.f_devices) {
                       device.f_paper_id = f_paper_id
-                      //tag
                       this.$androidUtil.bzLogic('saveDevice', {
                         row: device
                       }).then((ret) => {
-                        //tag
                         if (ret.code != 200) {
-                          // if(this.isUpload){
-                          //   this.isUpload = false
-                          // }
                           //TODO 失败后处理
                           this.$showMessage("保存失败!")
                           return false
@@ -1436,13 +1109,9 @@
                     }
                   }
                 })
-                // this.$showAlert('保存成功!', 'success', 2000)
                 this.$showMessage('保存成功!')
                 return true
               } else {
-                // if(this.isUpload){
-                //   this.isUpload = false
-                // }
                 this.$showMessage("保存失败!")
                 return false
               }
@@ -1454,27 +1123,20 @@
               f_checker_id: this.data.f_checker_id,
               row: this.rowCodata
             }).then((res) => {
-              //tag
               if (res.data.code == 200) {
                 //保存devices
                 this.$androidUtil.bzLogic('getPaperInfo', {
                   f_check_item_id: this.data.f_check_item_id
                 }).then((res) => {
-                  //tag
                   if (res.data.code == 200) {
 
                     let f_paper_id = res.data.data[0].id
                     for (let device of this.f_devices) {
                       device.f_paper_id = f_paper_id
-                      //tag
                       this.$androidUtil.bzLogic('saveDevice', {
                         row: device
                       }).then((ret) => {
-                        //tag
                         if (ret.code != 200) {
-                          // if(this.isUpload){
-                          //   this.isUpload = false
-                          // }
                           //TODO 失败后处理
                           this.$showMessage("保存失败!")
                           return false
@@ -1483,24 +1145,15 @@
                     }
                   }
                 })
-                // this.$showAlert('保存成功!', 'success', 2000)
                 this.$showMessage('保存成功!')
                 return true
               } else {
-                // if(this.isUpload){
-                //   this.isUpload = false
-                // }
                 this.$showMessage("保存失败!")
                 return false
               }
             })
           }
         }
-        // }catch (e) {
-        //   //tag)
-        //   // this.isUpload = false
-        //   this.$showMessage("保存失败!")
-        // }
       },
       runSyncLogic(logic,callback,backresult){
         HostApp.runSyncLogic({
@@ -1529,13 +1182,9 @@
         })
       },
       saveCallBack(jo){
-        //tag)
-        // console.log("jjjj"+JSON.stringify(jo))
         if(jo.state == 'ok'){
           let res = JSON.parse(jo.result)
-          //tag)
           if(res.code == 200){
-            //tag
             if(!this.onlySave){
               let codata = this.getAllDefect()
               //获取微信推送内容
@@ -1544,46 +1193,18 @@
                 f_check_item_id: this.data.f_check_item_id
               })
               //如果是转维修上传，则不做校验，上传完成后自动转维修
-              //tag
-              //tag
               if(!this.isToRepair){
                 if(haslivedispose.data.length > 0 && (this.livedispose == 'true' || this.livedispose == true)){
-                  //tag
-                  //tag
                   if(!this.isSafeCheckToRepair){
 
                   }
                 }
               }
-              //tag
               for (let key in codata){
                 if(key.startsWith("device")){
                   codata[key] = []
                 }
               }
-              //tag}`)
-
-              //tag
-              // let isStart = true
-              // let res
-              // for (let i in this.f_devices){
-              //   res = HostApp.organizeJSON({isStart:isStart,isDevice:true,device:this.f_devices[i]})
-              //   if(res.code == 200){
-              //     isStart = false
-              //   }else{
-              //     this.$showMessage("上传失败!")
-              //     return
-              //   }
-              // }
-              // let result = HostApp.organizeJSON({
-              //   isStart:false,
-              //   isJSON:true,
-              //   jsonstr:{
-              //     f_check_item_id: this.data.f_check_item_id,
-              //     f_checker_id: this.data.f_checker_id,
-              //     row: codata
-              //   }
-              // })
               codata.f_devices = this.f_devices
               if (this.rowCodata && this.rowCodata.istoRepair=='转维修') {
                 this.rowCodata = Object.assign({},this.rowCodata,codata)
@@ -1593,10 +1214,8 @@
               let param = {
                 f_check_item_id: this.data.f_check_item_id,
                 f_checker_id: this.data.f_checker_id,
-                // row: codata
                 row: this.rowCodata
               }
-              //tag)
               let paramStr = JSON.stringify(param)
               // 多长截断一次
               let subLength = 800
@@ -1619,7 +1238,6 @@
               if(this.clickBack){
                 this.isStrat = false
                 this.$dispatch('confirm')
-                //this.$back()
               }
             }
           }else{
@@ -1641,12 +1259,8 @@
             }
           }
         }
-        //tag)
-        //tag)
         if(jo.state == 'ok'){
           let res = JSON.parse(jo.result)
-          //tag)
-          //tag)
           if(res.code == 200){
             this.$set('data.f_paper_id', res.id)
             this.isStrat=false
@@ -1665,7 +1279,6 @@
                   }
               })
             }
-            //tag
             if(this.isToRepair){
               for (let device in this.data){
                 if(device.startsWith("device")){
@@ -1688,13 +1301,10 @@
               this.todo()
             }else{
               this.$showMessage('上传成功!')
-              //tag
               this.$dispatch('confirm')
-              // this.$back()
             }
           }else if(res.code == 309){
             this.$showMessage('该安检单已作废!')
-            //tag
             this.$dispatch('confirm')
           }else if(res.code == 710){
             this.$showMessage('上传照片失败,请检查网络是否正常！'+res.msg)
@@ -1721,16 +1331,13 @@
         //获取微信推送路径
         if(jo.state == 'ok'){
           let res = JSON.parse(jo.result)
-          //tag)
           if(res.code == 200){
-            //tag
             if(res.data.code == 200){
               this.$showMessage('上传并转维修成功！')
             }else{
               this.$showMessage('上传并转维修成功，回写安检单失败！')
             }
             this.$dispatch('confirm')
-            // this.$back()
           }else{
             this.$showMessage('上传失败！')
             this.onlySave = true
@@ -1766,11 +1373,9 @@
           HostApp.__this__.$set('data', paper)
           HostApp.__this__.$goto('safecheck-userinfo', {}, 'paper-router')
           // 如果打回重检则重新计时
-          //tag
           if(HostApp.__this__.role == 'inspect'
             && HostApp.__this__.data.f_approved
             && HostApp.__this__.data.f_approved == '打回') {
-            //tag
             HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
             HostApp.__this__.tick()
           }
@@ -1801,16 +1406,7 @@
         }
         return obj;
       },
-      // async isoverDate(){
-      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
-      //       condition:"f_plan_item_id='"+this.item.id+"'"
-      //     }
-      //   })
-      //   this.isneedDate=res.data[0]["f_subscribe_date"]
-      // },
       putDevices() {
-        //tag)
-        //tag)
         this.$set('data.approve', "true")
         this.$set('data.writeback', "false")
         if (Vue.config.safecheck != undefined) {
@@ -1834,22 +1430,14 @@
               this.refuseinspection = Vue.config.safecheck.ApproveConfig.refuseinspection
             }
           }
-          //tag
-          //tag)
-          //tag)
-          //tag
           if(this.item.f_user_type == '非民用'){
             // 非民用
             if (Vue.config.safecheck.DevicesSetConfig != undefined){
               if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
                 this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
               }else{
-                //tag
-                //tag
-                //tag
                 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)
             }
 
           }else{
@@ -1858,17 +1446,12 @@
               if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
                 this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
               }else{
-                //tag
-                //tag
-                //tag
                 this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type?this.item.f_user_type:'民用']])
               }
-              // this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
             }
           }
 
         }
-        //tag)
         // 预留设备项位置
         for (let i in this.config) {
           this.tabs.splice(1,0,null)
@@ -1877,17 +1460,8 @@
         for (let i in this.config) {
           //取得安检项索引值
           let n = this.config[i].index
-          //tag
           this.devices[n - 1] = {device: i, n: n, checkmust: this.config[i].checkmust}
           this.$set('data.' + 'device' + n, [])
-          //tag
-          // this.tabs.splice(2 + n - 1, 0,
-          //   {
-          //     header:i,
-          //     complete:'safecheck-devices',
-          //     class:'repair-details-class',
-          //     number:n
-          //   })
           this.tabs[n] = {
             header: i,
             complete: 'safecheck-devices',
@@ -1920,17 +1494,11 @@
               )
             }
           }
-          // this.data['device' + n].push(
-          //   {f_device_type: i, f_items: items}
-          // )
           n = n + 1
         }
-        //tag
         this.faultshow.number = this.tabs.length
       },
       init () {
-        //tag
-        // this.data.f_noplan_item_id =  this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()
         // 无计划安检是否回更待办计划
         this.data.isupdateplanitem = this.$appdata.getSingleValue('在线安检回更有计划') ? this.$appdata.getSingleValue('在线安检回更有计划') : 'false'
         // 预约安检单工单编号
@@ -1945,8 +1513,6 @@
         this.data.f_checker_name = Vue.user.name
         this.data.f_check_type = this.item.f_user_type
         this.data.f_safecheck_type = this.item.f_safecheck_type
-        //this.data.f_exceed_reason = ''//存放送气超期原因
-        //tag
         this.data.f_subcompany = this.item.f_subcompany
         this.data.f_approved = this.item.f_approvedf_read_instructions
         this.data.f_repair_approved = this.item.f_repair_approved
@@ -1965,7 +1531,6 @@
         this.$set('data.f_state',this.item.f_state)
         this.$set('data.f_source', this.source?this.source:'安检')
         this.$set('data.f_other_checker_name', '')
-        //tag
         // 用户信息
         this.$set('data.f_user_name', this.item.f_user_name)
         this.$set('data.f_rent_phone', this.item.f_rent_phone)
@@ -1980,7 +1545,6 @@
         this.$set('data.f_room', this.item.f_room)
         this.$set('data.f_building', this.item.f_building)
         this.$set('data.f_unit', this.item.f_unit)
-        //tag
         this.$set('data.f_floor', this.item.f_floor)
         this.$set('data.f_residential_area' , this.item.f_residential_area)
         this.$set('data.f_idnumber', this.item.f_idnumber)
@@ -1990,27 +1554,19 @@
         this.$set('data.f_userfiles_id', this.item.f_plan_meters[0].f_userfiles_id)
         this.$set('data.f_valve_state', this.item.f_plan_meters[0].f_valve_state)
         this.$set('data.f_off_valve_reason', this.item.f_plan_meters[0].f_off_valve_reason)
-        // 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)
-        // this.$set('data.f_user_family_remarks', this.item.f_user_family_remarks)
-        // this.$set('data.f_user_equipment_remarks', this.item.f_user_equipment_remarks)
         // 处置方式
-        //tag
         this.$set('data.f_gas_guidelines', true)
         this.$set('data.f_safety_warning', true)
         this.$set('data.f_gas_manual', true)
         this.$set('data.f_no_gas_device', false)
         this.$set('data.f_close_valve', false)
         this.$set('data.f_unload_battery', false)
-        //tag
         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()
         }
         if(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()
         }
-        //tag
         if(this.item.f_plan_meters) {
           for (let de in this.devices) {
             if(typeof this.devices[de]=='function'){
@@ -2083,7 +1639,6 @@
                   })
                 }
                 else if (this.devices[de].device == "燃气表") {
-                  // delete this.config['燃气表']['items']['表底数']
                   this.data['device' + this.devices[de].n].push({
                     f_device_type: "燃气表",
                     f_items: [
@@ -2145,9 +1700,7 @@
                   })
                 }
              if(this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('物联网表') >= 0){
-               //tag
                this.data['device' + this.devices[de].n].forEach(device => {
-                 //tag)
                  if (!this.data.f_collection_type) {
                    this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
                    delete this.config['燃气表']['items']['累购气量']
@@ -2203,13 +1756,10 @@
                        type: "number"
                      }
                    )
-                   //tag)
                  }
                })
              } else if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
                   this.data['device' + this.devices[de].n].forEach(device => {
-                    //tag)
-                    //tag)
                     /*
                       "累购气量":{"index":8,"type":"number","readonly":true},
                       "累购金额":{"index":8,"type":"number","readonly":true},
@@ -2276,7 +1826,6 @@
                             type: "number"
                           }
                         )
-                        //tag)
                       }
                     } else
                     if (this.item.f_plan_meters[i].f_collection_type == '按气量') {
@@ -2335,14 +1884,11 @@
                             type: "number"
                           }
                         )
-                        //tag)
                       }
                     }
                   })
                 } else if(this.devices[de].device == "燃气表"){
-                  //tag
                   this.data['device' + this.devices[de].n].forEach(device => {
-                    //tag)
                     if (!this.data.f_collection_type) {
                       this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
                       delete this.config['燃气表']['items']['累购金额']
@@ -2399,7 +1945,6 @@
                           type: "number"
                         }
                       )
-                      //tag)
                     }
                   })
                 }
@@ -2407,13 +1952,6 @@
             }
           }
         }
-        var pardate = {
-          _this:this,
-          tittle:'安检详情',
-          safe:true
-        }
-        // this.$dispatch('gotoson',pardate)
-        //tag
         this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
       }
     },
@@ -2434,9 +1972,7 @@
           HostApp.__this__ = this
           let that = this
           let value = {}
-          //tag
           if (this.role == 'inspect') {
-            //tag
             if (this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {
               value = this.$androidUtil.path({
                 alias: 'getUserinfomation',
@@ -2449,10 +1985,8 @@
             value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
           }
           Util.replaceFalse(value)
-          //tag)
           if (value.data.length != 0) {
             that.$set('data', value.data[0])
-            //tag)
             if (this.data.f_collection_type == '按气量') {
               delete this.config['燃气表']['items']['累购金额']
               delete this.config['燃气表']['items']['已用金额']
@@ -2475,14 +2009,10 @@
                 that.$set('data.device' + that.devices[da].n, [])
               }
               value.data[0].f_devices.forEach((item) => {
-                //tag)
                 for (let i in item.f_items) {
                   if(typeof item.f_items[i]=='function'){
                     continue
                   }
-                  // if (item.f_items[i].f_path != '' && item.f_items[i].f_path != null) {
-                  //   this.picture.push({f_path: item.f_items[i].f_path, name: item.f_items[i].f_item_name})
-                  // }
                   for (let de in that.config[item.f_device_type].items) {
                     if(typeof that.config[item.f_device_type].items[de]=='function'){
                       continue
@@ -2495,36 +2025,16 @@
                       }
                     }
                   }
-                  //tag)
-
-                  // if (item.f_items[i].f_item_name=='累购气量'){
-                  //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_total_gas
-                  // }else if (item.f_items[i].f_item_name=='累购金额'){
-                  //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_total_fee
-                  // }else if (item.f_items[i].f_item_name=='基表编号'){
-                  //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_meter_no
-                  // }else if (item.f_items[i].f_item_name=='气表品牌'){
-                  //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_aliasname
-                  // }else if (item.f_items[i].f_item_name=='进气方向'){
-                  //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_flow_direction
-                  // }else if (item.f_items[i].f_item_name=='气表型号'){
-                  //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_diaphgram_size
-                  // }else if (item.f_items[i].f_item_name=='表箱号'){
-                  //   item.f_items[i].f_item_value=this.item.f_plan_meters[0].f_metertitles
-                  // }
-                  // else{
                   for (let j in item.f_items[i].f_item_lists) {
                     if(typeof item.f_items[i].f_item_lists[j]=='function'){
                       continue
                     }
-                    //tag)
                     if (item.f_items[i].f_item_value instanceof Array) {
                       item.f_items[i].f_item_value.push(item.f_items[i].f_item_lists[j].f_item_value)
                     } else {
                       item.f_items[i].f_item_value = item.f_items[i].f_item_lists[j].f_item_value
                     }
                   }
-                  // }
 
                 }
                 for (let de in that.devices) {
@@ -2548,11 +2058,9 @@
               //tag)
             }
           } else {
-            //tag
             this.init()
           }
           if(this.parentPage && this.parentPage=='CurrentCreate'){
-            //tag
             let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
             if (isRecodr) {
               if (isRecodr=='true') {
@@ -2562,13 +2070,6 @@
               }
             }
           }
-          //tag
-          var pardate = {
-            _this:this,
-            tittle:'安检详情',
-            safe:true
-          }
-          // this.$dispatch('gotoson',pardate)getImgPath
           this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
         } else {
           let that = this
@@ -2601,17 +2102,10 @@
                 }else{
                   Util.androidRatifyPics(that.data,this.$androidUtil.getProxyUrl())
                 }
-                //tag
               } else {
                 alert("该安检单可能已不在本地!")
                 this.init()
               }
-              var pardate = {
-                _this:this,
-                tittle:'安检详情',
-                safe:true
-              }
-              // this.$dispatch('gotoson',pardate)
               this.$goto('safecheck-userinfo', {userinfo:this.data}, 'paper-router')
             }
           ).catch(
@@ -2633,27 +2127,6 @@
         }
         this.init()
       }
-      // tbs合并数组
-      // if( this.model.serviceacitivity[0].servicerepair.length > 0){
-      //   for(let i = 0;i < this.model.serviceacitivity[0].servicerepair.length;i++ ){
-      //
-      //   }
-      // }
-    },
-    components: {
-      // 'door-service': DoorService,
-      // 'repair-info': RepairInfo,
-      // 'repair-user-info': RepairUserInfo,
-      // 'outlay': Outlay,
-      // 'fault-all': FaultAll,
-      // 'repair-details':RepairDetails
-      // 'pipeline': Pipeline,
-      // 'device-service': DeviceService,
-      // 'trouble-removal': TroubleRemoval,
-      // 'cooking-utensils': CookingUtensils,
-      // 'repair-matter-info': RepairMatterInfo,
-      // 'first-gas-check': FirstGasCheck,
-      // 'tel-change-matter': TelChangeMatter/
     },
     events: {
       'tijiao': function () {