address-client 3.0.25 → 3.0.26-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/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.26-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}})
+            })
+          }
+
         }
       },
 

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="ta.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%"
@@ -99,6 +92,15 @@
                       condition="a.f_address like '%{}%'" placeholder="详细地址"
                       :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_special"
+                          v-model="model.f_special"
+                          :options='$parent.$parent.specialoptions' placeholder='请选择'
+                          condition=" {} "
+                          close-on-select></v-select>
+            </div>
+
           </div>
         </div>
       </criteria>
@@ -135,8 +137,8 @@
             <td style="text-align:center"><nobr>{{row.f_address}}</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>
@@ -158,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>
@@ -166,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,
@@ -177,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: '地址列表',
@@ -222,67 +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){
       }
+    },
+    'onFileError'(error) {
+      this.$showAlert(error, 'warning', 2000)
     }
+  }
 
   }
 </script>

package/src/components/AreaList.vue

@@ -38,6 +38,16 @@
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
                       condition="f_street like '%{}%'" placeholder="街道"/>
             </div>
+            <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">
+              <label class="font_normal_body">户数大于</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.areacount"
+                      condition="isnull(resi.areacount,0) >= '{}'" placeholder="使用人数大于等于"/>
+            </div>
+            <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">
+              <label class="font_normal_body">户数小于</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.areacount_end"
+                      condition="isnull(resi.areacount,0) <='{}'" placeholder="使用人数小于等于"/>
+            </div>
             <div class="col-sm-4 form-group button-range">
               <button class="button_search button_spacing" @click="search()" >查询</button>
               <button v-if="!$parent.$parent.f_special" class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('小区')">添加小区</button>
@@ -97,6 +107,8 @@
             <th v-if="$parent.$parent.$parent.f_special"><nobr>联系电话</nobr></th>
             <!--非民用单位信息结束-->
             <th><nobr>片区/管理站 </nobr></th>
+            <th><nobr>使用人数 </nobr></th>
+            <th><nobr>关联地址 </nobr></th>
             <th><nobr>操作人</nobr></th>
             <th><nobr>操作日期</nobr></th>
             <th><nobr>操作</nobr></th>
@@ -118,12 +130,14 @@
             <td  v-if="$parent.$parent.$parent.f_special"  style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
             <!--非民用单位信息结束-->
             <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
+            <td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operate(row.id,row.f_residential_area)" class="btn btn-link">{{row.areacount}}</button></td>
+            <td style="text-align:center"><nobr>{{row.addresscount}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
             <td><nobr>
               <!--<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"
+              <button type="button" name="button" class="btn btn-link" v-if="row.areacount===0"
                       @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
             </nobr></td>
           </tr>
@@ -168,6 +182,12 @@
       this.search()
     },
     methods: {
+      operate (f_residential_area_id,f_residential_area) {
+        this.$parent.areaShow = false;
+        this.$parent.usershow=true
+        this.$parent.f_residential_area_id=f_residential_area_id
+        this.$parent.f_residential_area=f_residential_area
+      },
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
@@ -207,7 +227,8 @@
         this.$dispatch('modify',val)
       },
       selfSearch (args) {
-
+        this.$parent.usershow = false;
+        this.$parent.areaShow = false;
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }

package/src/components/AreaManage.vue

@@ -1,8 +1,13 @@
 <template>
   <div id="unit" class="flex-row" :class="{'binary':areaShow}">
-    <div :class="{'basic-main':!areaShow,'binary-left':areaShow}">
+    <div :class="{'basic-main':!areaShow && !usershow,'binary-left':areaShow|| usershow}">
       <area-list @select-changed="selected" v-ref:arealist   :style="style" :f_filialeids.sync="f_filialeids"></area-list>
     </div>
+    <div class="binary-right" v-if="usershow" style="width: 60%">
+      <div class="flex">
+        <area-user :f_residential_area_id="f_residential_area_id" :f_filialeid="f_filialeids" :f_residential_area="f_residential_area"></area-user>
+      </div>
+    </div>
     <div v-show="areaShow" style="width: 60%" class="binary-right">
       <div class="flex">
         <add-area-msg v-ref:addareamsg :areatype="areatype" :operation="operation"
@@ -21,10 +26,14 @@
       return {
         //分公司id串
         width:'100%',
-        f_filialeids: this.$login.f.f_orgids,
+        f_filialeids: this.$login.f.orgid,
         areaShow:false,
         areatype:'小区',
+        f_filialeid:this.$login.f.orgid,
         arearow:{},
+        usershow:false,
+        f_residential_area_id:'',
+        f_residential_area:'',
         style:'col-sm-2 form-group'
       }
     },
@@ -37,6 +46,7 @@
     methods:{
       selected(obj){
         this.style='col-sm-3 form-group'
+        this.usershow =false
         if(obj.val&&obj.val.id){
           console.log('对比分公司', obj.val.f_filialeid, this.f_filialeids)
           if (obj.val.f_filialeid != this.f_filialeids) {
@@ -58,6 +68,7 @@
         }
       },
       refresh() {
+        this.usershow =false
         this.areaShow = false
         this.$refs.arealist.$refs.paged.$refs.cri.search()
       }
@@ -66,6 +77,7 @@
       'add'(){
         this.style='col-sm-3 form-group'
         this.areaShow=true
+        this.usershow =false
         this.$refs.addareamsg.cleardara()
         this.$refs.addareamsg.operation='add'
         this.$refs.addareamsg.areatype='小区'
@@ -74,12 +86,14 @@
       'confirm' () {
         this.style='col-sm-2 form-group'
         this.areaShow = false
+        this.usershow =false
         this.$refs.arealist.$refs.paged.$refs.cri.search()
       },
       'cancel' () {
         this.style='col-sm-2 form-group'
         this.$refs.arealist.$refs.paged.$refs.cri.search()
         this.areaShow = false
+        this.usershow =false
       }
     }
   }