safecheck-client 3.0.34-gongyi → 3.0.35-2

package/src/components/rongcheng/PaperMessageNocivil.vue

@@ -199,7 +199,7 @@
         }
       },
       viewPic(fileName) {
-        console.log('view pic: ' + fileName)
+        //tag
         if(this.role == 'view') {
           if(!fileName.endsWith('nopic.png')) {
             this.pic_to_be_viewed = fileName
@@ -243,18 +243,18 @@
               this.disableTimer()
               return this.save()
             } else {
-              console.log('赋值前',this.data)
+              //tag
               if(!this.data.f_offsite_time){
                 this.$set('data.f_offsite_time', Util.toStandardTimeString())
               }
-              console.log('赋值后',this.data)
+              //tag
               this.data.f_complete = '已完成'
               this.disableTimer()
               return this.save()
             }
           } else {
             if (errString) {
-              console.log(errString)
+              //tag
               if (Vue.android){
                 // if(this.isUpload){
                 //   this.isUpload = false
@@ -266,7 +266,7 @@
               if(!this.data.f_offsite_time){
                 this.$set('data.f_offsite_time', Util.toStandardTimeString())
               }
-              console.log('赋值后',this.data)
+              //tag
               this.data.f_complete = '已完成'
               this.disableTimer()
               return this.uploadCheckPaper()
@@ -284,7 +284,7 @@
       uploadPaper() {
         // this.isUpload = true
         this.savePaper(false).then((res) => {
-          console.log(`res${res}`)
+          //tag
           if(res !=true){
             console('失败')
             return
@@ -420,10 +420,10 @@
               }else{
                 f_device_type = codata[device][item].f_device_type
               }
-              // console.log('codata[device][item]=>',codata[device][item])
+              // //tag
               for(let i in codata[device][item].f_items){
                 let items = codata[device][item].f_items[i]
-                console.log('items',items)
+                //tag
                 if(items.f_is_defect == true || items.f_is_defect == 'true'){
                   checkResults.result = '有隐患'
                   if(!this.checkResult.hasOwnProperty(items.f_defect_level)){
@@ -433,7 +433,7 @@
                       this.$set('checkResult.' + items.f_defect_level,`${f_device_type}${items.f_item_name}${items.f_item_value}`)
                     }
                   }else{
-                    console.log('类型----',f_device_type)
+                    //tag
                     if(f_device_type.indexOf('其他') != -1){
                       this.$set('checkResult.' + items.f_defect_level,`${this.checkResult[items.f_defect_level]},${f_device_type}${items.f_item_name}`)
                     }else{
@@ -446,23 +446,23 @@
                   items.selected = ''
                 }
               }
-              console.log('checkResult',this.checkResult)
+              //tag
               this.f_devices.push(codata[device][item])
             }
           }
         }
         if(this.checkResult){
           for (let key in this.checkResult){
-            console.log('key=>',key)
+            //tag
             this.$set('newcheckResult.'+key,this.checkResult[key])
             checkResults.data.push(this.newcheckResult)
             this.newcheckResult = {}
           }
           this.checkResult = {}
         }
-        console.log(`typeof-checkResults-->${typeof checkResults}`)
+        //tag
         codata.f_defect_content = JSON.stringify(checkResults)
-        console.log('checkResults',checkResults)
+        //tag
         return codata
       },
 
@@ -567,13 +567,13 @@
             }
           }
           // HostApp.uploadPaper({f_check_item_id: this.data.f_check_item_id, f_checker_id: this.data.f_checker_id, data: this.data})
-          console.log(`codata类型-->${typeof codata}`)
+          //tag
           for (let key in codata){
             if(key.startsWith("device")){
               codata[key] = []
             }
           }
-          console.log(`codata内容-->${JSON.stringify(codata)}`)
+          //tag}`)
           try {
             let response = this.$androidUtil.bzLogic('上传安检信息', {
               f_check_item_id: this.data.f_check_item_id,
@@ -581,29 +581,29 @@
               row: codata
             })
             if (response.code == 200) {
-              console.log('=============response.data==================')
-              console.log(response.data)
-              console.log(typeof response.data)
+              //tag
+              //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("===data"+JSON.stringify(this.data))
+              //tag
+              //tag)
+              //tag)
               for (let device in this.data){
-                console.log('设备信息device======')
-                console.log(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
-                    console.log('上传设备信息device======')
-                    console.log(JSON.stringify(devices))
+                    //tag
+                    //tag)
                     let ret = this.$androidUtil.bzLogic('UpCheckPaperDevices', {
                       row: devices
                     })
-                    console.log(`上传设备信息结果res======${ret}`)
+                    //tag
                     if(ret.code == 200){
                       devices.f_device_id = JSON.parse(ret.data.f_device_id).id
                     }
@@ -618,12 +618,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("上传失败!")
@@ -656,7 +656,7 @@
               return false
             }
           }catch (e) {
-            console.log('上传失败==='+JSON.stringify(e))
+            //tag)
             // this.isUpload = false
             this.$showMessage("上传失败！")
           }
@@ -665,14 +665,14 @@
 
       save() {
         let codata = this.getAllDefect()
-        console.log(`codata类型-->${typeof codata}`)
-        console.log(`codata内容-->${JSON.stringify(codata)}`)
+        //tag
+        //tag}`)
         for (let key in codata){
           if(key.startsWith("device")){
             codata[key] = []
           }
         }
-        console.log(`codata内容-->${JSON.stringify(codata)}`)
+        //tag}`)
         if(Vue.android) {
           let  value = this.$androidUtil.path({alias: 'getUserinfomation', data:{condition: "f_userinfoid = '"+ this.item.f_userinfoid+"' and f_no_checkplan = '无计划安检'"}})
 
@@ -688,12 +688,12 @@
               let res = this.$androidUtil.bzLogic('getPaperInfo', {
                 f_check_item_id: this.data.f_noplan_item_id
               })
-              console.log(`查询paper结果res======${res.data}`)
+              //tag
               if(res.code == 200){
                 let f_paper_id = res.data[0].id
                 for (let device of this.f_devices){
                   device.f_paper_id = f_paper_id
-                  console.log('设备信息device======',device)
+                  //tag
                   let ret = this.$androidUtil.bzLogic('saveDevice', {
                     row:device
                   })
@@ -729,12 +729,12 @@
               let res = this.$androidUtil.bzLogic('getPaperInfo', {
                 f_check_item_id: this.data.f_check_item_id
               })
-              console.log(`查询paper结果res======${res.data}`)
+              //tag
               if(res.code == 200){
                 let f_paper_id = res.data[0].id
                 for (let device of this.f_devices){
                   device.f_paper_id = f_paper_id
-                  console.log('设备信息device======',device)
+                  //tag
                   let ret = this.$androidUtil.bzLogic('saveDevice', {
                     row:device
                   })
@@ -761,7 +761,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 = '无计划安检'"}})
 
           if(this.item.f_no_checkplan == '无计划安检' &&  value.data.length == 0  &&  this.item.f_no_checkplan != '打回'){
@@ -776,17 +776,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
@@ -816,23 +816,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){
                           //TODO 失败后处理
                           // if(this.isUpload){
@@ -873,11 +873,11 @@
           HostApp.__this__.$set('data', paper)
           HostApp.__this__.$goto('paper-state-noncivil', {}, '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()
           }
@@ -1025,7 +1025,7 @@
         return obj;
       },
       putDevices() {
-        console.log('Vue.config.safecheck', Vue.config.safecheck)
+        //tag
         this.$set('data.approve', "true")
         this.$set('data.writeback', "false")
         if (Vue.config.safecheck.ApproveConfig != undefined) {
@@ -1106,12 +1106,12 @@
             id = this.item.f_paper_id
           }
           this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
-              console.log('result....', respanse)
+              //tag
               if (respanse.data.length != 0) {
                 // 包含 其它 特殊处理的数组
                 // 对应位置
 
-                console.log('devices => ', respanse.data[0])
+                //tag
 
                 that.data = Object.assign(that.data, respanse.data[0])
                 if (respanse.data[0].f_devices) {
@@ -1122,11 +1122,11 @@
                     for (let de in that.devices) {
                       if (that.devices[de].device == item.f_device_type) {
                         item.f_items.forEach((f_item) => {
-                          console.log('f_item====>', f_item)
-                          console.log('f_item.f_path====>', f_item.f_path)
+                          //tag
+                          //tag
                           let itemValues = []
                           f_item.f_item_lists.forEach((tempItem) => {
-                            console.log('emm => ', f_item.f_item_name, '   ', tempItem.f_item_value)
+                            //tag
                             if (tempItem.f_item_value !== 'null') {
                               itemValues.push(tempItem.f_item_value)
                             }
@@ -1149,7 +1149,7 @@
                 } else {
                   Util.androidRatifyPics(that.data, this.$androidUtil.getProxyUrl())
                 }
-                console.log("that.data:", that.data)
+                //tag
               } else {
                 alert("该安检单可能已不在本地!")
                 this.init()
@@ -1159,7 +1159,7 @@
             }
           ).catch(
             (respanse) => {
-              console.log('respanse',respanse)
+              //tag
               alert('查找安检单失败')
             })
         }
@@ -1185,7 +1185,7 @@
         //           })
         //         }
         //         Util.booleanFilter(that.data)
-        //         console.log("that.data:", that.data)
+        //         //tag
         //       } else {
         //         alert("该安检单可能已不在本地!")
         //         this.init()
@@ -1204,7 +1204,7 @@
     },
     destroyed() {
       this.disableTimer()
-      console.log('退出当前页SetNoncivil')
+      //tag
     },
 
   }

package/src/components/rongcheng/PaperStateNoncivilm.vue

@@ -25,31 +25,41 @@
           <input type="radio" name="enterstatus" v-model="f_entry_status" id="enterhouse" value="入户">入户
         </div>
       </div>
-      <div class="form-group col-sm-12 col-xs-12" v-show="f_entry_status=='到访不遇'">
-        <div class="auto">
-          <label class="font" style="margin-right: 18px">是否激光检漏：</label>
-          <input type="radio" name="laser_check" v-model="f_laser_check" id="nopeople1" value="是">是
-          <input type="radio" name="laser_check" v-model="f_laser_check" id="rejectchecck1" value="否">否
+        <div class="row" v-show="item.f_entry_status=='到访不遇'">
+          <div class="col-sm-8 col-xs-8" :class="style__">
+            <label class="text-left font">到访不遇照片：</label>
+            <img-self :src="item.f_noanswer_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+            <img-self :src="item.f_noanswertwo_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>
+
+          </div>
+          <div class="col-sm-4 col-xs-4">
+            <div class="auto">
+              <label class="font" style="margin-right: 18px">是否激光检漏：</label>
+              <input type="radio" name="laser_check" v-model="item.f_laser_check" id="nopeople1" value="是">是
+              <input type="radio" name="laser_check" v-model="item.f_laser_check" id="rejectchecck1" value="否">否
+            </div>
+            <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="item.f_jujian_remark">
+              <label class="text-left font">到访备注：{{item.f_buyu_remark}}</label>
+            </div>
+          </div>
         </div>
-      </div>
-      <div class="form-group col-sm-12 col-xs-12" v-show="f_entry_status=='拒检'">
-        <label class="text-left font">拒检照片：</label>
-        <div class="auto">
-          <div class="panel" style="padding: 10px 10px 5px 10px;">
-            <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
-              <div class="row" style="height: 240px;overflow: scroll;top: 1px">
-                <div class="col-sm-4">
-                  <img-self :src="f_rejectcheck_path" alt="拒检照片" width="150" height="200"> </img-self>
-                </div>
-              </div>
-              <div class="row text-right div-photo">
-                <button type="button" name="button" class="btn btn-primary btn-photo"  @click="takePic('f_rejectcheck_path', '拒检照片')">拍照</button>
-                &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__"  @click="delfile('f_rejectcheck_path', this.f_rejectcheck_path)" style="width: 25%;"></img>
-              </div>
+        <div class="row" v-show="item.f_entry_status=='拒检'">
+          <div class="col-sm-8 col-xs-8" :class="style__">
+            <label class="text-left font">拒检照片：</label>
+            <img-self :src="item.f_rejectcheck_path" alt="拒检照片" style=" display: inline-block" width="150" height="200"> </img-self>
+            <!--          <img-self :src="item.f_noanswertwo_path" alt="到访不遇照片" style=" display: inline-block" width="150" height="200"> </img-self>-->
+          </div>
+          <div class="col-sm-4 col-xs-4">
+            <!--          <div class="auto">
+                        <label class="font" style="margin-right: 18px">是否激光检漏：</label>
+                        <input type="radio" name="laser_check" v-model="item.f_laser_check" id="nopeople1" value="是">是
+                        <input type="radio" name="laser_check" v-model="item.f_laser_check" id="rejectchecck1" value="否">否
+                      </div>-->
+            <div class="form-group col-sm-12 col-xs-12" v-show="item.f_jujian_remark" :class="style__">
+              <label class="text-left font">拒检备注：{{item.f_jujian_remark}}</label>
             </div>
           </div>
         </div>
-      </div>
       <div :class="style__" class="form-group groupm">
         <span class="col-sm-12 col-xs-12 text-left ">暂停使用天然气:</span>
         <div class="col-sm-12 col-xs-12">
@@ -203,7 +213,7 @@ export default {
     takePic(prop, title) {
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
-      console.log('this[prop]:' + this[prop])
+      //tag
       let fileName
       if(!this[prop] || this[prop].includes("nopic.png")) {
         fileName = Util.guid() +'-' + prop + '.jpg'
@@ -254,11 +264,11 @@ export default {
       this.$set('last_check_data.data',[])
     }
     if(this.$parent.data.f_onsite_time){
-      console.log('已经开始安检')
+      //tag
       this.$parent.startClick = true
     }
     this.action = true
-    console.log('this.f_onsite_time',this.f_onsite_time)
+    //tag
     if(this.f_onsite_time){
       this.$parent.isStrat = true
     }
@@ -285,7 +295,7 @@ export default {
       this.$set('f_close_adjuster_path', Vue.nopic)
     // 如果停气取消选中
     this.$watch('f_stop_service', function (val) {
-      console.log('val',val)
+      //tag
       if(!val) {
         this.f_stop_devices = false
         this.f_close_valve = false