safecheck-client 3.0.33-gongyi → 3.0.34-2

package/src/components/rongcheng/SafecheckOrderVCli.vue

@@ -107,7 +107,7 @@
 
   export default {
     title: '安检单',
-    props: ['f_plan_id', 'item', 'role'],
+    props: ['f_plan_id', 'item', 'role','source'],
     // props: ['f_plan_id', 'role'],
     data() {
       return {
@@ -315,7 +315,7 @@
       saveNoclick() {
         // 禁用点击事件
         $("#savebut").addClass("noclickbut");
-        console.log("进入禁用按钮事件")
+        //tag
 
         // 5秒后启用点击事件
         setTimeout(function(){
@@ -345,16 +345,16 @@
         }
       },
       changediv(val){
-        console.log(val)
+        //tag
         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)
+        //tag
+        //tag
+        //tag
+        //tag
         // 处理关闭/显示 内容
         if(this.number == number && !this.routeShow ){
           this.routeShow = true
@@ -365,14 +365,14 @@
         }
         this.number = number
         this.componentName = item.complete
-        console.log('跳转前this.routeShow',this.routeShow)
+        //tag
         if(item.complete == 'safecheck-devices'){
-          console.log('this.data', this.data)
+          //tag
           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]))
+          //tag
+          //tag)
           let idx=this.data['device' + item.number].length - 1
           let itemprops = {
             config:this.config,
@@ -381,16 +381,16 @@
             item:this.item,
             role:'inspect'
           }
-          console.log('tabSelect函数中赋值')
-          console.log(JSON.stringify(itemprops))
-          console.log('itemprops.device ===> ' + JSON.stringify(itemprops.device))
-          console.log('item.complete',item.complete)
+          //tag
+          //tag)
+          //tag)
+          //tag
           if(this.routeShow){
             this.$goto(item.complete, itemprops, 'repair')
-            console.log('跳转完成')
+            //tag
           }
         }else{
-          console.log('页面跳转==》',this.tabs[number])
+          //tag
           if(this.routeShow){
             this.$goto(item.complete, {userinfo:this.data}, 'repair')
           }
@@ -417,8 +417,8 @@
           }}, {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())
-              console.log(this.model.serviceacitivity[0].imgs[j].imgid)
+              //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])
               }
@@ -564,7 +564,7 @@
 
       verifyFeedback() {
         let prefix = '拍照签名：'
-        console.log('this.data.f_overall_imgs==>'+JSON.stringify(this.data.f_overall_imgs))
+        //tag)
         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 == '入户')
@@ -580,16 +580,23 @@
           result: '正常',
           data: []
         }
+        let f_fist_count=0
+        let f_fist_content=''
+        let f_second_count=0
+        let f_second_content=''
+        let f_third_count=0
+        let f_third_content=''
+        let f_defect_text=''
         let value = ''
         let codata = JSON.parse(JSON.stringify(this.data))
