safecheck-client 3.0.34-1 → 3.0.34-11

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

@@ -431,7 +431,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -457,6 +456,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

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

@@ -439,7 +439,6 @@
         if (this.role == 'androidview') {
           return
         }
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -459,6 +458,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         //tag

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

@@ -425,7 +425,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(type, prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -451,6 +450,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true') {
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu = '\t经度：' + obj.longitude + '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

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

@@ -1375,8 +1375,10 @@ export default {
         if(HostApp.__this__.role == 'inspect'
           && HostApp.__this__.data.f_approved
           && HostApp.__this__.data.f_approved == '打回') {
+          if (!this.data.f_onsite_time){
+            HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
+          }
           //tag
-          HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
           HostApp.__this__.tick()
         }
       }
@@ -2235,3 +2237,4 @@ export default {
   padding: 13px 16px;
 }
 </style>
+

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

@@ -240,9 +240,6 @@ export default {
         }
       }
     }
-    for (let i in this.userinfo) {
-      //tag + '：' + JSON.stringify(this.userinfo[i]))
-    }
     this.safecheckStateReady()
   },
   methods: {
@@ -409,7 +406,9 @@ export default {
     start() {
       this.$parent.$parent.isStrat = true
       this.$set('action', !this.action)
-      this.$set('f_onsite_time', Util.toStandardTimeString())
+      if (!this.f_onsite_time){
+        this.$set('f_onsite_time', Util.toStandardTimeString())
+      }
     },
     safecheckStateReady() {
       //tag
@@ -441,7 +440,9 @@ export default {
       //tag
       if (this.f_onsite_time) {
         this.$parent.$parent.isStrat = true
-        this.$parent.$parent.data.f_onsite_time = Util.toStandardTimeString()
+        if (!this.$parent.$parent.data.f_onsite_time){
+          this.$parent.$parent.data.f_onsite_time = this.f_onsite_time
+        }
       }
       if (this.$parent.$parent.role == 'repair') {
         this.$set('style__', 'divmask')

package/src/filiale/yangchunboneng/android/CurrentCreate.vue

@@ -662,15 +662,7 @@
           {label: '未检', value: '未检'},
           {label: '已检', value: '已检'},
         ],
-        last_check_states: [
-          {label: '请选择', value: ''},
-          {label: '入户', value: '入户'},
-          {label: '拒检', value: '拒检'},
-          {label: '到访不遇', value: '到访不遇'},
-          {label: '拆除', value: '拆除'},
-          {label: '停用', value: '停用'},
-          {label: '未通气', value: '未通气'}
-        ],
+        last_check_states: Vue.$appdata.getParam('安检状态'),
         upload_states: [
           {label: '请选择上传状态', value: ''},
           {label: '未传', value: '未传'},
@@ -1009,8 +1001,13 @@
           condition += ` and (ti.f_user_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%' or f_zuhu_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%' or f_rent_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%' or f_user_phone2 like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%')`
         }
 
-        if(this.$refs.paged.$refs.cri.model.f_last_check_state !=''){
-          condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_check_state+"'"
+        if(this.$refs.paged.$refs.cri.model.f_last_check_state.length > 0){
+          let last_check_state = ''
+          this.$refs.paged.$refs.cri.model.f_last_check_state.forEach((item) => {
+            last_check_state = last_check_state + `'${item}',`
+          })
+          last_check_state = last_check_state.slice(0, -1)
+          condition += " and ti.f_last_check_state in ("+last_check_state+")"
         }
         if(this.$refs.paged.$refs.cri.model.userinfo){
           condition += ` and (f_userinfo_code like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_name like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_meter_no like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_address like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_zuhu_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_rent_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_phone2 like '%${this.$refs.paged.$refs.cri.model.userinfo}%')`

package/src/filiale/yangchunboneng/android/DailyworkloadQuery.vue

@@ -302,15 +302,7 @@ export default {
         {label: '左表', value: '左表'},
         {label: '右表', value: '右表'}
       ],
-      check_states: [
-        {label: '请选择安检状态', value: ''},
-        {label: '入户', value: '入户'},
-        {label: '到访不遇', value: '到访不遇'},
-        {label: '拒检', value: '拒检'},
-        {label: '停用', value: '停用'},
-        {label: '未通气', value: '未通气'},
-        {label: '拆除', value: '拆除'}
-      ],
+      check_states: Vue.$appdata.getParam('安检状态'),
       last_check_states: [
         {label: '请选择上次安检状态', value: ''},
         {label: '入户', value: '入户'},
@@ -436,10 +428,13 @@ export default {
           condition += " and f_offsite_time < '"+this.$refs.paged.$refs.cri.model.f_end_date +"'"
         }
       }
-      if(this.$refs.paged.$refs.cri.model.f_state){
-        if(this.$refs.paged.$refs.cri.model.f_state.toString().trim()){
-          condition += " and f_entry_status = '"+this.$refs.paged.$refs.cri.model.f_state +"'"
-        }
+      if(this.$refs.paged.$refs.cri.model.f_state.length > 0){
+        let last_check_state = ''
+        this.$refs.paged.$refs.cri.model.f_state.forEach((item) => {
+          last_check_state = last_check_state + `'${item}',`
+        })
+        last_check_state = last_check_state.slice(0, -1)
+        condition += " and f_entry_status in ("+last_check_state+")"
       }
       if(this.$refs.paged.$refs.cri.model.f_user_type){
         if(this.$refs.paged.$refs.cri.model.f_user_type.toString().trim()){