address-client 4.0.24 → 4.0.26

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,101 +1,101 @@
-{
-  "name": "address-client",
-  "version": "4.0.24",
-  "description": "地址管理前台组件",
-  "author": "wanbochao",
-  "license": "ISC",
-  "main": "src/index.js",
-  "keywords": [
-    "sale"
-  ],
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js",
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/address_management.git"
-  },
-  "dependencies": {
-    "crypto-js": "^4.1.1",
-    "less-loader": "^2.2.3",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "less": "^2.7.3",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "rimraf": "^2.5.0",
-    "sale-client": "3.2.11-17",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "ldap-clients": "3.0.48",
-    "system-clients": "3.3.2",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.162",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "jsencrypt": "3.0.0-rc.1",
-    "axios": "0.15.3"
-  }
-}
+{
+  "name": "address-client",
+  "version": "4.0.26",
+  "description": "地址管理前台组件",
+  "author": "wanbochao",
+  "license": "ISC",
+  "main": "src/index.js",
+  "keywords": [
+    "sale"
+  ],
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js",
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/address_management.git"
+  },
+  "dependencies": {
+    "crypto-js": "^4.1.1",
+    "less-loader": "^2.2.3",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "less": "^2.7.3",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.0",
+    "sale-client": "3.2.11-17",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "ldap-clients": "3.0.48",
+    "system-clients": "3.3.2",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.162",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "jsencrypt": "3.0.0-rc.1",
+    "axios": "0.15.3"
+  }
+}

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

@@ -55,6 +55,13 @@
                         close-on-select v-ref:slice>
               </v-select>
             </div>
+            <div class="col-sm-6 form-group">
+              <label class="font_normal_body">社&emsp;&emsp;区</label>
+              <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 +318,7 @@ export default {
       pcdslist: [],
       //初始化街道数据
       streetslist: [],
+      communitys:[],
       //小区
       areamodel: {
         f_area_id: '',
@@ -369,6 +377,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 +475,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 +654,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)