manage-client 1.60.10 → 1.60.12-2

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri Apr 22 09:00:45 CST 2022
+gradle.version=7.1

package/build/dev-server.js

@@ -7,81 +7,53 @@ var httpProxy = require('http-proxy')
 var app = express()
 var compiler = webpack(config)
 var proxy = httpProxy.createProxyServer()
-
+let server = 'http://192.168.1.212:8300/'
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 var proxyTable = {
   '/images': {
-    // target: 'http://localhost:8086'
-    target: 'http://192.168.50.220:7000/ldap'
+    target : server
   },
   // 查找资源服务数据
   '/rs/search': {
-    // target: 'http://192.168.50.202:8099'
-    // target: 'http://192.168.20.2:8081'
-    target: 'http://192.168.50.220:7000/ldap'
-    // target: 'http://192.168.20.191:8011'
+    target : server
   },
   // 用户登录服务地址
   '/rs/user': {
-    // target: 'http://192.168.50.202:8099'
-    // target: 'http://192.168.2.77:8081'
-    target: 'http://192.168.50.220:7000/ldap'
-    // target: 'http://192.168.20.191:8011'
+    target : server
   },
   '/rs/path/getParams': {
-    // target: 'http://192.168.50.202:8099'
-    //target: 'http://127.0.0.1:8888/product'
-    target: 'http://192.168.50.220:8200/system'
-    // target: 'http://192.168.20.191:8011'
+    target : server
+  },
+  '/rs/logic/getInitData': {
+    target : server
   },
-   '/rs/logic/getInitData': {
-     // target: 'http://192.168.50.202:8099'
-     //target: 'http://127.0.0.1:8888/product'
-     target: 'http://192.168.50.220:8200/system'
-     // target: 'http://192.168.20.191:8011'
-   },
   '/rs/sql/saleSingleTable': {
-    // target: 'http://192.168.50.202:8099'
-    //target: 'http://127.0.0.1:8888/product'
-    target: 'http://192.168.50.220:8300'
-    // target: 'http://192.168.20.191:8011'
+    target : server
+  },
+  '/rs/sql/singleTable_OrderBy': {
+    target : server
   },
-'/rs/sql/singleTable_OrderBy': {
-  // target: 'http://192.168.50.202:8099'
-  //target: 'http://127.0.0.1:8888/product'
-  target: 'http://192.168.50.220:8200/system'
-  // target: 'http://192.168.20.191:8011'
-},
   '/rs/logic/getLogin': {
-    // target: 'http://192.168.50.202:8099'
-    //target: 'http://127.0.0.1:8888/product'
-    target: 'http://192.168.50.220:8200/system'
-    // target: 'http://192.168.20.191:8011'
+    target : server
   },
   '/rs/db': {
-    target: 'http://192.168.50.220:7000/ldap'
-    // target: 'http://127.0.0.1:8012'
-    // target: 'http://192.168.20.191:s8011'
+    target : server
   },
   '/excel': {
-    target: 'http://127.0.0.1:8080/'
-    // target: 'http://127.0.0.1:8080/manager'
-    // target: 'http://192.168.50.220:8300'
+    target : server
   },
   '/rs/file': {
-    target: 'http://192.168.50.220:8300'
+    target : server
   },
   '/rs/logic/getSaleInitData':{
-    target: 'http://192.168.50.220:8300'
+    target : server
   },
   '/rs/vue': {
-    target: 'http://192.168.50.220:8200/system'
+    target : server
   },
-  '/rs': {//rs/sql/newsellQuery
-    // target: 'http://127.0.0.1:8088/mamage'
-    target: 'http://127.0.0.1:8080/'
-    // target: 'http://192.168.50.220:8300'
+  '/rs': {
+    target : server
   }
 }
 

package/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,185 @@
+#!/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

@@ -0,0 +1,89 @@
+@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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "1.60.10",
+  "version": "1.60.12-2",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/ManageBusiness/BusinessQuery.vue

@@ -1,71 +1,71 @@
-<template>
-  <tab-button>
-    <tabs header="收费查询">
-      <charge-query></charge-query>
-    </tabs>
-    <tabs header="换表查询">
-      <intable-query v-if="show[1]"></intable-query>
-    </tabs>
-    <tabs header="抄表查询">
-      <meter-read-query v-if="show[2]"></meter-read-query>
-    </tabs>
-    <tabs header="过户查询">
-      <change-name-query v-if="show[3]"></change-name-query>
-    </tabs>
-    <tabs header="其他收费查询">
-      <other-charges-query v-if="show[4]"></other-charges-query>
-    </tabs>
-    <tabs header="冲正查询">
-      <impact-query v-if="show[5]"></impact-query>
-    </tabs>
-    <tabs header="补卡查询">
-      <reissue-card-query v-if="show[6]"></reissue-card-query>
-    </tabs>
-    <tabs header="补气查询">
-      <fill-gas-query v-if="show[7]"></fill-gas-query>
-    </tabs>
-    <!--<tabs header="操作查询">-->
-    <tabs header="启用查询">
-      <open-query v-if="show[8]"></open-query>
-    </tabs>
-    <tabs header="停用查询">
-      <close-query v-if="show[9]"></close-query>
-    </tabs>
-    <tabs header="收费阶梯明细">
-          <charge-query-detail></charge-query-detail>
-    </tabs>
-    <tabs header="机表收费信息">
-      <machine-charge-detail></machine-charge-detail>
-    </tabs>
-    <!--<tabs header="居民收费汇总查询">-->
-      <!--<consumer-charge-collect v-if="show[10]"></consumer-charge-collect>-->
-    <!--</tabs>-->
-    <!--<tabs header="商业收费汇总查询">-->
-      <!--<business-charge-collect v-if="show[11]"></business-charge-collect>-->
-    <!--</tabs>-->
-    <!--</tabs>-->
-    <!--<tabs header="撤销查询">-->
-
-    <!--</tabs>-->
-  </tab-button>
-</template>
-
-<script>
-  import TabButton from "./TabButton";
-  import Tabs from "./Tabs";
-
-  export default {
-    name: "BusinessQuery",
-    title: '业务查询',
-    data() {
-      return {
-        show: [true]
-      }
-    },
-    components: {Tabs, TabButton},
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <tab-button>
+    <tabs header="收费查询">
+      <charge-query></charge-query>
+    </tabs>
+    <tabs header="换表查询">
+      <intable-query v-if="show[1]"></intable-query>
+    </tabs>
+    <tabs header="抄表查询">
+      <meter-read-query v-if="show[2]"></meter-read-query>
+    </tabs>
+    <tabs header="过户查询">
+      <change-name-query v-if="show[3]"></change-name-query>
+    </tabs>
+    <tabs header="其他收费查询">
+      <other-charges-query v-if="show[4]"></other-charges-query>
+    </tabs>
+    <tabs header="冲正查询">
+      <impact-query v-if="show[5]"></impact-query>
+    </tabs>
+    <tabs header="补卡查询">
+      <reissue-card-query v-if="show[6]"></reissue-card-query>
+    </tabs>
+    <tabs header="补气查询">
+      <fill-gas-query v-if="show[7]"></fill-gas-query>
+    </tabs>
+    <!--<tabs header="操作查询">-->
+    <tabs header="启用查询">
+      <open-query v-if="show[8]"></open-query>
+    </tabs>
+    <tabs header="停用查询">
+      <close-query v-if="show[9]"></close-query>
+    </tabs>
+    <tabs header="收费阶梯明细">
+          <charge-query-detail></charge-query-detail>
+    </tabs>
+    <tabs header="机表收费信息">
+      <machine-charge-detail></machine-charge-detail>
+    </tabs>
+    <!--<tabs header="居民收费汇总查询">-->
+      <!--<consumer-charge-collect v-if="show[10]"></consumer-charge-collect>-->
+    <!--</tabs>-->
+    <!--<tabs header="商业收费汇总查询">-->
+      <!--<business-charge-collect v-if="show[11]"></business-charge-collect>-->
+    <!--</tabs>-->
+    <!--</tabs>-->
+    <!--<tabs header="撤销查询">-->
+
+    <!--</tabs>-->
+  </tab-button>
+</template>
+
+<script>
+  import TabButton from "./TabButton";
+  import Tabs from "./Tabs";
+
+  export default {
+    name: "BusinessQuery",
+    title: '业务查询',
+    data() {
+      return {
+        show: [true]
+      }
+    },
+    components: {Tabs, TabButton},
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/ManageBusiness/ChargeQuery.vue

@@ -37,6 +37,12 @@
                      condition="f_residential_area like '%{}%'" placeholder="小区"
                      :size="model.f_residential_area ? model.f_residential_area.length * 2 : 1"/>
             </div>
+            <div class="col-sm-3 form-group form-input-group" style="width: 20%">
+              <label class="control-label">片区</label>
+              <input type="text" class="form-control" v-model="model.f_slice_area"
+                     condition="f_slice_area like '%{}%'" placeholder="片区"
+                     :size="model.f_slice_area ? model.f_slice_area.length * 2 : 1"/>
+            </div>
             <div class="col-sm-3 form-group form-input-group" style="width: 20%">
               <label class="control-label">用户地址</label>
               <input  type="text" class="form-control" v-model="model.f_address"
@@ -183,6 +189,7 @@
     <table class="table-hover">
       <tr style="position: relative" class="table-bordered">
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">卡费合计:&emsp;{{sumsmodel.f_open_fee}}</td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">气量合计:&emsp;{{sumsmodel.f_pregas}}</td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">应交金额合计:&emsp;{{sumsmodel.f_preamount}}</td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">收款合计:&emsp;{{sumsmodel.f_collection}}</td>
@@ -239,11 +246,11 @@
         meterbrands: [],
         businesstype: '收费查询',
         data: {},
-        model: new PagedList('rs/sql/newsellQuery', 20,{},{f_pregas: 0,f_preamount: 0,f_collection: 0}),
+        model: new PagedList('rs/sql/newsellQuery', 20,{},{f_open_fee: 0,f_pregas: 0,f_preamount: 0,f_collection: 0}),
         criteriaShow: true,
         classname: 'table table-bordered table table-hover',
-        headData: ["用户编号","用户姓名","用户电话","气量","应交金额","收款","上期结余","本期结余","状态","收费日期","操作员","营业网点","分公司","收费类型","用户类型","用气性质","气价名称","付款方式","表编号","气表类型","气表品牌","滞纳金","身份证号","小区","用户地址"],
-        bodyData: ["f_userinfo_code","f_user_name","f_user_phone","f_pregas","f_preamount","f_collection","f_balance","f_curbalance","f_charge_state","f_delivery_date","f_operator","f_outlets","f_filiale","f_charge_type","f_user_type","f_gasproperties","f_price_name","f_payment","f_user_id","f_meter_type","f_meter_brand","f_delaypay","f_idnumber","f_residential_area","f_address"],
+        headData: ["用户编号","用户姓名","用户电话","片区","卡费","气量","应交金额","收款","上期结余","本期结余","状态","收费日期","操作员","营业网点","分公司","收费类型","用户类型","用气性质","气价名称","付款方式","表编号","气表类型","气表品牌","滞纳金","身份证号","小区","用户地址"],
+        bodyData: ["f_userinfo_code","f_user_name","f_user_phone","f_slice_area","f_open_fee","f_pregas","f_preamount","f_collection","f_balance","f_curbalance","f_charge_state","f_delivery_date","f_operator","f_outlets","f_filiale","f_charge_type","f_user_type","f_gasproperties","f_price_name","f_payment","f_user_id","f_meter_type","f_meter_brand","f_delaypay","f_idnumber","f_residential_area","f_address"],
 
         filialeNameStr: null,
         filialeCodeStr: this.$login.f.f_orgids,
@@ -433,7 +440,8 @@
       },
       charge_state(){
         return [{label: '全部', value: ''},...this.$appdata.getParam('收费状态')]
-      }
+      },
+
     }
   }
 </script>