-        console.log('config =====> ' + JSON.stringify(this.config))
-        console.log('codata =====> ' + JSON.stringify(codata))
+        //tag)
+        //tag)
         codata.f_devices = []
         this.f_devices = []
         for (let device in codata) {
           let f_device_type
           if (device.startsWith("device")) {
-            console.log('codata[device] =====> ' + JSON.stringify(codata[device]))
+            //tag)
             let hasOther = ''
             let otherValue = null
             for (let item in codata[device]) {
@@ -600,20 +607,20 @@
               // } else {
               //     f_device_type = codata[device][item].f_device_type
               // }
-              // console.log('codata[device][item]=>',codata[device][item])
+              // //tag
               for (let i = 0; i < codata[device][item].f_items.length ; i++) {
-                console.log('i' + i)
+                //tag
                 if(i == 'sum'){
                   continue
                 }
-                console.log('codata[device][item].f_items' + JSON.stringify(codata[device][item].f_items))
+                //tag)
                 var items = codata[device][item].f_items[i]
                 items.f_create_time = Util.toStandardTimeString()
-                console.log('之前items' + JSON.stringify(items))
+                //tag)
                 items.f_item_lists = []
-                console.log('之后items' + JSON.stringify(items))
-                // console.log('items' + JSON.stringify(items))
-                // console.log(`type => ${JSON.stringify(codata[device][item].f_device_type)} name => ${JSON.stringify(items.f_item_name)} value => ${JSON.stringify(items.f_item_value)}`)
+                //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]
@@ -621,15 +628,15 @@
                 //     .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')) {
-                //     console.log('进入有隐患')
+                //     //tag
                 //     checkResults.result = '有隐患'
-                //     console.log('有隐患items.f_item_name==》' + JSON.stringify(items.f_item_name))
-                //     console.log('有隐患items.f_item_value==》' + JSON.stringify(items.f_item_value))
+                //     //tag)
+                //     //tag)
                 //     // this.$set('checkResult.' + items.f_item_name, items.f_item_value)
                 //       this.checkResult[items.f_item_name] = items.f_item_value
-                //     console.log('有隐患checkResult==》' + JSON.stringify(this.checkResult))
+                //     //tag)
                 //     // this.$set('checkResultsss.' + items.f_item_name, `${f_device_type}${items.f_item_value}`)
-                //     // console.log('有隐患checkResultsss==》' + JSON.stringify(this.checkResultsss))
+                //     // //tag)
                 // }
                 if (items.type == 'selector') {
                   items.selected = []
@@ -644,36 +651,46 @@
                 let f_is_eliminate //隐患是否消除
                 let f_meternumber = ''
                 let f_user_defects = [] // 用户所有隐患
-                console.log('f_item_name=====>' + f_item_name)
-                console.log('items.type=====>' + items.type)
+                //tag
+                //tag
                 if (items.type == 'selector' || items.type == 'checkbox') {
                   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))
+                    //tag)
                     for (let k in configItems.options) {
-                      console.log('configItems.options[k]==>' + JSON.stringify(configItems.options[k]))
+                      //tag)
                       if (items.f_item_value[i] === configItems.options[k].data) {
 
                         f_is_defect = configItems.options[k].isdefect
                         f_item_value = items.f_item_value[i]
                         f_defect_level = configItems.options[k].level
 
-                        console.log('f_is_defect=====>' + f_is_defect)
-                        console.log('f_item_value=====>' + f_item_value)
-                        console.log('f_defect_level=====>' + f_defect_level)
+                        //tag
+                        //tag
+                        //tag
 
                         if (f_is_defect) {
                           if (checkResults.result !== '有隐患') {
                             checkResults.result = '有隐患'
                           }
                           if (!this.checkResult.hasOwnProperty(f_item_name)) {
-                            console.log(`The ${f_item_name} initialized`)
+                            //tag
                             this.checkResult[f_item_name] = []
                           }
 
-                          console.log(`The ${f_item_name} was pushed ${f_item_value}`)
+                          //tag
                           this.checkResult[f_item_name].push(f_item_value)
-
+                          if(codata[device][item].f_device_type == '一级隐患'){
+                            f_fist_content += `${f_item_name}:${f_item_value},`
+                            f_fist_count = f_fist_count+1
+                          }else if(codata[device][item].f_device_type == '二级隐患'){
+                            f_second_content += `${f_item_name}:${f_item_value},`
+                            f_second_count = f_second_count+1
+                          }else if(codata[device][item].f_device_type == '三级隐患'){
+                            f_third_content += `${f_item_name}:${f_item_value},`
+                            f_third_count = f_third_count+1
+                          }
+                          f_defect_text += `${f_item_name}:${f_item_value},`
                         }
 
                         let items_list = {
@@ -684,17 +701,17 @@
                           f_create_time: Util.toStandardTimeString()
                         }
                         if (!items.f_item_lists) {
-                          console.log('f_item_lists未定义')
+                          //tag
                           items.f_item_lists = []
-                          console.log('items_list=========>' + JSON.stringify(items_list))
+                          //tag)
                           if (JSON.stringify(items_list) !== '{}') {
-                            console.log('放了')
+                            //tag
                             items.f_item_lists.push(items_list)
                           }
                         } else {
-                          console.log('items_list=========>' + JSON.stringify(items_list))
+                          //tag)
                           if (JSON.stringify(items_list) !== '{}') {
-                            console.log('也放了')
+                            //tag
                             items.f_item_lists.push(items_list)
                           }
                         }
@@ -703,13 +720,13 @@
                   }
                 } else {
                   let configItems = this.config[codata[device][item].f_device_type].items[items.f_item_name]
-                  console.log('configItems===>' + JSON.stringify(configItems))
+                  //tag)
                   f_is_defect = configItems.isdefect
                   f_defect_level = configItems.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)
+                  //tag
+                  //tag
+                  //tag
                   let items_list = {
                     f_is_defect: f_is_defect,
                     f_item_value: f_item_value,
@@ -722,43 +739,43 @@
                       checkResults.result = '有隐患'
                     }
                     if (!this.checkResult.hasOwnProperty(items.f_item_name)) {
-                      console.log(`The ${items.f_item_name} initialized`)
+                      //tag
                       this.checkResult[items.f_item_name] = []
                     }
 
-                    console.log(`The ${items.f_item_name} was pushed ${f_item_value}`)
+                    //tag
                     this.checkResult[items.f_item_name].push(f_item_value)
 
                   }
-                  console.log('items_list=========>' + JSON.stringify(items_list))
-                  console.log('items.f_item_lists' + JSON.stringify(items.f_item_lists))
+                  //tag)
+                  //tag)
                   if (!items.f_item_lists) {
-                    console.log('f_item_lists未定义')
+                    //tag
                     items.f_item_lists = []
                     if (JSON.stringify(items_list) != '{}') {
-                      console.log('else放了')
+                      //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) != '{}') {
-                      console.log('else也放了')
-                      console.log('放之后items_list=========>' + JSON.stringify(items_list))
-                      console.log('放之后items.f_item_lists' + JSON.stringify(items.f_item_lists))
-                      console.log('type=>items.f_item_lists' + typeof items.f_item_lists)
+                      //tag
+                      //tag)
+                      //tag)
+                      //tag
                       items.f_item_lists.push(items_list)
                     }
                   }
                 }
                 if (hasOther !== '' && otherValue !== null) {
-                  console.log(`The other value was pushed.`)
+                  //tag
                   this.checkResult[hasOther].push(otherValue)
                   hasOther = ''
                   otherValue = null
                 }
                 items.f_item_value = ''
               }
-              console.log('安检结果checkResult' + JSON.stringify(this.checkResult))
+              //tag)
               this.f_devices.push(codata[device][item])
             }
           }
