safecheck-client 3.0.34-4 → 3.0.34-42

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

@@ -500,7 +500,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(type, prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -526,6 +525,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/dexin/android/SafecheckDevices.vue

@@ -430,7 +430,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -450,6 +449,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

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

@@ -170,30 +170,35 @@
 
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">街道/乡镇</label>
-              <v-select :value.sync="model.f_street_id" :value-single="true"
+              <v-select :value.sync="model.f_street_id"
+                        :multiple="true"
                         :options='$parent.$parent.streetslist' placeholder='请选择'
-                        condition="f_street_id = '{}'"
+                        condition="f_street_id in {}"
                         v-model='model.f_street_id'
                         @change="$parent.$parent.streetChange"
-                        close-on-select :search="true" >
+                       :search="true" >
               </v-select>
             </div>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body">片区/行政村</label>
-              <v-select :value.sync="model.f_community_id" v-model='model.f_community_id'
-                        :options='$parent.$parent.communitylist' placeholder='片区/管理站' filer-key="name"
-                        condition="f_community_id = '{}'"
+              <v-select :value.sync="model.f_community_id"
+                        :multiple="true"
+                        v-model='model.f_community_id'
+                        :options='$parent.$parent.communitylist'
+                        placeholder='片区/管理站' filer-key="name"
+                        condition="f_community_id in {}"
                         @change="$parent.$parent.communityChange"
-                        close-on-select v-ref:slice>
+                         v-ref:slice>
               </v-select>
             </div>
             <div  class="col-sm-3 form-group">
               <label class="font_normal_body">小区/自然村</label>
-              <v-select :value.sync="model.f_residential_area_id" :value-single="true"
+              <v-select :value.sync="model.f_residential_area_id"
+                        :multiple="true"
                         :options='$parent.$parent.areaslist' placeholder='请选择'
-                        condition="f_residential_area_id = '{}'"
+                        condition="f_residential_area_id in {}"
                         v-model='model.f_residential_area_id'
-                        close-on-select>
+                       >
               </v-select>
             </div>
             <div  class="col-sm-3 form-group">
@@ -712,15 +717,30 @@ export default {
       })
       this.communitylist=redata
     },
-    async streetChange(val){
-      if(val){
-        await this.initcommunity(` f_filialeid = '${this.f_filialeids}' and f_street_id ='${val}' `)
+    async streetChange(val) {
+      if (val.length > 0) {
+        // 使用数组来收集值
+        const ids = [];
+        for (let i = 0; i < val.length; i++) {
+          ids.push(val[i]);
+        }
+        // 将数组转换为逗号分隔的字符串
+        const strs = ids.join(',');
+        // 调用 initcommunity 方法时确保 SQL 语法正确
+        await this.initcommunity(`f_filialeid = '${this.f_filialeids}' and f_street_id in (${strs})`);
       }
     },
     async  communityChange(val){
       console.log(val)
-      if(val){
-        await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id ='${val}' `)
+      if(val.length > 0){
+        // 使用数组来收集值
+        const ids = [];
+        for (let i = 0; i < val.length; i++) {
+          ids.push(val[i]);
+        }
+        // 将数组转换为逗号分隔的字符串
+        const strs = ids.join(',');
+        await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_community_id in (${strs}) `)
       }
     }
   },

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

@@ -608,7 +608,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -629,6 +628,7 @@ export default {
       }
       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/hanzhong/android/SafecheckDevices.vue

@@ -435,7 +435,6 @@
         if (this.role == 'androidview') {
           return
         }
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -455,6 +454,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/hanzhong/android/SafecheckUserInfo.vue

@@ -422,7 +422,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -448,6 +447,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'