safecheck-client 4.0.1-6 → 4.0.1-61

package/src/filiale/xinkang/android/SafecheckDevices.vue

@@ -814,9 +814,28 @@ export default {
         if(Vue.config.safecheck.ApproveConfig.dealdispose != undefined) {
           this.dealdispose = Vue.config.safecheck.ApproveConfig.dealdispose
         }
+        if(Vue.config.safecheck.ApproveConfig.showtorepair) {
+          this.deals=[{label: '现场整改', value: '现场整改'},
+            {label: '自行处理', value: '自行处理'},
+            {label: '转维修', value: '报修'}
+          ]
+        }
+        if(Vue.config.safecheck.ApproveConfig.Processing) {
+          if(Vue.config.safecheck.ApproveConfig.Processing.length > 0){
+            this.deals = Vue.config.safecheck.ApproveConfig.Processing
+          }
+        }
+        if(Vue.config.safecheck.ApproveConfig.showXCImg) {
+          this.showXCImg = true
+        }
+        if(Vue.config.safecheck.ApproveConfig.showZXTime) {
+          this.showZXTime = true
+        }
+        if(Vue.config.safecheck.ApproveConfig.showtorepair) {
+        }
         if(Vue.config.safecheck.ApproveConfig.hiddendanger != undefined) {
-          if (parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger) >= 3) {
-            this.hiddenDangerImgNumber = 3
+          if (parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger) >= 5) {
+            this.hiddenDangerImgNumber = 5
           }else {
             this.hiddenDangerImgNumber = parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger)
           }
@@ -883,6 +902,9 @@ export default {
         f_item_name: item,
         checkmust: this.config[this.device.device].items[item].checkmust,
         f_item_value: f_item_value,
+        is_verification:this.config[this.device.device].items[item].is_verification,
+        verification_text:'',
+        verification_state:'',// ai验证是否通过 npass(未通过)/pass(通过)
         f_is_defect: '',
         multiple:this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
         isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
@@ -896,7 +918,9 @@ export default {
         f_else: '',
         f_p1_path: '',
         f_p2_path: '',
-        f_p3_path: ''
+        f_p3_path: '',
+        f_longitude:'',
+        f_latitude:''
       }
       //tag)
       //tag)
@@ -952,7 +976,7 @@ export default {
       }
       n = n + 1
     }
-    if(JSON.stringify(this.piece) == '{}') {
+    if(!this.piece || JSON.stringify(this.piece) == '{}') {
       // 如果没有，则新建
       this.$set('piece.f_items',this.f_items)
       this.$set('piece.f_device_type',this.device.device)
@@ -963,7 +987,6 @@ export default {
           continue
         }
         for(let p in this.piece.f_items) {
-          //
           if(typeof this.piece.f_items[p]=='function'){
             continue
           }
@@ -1029,8 +1052,7 @@ export default {
             }else if (this.f_items[f].f_item_name == '表读数') {
               //tag)
               this.f_meter_base.index = f
-            }
-            else if (this.f_items[f].f_item_name == '表剩余金额') {
+            }else if (this.f_items[f].f_item_name == '表剩余金额') {
               //tag)
               this.f_balance_amount.index = f
             }else if (this.f_items[f].f_item_name == '字轮数') {

package/src/filiale/xinkang/android/SafecheckOrderV.vue

@@ -1529,8 +1529,6 @@ export default {
     //   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) {
@@ -1544,68 +1542,51 @@ export default {
           if (Vue.config.safecheck.ApproveConfig.livedispose != undefined) {
             this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
           }
-        }
-        //tag
-        //tag)
-        //tag)
-        //tag
-        if(this.item.f_user_type == '民用'){
-          // 民用户
-
-          if (Vue.config.safecheck.DevicesConfig != undefined){
-            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
-              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.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
+          if (Vue.config.safecheck.ApproveConfig.showtorepair) {
+            this.show_torepair = Vue.config.safecheck.ApproveConfig.showtorepair
           }
-        }else {
+          if (Vue.config.safecheck.ApproveConfig.notencountered != undefined){
+            this.notencountered = Vue.config.safecheck.ApproveConfig.notencountered
+          }
+          if (Vue.config.safecheck.ApproveConfig.refuseinspection != undefined){
+            this.refuseinspection = Vue.config.safecheck.ApproveConfig.refuseinspection
+          }
+        }
+        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) {
+            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
               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{
+          // 民用户
+          if (Vue.config.safecheck.DevicesConfig != undefined){
+            if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
+              this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
+            }else{
+              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:'民用']])
+            }
           }
         }
 
       }
-      //tag)
-      // 预留设备项位置
       for (let i in this.config) {
         this.tabs.splice(1,0,null)
       }
-      //遍历安检项配置
       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',
           class: 'repair-details-class',
           number: n
         }
-
         if(this.config[i].quantity &&  this.config[i].quantity >0){
           let items = []
           for (let it in this.config[i].items) {
@@ -1631,12 +1612,8 @@ export default {
             )
           }
         }
-        // this.data['device' + n].push(
-        //   {f_device_type: i, f_items: items}
-        // )
         n = n + 1
       }
-      //tag
       this.faultshow.number = this.tabs.length
     },
     //组织config数据---
@@ -2373,22 +2350,16 @@ export default {
         HostApp.__this__ = this
         let that = this
         let value = {}
-        //tag
         if (this.role == 'inspect') {
-          //tag
+          let condition=` f_check_item_id ='${this.item.id}'`
           if (this.item.f_no_checkplan == '无计划安检') {
-            value = this.$androidUtil.path({
-              alias: 'getUserinfomation',
-              data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan = '无计划安检'"}
-            })
-          } else {
-            value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+            condition += ` and f_no_checkplan = '无计划安检'`
           }
+          value = this.$androidUtil.bzLogic('path_getPhoneCheckPaper', {condition: condition})
         } else {
           value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
         }
         Util.replaceFalse(value)
-        //tag)
         if (value.data.length != 0) {
           that.$set('data', value.data[0])
           //tag)
@@ -2402,14 +2373,10 @@ export default {
               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
@@ -2422,36 +2389,16 @@ export default {
                     }
                   }
                 }
-                //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) {
@@ -2475,11 +2422,9 @@ export default {
             //tag)
           }
         } else {
-          //tag
           this.init()
         }
         if(this.parentPage && this.parentPage=='CurrentCreate'){
-          //tag
           let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
           if (isRecodr) {
             if (isRecodr=='true') {
@@ -2528,7 +2473,6 @@ export default {
               }else{
                 Util.androidRatifyPics(that.data,this.$androidUtil.getProxyUrl())
               }
-              //tag
             } else {
               alert("该安检单可能已不在本地!")
               this.init()

package/src/filiale/xinkang/android/SafecheckUserInfo.vue

@@ -368,7 +368,7 @@ export default {
         title: '购气记录',
         safe: false
       })
-      this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
+      this.$parent.$parent.$goto('safe-phone-sell-info', {f_userinfo_id: f_userinfo_id})
     },
     cameraCallBack (prop, fileName) {
       if (prop == 'f_noanswers_path') {