safecheck-client 3.0.34-21 → 3.0.34-24

package/src/filiale/baiyin/pc/RoleSelector.vue

@@ -1,160 +1,160 @@
-<template>
-  <div style="width: 100%;height: 100%">
-    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-      <label class="font_normal_body">公&emsp;&emsp;司</label>
-      <right-tree-safe :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe>
-    </div>
-    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-      <label class="font_normal_body">{{ roleLable }}</label>
-      <v-select :value="selVal" v-model='selVal'
-                :value-single="!valueMultiple"
-                class="select_list select"
-                :options='users' :placeholder='roleName'
-                :close-on-select = 'valueClose'
-                :multiple="valueMultiple"
-                :width="rightWidth"
-                @change="valuechange">
-      </v-select>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    name: "RoleSelector",
-    props: {
-      valueMultiple: {
-        type: Boolean,
-        default: false
-      },
-      roleName: {
-        type: String,
-        default: '安检员'
-      },
-      roleLable: {
-        type: String,
-        default: '安检员'
-      },
-      leftWidth: {
-        type: String,
-        default: '60%'
-      },
-      rightWidth: {
-        type: String,
-        default: '60%'
-      },
-      value: {
-        default: ''
-      },
-      resobjprop: {
-        default: {}
-      },
-      valueClose: {
-        type: Boolean,
-        default: true
-      }
-    },
-    data() {
-      return {
-         source: `tool.getChildrenOfResName($${this.roleName}$)`,
-        //source: `root.getResourceById($${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolesnames$).indexOf($${this.roleName}$) != -1)`,
-        allUsers: [],
-        users: [],
-        selVal: '',
-        organizationname:this.$login.f.f_fengongsi,
-        resids: [],
-        changeval: ''
-      }
-    },
-    watch: {
-      'value'(val) {
-        console.log("969696", val)
-        if (val) {
-          if (this.valueMultiple) {
-
-          } else {
-            this.selVal = val
-          }
-
-        }
-      }
-    },
-    async ready() {
-      await this.search()
-      await this.filterUser(this.resids)
-    },
-    methods: {
-      async search() {
-        let http = new HttpResetClass()
-        const res = await http.load('POST', '/rs/search', {
-          data: {
-            source: this.source,
-            userid: this.$login.f.id
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        this.allUsers = res.data
-      },
-      valuechange(val) {
-        console.log(`val instanceof Array======${!val instanceof Array}`)
-        if ((typeof val === 'object' && !val instanceof Array) || (val instanceof Event)) {
-          return
-        }
-        if (this.valueMultiple && Array.isArray(val)) {
-          if (val && val.length > 0) {
-            let valuesele = `(`
-            for (let i = 0; i < val.length; i++) {
-              valuesele += `'${val[i]}',`
-            }
-            this.value = valuesele.substring(0, valuesele.length - 1) + ')'
-          } else {
-            this.value = ''
-          }
-        } else {
-          this.value = val
-        }
-        // this.changeval = val
-      },
-      getRes(obj) {
-        this.resids = obj.resids
-        this.organizationname = obj.res[0]
-        this.filterUser(this.resids)
-        this.$dispatch('re-res', obj)
-      },
-      async filterUser(resids) {
-        // 处理第一次进入页面值异常问题
-        if (resids.length > 0 && typeof resids[0] == "object") {
-          resids = resids[0]
-        }
-        if (resids[0]) {
-          this.source = `tool.getChildrenOfResName($${this.roleName}$)`
-          await this.search()
-        }
-        this.users = []
-        this.allUsers.forEach(user => {
-          if (this.organizationname == user.organizationname || !user.organizationname){
-            this.users.push({label: user.name, value: user.name})
-          }
-        })
-        if (!this.valueMultiple && this.users.length > 0) {
-          this.users = [{label: '全部', value: ''}, ...this.users]
-        }
-        let temp = []
-        this.users = this.users.filter(item => {
-          if (!temp.includes(item.label)) {
-            temp.push(item.label)
-            return true
-          }
-          return false
-        })
-        this.$emit('alluser', this.allUsers)
-        //tag
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div style="width: 100%;height: 100%">
+    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+      <label class="font_normal_body">公&emsp;&emsp;司</label>
+      <right-tree-safe :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe>
+    </div>
+    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+      <label class="font_normal_body">{{ roleLable }}</label>
+      <v-select :value="selVal" v-model='selVal'
+                :value-single="!valueMultiple"
+                class="select_list select"
+                :options='users' :placeholder='roleName'
+                :close-on-select = 'valueClose'
+                :multiple="valueMultiple"
+                :width="rightWidth"
+                @change="valuechange">
+      </v-select>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    name: "RoleSelector",
+    props: {
+      valueMultiple: {
+        type: Boolean,
+        default: false
+      },
+      roleName: {
+        type: String,
+        default: '安检员'
+      },
+      roleLable: {
+        type: String,
+        default: '安检员'
+      },
+      leftWidth: {
+        type: String,
+        default: '60%'
+      },
+      rightWidth: {
+        type: String,
+        default: '60%'
+      },
+      value: {
+        default: ''
+      },
+      resobjprop: {
+        default: {}
+      },
+      valueClose: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+         source: `tool.getChildrenOfResName($${this.roleName}$)`,
+        //source: `root.getResourceById($${this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1)}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolesnames$).indexOf($${this.roleName}$) != -1)`,
+        allUsers: [],
+        users: [],
+        selVal: '',
+        organizationname:this.$login.f.f_fengongsi,
+        resids: [],
+        changeval: ''
+      }
+    },
+    watch: {
+      'value'(val) {
+        console.log("969696", val)
+        if (val) {
+          if (this.valueMultiple) {
+
+          } else {
+            this.selVal = val
+          }
+
+        }
+      }
+    },
+    async ready() {
+      await this.search()
+      await this.filterUser(this.resids)
+    },
+    methods: {
+      async search() {
+        let http = new HttpResetClass()
+        const res = await http.load('POST', '/rs/search', {
+          data: {
+            source: this.source,
+            userid: this.$login.f.id
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        this.allUsers = res.data
+      },
+      valuechange(val) {
+        console.log(`val instanceof Array======${!val instanceof Array}`)
+        if ((typeof val === 'object' && !val instanceof Array) || (val instanceof Event)) {
+          return
+        }
+        if (this.valueMultiple && Array.isArray(val)) {
+          if (val && val.length > 0) {
+            let valuesele = `(`
+            for (let i = 0; i < val.length; i++) {
+              valuesele += `'${val[i]}',`
+            }
+            this.value = valuesele.substring(0, valuesele.length - 1) + ')'
+          } else {
+            this.value = ''
+          }
+        } else {
+          this.value = val
+        }
+        // this.changeval = val
+      },
+      getRes(obj) {
+        this.resids = obj.resids
+        this.organizationname = obj.res[0]
+        this.filterUser(this.resids)
+        this.$dispatch('re-res', obj)
+      },
+      async filterUser(resids) {
+        // 处理第一次进入页面值异常问题
+        if (resids.length > 0 && typeof resids[0] == "object") {
+          resids = resids[0]
+        }
+        if (resids[0]) {
+          this.source = `tool.getChildrenOfResName($${this.roleName}$)`
+          await this.search()
+        }
+        this.users = []
+        this.allUsers.forEach(user => {
+          if (this.organizationname == user.organizationname || !user.organizationname){
+            this.users.push({label: user.name, value: user.name})
+          }
+        })
+        if (!this.valueMultiple && this.users.length > 0) {
+          this.users = [{label: '全部', value: ''}, ...this.users]
+        }
+        let temp = []
+        this.users = this.users.filter(item => {
+          if (!temp.includes(item.label)) {
+            temp.push(item.label)
+            return true
+          }
+          return false
+        })
+        this.$emit('alluser', this.allUsers)
+        //tag
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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}) `)
       }
     }
   },