@@ -766,34 +783,41 @@
         if (this.checkResult) {
           for (let key in this.checkResult) {
             // 上次安检结果数据组织
-            console.log('key=>' + key)
-            console.log('value=>' + this.checkResult[key])
+            //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)
-            console.log('checkResults.data==>' + JSON.stringify(checkResults))
+            //tag)
             // this.newcheckResult = {}
           }
           this.checkResult = {}
         }
-        console.log(`typeof-checkResults-->${typeof checkResults}`)
-        console.log('checkResults ==> ' + JSON.stringify(checkResults))
+        //tag
+        //tag)
+        codata.f_fist_count = f_fist_count
+        codata.f_fist_content = f_fist_content
+        codata.f_second_count = f_second_count
+        codata.f_second_content = f_second_content
+        codata.f_third_count = f_third_count
+        codata.f_third_content = f_third_content
+        codata.f_defect_text = f_defect_text
         codata.f_defect_content = JSON.stringify(checkResults)
         this.data.f_defect_content = JSON.stringify(checkResults)
-        console.log('f_defect_content' + codata.f_defect_content)
+        //tag
         return codata
       },
       uploadCheckPaper(){
         this.saveNoclick()
-        console.log('进入上传')
+        //tag
         let errString = this.errorVerify()
         this.isdisable = true
         if (errString) {
-          console.log(errString)
-          console.log('Vue.android',Vue.android)
-          console.log('this.isUpload',this.isUpload)
+          //tag
+          //tag
+          //tag
           if (Vue.android){
             // if(this.isUpload){
             //   this.isUpload = false
@@ -806,7 +830,7 @@
           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)
+          //tag
           this.data.f_complete = '已完成'
           this.disableTimer()
         }
@@ -820,7 +844,7 @@
           this.isdisable = false
           return
         }*/
-        console.log('uploadCheckPaper-->isUpload'+this.isUpload)
+        //tag
         this.onlySave = false
         let res =  this.save()
         // if(res) {
@@ -832,27 +856,27 @@
         //       f_check_item_id: this.data.f_check_item_id
         //     })
         //     //如果是转维修上传，则不做校验，上传完成后自动转维修
-        //     console.log('this.isToRepair=======》'+this.isToRepair)
-        //     console.log('this.livedispose=======》'+this.livedispose)
+        //     //tag
+        //     //tag
         //     if(!this.isToRepair){
         //       if(haslivedispose.data.length > 0 && (this.livedispose == 'true' || this.livedispose == true)){
-        //         console.log('是否已转维修')
-        //         console.log(this.isSafeCheckToRepair)
+        //         //tag
+        //         //tag
         //         if(!this.isSafeCheckToRepair){
         //           this.$showMessage('有未处理的隐患，请前往拍照上传中将安检转为维修单！')
         //           return
         //         }
         //       }
         //     }
-        //     console.log(`codata类型-->${typeof codata}`)
+        //     //tag
         //     for (let key in codata){
         //       if(key.startsWith("device")){
         //         codata[key] = []
         //       }
         //     }
-        //     console.log(`codata内容-->${JSON.stringify(codata)}`)
+        //     //tag}`)
         //
-        //     console.log('遮挡上传')
+        //     //tag
         //     let isStart = true
         //     let res
         //     for (let i in this.f_devices){
@@ -884,33 +908,33 @@
         //     //   row: codata
         //     // })
         //     // if (response.code == 200) {
-        //     //   console.log('=============response.data==================')
-        //     //   console.log(JSON.stringify(response.data))
+        //     //   //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)
-        //     //   console.log('=============f_paper_id==================')
-        //     //   console.log(JSON.stringify(f_paper_id))
-        //     //   console.log(this.data.f_paper_id)
-        //     //   console.log("===data"+JSON.stringify(this.data))
+        //     //   //tag
+        //     //   //tag)
+        //     //   //tag
+        //     //   //tag)
         //     //   for (let device in this.data){
-        //     //     console.log("上传设备信息device=======>"+device)
-        //     //     console.log("上传设备信息device=======>"+JSON.stringify(this.data[device]))
+        //     //     //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
         //     //         })
-        //     //         console.log(`上传设备信息结果res======${JSON.stringify(ret.data)}`)
+        //     //         //tag}`)
         //     //         if(ret.code == 200){
