address-client 4.0.16 → 4.0.18

package/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

package/gradlew

@@ -0,0 +1,249 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "4.0.16",
+  "version": "4.0.18",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/filiale/meihekou/AreaList.vue

@@ -328,9 +328,14 @@ export default {
         this.$refs.paged.$refs.grid.selectInit()
         this.$refs.paged.$refs.cri.search()
         this.showUpdate = false
-      })
-
-
+        this.areamodel={
+            slice_area:null,
+            f_slice_area_id: '',
+            f_slice_area:'',
+            f_pcd_id: '',
+            f_pcd:''
+          }
+        })
     },
     async delete(row){
       if(row.id >= 0){

package/src/filiale/tongchuan/AddressList.vue

@@ -107,9 +107,14 @@
             </div>
             <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.showrightchange">
               <label class="font_normal_body">街&emsp;&emsp;道</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
-                      condition="f_street like '%{}%'" placeholder="街道/乡镇"
-                      :size="model.f_street ? model.f_street.length*2 : 6"/>
+              <v-select
+                :value.sync="$parent.$parent.selectedStreets"
+                multiple
+                :options="$parent.$parent.streetslist"
+                placeholder="请选择"
+                close-on-select
+                search="true">
+              </v-select>
             </div>
             <div :class="$parent.$parent.style" >
               <label class="font_normal_body">地址状态</label>
@@ -246,6 +251,9 @@
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
+        // 街道下拉
+        streetslist: [],
+        selectedStreets: [],
         getstate:[{label:'全部',value:''},{label:'有效',value:" = '有效' or a.f_state is null"},{label:'作废',value:" = '作废'"}],
         //文件上传弹框
         showFile: false,
@@ -264,6 +272,10 @@
     },
     ready(){
       readyGen(this)
+      // 初始化组织并加载街道
+      this.f_orgid = this.$login.convertToIn(this.curorgid)
+      this.f_filialeids = this.curorgid[0]
+      this.initstreets(` f_filialeid in ${this.f_orgid} `)
       this.search()
     },
     methods: {
@@ -328,21 +340,62 @@
       search () {
         this.$refs.paged.$refs.cri.search()
       },
+      // 初始化街道下拉
+      async initstreets (condition) {
+        try {
+          this.streetslist = []
+          const req = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+            data: {
+              items: '*',
+              tablename: 't_street',
+              orderitem: 'id',
+              condition
+            }
+          }, { resolveMsg: null, rejectMsg: '获取街道失败!' })
+          if (req && req.data) {
+            const seen = new Set()
+            this.streetslist = req.data.reduce((acc, row) => {
+              const key = row.f_street
+              if (key && !seen.has(key)) {
+                seen.add(key)
+                acc.push({
+                  label: row.f_street,
+                  value: row.f_street
+                })
+              }
+              return acc
+            }, [])
+          }
+        } catch (e) {
+          // ignore errors
+        }
+      },
       selfSearch (args) {
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
         args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+        if (Array.isArray(this.selectedStreets) && this.selectedStreets.length > 0) {
+          const streetConds = this.selectedStreets
+            .filter(s => !!s)
+            .map(s => `a.f_street = '${s.replace(/'/g, "''")}'`)
+            .join(' or ')
+          if (streetConds) {
+            args.condition = `${args.condition} and (${streetConds})`
+          }
+        }
         this.model.search(args.condition, args.model)
       },
 
       //清空
       clear(){
         this.$refs.paged.$refs.cri.model = {}
+        this.selectedStreets = []
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeids = val[0]
+        this.initstreets(` f_filialeid in ${this.f_orgid} `)
       }
     },
     events: {

package/src/filiale/tongchuan/AreaList.vue

@@ -35,8 +35,14 @@
             </div>
             <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">
               <label class="font_normal_body">街道乡镇</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
-                      condition="f_street like '%{}%'" placeholder="街道/乡镇"/>
+              <v-select
+                :value.sync="$parent.$parent.selectedStreets"
+                multiple
+                :options="$parent.$parent.streetslist"
+                placeholder="请选择"
+                close-on-select
+                search="true">
+              </v-select>
             </div>
             <div class="col-sm-4 form-group button-range">
               <button class="button_search button_spacing" @click="search()" >查询</button>
@@ -67,9 +73,14 @@
             </div>
             <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.areaShow">
               <label class="font_normal_body">街道乡镇</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
-                      condition="f_street like '%{}%'" placeholder="街道/乡镇"
-                      :size="model.f_street ? model.f_street.length*2 : 6"/>
+              <v-select
+                :value.sync="$parent.$parent.selectedStreets"
+                multiple
+                :options="$parent.$parent.streetslist"
+                placeholder="请选择"
+                close-on-select
+                search="true">
+              </v-select>
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">小区名称</label>
@@ -179,6 +190,10 @@
         addflag: false,
         addtitle:'',
         getfield: {},
+        // 下拉：街道选项
+        streetslist: [],
+        // 已选街道（多选）
+        selectedStreets: [],
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
@@ -218,6 +233,9 @@
     },
     ready(){
       readyGen(this)
+      // 初始化组织 IN 条件，并加载默认街道
+      this.f_orgid = this.$login.convertToIn([this.$login.f.orgid])
+      this.initstreets(` f_orgid in ${this.f_orgid} `)
 
     },
     methods: {
@@ -227,6 +245,36 @@
       search() {
         this.$refs.paged.$refs.cri.search()
       },
+      // 初始化街道下拉数据
+      async initstreets (pconditon) {
+        try {
+          this.streetslist = []
+          const req = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+            data: {
+              items: '*',
+              tablename: 't_street',
+              orderitem: 'id',
+              condition: pconditon
+            }
+          }, { resolveMsg: null, rejectMsg: '获取街道失败!' })
+          if (req && req.data) {
+            const seen = new Set()
+            this.streetslist = req.data.reduce((acc, row) => {
+              const key = row.f_street
+              if (key && !seen.has(key)) {
+                seen.add(key)
+                acc.push({
+                  label: row.f_street,
+                  value: row.f_street
+                })
+              }
+              return acc
+            }, [])
+          }
+        } catch (e) {
+          // 忽略异常，保持为空列表
+        }
+      },
 
       async delete(row){
         if(row.id >= 0){
@@ -269,15 +317,28 @@
         }else{
           args.condition =  `${args.condition} and s.f_filialeid = ${this.f_orgid}`
         }
+        // 街道多选条件
+        if (Array.isArray(this.selectedStreets) && this.selectedStreets.length > 0) {
+          const streetConds = this.selectedStreets
+            .filter(s => !!s)
+            .map(s => `s.f_street = '${s.replace(/'/g, "''")}'`)
+            .join(' or ')
+          if (streetConds) {
+            args.condition = `${args.condition} and (${streetConds})`
+          }
+        }
         this.model.search(args.condition, args.model)
       },
       //清空
       clear(){
         this.$refs.paged.$refs.cri.model = {}
+        this.selectedStreets = []
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeids = val[0]
+        // 根据分公司刷新街道下拉
+        this.initstreets(` f_orgid in ${this.f_orgid} `)
       }
     },
     watch:{

package/src/filiale/tongchuan/StreetList.vue

@@ -13,8 +13,15 @@
             </div>
             <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
               <label class="font_normal_body">街道名称</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
-                      condition="f_street like '%{}%'" placeholder="街道名称"/>
+              <input type="text" v-show="false" v-model="model.f_street" condition="f_street like '%{}%'" />
+              <v-select
+                :value.sync="$parent.$parent.selectedStreets"
+                multiple
+                :options="$parent.$parent.streetslist"
+                placeholder="请选择"
+                close-on-select
+                search="true">
+              </v-select>
             </div>
             <div  class="col-sm-4 form-group button-range">
               <button class="button_search button_spacing" @click="search()" >查询</button>
@@ -119,6 +126,10 @@
         model: new PagedList('api/af-revenue/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
         addflag: false,
         getfield: {},
+        // 下拉：街道选项
+        streetslist: [],
+        // 已选街道（多选）
+        selectedStreets: [],
         addtitle:'',
         // 公司下拉
         curorgid: [this.$login.f.orgid],
@@ -147,6 +158,9 @@
     },
     ready(){
       readyGen(this)
+      // 初始化组织 IN 条件，并加载默认街道
+      this.f_orgid = this.$login.convertToIn([this.$login.f.orgid])
+      this.initstreets(` f_orgid in ${this.f_orgid} `)
       this.search()
     },
     methods: {
@@ -156,6 +170,40 @@
       search () {
         this.$refs.paged.$refs.cri.search()
       },
+      // 初始化街道下拉数据
+      async initstreets (pconditon) {
+        try {
+          this.streetslist = []
+          const req = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+            data: {
+              items: '*',
+              tablename: 't_street',
+              orderitem: 'id',
+              condition: pconditon
+            }
+          }, { resolveMsg: null, rejectMsg: '获取街道失败!' })
+          if (req && req.data) {
+            const seen = new Set()
+            this.streetslist = req.data.reduce((acc, row) => {
+              const key = row.f_street
+              if (key && !seen.has(key)) {
+                seen.add(key)
+                acc.push({
+                  label: row.f_street,
+                  value: row.f_street
+                })
+              }
+              return acc
+            }, [])
+            // 若父容器使用其 streetslist，则同步去重后的结果
+            if (this.$parent && this.$parent.$parent && Array.isArray(this.$parent.$parent.streetslist)) {
+              this.$parent.$parent.streetslist = this.streetslist
+            }
+          }
+        } catch (e) {
+          // 忽略异常，保持为空列表
+        }
+      },
       async delete(row){
         if(row.id >= 0 ){
           var id = row.id
@@ -191,22 +239,36 @@
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
+        // 分公司多选条件
         args.condition = `${args.condition} and s.f_filialeid  in ${this.f_orgid}`
+        // 街道多选条件
+        if (Array.isArray(this.selectedStreets) && this.selectedStreets.length > 0) {
+          const streetConds = this.selectedStreets
+            .filter(s => !!s)
+            .map(s => `s.f_street = '${s.replace(/'/g, "''")}'`)
+            .join(' or ')
+          if (streetConds) {
+            args.condition = `${args.condition} and (${streetConds})`
+          }
+        }
         this.model.search(args.condition, args.model)
       },
       //清空
       clear(){
         this.$refs.paged.$refs.cri.model = {}
+        this.selectedStreets = []
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
+        this.f_filialeids = Array.isArray(val) && val.length ? val[0] : ''
+        // 根据分公司（多选）刷新街道下拉
+        this.initstreets(` f_orgid in ${this.f_orgid} `)
       }
     },
     computed: {
       getCondition() {
         return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`,
+          condition: `${this.$refs.paged.$refs.cri.condition}` + ` and s.f_filialeid in ${this.f_orgid}`,
           orderitem: this.orderitem ? `${this.orderitem}` : " id desc"
         }
       }