address-client 3.0.24-9 → 3.0.24-aode

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:8078', str2= 'http://192.168.50.4:8400/'
+var str = 'http://127.0.0.1:8091/ldap', str2= 'http://192.168.10.14:8300'
 var proxyTable = {
 
   '/rs/logic/getLogin': {
@@ -36,7 +36,7 @@ var proxyTable = {
   },
   '/rs': {
     // target: 'http://192.168.50.199:8300'
-    target: str
+    target: str2
   }
 }
 

package/package.json

@@ -1,97 +1,98 @@
-{
-  "name": "address-client",
-  "version": "3.0.24-9",
-  "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": {
-    "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.0.0",
-    "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",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.21.47",
-    "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"
-  }
-}
+{
+  "name": "address-client",
+  "version": "3.0.24-aode",
+  "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": {
+    "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": "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.1.84",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.22.20-5",
+    "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"
+  }
+}

package/src/address.js

@@ -3,7 +3,7 @@ import App from './App'
 import { all } from 'vue-client'
 // import 'babel-polyfill'
 
-export default function (filiale) {
+export default function () {
   Vue.config.silent = false
   /** ********************** pc端 *********************** **/
   Vue.component('address-select', (resolve) => { require(['./components/AddressModel'], resolve) })
@@ -27,6 +27,8 @@ export default function (filiale) {
   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,11 +45,5 @@ export default function (filiale) {
   Vue.component('user-address-change', (resolve) => { require(['./components/UserAddressChange'], resolve) })
   //批量置换接单
   Vue.component('batch_orders', (resolve) => { require(['./components/selectAddress/BatchOrders'], resolve) })
-  // 分公司特殊页面注册替换
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
+
 }

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}})
+            })
+          }
+
         }
       },
 

package/src/components/AddressList.vue

@@ -2,7 +2,7 @@
   <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 novalidate class="form-horizontal select-overspread container-fluid auto" partial>
 
           <div class="row">
 
@@ -10,9 +10,9 @@
               <label class="font_normal_body">组织机构</label>
               <res-select
                 restype='organization'
-                          @res-select="$parent.$parent.getorg"
-                          is-mul="false"
-                          :initresid='$parent.$parent.curorgid'
+                @res-select="$parent.$parent.getorg"
+                is-mul="false"
+                :initresid='$parent.$parent.curorgid'
               >
               </res-select>
             </div>
@@ -59,19 +59,19 @@
             <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.showrightchange">
               <label class="font_normal_body">楼&emsp;&emsp;号</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_building" style="width:60%"
-                      condition="a.f_building like '%{}%'" placeholder="楼号"
+                      condition="a.f_building like '{}'" placeholder="楼号"
                       :size="model.f_building ? model.f_building.length*2 : 6"/>
             </div>
             <div :class="$parent.$parent.style" >
               <label class="font_normal_body">单&emsp;&emsp;元</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_unit" style="width:60%"
-                      condition="a.f_unit like '%{}%'" placeholder="单元"
+                      condition="a.f_unit like '{}'" placeholder="单元"
                       :size="model.f_unit ? model.f_unit.length*2 : 6"/>
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">楼&emsp;&emsp;层</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_floor" style="width:60%"
-                      condition="a.f_floor like '%{}%'" placeholder="楼层"
+                      condition="a.f_floor like '{}'" placeholder="楼层"
                       :size="model.f_floor ? model.f_floor.length*2 : 6"/>
             </div>
             <div :class="$parent.$parent.style">
@@ -80,13 +80,6 @@
                       condition="a.f_room like '%{}%'" placeholder="门牌号"
                       :size="model.f_room ? model.f_room.length*2 : 6"/>
             </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
-                      condition="a.f_residential_area like '%{}%'" placeholder="小区"
-                      :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
-            </div>
-
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">地址&emsp;ID</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.id" style="width:60%"
@@ -100,15 +93,14 @@
                       :size="model.f_address ? model.f_address.length*2 : 8"/>
             </div>
             <div :class="$parent.$parent.style" >
-              <label class="font_normal_body">地址状态</label>
-              <v-select :value.sync="model.f_address_state"
-                        class="select_list select"
-                        v-model="model.f_address_state"
-                        condition="a.f_address_state = '{}'"
-                        :options='$parent.$parent.getaddresstate' placeholder='地址状态'
-                        close-on-select>
-              </v-select>
+              <label class="font_normal_body">特殊地址</label>
+                <v-select :value.sync="model.f_special"
+                          v-model="model.f_special"
+                          :options='$parent.$parent.specialoptions' placeholder='请选择'
+                          condition=" {} "
+                          close-on-select></v-select>
             </div>
+
           </div>
         </div>
       </criteria>