-        //     //           console.log(`设备信息id======${ret.data.f_device_id}`)
+        //     //           //tag
         //     //           devices.f_device_id = JSON.parse(ret.data.f_device_id).id
         //     //         }
-        //     //         console.log('上传设备信息device======')
-        //     //         console.log(JSON.stringify(devices))
+        //     //         //tag
+        //     //         //tag)
         //     //         if (ret.code != 200) {
         //     //           //TODO 失败后处理
         //     //           // this.isUpload = false
@@ -922,12 +946,12 @@
         //     //   }
         //     //   // for (let device of this.f_devices) {
         //     //   //   device.f_paper_id = f_paper_id
-        //     //   //   console.log('上传设备信息device======')
-        //     //   //   console.log(JSON.stringify(device))
+        //     //   //   //tag
+        //     //   //   //tag)
         //     //   //   let ret = this.$androidUtil.bzLogic('UpCheckPaperDevices', {
         //     //   //     row: device
         //     //   //   })
-        //     //   //   console.log(`上传设备信息结果res======${ret}`)
+        //     //   //   //tag
         //     //   //   if (ret.code != 200) {
         //     //   //     //TODO 失败后处理
         //     //   //     HostApp.alert("上传失败!")
@@ -959,7 +983,7 @@
         //     //   return false
         //     // }
         //   }catch (e) {
-        //     console.log('上传失败==='+JSON.stringify(e))
+        //     //tag)
         //     // this.isUpload = false
         //     this.$showMessage("上传失败!")
         //   }
@@ -967,16 +991,16 @@
       },
       save(type) {
         this.saveNoclick()
-        console.log('进入保存')
+        //tag
         if(type == 'temp'){
           this.data.f_complete = '未完成'
           this.disableTimer()
         }else {
           let errString = this.errorVerify()
           if (errString) {
-            console.log(errString)
-            console.log('Vue.android',Vue.android)
-            console.log('this.isUpload',this.isUpload)
+            //tag
+            //tag
+            //tag
             if (Vue.android){
               this.$showMessage(errString)
             }
@@ -987,6 +1011,16 @@
             this.disableTimer()
           }
         }
+        if (this.data.f_entry_status == '入户') {
+          this.data.f_rejectcheck_path = null
+          this.data.f_noanswer_path = null
+          this.data.f_noanswertwo_path = null
+        }else if (this.data.f_entry_status == '到访不遇') {
+          this.data.f_rejectcheck_path = null
+        }else if (this.data.f_entry_status == '拒检') {
+          this.data.f_noanswer_path = null
+          this.data.f_noanswertwo_path = null
+        }
         // try {
         let codata = this.getAllDefect()
         if(this.isToRepair && JSON.parse(this.data.f_defect_content).result != '有隐患'){
@@ -995,24 +1029,24 @@
           this.isdisable = false
           return
         }
-        console.log(`codata类型-->${typeof codata}`)
-        console.log(`codata内容-->${JSON.stringify(codata)}`)
+        //tag
+        //tag}`)
         for (let key in codata) {
           if (key.startsWith("device")) {
-            console.log('this.data.' + key + JSON.stringify(codata[key]))
+            //tag)
             codata[key] = []
           }
         }
-        console.log(`codata内容-->${JSON.stringify(codata)}`)
-        console.log(`codata内容-->${JSON.stringify(codata.f_user_defects)}`)
-        console.log('安卓环境？=》' + Vue.android)
+        //tag}`)
+        //tag}`)
+        //tag
         if (Vue.android) {
-          console.log('Vue.android is true')
+          //tag
           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))
+          //tag)
           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,
@@ -1020,7 +1054,7 @@
             //   f_upload_state:'未传',
             //   row: codata
             // })
-            console.log('无计划安检保存')
+            //tag
             let isStart = true
             // let res
             // for (let i in this.f_devices) {
@@ -1048,7 +1082,7 @@
               f_upload_state: '未传',
               row: codata
             }
-            console.log('codata ===> ' + JSON.stringify(codata))
+            //tag)
             let paramStr = JSON.stringify(param)
             // 多长截断一次
             let subLength = 800
@@ -1067,26 +1101,26 @@
               'backresult': 1
             })
           } else {
-            console.log('非无计划安检保存')
+            //tag
             let isStart = true
             let res
-            console.log('this.f_devices' + JSON.stringify(this.f_devices))
+            //tag)
             // for (let i in this.f_devices) {
-            //   console.log('this.f_devices[i] ====>' + JSON.stringify(this.f_devices[i]))
+            //   //tag)
             //   for (let j = 0; j < this.f_devices[i].f_items.length; j++) {
-            //     console.log(`this.f_devices[i].f_items[${j}] ===> ` + JSON.stringify(this.f_devices[i].f_items[j]))
+            //     //tag)
             //   }
             //   res = HostApp.organizeJSON({isStart: isStart, isDevice: true, device: this.f_devices[i]})
-            //   console.log('f_devices organizeJSON ==> ' + JSON.stringify(res))
+            //   //tag)
             //   if (res.code == 200) {
             //     isStart = false
             //   } else {
             //     this.$showMessage("保存失败!")
             //   }
             // }
-            console.log('this.data ==> ' + JSON.stringify(this.data))
-            console.log('f_check_item_id ==> ' + JSON.stringify(this.data.f_check_item_id))
-            console.log('f_checker_id ==> ' + JSON.stringify(this.data.f_checker_id))
+            //tag)
+            //tag)
+            //tag)
             // let result = HostApp.organizeJSON({
             //   isStart: false,
             //   isJSON: true,
@@ -1102,7 +1136,7 @@
               f_checker_id: this.data.f_checker_id,
               row: codata
             }
