address-client 4.0.23 → 4.0.25

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.10-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

package/gradlew

@@ -0,0 +1,252 @@
+#!/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.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   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/platforms/jvm/plugins-application/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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || 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,94 @@
+@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
+@rem SPDX-License-Identifier: Apache-2.0
+@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. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+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.23",
+  "version": "4.0.25",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/components/UserAddressList.vue

@@ -196,13 +196,35 @@
         }
       },
       search () {
+        let condition = this.$refs.paged.$refs.cri.condition || ''
+        if (this.areaid) {
+          let areaCondition = `f_residential_area_id = '${this.areaid}'`
+          if (condition) {
+            condition = `${areaCondition} and ${condition}`
+          } else {
+            condition = areaCondition
+          }
+          this.$refs.paged.$refs.cri.condition = condition
+        }
+
         this.$refs.paged.$refs.cri.search()
       },
       selfSearch (args) {
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
-        args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+        // 处理 areaid 条件
+        let condition = args.condition || ''
+        if (this.areaid) {
+          let areaCondition = `f_residential_area_id = '${this.areaid}'`
+          if (condition) {
+            condition = `${areaCondition} and ${condition}`
+          } else {
+            condition = areaCondition
+          }
+        }
+        condition = `${condition} and a.f_filialeid = '${this.f_filialeids}'`
+        args.condition = condition
         this.model.search(args.condition, args.model)
       },
 