@@ -126,7 +118,6 @@
             <th><nobr>楼层</nobr></th>
             <th><nobr>门牌号</nobr></th>
             <th><nobr>详细地址</nobr></th>
-            <th><nobr>地址状态</nobr></th>
             <th><nobr>时间</nobr></th>
             <th><nobr>操作</nobr></th>
           </tr>
@@ -144,11 +135,10 @@
             <td style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_address_state}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_create_date}}</nobr></td>
             <td style="text-align:center">
-             <!-- <button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
+              <!-- <button type="button" name="button" class="btn btn-link"
+                       @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
               <button type="button" name="button" class="btn btn-link"
                       @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
             </td>
@@ -170,6 +160,8 @@
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>
   </modal>
+  <work-busy :is-busy="iswork" v-show="iswork"></work-busy>
+
 </template>
 
 <script>
@@ -178,6 +170,7 @@
   export default {
     data () {
       return {
+        iswork: false,
         criteriaShow: false,
         model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
         addflag: false,
@@ -189,7 +182,8 @@
 
         //文件上传弹框
         showFile: false,
-        showrightchange:true
+        showrightchange:true,
+        specialoptions:[{label:"全部",value:""},{label:"是",value:"a.f_special ='1'"},{label:"否",value:"a.f_special is null"}]
       }
     },
     title: '地址列表',
@@ -234,73 +228,80 @@
         this.$dispatch('modify',val)
       },
       async delete(row){
-        if(row.id){
-          var id = row.id
-          let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
-          if(userfiles.data.length){
-            this.$showAlert('该地址下已有正常表具档案,无法删除！','warning',1000)
-          }else{
-            this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-              this.$dispatch('cancel')
-            })
-          }
-        }
-      },
 
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
-
-      selfSearch (args) {
-
-        if (!this.f_orgid) {
-          this.getorg([this.$login.f.orgid])
+      if(row.id){
+        var id = row.id
+        let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
+        let isdelete = await this.$resetpost('rs/sql/isDeleteAddress', {data: {f_addressid: id}},{resolveMsg: null, rejectMsg: null})
+        if(userfiles.data.length){
+          this.$showAlert('该地址下已有正常/待开通表具档案,无法删除！','warning',1000)
+           return
+        }
+        if(isdelete.data.length){
+          this.$showAlert('该地址下已有正在工作的置换单,无法删除！','warning',1000)
+          return
         }
+        this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+          this.$dispatch('cancel')
+        })
+      }
+  },
 
-        args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
-        this.model.search(args.condition, args.model)
-      },
+  search () {
+    this.$refs.paged.$refs.cri.search()
+  },
 
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-      getorg (val) {
-        this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
+  selfSearch (args) {
+        debugger
+    //去除空格
+    for(let key in args.model){
+      if(args.model[key] instanceof  String){
+        args.model[key] = args.model[key].trim();
       }
-    },
-    events: {
-      onFileUpload: async function (file, res) {
-        console.log("上传完毕"+JSON.stringify(res))
-        let data = {
-          filepath: res.f_downloadpath,
-          user:this.$login.f
-        }
-        console.log("filepath="+JSON.stringify(data))
-        await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
-          if(res.data.type=="success"){
-            this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
-          }else{
-            this.$showMessage(res.data.msg);
-          }
+    }
+    if (!this.f_orgid) {
+      this.getorg([this.$login.f.orgid])
+    }
+    console.log("xxx"+this.f_filialeids)
+    args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+    this.model.search(args.condition, args.model)
+  },
 
-          //关闭上传框
-          this.closeFile()
-          //重新查询
+  //清空
+  clear(){
+    this.$refs.paged.$refs.cri.model = {}
+  },
+  getorg (val) {
+    this.f_orgid = this.$login.convertToIn(val)
+    if (!this.f_orgid) {
+      this.f_orgid = this.f_filialeids
+    }
+    this.f_filialeids = val[0]
+  }
+  },
+  events: {
+    onFileUpload: async function (file, res) {
+      this.$showAlert('文件上传成功','success',1000);
+      this.iswork = true
+      console.log("上传完毕"+JSON.stringify(res))
+      let data = {
+        filepath: res.f_downloadpath,
+        user:this.$login.f
+      }
+      this.closeFile();
+      try{
+        await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+          this.$showAlert("导入成功",'success', 2000);
+          this.iswork = false
           this.init()
         })
-      },
-      'onFileError'(error) {
-        this.$showAlert(error, 'warning', 2000)
+      }catch(e){
       }
     },
-    computed: {
-      //地址状态下拉框
-      getaddresstate() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
-      }
+    'onFileError'(error) {
+      this.$showAlert(error, 'warning', 2000)
     }
+  }
 
   }
 </script>