address-client 3.0.24-78 → 3.0.24-aode

package/src/components/areauser/AreaUser.vue

@@ -0,0 +1,233 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">客户编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
+                     condition="f_userinfo_code = '{}'" @keyup.enter="search()">
+            </div>
+            <div class="form-group col-sm-4 button-range" >
+              <button class="button_search" style="margin-right: 10px" v-if="this.$login.r.includes('批量调小区')"  @click="$parent.$parent.changearea()" v-el:cba>批量调小区</button>
+              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
+        <template partial='head' >
+          <tr>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>客户编号</nobr></th>
+            <th><nobr>客户名称</nobr></th>
+            <th><nobr>客户地址</nobr></th>
+          </tr>
+        </template>
+        <template partial='body' >
+          <tr >
+            <td style="text-align:center;">{{$index+1}}</td>
+            <td style="text-align:center"><span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></td>
+            <td style="text-align:center">{{row.f_user_name}}</td>
+            <td style="text-align:center;white-space: nowrap;">{{row.f_address}}</td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+
+
+    <modal :show.sync="show" width="40%" backdrop="false">
+
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title" style="text-align: center;">小区调整</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="panel panel-primary datapanel">
+          <form class="form-horizontal select-overspread">
+            <div class="form-group">
+              <div class="row bg-info text-center text-center" style="height:35px">
+                <div style="float: left">
+                  <label class="font_normal_body">旧小区信息</label>
+                </div>
+              </div>
+              <div class="row" style="margin-top: 2%">
+                <div class="col-sm-6 flex-row ">
+                  <label class="control-label">小区名称</label>
+                  <p class="form-control-static">{{model.rows[0].f_residential_area}}</p>
+                </div>
+                <div class="col-sm-6 flex-row ">
+                  <label class="control-label">可调整用户数</label>
+                  <p class="form-control-static">{{model.count}}</p>
+                </div>
+              </div>
+              <div class="row bg-info text-center text-center" style="height:35px">
+                <div style="float: left">
+                  <label class="font_normal_body">新小区信息</label>
+                </div>
+              </div>
+              <div class="row" style="margin-top: 2%">
+
+                <div class="col-sm-6 flex-row" >
+                  <label class="control-label">小区名称</label>
+                  <v-select :value.sync="newinfo.residential_id" v-model="newinfo.residential_id"
+                            placeholder='小区名称' :options="areaslist" value-single
+                            close-on-select  v-ref:name></v-select>
+                </div>
+
+              </div>
+            </div>
+          </form>
+        </div>
+
+
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button :disabled="battchbuttonClick" class="button_search" @click="modifyUser">确认</button>
+        <button type="button" class="button_clear" @click='close'>取消</button>
+      </footer>
+
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+
+
+  let loadParamGem = async function (self) {
+    console.log('执行了')
+    await self.initareas(` f_filialeid = '${self.f_filialeid}'`)
+  }
+  export default {
+    title: '小区使用人',
+    data () {
+      return {
+         model: new PagedList('rs/sql/getareauser', 20, {}),
+        condition:'',
+        getfield: {},
+        show:false,
+        gasproperties: [],
+        newinfo:{
+          residential_id:''
+        },
+        battchbuttonClick:false,  //批量调整确认按钮
+        areaslist:[]
+      }
+    },
+    props: ['f_residential_area_id','f_residential_area','f_filialeid'],
+    ready () {
+      this.search()
+      loadParamGem(this)
+    },
+    methods: {
+      async initareas(pconditon){
+        // if(this.usertype){
+        //   pconditon=pconditon+` and  f_special='1' `
+        // }
+        this.areaslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+          data: {
+            items: '*',
+            tablename: 't_area',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row) => {
+          redata.push({
+            label: row.f_residential_area,
+            value: row.id,
+            data: row,
+            id: row.id
+          })
+        })
+        this.areaslist=redata
+      },
+      close() {
+        this.show = false
+        this.newinfo = {
+          residential_id:''
+        }
+      },
+      async modifyUser () {
+        if(this.newinfo.residential_id == ''){
+          this.$showAlert('请选择新小区后进行点击!','warning',1000)
+          return;
+        }
+        if(this.f_filialeid ==''){
+          this.$showAlert('请选择组织后进行点击!','warning',1000)
+          return;
+        }
+        //将调整按钮改为不可点击
+        this.battchbuttonClick = true
+        let param={
+          f_oldresidential_area_id: this.f_residential_area_id,
+          f_oldresidential_area: this.model.rows[0].f_residential_area,
+          f_filialeid:this.f_filialeid,
+          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,
+          f_residential_area_id:this.newinfo.residential_id
+        }
+
+        let res =  await this.$resetpost('rs/logic/changeareaUser', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
+        this.$showMessage(`成功批量修改了${res.data}位用户的小区`)
+        this.criteriaShow = false
+        this.close()
+        this.search ()
+      },
+      search() {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      changearea(){
+        this.battchbuttonClick=false
+        this.show=true
+      },
+      selfSearch(args) {
+        if(this.f_filialeid==null || this.f_filialeid == ''){
+          this.$showAlert("请选择组织进行操作!!",'warning',2000);
+          return;
+        }
+        args.condition = `${args.condition} and id = '${this.f_residential_area_id}' and f_orgid = ${this.f_filialeid}`
+        this.condition = args.condition
+        this.model.search(args.condition, args.model)
+      },
+      dealmsg (val) {
+        this.$parent.f_userinfo_id=val.f_userinfo_id
+        this.$parent.listpage=false
+      },
+      getPricenames () {
+        console.log('气价。，。。', this.newinfo.pricetype, this.newinfo.f_user_type, this.newinfo.f_gasproperties)
+        let rs = []
+        if (this.newinfo.f_user_type.length === 1 && this.newinfo.f_gasproperties.length === 1 && this.newinfo.pricetype.length === 1) {
+          let params = {
+            f_user_type: this.newinfo.f_user_type[0],
+            f_gasproperties: this.newinfo.f_gasproperties[0],
+            f_price_type: this.newinfo.pricetype[0],
+            filter: this.f_filialeid
+          }
+          rs = this.$GetSaleParam.getPrice(params)
+        }
+        if (rs.length === 0) {
+          this.newinfo.f_price_name = ''
+        }
+        return rs
+      },
+    },
+    watch:{
+      'f_residential_area_id'(){
+        this.search()
+      },
+      'f_filialeid' (val) {
+        loadParamGem(this)
+      }
+    }
+  }
+</script>

package/gradle/wrapper/gradle-wrapper.properties

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

package/gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  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"'
-
-# 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
-    ;;
-  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, switch paths to Windows format before running java
-if $cygwin ; 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=$((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"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

package/gradlew.bat

@@ -1,84 +0,0 @@
-@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 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"
-
-@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 init
-
-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 init
-
-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
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-: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 %CMD_LINE_ARGS%
-
-: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

package/src/components/CityList.vue

@@ -1,133 +0,0 @@
-<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="col-sm-6 form-group">
-              <label class="font_normal_body">省份</label>
-              <input  type="text"   class="input_search" v-model="model.f_province"
-                      condition="f_province like '%{}%'" placeholder="省份"
-                      :size="model.f_province ? model.f_province.length*2 : 6"/>
-            </div>
-            <div  class="col-sm-4 form-group button-range">
-              <button class="button_search button_spacing" @click="search()" >查询</button>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th><nobr>序号</nobr></th>
-            <th><nobr>省份</nobr></th>
-            <th><nobr>城市</nobr></th>
-            <th><nobr>区/县</nobr></th>
-            <th><nobr>省市区编码</nobr></th>
-            <th title="该区域下现有的街道数"><nobr>街道数量</nobr></th>
-            <th><nobr>操作</nobr></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr @click="$parent.$parent.changestyle()">
-            <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_pcd_number}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
-            <td style="text-align:center"><nobr>
-              <button v-if="row.streenum === 0" type="button" name="button" class="btn btn-danger"
-                      style="padding: 5px 12px"
-                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
-            </nobr></td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  let readyGen = async function (self) {
-    self.getfield = self.config.excelHeaders
-  }
-  export default {
-    data () {
-      return {
-        model: new PagedList('rs/sql/address_getcitylist',20),
-        addflag: false,
-        getfield: {},
-        f_orgid: ''
-      }
-    },
-    props:{
-      f_filialeids:{
-        type: String
-      }
-    },
-    ready(){
-      readyGen(this)
-      this.search()
-    },
-    methods: {
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
-      async delete(row){
-        if(row.id >= 0 ){
-          var id = row.id
-          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
-            {data: {
-                items: 'f_pcd_id',
-                tablename: 't_street',
-                condition: `f_pcd_id='${id}'`}
-            },
-            {resolveMsg: null, rejectMsg: null})
-          if(useraredss.data.length>0){
-            this.$showAlert('该区县下已有街道信息,无法删除!','warning',1000)
-          }else{
-            this.$resetdelete('rs/entity/t_pcd', {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',val)
-        } 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])
-        }
-        args.condition = `${args.condition} and p.f_filialeid  in ${this.f_orgid}`
-        this.model.search(args.condition, args.model)
-      },
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-      getorg (val) {
-        this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
-      }
-    },
-    computed: {
-      getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and p.f_filialeid = '${this.f_filialeids}'`}
-      }
-    }
-  }
-</script>