safecheck-client 3.0.34-3 → 3.0.34-31

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()){

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

@@ -676,7 +676,6 @@
         HostApp.__this__ = null
       },
       takePic(prop, title, index) {
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         ////tag
@@ -697,6 +696,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true') {
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu = '\t经度:' + obj.longitude + '\t纬度:' + obj.latitude
         }
         HostApp._open_a_page({

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

@@ -452,7 +452,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -472,6 +471,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag
@@ -747,7 +747,7 @@ export default {
       this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
       if(val=='已用气量'){
         //剩余气量 = 累购-已用
-        this.f_items[this.f_gas_balance.index].f_item_value= this.f_items[this.f_total_gas.index].f_item_value-this.f_items[this.f_table_base.index].f_item_value
+        this.f_items[this.f_gas_balance.index].f_item_value= (this.f_items[this.f_total_gas.index].f_item_value-this.f_items[this.f_table_base.index].f_item_value).toFixed(2)
         if (isNaN(this.f_items[this.f_gas_balance.index].f_item_value)) {
           this.f_items[this.f_gas_balance.index].f_item_value = null
         }

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

@@ -505,7 +505,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -531,6 +530,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/yangchunboneng/android/safeHistoryLook.vue

@@ -303,15 +303,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: '入户'},
@@ -437,10 +429,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()){

package/src/filiale/yangchunboneng/pc/CheckBookSearchUser.vue

@@ -72,6 +72,7 @@
                 <datepicker
                   :value.sync="model.f_gas_date_str"
                   style="width: 60%"
+                  placeholder='用户首次通气'
                   :format="'yyyy-MM-dd 00:00:00'"
                   v-model="model.f_gas_date_str"
                   condition="f_uservent_date > '{}'"
@@ -83,34 +84,35 @@
                 <datepicker
                   :value.sync="model.f_gas_date_end"
                   style="width: 60%"
+                  placeholder='用户首次通气'
                   :format="'yyyy-MM-dd 23:59:59'"
                   v-model="model.f_gas_date_end"
                   condition="f_uservent_date < '{}'"
                 >
                 </datepicker>
               </div>
-              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow" >
                 <label class="font_normal_body">开始时间</label>
                 <datepicker
                   :value.sync="model.f_check_start"
-                  placeholder='首次通气时间' style="width: 60%"
+                  placeholder='表具通气时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_start"
-                  condition="f_uservent_date > ='{} 00:00:00'">
+                  condition="f_gas_date > ='{} 00:00:00'">
                 </datepicker>
               </div>
-              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+              <div class="form-group col-sm-4"  v-show="$parent.$parent.criteriaShow" >
                 <label class="font_normal_body">结束时间</label>
                 <datepicker
                   :value.sync="model.f_check_end"
-                  placeholder='首次通气时间' style="width: 60%"
+                  placeholder='表具通气时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_end"
-                  condition="f_uservent_date <=  '{} 23:59:59'">
+                  condition="f_gas_date <=  '{} 23:59:59'">
                 </datepicker>
               </div>
             </div>
@@ -635,7 +637,7 @@ export default {
     // this.$refs.paged.$refs.criteria.model.f_is_checkbook = 'f_check_book_name is null'
     // //tag
     // // this.init=true
-    // this.freshCheckBook()
+    this.freshCheckBook()
   }
 }
 </script>