address-client 3.0.25 → 3.0.27-aode

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Oct 09 19:07:26 CST 2020
+#Fri Jul 10 10:01:08 CST 2020
 gradle.version=3.5

package/AddressClient.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="AddressClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.0.11" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/CHANGELOG.md

@@ -1,9 +1,6 @@
 # Change Log
 所有关于本产品的变化都在该文档里。
 
-## 3.0.24-2020-10-15 @张科科
---地址管理 特殊建档 增加小区选择
-
 ## 1.3.2-2018-11-12 @刘江涛
 - 地址查询修改
 

package/build/dev-server.js

@@ -10,7 +10,7 @@ var proxy = httpProxy.createProxyServer()
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var str = 'http://127.0.0.1:8091/ldap', str2= 'http://127.0.0.1:8300'
+var str = 'http://127.0.0.1:8091/ldap', str2= 'http://192.168.10.14:8300'
 var proxyTable = {
 
   '/rs/logic/getLogin': {
@@ -32,11 +32,11 @@ var proxyTable = {
     target: str2
   },
   '/rs/logic/getSaleInitData': {
-    target: 'http://127.0.0.1:8090/product'
+    target: str2
   },
   '/rs': {
     // target: 'http://192.168.50.199:8300'
-    target: 'http://127.0.0.1:8092/address'
+    target: str2
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.0.25",
+  "version": "3.0.27-aode",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",
@@ -72,15 +72,15 @@
     "mocha": "^3.2.0",
     "ncp": "^2.0.0",
     "rimraf": "^2.5.0",
-    "sale-client": "^3.0.0",
+    "sale-client": "1.0.66-aode",
     "selenium-server": "2.52.0",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.0.52",
+    "system-clients": "3.1.84",
     "url-loader": "^0.5.7",
-    "vue-client": "1.21.47",
+    "vue-client": "1.22.20-5",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",
@@ -92,6 +92,12 @@
     "webpack": "^1.12.2",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
+    "webpack-merge": "^0.8.3",
+    "jsencrypt": "3.0.0-rc.1"
+  },
+  "directories": {
+    "doc": "doc",
+    "example": "examples",
+    "test": "test"
   }
 }

package/src/address.js

@@ -27,6 +27,8 @@ export default function () {
   Vue.component('add-street-pcd', (resolve) => { require(['./components/AddStreetOrPcd'], resolve) })
   //小区列表
   Vue.component('area-list', (resolve) => { require(['./components/AreaList'], resolve) })
+  // 使用该小区的用户信息
+  Vue.component('area-user', (resolve) => { require(['./components/areauser/AreaUser.vue'], resolve) })
   //小区管理（包含修改表具，小区的添加）
   Vue.component('area-manage', (resolve) => { require(['./components/AreaManage'], resolve) })
   //单位管理（）
@@ -43,4 +45,5 @@ export default function () {
   Vue.component('user-address-change', (resolve) => { require(['./components/UserAddressChange'], resolve) })
   //批量置换接单
   Vue.component('batch_orders', (resolve) => { require(['./components/selectAddress/BatchOrders'], resolve) })
+
 }

package/src/components/AddAreaMsg.vue

@@ -298,18 +298,22 @@
 
       async initSlice (val) {
         if (val) {
-          let getAllArea = await this.$resetpost('/rs/search', {
-            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-            userid: this.$login.f.id
+          this.sliceArea = [];
+          let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
+            data:{
+              items: '*',
+              tablename: 't_zone',
+              orderitem: 'id',
+              condition: ` parentid = ${val}`
+            }
           }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
 
-          let arr = getAllArea.data.filter((res) => {
-            return res.parentid == val
-          })
-          this.sliceArea = []
-          arr.forEach((res) => {
-            this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
-          })
+          if(getAllArea.data){
+            getAllArea.data.forEach((res) => {
+              this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+            })
+          }
+
         }
       },