-            console.log('codata ===> ' + JSON.stringify(codata))
+            //tag)
             let paramStr = JSON.stringify(param)
             // 多长截断一次
             let subLength = 800
@@ -1123,7 +1157,7 @@
           }
 
         } else {
-          console.log("保存的值", codata)
+          //tag
           let value = this.$androidUtil.path({
             alias: 'getUserinfomation',
             data: {condition: "f_userinfoid = '" + this.item.f_userinfoid + "' and f_no_checkplan = '无计划安检'"}
@@ -1141,17 +1175,17 @@
                 this.$androidUtil.bzLogic('getPaperInfo', {
                   f_check_item_id: this.data.f_check_item_id
                 }).then((res) => {
-                  console.log(`查询paper结果res======${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
-                      console.log('设备信息device======', device)
+                      //tag
                       this.$androidUtil.bzLogic('saveDevice', {
                         row: device
                       }).then((ret) => {
-                        console.log(`保存设备信息结果res======`, ret)
+                        //tag
                         if (ret.code != 200) {
                           // if(this.isUpload){
                           //   this.isUpload = false
@@ -1181,23 +1215,23 @@
               f_checker_id: this.data.f_checker_id,
               row: codata
             }).then((res) => {
-              console.log('asdddddddddddddddddddddddddddddd')
+              //tag
               if (res.data.code == 200) {
                 //保存devices
                 this.$androidUtil.bzLogic('getPaperInfo', {
                   f_check_item_id: this.data.f_check_item_id
                 }).then((res) => {
-                  console.log(`查询paper结果res======${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
-                      console.log(`设备信息device======${device}`)
+                      //tag
                       this.$androidUtil.bzLogic('saveDevice', {
                         row: device
                       }).then((ret) => {
-                        console.log(`保存设备信息结果res======${ret}`)
+                        //tag
                         if (ret.code != 200) {
                           // if(this.isUpload){
                           //   this.isUpload = false
@@ -1224,7 +1258,7 @@
           }
         }
         // }catch (e) {
-        //   console.log('保存失败==='+JSON.stringify(e))
+        //   //tag)
         //   // this.isUpload = false
         //   this.$showMessage("保存失败!")
         // }
@@ -1256,13 +1290,13 @@
         })
       },
       saveCallBack(jo){
-        console.log(JSON.stringify(jo))
+        //tag)
         this.isdisable = false
         if(jo.state == 'ok'){
           let res = JSON.parse(jo.result)
-          console.log('保存结果===》'+JSON.stringify(res))
+          //tag)
           if(res.code == 200){
-            console.log('onlySave=====>'+this.onlySave)
+            //tag
             if(!this.onlySave){
               let codata = this.getAllDefect()
               //获取微信推送内容
@@ -1271,26 +1305,26 @@
                 f_check_item_id: this.data.f_check_item_id
               })
               //如果是转维修上传，则不做校验，上传完成后自动转维修
-              console.log('this.isToRepair=======》'+this.isToRepair)
-              console.log('this.livedispose=======》'+this.livedispose)
+              //tag
+              //tag
               if(!this.isToRepair){
                 if(haslivedispose.data.length > 0 && (this.livedispose == 'true' || this.livedispose == true)){
-                  console.log('是否已转维修')
-                  console.log(this.isSafeCheckToRepair)
+                  //tag
+                  //tag
                   if(!this.isSafeCheckToRepair){
 
                   }
                 }
               }
-              console.log(`codata类型-->${typeof codata}`)
+              //tag
               for (let key in codata){
                 if(key.startsWith("device")){
                   codata[key] = []
                 }
               }
-              console.log(`codata内容-->${JSON.stringify(codata)}`)
+              //tag}`)
 
-              console.log('遮挡上传')
+              //tag
               // let isStart = true
               // let res
               // for (let i in this.f_devices){
@@ -1317,7 +1351,7 @@
                 f_checker_id: this.data.f_checker_id,
                 row: codata
               }
-              console.log('codata ===> ' + JSON.stringify(codata))
+              //tag)
               let paramStr = JSON.stringify(param)
               // 多长截断一次
               let subLength = 800
@@ -1363,31 +1397,31 @@
             }
           }
         }
-        console.log(JSON.stringify(jo))
-        console.log('jo ===> ' + JSON.stringify(jo))
+        //tag)
+        //tag)
         this.isdisable = false
         if(jo.state == 'ok'){
           let res = JSON.parse(jo.result)
-          console.log('上传结果===》'+JSON.stringify(res))
-          console.log('上传结果的f_paper_id===》'+JSON.stringify(res.id))
+          //tag)
+          //tag)
           if(res.code == 200){
             this.$set('data.f_paper_id', res.id)
             this.isStrat=false
             if(url != ""){
               this.$resetpost(`${url}`,{data:WxResult})
             }
-            console.log('this.isToRepair==============>'+this.isToRepair)
+            //tag
             if(this.isToRepair){
               /*let defect=JSON.parse(this.data.f_defect_content)
               let repairContent=''
               defect.data.forEach(de =>{
                 let arr=Object.keys(de)
-                console.log("defect----------"+JSON.stringify(arr))
+                //tag)
                 arr.forEach(key=>{
                   repairContent += key+':'+de[key]+' '
                 })
               })
-              console.log("defect----------"+repairContent)
+              //tag
               let repair={
                 "sn": res.id,
                 "caseType": "客户问题",
@@ -1410,11 +1444,11 @@
                 "faultCategory": "安检隐患",
                 "processingLevel": "普通",
                 "remarks": "" }*/
-              /*console.log('开始转维修！4'+JSON.stringify(repair))
+              /*//tag)
               new HttpResetClass().load('POST','http://39.101.182.117:8909/api/cc/workorder.ashx?sign=5F27F9CA-2793-40CE-9834-0F033F71EDD2&method=postpreorder',repair,{resolveMsg: null, rejectMsg: null}).then(res =>{
-                console.log('调维修接口返回的结果！'+JSON.stringify(res))
+                //tag)
                 if(res.data.success){
-                  console.log('调维修接口成功！'+JSON.stringify(res))
+                  //tag)
                   let param={
                     itemid:res.id,
                     gid:res.data.gid
@@ -1433,17 +1467,17 @@
               //this.todo()
             }else{
               this.$showMessage('上传成功!')
-              console.log('上传结束back')
+              //tag
               this.$dispatch('confirm')
               // this.$back()
             }
           }else if(res.code == 309){
             this.$showMessage('该安检单已作废!')
-            console.log('该安检单已作废')
+            //tag
             this.$dispatch('confirm')
           }else if(res.code == 310){
             this.$showMessage('该安检单已上传，请勿重复上传!')
-            console.log('该安检单已上传')
+            //tag
             this.$dispatch('confirm')
           }else if(res.code == 500){
             this.$showMessage('图片上传失败，请检查图片，确认无误后再次进行上传！')
@@ -1464,9 +1498,9 @@
         //获取微信推送路径
         if(jo.state == 'ok'){
           let res = JSON.parse(jo.result)
-          console.log('安检转维修===》'+JSON.stringify(res))
+          //tag)
           if(res.code == 200){
-            console.log('安检转维修成功')
+            //tag
             if(res.data.code == 200){
               this.$showMessage('上传并转维修成功！')
             }else{
@@ -1509,11 +1543,11 @@
           HostApp.__this__.$set('data', paper)
           HostApp.__this__.$goto('safecheck-userinfo', {}, 'paper-router')
           // 如果打回重检则重新计时
-          console.log('HostApp.__this__.role' + HostApp.__this__.role + ' HostApp.__this__.f_approved:' + HostApp.__this__.data.f_approved)
+          //tag
           if(HostApp.__this__.role == 'inspect'
             && HostApp.__this__.data.f_approved
             && HostApp.__this__.data.f_approved == '打回') {
-            console.log('打回')
+            //tag
             HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
             HostApp.__this__.tick()
           }
@@ -1545,7 +1579,7 @@
         return obj;
       },
       async isoverDate(){
-        console.log('123456')
+        //tag
         let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
             condition:"ti.id='"+this.item.id+"'"
           }
@@ -1554,8 +1588,8 @@
         this.isneedDate=res.data.length>0?res.data[0]["f_subscribe_date"]:''
       },
       putDevices() {
-        console.log('Vue.config => ' + JSON.stringify(Vue.config))
-        console.log('Vue.config.DevicesConfig => ' + JSON.stringify(Vue.config.DevicesConfig))
+        //tag)
+        //tag)
         this.$set('data.approve', "true")
         this.$set('data.writeback', "false")
         if (Vue.config.safecheck != undefined) {
@@ -1570,10 +1604,10 @@
               this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
             }
           }
-          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)
+          //tag
+          //tag)
+          //tag)
+          //tag
           if(this.item.f_user_type == '民用'){
             // 民用户
 
@@ -1601,19 +1635,19 @@
                 items:{}}
               if(this.deviceinfo.data.length>0){
                 for (let i=0;i<this.deviceinfo.data.length;i++){
-                  dev.items[this.deviceinfo.data[i].f_devices_model+'数量']={index: i*3+1,type:"number",f_item_value: this.deviceinfo.data[i].f_devices_num}
-                  dev.items[this.deviceinfo.data[i].f_devices_model+'品牌']={index: i*3+2,type:"string",f_item_value: this.deviceinfo.data[i].f_brand}
-                  dev.items[this.deviceinfo.data[i].f_devices_model+'检查情况']={index: i*3+3,type:"string"}
+                  dev.items[this.deviceinfo.data[i].f_devices_model+(i+1)+'数量']={index: i*3+1,type:"number",f_item_value: this.deviceinfo.data[i].f_devices_num}
+                  dev.items[this.deviceinfo.data[i].f_devices_model+(i+1)+'品牌']={index: i*3+2,type:"string",f_item_value: this.deviceinfo.data[i].f_brand}
+                  dev.items[this.deviceinfo.data[i].f_devices_model+(i+1)+'检查情况']={index: i*3+3,type:"string"}
                 }
               }
-              console.log("dev:"+JSON.stringify(dev))
+              //tag)
               this.config["燃气具检查"]=dev
               //this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
             }
           }
 
         }
-        console.log('赋值后的config=>' + JSON.stringify(this.config))
+        //tag)
         // 预留设备项位置
         for (let i in this.config) {
           this.tabs.splice(1,0,null)
@@ -1622,10 +1656,10 @@
         for (let i in this.config) {
           //取得安检项索引值
           let n = this.config[i].index
-          console.log('type '+ typeof n)
+          //tag
           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)
+          //tag
           // this.tabs.splice(2 + n - 1, 0,
           //   {
           //     header:i,
@@ -1670,11 +1704,11 @@
           // )
           n = n + 1
         }
-        console.log('tbs合并数组')
+        //tag
         this.faultshow.number = this.tabs.length
       },
       init () {
-        console.log("123456789")
+        //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.ename = Vue.user.ename
         this.data.f_outlets = Vue.user.f_parentname
@@ -1687,7 +1721,7 @@
         this.data.f_check_type = this.item.f_user_type
         this.data.f_safecheck_type = this.item.f_safecheck_type ? this.item.f_safecheck_type:'年度普检'
         //this.data.f_exceed_reason = ''//存放送气超期原因
-        console.log('设置参数2')
+        //tag
         this.data.f_subcompany = this.item.f_subcompany
         this.data.f_approved = this.item.f_approved
         this.data.f_repair_approved = this.item.f_repair_approved
@@ -1704,10 +1738,14 @@
         this.$set('data.f_is_meterreadding', '未抄表')
         this.$set('data.f_usegas', '已使用')
         this.$set('data.f_state',this.item.f_state)
-        console.log('设置参数3')
+        //tag
         // 用户信息
         this.$set('data.f_user_name', this.item.f_user_name)
         this.$set('data.f_user_phone', this.item.f_user_phone)
+        this.$set('data.f_used_name', this.item.f_used_name)
+        this.$set('data.f_rent_phone', this.item.f_rent_phone)
+        this.$set('data.f_user_phone2', this.item.f_user_phone2)
+        this.$set('data.f_remark', '')
         this.$set('data.f_userinfoid', this.item.f_userinfoid)
         this.$set('data.f_address', this.item.f_address)
         this.$set('data.f_small_area', this.item.f_small_area)
@@ -1717,7 +1755,7 @@
         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)
-        console.log('设置参数4')
+        //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)
@@ -1729,23 +1767,23 @@
         // 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)
         // 处置方式
-        console.log('设置参数5')
+        //tag
         this.$set('data.f_no_gas_device', false)
         this.$set('data.f_close_valve', false)
         this.$set('data.f_unload_battery', false)
-        console.log('设置参数6')
+        //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()
         }
-        console.log("item.f_plan_meters",this.item.f_plan_meters)
+        //tag
         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])+"------------"+this.devices[de].device)
