address-client 3.2.73 → 3.2.75

package/src/filiale/meihekou/sale.js

@@ -1,8 +1,8 @@
-// 分公司特殊组件页面注册
-import Vue from 'vue'
-
-let specialComp = {
-  'user-address': (resolve) => { require (['./UserAddress'], resolve)
-  }
-}
-exports.specialComp = specialComp
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+let specialComp = {
+  'user-address': (resolve) => { require (['./UserAddress'], resolve)
+  }
+}
+exports.specialComp = specialComp

package/src/filiale/qianneng/UserAddress.vue

@@ -99,6 +99,24 @@
               close-on-select>
             </v-select>
 
+          </div>
+          <div class="col-sm-6 form-group " v-if="!usertype">
+            <label class="font_normal_body">&emsp;&emsp;&nbsp;乡&emsp;&emsp;镇</label>
+            <v-select
+              :value.sync="model.f_community" :value-single="true"
+              :options='community' placeholder='请选择'
+              close-on-select>
+            </v-select>
+
+          </div>
+          <div class="col-sm-6 form-group " v-if="!usertype">
+            <label class="font_normal_body">&emsp;&emsp;&nbsp;社&emsp;&emsp;区</label>
+            <v-select
+              :value.sync="model.f_committee" :value-single="true"
+              :options='committee' placeholder='请选择'
+              close-on-select>
+            </v-select>
+
           </div>
           <div v-if="!usertype" class="col-sm-6 form-group" :class="[$v.f_building_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;楼&emsp;&emsp;号</label>
@@ -731,14 +749,8 @@
         })
       },
       roomChange(val){
-        console.log("this.model==：",this.model, this.pcdslist)
-        console.log("this.pcdslist==：",this.pcdslist[0].data, this.pcdslist[0].data.f_district)
-        console.log("this.areaschoice==：",this.areaschoice[0].data)
-        console.log("this.pcd==：",this.model.f_pcd, this.model.f_pcd_id)
-        console.log("this.street==：",this.model.f_street,this.model.f_street_id)
-        console.log("this.area==：",this.model.f_area,this.model.f_residential_area_id)
+
         this.model.f_district = this.pcdslist ? this.pcdslist[0].data.f_district : ''
-        console.log("this.model.f_district==：",this.model.f_district)
         this.model.f_create_person= this.$login.f.name
         this.model.f_filialeid = this.f_filialeids
         this.model.f_operator = this.$login.f.name
@@ -747,16 +759,12 @@
         this.model.f_orgname = this.$login.f.orgs
         this.model.f_depid = this.$login.f.depids
         this.model.f_depname = this.$login.f.deps
-        console.log("片区：",this.model.slice_area)
         if (this.model.slice_area ) {
           if (this.model.slice_area instanceof Array) {
-            console.log("修改",this.model.slice_area)
             this.model.f_slice_area = this.model.slice_area[0].name
           } if (this.model.slice_area instanceof Object) {
-            console.log("修改",this.model.slice_area)
             this.model.f_slice_area = Object.values(this.model.slice_area)[0].name
           } else{
-            console.log("保存",this.model.slice_area)
             this.model.f_slice_area = this.model.slice_area
           }
         }
@@ -935,16 +943,12 @@
         this.model.f_orgname = this.$login.f.orgs
         this.model.f_depid = this.$login.f.depids
         this.model.f_depname = this.$login.f.deps
-        console.log("片区：",this.model.slice_area)
         if (this.model.slice_area ) {
           if (this.model.slice_area instanceof Array) {
-            console.log("修改",this.model.slice_area)
             this.model.f_slice_area = this.model.slice_area[0].name
           } if (this.model.slice_area instanceof Object) {
-            console.log("修改",this.model.slice_area)
             this.model.f_slice_area = Object.values(this.model.slice_area)[0].name
           } else{
-            console.log("保存",this.model.slice_area)
             this.model.f_slice_area = this.model.slice_area
           }
         }
@@ -1086,6 +1090,16 @@
       //地址状态下拉框
       addresstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
+      },
+      community() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('行政划分')]
+      },
+      committee() {
+        let rs = []
+        if (this.model.f_community) {
+          rs = this.$appdata.getParam(this.model.f_community)
+        }
+        return rs
       }
     }
   }

package/src/filiale/shanxian/AddressList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex" @keyup.enter="search">
-    <criteria-paged :model="model" v-ref:paged>
+    <criteria-paged :model="model" v-ref:paged @sort="sort">
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
@@ -143,7 +143,7 @@
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>片区/管理站</nobr></th>
           <th><nobr>街道/乡镇</nobr></th>
           <th><nobr>小区(单位)</nobr></th>
-          <th><nobr>详细地址</nobr></th>
+          <th><data-order field="f_address" name="详细地址"></data-order></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼号</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>单元</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼层</nobr></th>
@@ -284,6 +284,11 @@
         isbusy:false,
         addflag: false,
         addtitle:'',
+        // 排序
+        orderitem: 'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         other: [],
         footer: [],
         getfield: {},
@@ -333,6 +338,25 @@
       //this.$refs.paged.$refs.grid.selectInit()
     },
     methods: {
+
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      },
       downloadFiles(){
         let downurl='rs/downloadfile/file?filename=地址导入Excel模板';
         this.$resetget(downurl,{}).then(res=>{

package/src/filiale/shanxian/AreaList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex" @keyup.enter="search">
-    <criteria-paged :model="model" v-ref:paged>
+    <criteria-paged :model="model" v-ref:paged @sort="sort">
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
@@ -128,7 +128,7 @@
             <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><data-order field="f_operate_date" name="操作日期"></data-order></th>
             <th title="该小区下现有的地址数"><nobr>地址数</nobr></th>
             <th><nobr>操作</nobr></th>
         </template>
@@ -211,7 +211,12 @@
           f_slice_area: '',
           f_residential_area: ''
         },
-        model: new PagedList('rs/sql/address_getarealist',20),
+        model: new PagedList('rs/sql/address_getarealist',20, {orderitem: '"f_operate_date DESC"'}),
+        // 排序
+        orderitem: 'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         addflag: false,
         addtitle:'',
         getfield: {},
@@ -266,6 +271,24 @@
         this.$refs.paged.$refs.cri.search()
       },
 
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      },
       async delete(row){
         if(row.id >= 0){
           var id = row.id

package/src/main.js

@@ -1,23 +1,22 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import { sale } from 'sale-client'
-import address from './address'
-
-Vue.config.silent = true
-
-/** **************************通用组件******************************/
-all()
-address()
-system(false)
-ldap()
-// sale()
-require('system-clients/src/styles/less/bootstrap.less')
-
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import address from './address'
+
+Vue.config.silent = true
+
+/** **************************通用组件******************************/
+all()
+address('qianneng')
+system(false)
+ldap()
+// sale()
+require('system-clients/src/styles/less/bootstrap.less')
+
+
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

package/gradlew

@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or 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 UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# 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"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# 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"
-    which java >/dev/null 2>&1 || 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
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -1,89 +0,0 @@
-@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=.
-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%" == "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%"=="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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega