address-client 3.2.30 → 3.2.31

package/src/filiale/macheng/AddressList.vue

@@ -28,7 +28,6 @@
                       :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
             </div>
             <!--<div v-if="$parent.$parent.showrightchange" :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.useraddressShow">-->
-
             <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%"
@@ -39,8 +38,12 @@
               <button class="button_search button_spacing" @click="search()" >查询</button>
               <button class="button_new button_spacing"  style="width: max-content" @click="$parent.$parent.add('民用')">添加民用</button>
               <button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
+              <button class="button_new button_spacing" style="width: max-content" v-show="this.$login.r.includes('批量修改')" @click="$parent.$parent.modifyBatch()">批量修改</button>
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-              <button class="button_export button_spacing"  @click="$parent.$parent.importAddress">导入地址</button>
+              <button class="button_export button_spacing"  @click="$parent.$parent.importAddress('导入')">模板导入</button>
+              <button class="button_export button_spacing"
+                      v-show="this.$login.r.includes('完善地址')"
+                      @click="$parent.$parent.importAddress('完善')">完善地址</button>
               <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
                             sqlurl="rs/logic/exportfile"
@@ -105,6 +108,12 @@
                       condition="a.f_address like '%{}%'" placeholder="详细地址"
                       :size="model.f_address ? model.f_address.length*2 : 8"/>
             </div>
+            <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.showrightchange">
+              <label class="font_normal_body">街道/乡镇</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
+                      condition="f_street like '%{}%'" placeholder="街道/乡镇"
+                      :size="model.f_street ? model.f_street.length*2 : 6"/>
+            </div>
             <div :class="$parent.$parent.style" >
               <label class="font_normal_body">地址状态</label>
               <v-select :value.sync="model.f_address_state"
@@ -118,53 +127,55 @@
           </div>
         </div>
       </criteria>
-      <data-grid  :model="model" partial='list' style="overflow: auto" class="list_area table_sy"  v-ref:grid>
+      <data-grid  :model="model" partial='list' style="overflow: auto" class="list_area table_sy" :optional="true" v-ref:grid>
         <template partial='head'>
-          <tr>
-            <th><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>
-            <th><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>
-          </tr>
+          <th><nobr>序号</nobr></th>
+          <th><nobr>用户编号</nobr></th>
+          <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>区/县</nobr></th>
+          <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>片区/管理站</nobr></th>
+          <th><nobr>街道/乡镇</nobr></th>
+          <th><nobr>小区(单位)</nobr></th>
+          <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼号</nobr></th>
+          <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>单元</nobr></th>
+          <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>楼层</nobr></th>
+          <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><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>
         </template>
         <template partial='body'>
-          <tr>
-            <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_userinfo_code}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_building}}{{row.f_building_suffix}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_unit}}{{row.f_unit_suffix}}</nobr></td>
-            <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.delete(row)">删除</button>
-            </td>
-          </tr>
+          <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_userinfo_code}}</nobr></td>
+          <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>
+          <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
+          <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_building}}{{row.f_building_suffix}}</nobr></td>
+          <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_unit}}{{row.f_unit_suffix}}</nobr></td>
+          <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
+          <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" 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_state ==='作废'?'作废':'有效'}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_create_date}}</nobr></td>
+          <td style="text-align:center"><nobr>{{row.f_comments}}</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 v-if="!row.f_useraddress_id" type="button" name="button" class="btn btn-danger"
+                    style="padding: 5px 12px"
+                    @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
+          </td>
         </template>
         <template partial='foot'></template>
       </data-grid>
     </criteria-paged>
   </div>
-  <modal :show.sync="showFile" v-ref:modal backdrop="true">
+  <work-busy :is-busy='isbusy'></work-busy>
+  <modal :show.sync="showFile" width="480px" v-ref:modal backdrop="true">
     <header slot="modal-header" class="modal-header">
       <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
       <h4 class="modal-title">选择文件</h4>
@@ -174,11 +185,60 @@
         <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
       </div>
     </article>
-    <footer slot="modal-footer" class="modal-footer"></footer>
+    <footer slot="modal-footer" class="modal-footer" style="display: none"></footer>
+  </modal>
+
+  <modal :show.sync="showModify"  large backdrop="false" :width="900">
+    <header slot="modal-header" class="modal-header">
+    </header>
+    <article slot="modal-body" class="modal-body">
+
+      <validator name='v'>
+        <div class="auto select-overspread form-horizontal">
+          <div class="col-sm-6 form-group">
+            <label class="font_normal_body">省&ensp;市&ensp;区</label>
+            <input type="text" class="input_search" class="input_search" style="width:60%" v-show="false" v-model="areamodel.f_pcd_id">
+            <v-select
+              :value.sync="areamodel.f_pcd_id" :value-single="true"
+              :options='pcdslist' placeholder='请选择'
+              close-on-select search="true" @change="pcdChange">
+            </v-select>
+          </div>
+          <div class="col-sm-6 form-group"
+               :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">街道名称</label>
+            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_street_id"
+                   v-validate:f_street_id='{required: true }'>
+            <v-select
+              :value.sync="areamodel.f_street_id" :value-single="true"
+              :options='streetslist' placeholder='请选择'
+              close-on-select search="true" @change="streetChange">
+            </v-select>
+          </div>
+          <div  class="col-sm-6 form-group " v-if="showModify"
+                :class="[$v.f_residential_area_id.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">小区名称</label>
+            <input type="text" style="width:41%" v-show="false" v-model="areamodel.f_residential_area_id"
+                   v-validate:f_area_id='{required: true }'>
+            <v-select :value.sync="areamodel.f_residential_area_id" :value-single="true"
+                      :options='areaslist' placeholder='请选择'
+                      @change=""
+                      close-on-select search="true">
+            </v-select>
+          </div>
+        </div>
+      </validator>
+
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="showModify" type="button" class="button_search button_spacing" @click='confirmModify()' :disabled='!$v.valid'>确认</button>
+      <button v-show="showModify" type="button" class="button_clear button_spacing" @click='cancelModify()'>取消</button>
+    </footer>
   </modal>
 </template>
 
 <script>
+  import {HttpResetClass} from 'vue-client'
   import { PagedList } from 'vue-client'
 
   let readyGen = async function (self) {
@@ -215,13 +275,32 @@
             'f_state':'状态'
           },
         },
+        isbusy:false,
+        imptype:'',
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
-
+        getstate:[{label:'全部',value:''},{label:'有效',value:" = '有效' or a.f_state is null"},{label:'作废',value:" = '作废'"}],
         //文件上传弹框
         showFile: false,
-        showrightchange:true
+        showrightchange:true,
+        showModify: false,
+        //小区
+        areamodel: {
+          f_area_id: '',
+          f_pcd_id:'',
+          f_street_id:'',
+          f_residential_area:'',
+          f_residential_area_id:''
+        },
+        //初始化省市区数据
+        pcdslist:[],
+        //初始化街道数据
+        streetslist:[],
+        //初始化街道数据
+        areaslist:[],
+        // 要修改的用户信息
+        userInfos:  []
       }
     },
     title: '地址列表',
@@ -271,7 +350,8 @@
           this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
         }
       },
-      importAddress(){
+      importAddress(val){
+        this.imptype = val
         this.showFile = true
       },
       // 关闭文件上传对话框
@@ -286,7 +366,7 @@
         this.$dispatch('modify',val)
       },
       async delete(row){
-        if(row.id){
+        if(row.id >= 0){
           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){
@@ -316,21 +396,190 @@
       //清空
       clear(){
         this.$refs.paged.$refs.cri.model = {}
+        this.$refs.paged.$refs.grid.selectInit()
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeids = val[0]
-      }
+      },
+      async modifyBatch () {
+        if (this.f_filialeids) {
+          if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
+            this.areamodel.f_pcd_id = this.$refs.paged.$refs.grid.getRowData()[0].f_pcd_id
+            this.showModify = true
+          } else {
+            this.$showAlert('请至少选择一项！', 'warning', 2000)
+          }
+        }else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      confirmModify () {
+        this.userInfos = []
+        this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
+          this.userInfos[n] = {
+            userid: row.id,
+            f_residential_area: row.f_residential_area,
+            f_street: row.f_street,
+            f_address: row.f_address,
+            f_address_rest: row.f_street + row.f_residential_area + (row.f_building?row.f_building+row.f_building_suffix:'') + (row.f_unit?row.f_unit+row.f_unit_suffix:'') + (row.f_floor?row.f_floor+row.f_floor_suffix:'') + (row.f_room?row.f_room+row.f_room_suffix:'')
+          }
+        })
+        let modifyBatchData = {
+          userInfos: this.userInfos,
+          f_pcd_id: this.areamodel.f_pcd_id,
+          f_residential_area_id: this.areamodel.f_residential_area_id,
+          f_street_id: this.areamodel.f_street_id,
+          f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps,
+          f_filialeid: this.f_filialeids
+        }
+        this.$resetpost('rs/logic/modifyBatch',modifyBatchData)
+        this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
+        this.showModify = false
+        this.$refs.paged.$refs.grid.selectInit()
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancelModify() {
+        this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
+        this.showModify = false
+        this.$refs.paged.$refs.grid.selectInit()
+      },
+
+      //初始化省市区,添加街道
+      async initpcds(pconditon){
+        this.pcdslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_pcd',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_pcd,
+            value: row.id,
+            data:row,
+            id:row.id
+          }
+        })
+        this.pcdslist=redata
+      },
+
+      //初始化街道
+      async initstreets(pconditon){
+        this.streetslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_street',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_street,
+            value: row.id,
+            data:row,
+            id:row.id
+          }
+        })
+        this.streetslist=redata
+      },
+      //初始化小区
+      async initareas(pconditon){
+        this.areaslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+          data: {
+            items: '*',
+            tablename: 't_area',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row) => {
+          redata.push({
+            label: row.f_residential_area,
+            value: row.id,
+            data: row,
+            id: row.id
+          })
+        })
+        this.areaslist=redata
+      },
+
+
+      //省/市/区变化
+      async pcdChange(val){
+        if(val){
+          //那就把街道数据重新组织一下
+          await this.initstreets(` f_filialeid = '${this.f_filialeids}' and f_pcd_id ='${val}' `)
+          if(this.areamodel.f_street_id){
+            if (this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
+              let pcd_id=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id
+              if(pcd_id!=val){
+                this.areamodel.f_street_id=''
+              }
+            } else {
+              this.areamodel.f_street_id=''
+            }
+          }
+        }
+        this.$resetValidation()
+      },
+      //街道变化
+      async streetChange(val){
+        if(val){
+          await this.initareas(` f_filialeid = '${this.f_filialeids}' and f_street_id ='${val}' `)
+          if(this.areamodel.f_area_id){
+            if (this.findbyid(this.areaslist,this.areamodel.f_area_id)) {
+              let street_id=this.findbyid(this.areaslist,this.areamodel.f_area_id).f_street_id
+              if(street_id!=val){
+                this.areamodel.f_area_id=''
+              }
+            } else {
+              this.areamodel.f_area_id=''
+            }
+          }
+        }
+        this.$resetValidation()
+      },
+      //根据名字找数据
+      findbyid(list,name){
+        var result
+        list.forEach((row, n) => {
+          if(name==row.id){
+            result= row.data
+          }
+        })
+        return result
+      },
     },
     events: {
       onFileUpload: async function (file, res) {
+        this.isbusy = true
         console.log("上传完毕"+JSON.stringify(res))
         let data = {
           filepath: res.f_downloadpath,
-          user:this.$login.f
+          user:this.$login.f,
+          type :this.imptype
         }
         console.log("filepath="+JSON.stringify(data))
         await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+          this.isbusy = false
           if(res.data.type=="success"){
             this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
           }else{
@@ -341,6 +590,8 @@
           this.closeFile()
           //重新查询
           this.init()
+        }).catch(error=>{
+          this.isbusy = false
         })
       },
       'onFileError'(error) {