+                //tag+"------------"+this.devices[de].device)
                 if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') > 0) {
-                  console.log("是机表")
+                  //tag
                   this.data['device' + this.devices[de].n].push({
                     f_device_type: "燃气表",
                     f_items: [
@@ -1806,7 +1844,7 @@
                     ]
                   })
                 } else if (this.devices[de].device == "燃气表") {
-                  console.log("不是是机表")
+                  //tag
                   // delete this.config['燃气表']['items']['表底数']
                   this.data['device' + this.devices[de].n].push({
                     f_device_type: "燃气表",
@@ -1869,10 +1907,10 @@
                   })
                 }
                 if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
-                  console.log("有this.item.f_plan_meters[i].f_collection_type")
+                  //tag
                   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))
+                    //tag)
+                    //tag)
                     /*
                       "累购气量":{"index":8,"type":"number","readonly":true},
                       "累购金额":{"index":8,"type":"number","readonly":true},
@@ -1975,7 +2013,7 @@
                             type: "date"
                           }
                         )
-                        console.log('this.config[\'燃气表\'][\'items\']  ===> ' + JSON.stringify(this.config['燃气表']['items']))
+                        //tag)
                       }
                     } else if (this.item.f_plan_meters[i].f_collection_type == '按气量') {
                       if (!this.data.f_collection_type) {
@@ -2087,14 +2125,14 @@
                             type: "selector"
                           }
                         )
-                        console.log('this.config[\'燃气表\'][\'items\']  ---> ' + JSON.stringify(this.config['燃气表']['items']))
+                        //tag)
                       }
                     }
                   })
                 }else if(this.devices[de].device == "燃气表"){
-                  console.log("没有this.item.f_plan_meters[i].f_collection_type")
+                  //tag
                   this.data['device' + this.devices[de].n].forEach(device => {
-                    console.log('device ===> ' + JSON.stringify(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']['累购金额']
@@ -2204,7 +2242,7 @@
                           type: "selector"
                         }
                       )
-                      console.log('this.config[\'燃气表\'][\'items\']  ---> ' + JSON.stringify(this.config['燃气表']['items']))
+                      //tag)
                     }
                   })
                 }
@@ -2212,8 +2250,8 @@
             }
             //工商户安检设备添加值
             if(this.devices[de].device == "燃气具检查"){
-              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]))
+              //tag)
+              //tag)
               this.data['device' + this.devices[de].n].forEach((device)=>{
                 for (let i=0;i<this.deviceinfo.data.length;i++){
                   device.f_items.push(
@@ -2240,7 +2278,7 @@
                   )
                 }
               })
-              console.log("this.data['device' + this.devices[de].n]"+JSON.stringify(this.data['device' + this.devices[de].n]))
+              //tag)
             }
           }
         }
@@ -2250,13 +2288,13 @@
           safe:true
         }
         // this.$dispatch('gotoson',pardate)
-        console.log('页面跳转')
+        //tag
         this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
       }
     },
     watch: {
       'row' () {
-        console.log('row changed')
+        //tag
         this.copy()
       }
     },
@@ -2280,9 +2318,9 @@
           HostApp.__this__ = this
           let that = this
           let value = {}
-          console.log('this.item.f_no_checkplan',this.item.f_no_checkplan)
+          //tag
           if (this.role == 'inspect') {
-            console.log('this.item.f_no_checkplan', this.item.f_no_checkplan)
+            //tag
             if (this.item.f_no_checkplan == '无计划安检') {
               value = this.$androidUtil.path({
                 alias: 'getUserinfomation',
@@ -2295,10 +2333,10 @@
             value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
           }
           Util.replaceFalse(value)
-          console.log("value:" + JSON.stringify(value))
+          //tag)
           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))
+            //tag)
             if (this.item.f_plan_meters[0].f_meter_type=='机表' || this.data.f_collection_type == '按气量') {
               delete this.config['燃气表']['items']['累购金额']
               delete this.config['燃气表']['items']['已用金额']
@@ -2310,13 +2348,13 @@
               delete this.config['燃气表']['items']['剩余气量']
               delete this.config['燃气表']['items']['气量异常差值']
             }
-            console.log("f_devices:" + JSON.stringify(value.data[0].f_devices))
+            //tag)
             if (value.data[0].f_devices) {
               for (let da in that.devices) {
                 that.$set('data.device' + that.devices[da].n, [])
               }
               value.data[0].f_devices.forEach((item) => {
-                console.log('回写数据=>' + JSON.stringify(item))
+                //tag)
                 for (let i in item.f_items) {
                   // 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})
@@ -2330,9 +2368,9 @@
                       }
                     }
                   }
-                  console.log('回写数据item.f_items[i]=======>' + JSON.stringify(item.f_items[i]))
+                  //tag)
                   for (let j in item.f_items[i].f_item_lists) {
-                    console.log('回写数据item.f_items.f_item_lists[j]=======>' + JSON.stringify(item.f_items[i].f_item_lists[j]))
+                    //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 {
@@ -2347,7 +2385,7 @@
                       f_device_type: item.f_device_type,
                       f_items: item.f_items
                     })
-                    console.log("device:" + JSON.stringify(that.data['device' + that.devices[de].n]))
+                    //tag)
                   }
                 }
               })
@@ -2356,13 +2394,13 @@
                 Util.androidRatifyPics(that.picture, this.$androidUtil.getProxyUrl())
                 Util.booleanFilter(that.data)
               }
-              console.log('回写数据完成后'+JSON.stringify(that.data))
+              //tag)
             }
           } else {
-            console.log("该安检单可能已不在本地!")
+            //tag
             this.init()
           }
-          console.log('页面跳转')
+          //tag
           var pardate = {
             _this:this,
             tittle:'安检详情',
@@ -2401,7 +2439,7 @@
                 }else{
                   Util.androidRatifyPics(that.data,this.$androidUtil.getProxyUrl())
                 }
-                console.log("that.data:", that.data)
+                //tag
               } else {
                 alert("该安检单可能已不在本地!")
                 this.init()