@@ -218,8 +240,18 @@
     },
     computed: {
       getCondition() {
+        let condition = this.$refs.paged.$refs.cri.condition || '';
+        if (this.areaid) {
+          let areaCondition = `f_residential_area_id = '${this.areaid}'`
+          if (condition) {
+            condition = `${areaCondition} and ${condition}`
+          } else {
+            condition = areaCondition
+          }
+        }
         return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and a.f_filialeid = '${this.f_filialeids}'`}
+          condition: `${condition} and a.f_filialeid = '${this.f_filialeids}'`
+        }
       }
     }
 

package/src/filiale/meihekou/AreaList.vue

@@ -102,6 +102,12 @@
                         close-on-select condition="f_inputtor='{}'"
                         placeholder='抄表员' v-model="model.f_inputtor"></v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">维修片区</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_slice_area"
+                      condition="f_slice_area like '%{}%'" placeholder="维修片区"
+                      :size="model.f_slice_area ? model.f_slice_area.length*2 : 6"/>
+            </div>
           </div>
         </div>
       </criteria>

package/src/filiale/xinkang/AddAreaMsg.vue

@@ -12,7 +12,7 @@
           <div v-if="areatype != '楼栋'">
             <!--基本小区(单位)信息-->
             <div class="col-sm-6 form-group" v-if="!config.hasnumber">
-              <label class="font_normal_body">小区编号</label>
+              <label class="font_normal_body">小区编号1</label>
               <input type="text" class="input_search" style="width:60%" v-model="areamodel.f_area_id"
                      @blur="areaidChange" placeholder="小区编号">
             </div>
@@ -55,6 +55,15 @@
                         close-on-select v-ref:slice>
               </v-select>
             </div>
+            <div class="col-sm-6 form-group" :class="[$v.community.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">社&emsp;&emsp;区</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.community.selectedItems"
+                     v-validate:community='{required: true }'>
+              <v-select :value.sync="areamodel.f_community_id" v-model="areamodel.f_community_id"
+                        :options='communitys' placeholder='社区' filer-key="name" :value-single="true"
+                        close-on-select v-ref:community>
+              </v-select>
+            </div>
             <!--小区(特殊)信息-->
             <div v-if="!f_special"
                  class="col-sm-6 form-group"
@@ -311,6 +320,7 @@ export default {
       pcdslist: [],
       //初始化街道数据
       streetslist: [],
+      communitys:[],
       //小区
       areamodel: {
         f_area_id: '',
@@ -369,6 +379,7 @@ export default {
       // 初始化片区
       await this.initSlice(this.f_filialeids)
       await this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
+      await this.initcommunitys(` f_filialeid = '${this.f_filialeids}'`)
     },
     initrow(val) {
       this.areamodel.f_meter_book = val.f_meter_book;
@@ -466,6 +477,29 @@ export default {
       this.pcdslist = redata
 
     },
+      //初始化社区
+      async initcommunitys(conditon){
+        this.communitys = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
+          data: {
+            items: 'id,f_community_name',
+            tablename: 't_community',
+            orderitem: 'id',
+            condition: conditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取社区失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_community_name,
+            value: row.id,
+            data:row,
+            id:row.id
+          }
+        })
+        this.communitys=redata
+      },
     //初始化街道 添加小区
     async initstreets(pconditon) {
       this.streetslist = []
@@ -622,6 +656,9 @@ export default {
         }
       }
       this.areamodel.f_pcd = this.findbyid(this.pcdslist, this.areamodel.f_pcd_id).f_pcd
+      if (this.findbyid(this.communitys,this.areamodel.f_community_id)) {
+        this.areamodel.f_community=this.findbyid(this.communitys,this.areamodel.f_community_id).f_community_name
+      }
       this.areamodel.f_street = this.findbyid(this.streetslist, this.areamodel.f_street_id).f_street
 
       await this.$resetpost('api/af-revenue/logic/address_updatearea', this.areamodel)

package/src/filiale/xinkang/AreaList.vue

@@ -0,0 +1,428 @@
+<template>
+  <div class="flex" @keyup.enter="search">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">组织机构</label>
+              <res-select restype='organization'
+                          @res-select="$parent.$parent.getorg"
+                          is-mul="false"
+                          :initresid='$parent.$parent.curorgid'>
+              </res-select>
+            </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_area_id"
+                      condition="f_area_id = '{}'" placeholder="小区编号"/>
+            </div>
+            <div :class="$parent.$parent.style" v-if="false">
+              <label class="font_normal_body">省&emsp;&emsp;份</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_province"
+                      condition="f_province like '%{}%'" placeholder="省份"/>
+            </div>
+            <!--<div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">-->
+            <div :class="$parent.$parent.style" v-if="false">
+              <label class="font_normal_body">城&emsp;&emsp;市</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_city"
+                      condition="f_city like '%{}%'" placeholder="城市"/>
+            </div>
+            <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">
+              <label class="font_normal_body">区&emsp;&emsp;县</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_district"
+                      condition="f_district like '%{}%'" placeholder="区县"/>
+            </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="街道/乡镇"/>
+            </div>
+            <div class="col-sm-4 form-group button-range">
+              <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button class="button_search button_spacing" @click="$parent.$parent.batchDelete()">批量删除</button>
+              <button v-if="!$parent.$parent.f_special" class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('小区')">添加小区</button>
+              <button v-if="$parent.$parent.f_special"class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('单位')">添加单位</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="api/af-revenue/logic/exportfile"
+                            sql-name="manage_getarealist"
+                            template-name='小区信息查询导出'
+                            :choose-col="true"></export-excel>
+              <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+            </div>
+          </div>
+          <div class="row" v-if="$parent.$parent.criteriaShow">
+            <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_area_id"
+                      condition="f_area_id = '{}'" placeholder="小区编号"/>
+            </div>
+            <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.areaShow">
+              <label class="font_normal_body">城&emsp;&emsp;市</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_city"
+                      condition="f_city like '%{}%'" placeholder="城市"
+                      :size="model.f_city ? model.f_city.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.areaShow">
+              <label class="font_normal_body">区&emsp;&emsp;县</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_district"
+                      condition="f_district like '%{}%'" placeholder="区县"
+                      :size="model.f_district ? model.f_district.length*2 : 6"/>
+            </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"/>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">小区名称</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_area"
+                      condition="f_residential_area like '%{}%'" placeholder="小区"
+                      :size="model.f_residential_area ? model.f_residential_area.length*2 : 6"/>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">小区属性</label>
+              <v-select :options='$parent.$parent.areaAttributes' :value.sync="model.f_area_attributes"
+                        close-on-select condition="f_area_attributes='{}'"
+                        placeholder='小区属性' v-model="model.f_area_attributes"></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">房屋类型</label>
+              <v-select :options='$parent.$parent.housetype' :value.sync="model.f_house_type"
+                        close-on-select condition="f_house_type='{}'"
+                        placeholder='房屋类型' v-model="model.f_house_type"></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">安装位置</label>
+              <v-select :options='$parent.$parent.position' :value.sync="model.f_position"
+                        close-on-select condition="f_position='{}'"
+                        placeholder='安装位置' v-model="model.f_position"></v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">&emsp;抄表员</label>
+              <v-select :options='$parent.$parent.inputtores' :value.sync="model.f_inputtor"
+                        close-on-select condition="f_inputtor='{}'"
+                        placeholder='抄表员' v-model="model.f_inputtor"></v-select>
+            </div>
+          </div>
+        </div>
+      </criteria>
+
+      <data-grid  :model="model" partial='list'  class="list_area table_sy" :optional="true" v-ref:grid>
+        <template partial='head'>
+            <th><nobr>序号</nobr></th>
+            <th v-if="false"><nobr>省份</nobr></th>
+            <th v-if="false"><nobr>城市</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>区/县</nobr></th>
+            <th><nobr>街道/乡镇</nobr></th>
+            <th><nobr>社区</nobr></th>
+            <th><nobr>小区属性</nobr></th>
+            <!--民用小区信息开始-->
+            <th v-if="!$parent.$parent.$parent.f_special"><nobr>小区名称</nobr></th>
+            <th v-if="!$parent.$parent.$parent.f_special"><nobr>地址</nobr></th>
+            <th v-if="!$parent.$parent.$parent.f_special && !$parent.$parent.$parent.$parent.areaShow"><nobr>小区备注</nobr></th>
+            <!--民用小区信息结束-->
+            <!--非民用单位信息开始-->
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位名称</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>单位地址</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>联系人</nobr></th>
+            <th v-if="$parent.$parent.$parent.f_special"><nobr>联系电话</nobr></th>
+            <!--非民用单位信息结束-->
+            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>抄表员</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>房屋类型</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>安装位置</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>片区/管理站 </nobr></th>
+            <th><nobr>操作人</nobr></th>
+            <th><nobr>操作日期</nobr></th>
+            <th title="该小区下现有的地址数"><nobr>地址数</nobr></th>
+            <th><nobr>操作</nobr></th>
+        </template>
+        <template partial='body'>
+            <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
+            <td style="text-align:center" v-if="false"><nobr>{{row.f_province}}</nobr></td>
+            <td style="text-align:center" v-if="false"><nobr>{{row.f_city}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_community}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_area_attributes}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_area_address}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_comments}}</nobr></td>
+            <!--非民用单位信息开始-->
+            <td  v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkname}}</nobr></td>
+            <td  v-if="$parent.$parent.$parent.f_special"  style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
+            <!--非民用单位信息结束-->
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_inputtor}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_house_type}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_position}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
+          <td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operates(row.id)" class="btn btn-link"><b>{{row.addressnum}}</b></button></td>
+            <td><nobr>
+              <!--<button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
+              <button v-if="!row.addressnum>0" type="button" name="button" class="btn btn-danger"
+                      style="padding: 5px 12px"
+                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
+                </nobr>
+            </td>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show="showDelete"  large backdrop="false" :width="900">
+        <header slot="modal-header" class="modal-header">
+          <p class="bg-info text-center" style="padding: 8px;">提示</p>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <p>您一共选中{{selectDataLen}}个小区，您确定是否要删除吗？</p>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button v-show="showDelete" type="button" class="button_search button_spacing" @click='confirmDelete()' :disabled='!$v.valid'>确认</button>
+          <button v-show="showDelete" type="button" class="button_clear button_spacing" @click='cancelDelete()'>取消</button>
+        </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  let readyGen = async function (self) {
+    self.getfield = self.config.excelHeaders
+    self.search()
+  }
+  export default {
+
+    data () {
+      return {
+        showDelete: false,
+        criteriaShow: false,
+        model: new PagedList('api/af-revenue/sql/address_getarealist',20),
+        selectDataLen: 0,
+        addflag: false,
+        addtitle:'',
+        getfield: {},
+        getRowData:[],
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: '',
+        //初始化小区数据
+        areaslist:[],
+        config: {
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_district':'区/县',
+            'f_street':'街道名称',
+            'f_community':'社区名称',
+            'f_area_attributes':'小区属性',
+            'f_residential_area':'小区名称',
+            'f_area_address':'小区地址',
+            'f_comments':'小区备注',
+            'f_inputtor':'抄表员',
+            'f_house_type':'房屋类型',
+            'f_position':'安装位置',
+            'f_slice_area':'片区/管理站',
+            'f_operator':'操作人',
+            'f_operate_date':'操作日期',
+            'addressnum':'地址数'
+          }
+        },
+        housetype:[{label:'全部',value:''},{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
+        areaAttributes: [{label: '新小区', value: '新小区'}, {label: '老小区', value: '老小区'}],
+        position:this.$appdata.getParam('安装位置')?[{label:'全部',value:''},...this.$appdata.getParam('安装位置')]:[{label:'全部',value:''}]
+      }
+    },
+    title: '小区管理',
+    props:{
+      f_filialeids:{
+        type: String
+      },
+      style: {
+        type: String,
+        default: 'col-sm-2 form-group'
+      },
+      f_special:{
+        type: String
+      }
+    },
+    ready(){
+      readyGen(this)
+
+    },
+    methods: {
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      operates(areaid){
+        this.$parent.areaShow = false
+        this.$parent.addressShow = true
+        this.$parent.areaid = areaid
+      },
+      async delete(row){
+        if(row.id >= 0){
+          var id = row.id
+          let useraredss = await this.$resetpost('api/af-revenue/sql/address_singleTable',
+            {data: {
+                items: 'f_residential_area_id',
+                tablename: 't_user_address',
+                condition: `f_residential_area_id='${id}'`}
+            },
+            {resolveMsg: null, rejectMsg: null})
+          if(useraredss.data.length>0){
+            this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
+          }else{
+            this.$resetdelete('api/af-revenue/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.$dispatch('cancel')
+            })
+          }
+        }
+      },
+      add(val){
+        if (this.f_filialeids) {
+          this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add')
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      selfSearch (args) {
+
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        if(this.f_special){
+          args.condition =  `${args.condition} and s.f_special='1' and s.f_filialeid = '${this.f_filialeids}'`
+        }else{
+          args.condition =  `${args.condition} and s.f_filialeid = ${this.f_orgid}`
+        }
+        this.model.search(args.condition, args.model)
+        this.$parent.addressShow = false
+      },
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      },
+      async batchDelete () {
+        let flag = true
+        if (this.f_filialeids) {
+          if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
+            // 获取要批量删除的小区数据
+            this.getRowData = this.$refs.paged.$refs.grid.getRowData()
+            this.getRowData.forEach((row,n) => {
+              console.log(JSON.stringify(row) + '==========')
+              if (row.addressnum > 0 ) {
+                this.$showAlert('您所选择的小区下已有地址信息,无法删除!','warning',2000)
+                this.selectDataLen = 0
+                flag = false
+              }
+            })
+            if(flag){
+              this.selectDataLen = this.getRowData.length
+              console.log(this.selectDataLen + '-----------------------')
+              this.showDelete = true
+            }
+          } else {
+            this.$showAlert('请至少选择一项！', 'warning', 2000)
+          }
+        }else {
+          this.$showAlert('请先选择左上角的所在分公司！', 'warning', 2000)
+        }
+      },
+      confirmDelete () {
+        let msg = {
+          resolveMsg: '批量删除成功！',
+          rejectMsg: '批量删除失败！'
+        }
+        let oldAreaIds = this.getRowData
+        console.log('所选中的小区信息:=======' + JSON.stringify(oldAreaIds))
+        this.$resetpost('api/af-revenue/logic/batchDelete',{
+          data:{
+                oldAreaIds:oldAreaIds,
+                f_operator: this.$login.f.name,
+                f_operatorid: this.$login.f.id,
+                f_orgid: this.$login.f.orgid,
+                f_orgname: this.$login.f.orgs,
+                f_depid: this.$login.f.depids,
+                f_depname: this.$login.f.deps
+          }
+        },msg)
+        this.$refs.paged.$refs.grid.selectInit()
+        this.$refs.paged.$refs.cri.search()
+        this.showDelete = false
+      },
+      cancelDelete () {
+        this.$refs.paged.$refs.grid.selectInit()
+        this.$refs.paged.$refs.cri.search()
+        this.showDelete = false
+      },
+      // areaChange(val){
+      //   console.log("小区变化",val)
+      //   let selectArea // 选中的小区数据
+      //   for (let row of this.areaslist) {
+      //     if (val == row.value) {
+      //       selectArea = row.data
+      //       break
+      //     }
+      //   }
+      //   if (selectArea) {
+      //     this.areamodel.f_residential_area_id = selectArea.id
+      //     this.areamodel.f_pcd = selectArea.f_pcd
+      //     this.areamodel.f_pcd_id = selectArea.f_pcd_id
+      //     this.areamodel.f_street = selectArea.f_street
+      //     this.areamodel.f_street_id = selectArea.f_street_id
+      //     this.areamodel.f_slice_area = selectArea.f_slice_area
+      //     this.areamodel.f_residential_area = selectArea.f_residential_area
+      //   }
+      //   this.$nextTick(() => {
+      //     this.$resetValidation()
+      //   })
+      // },
+    },
+    watch:{
+
+    },
+    computed:{
+      getCondition() {
+        var condition=''
+        if(this.f_special){
+          condition =  `${this.$refs.paged.$refs.cri.condition} and s.f_special='1' and s.f_filialeid = '${this.f_filialeids}'`
+        }else{
+          condition =  `${this.$refs.paged.$refs.cri.condition} and s.f_filialeid = ${this.f_orgid}`
+        }
+        return {
+          condition: condition
+        }
+      },
+      inputtores () {
+        // 获取抄表员
+        let rs = new Array()
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
+        }
+        return rs
+      }
+    }
+
+  }
+</script>

package/src/filiale/xinkang/sale.js

@@ -2,7 +2,8 @@
 import Vue from 'vue'
 
 let specialComp = {
-  // 'area-list': (resolve) => { require(['./AreaList'], resolve) },
+  //小区列表
+  'area-list': (resolve) => { require(['./AreaList'], resolve) },
   // 添加小区
   'add-area-msg': (resolve) => { require(['./AddAreaMsg'], resolve) }
 }