address-client 3.2.6 → 3.2.10

package/src/filiale/WEINAN/AddressList.vue

@@ -39,6 +39,7 @@
               <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>
               <export-excel :data="$parent.$parent.getCondition"
@@ -124,9 +125,8 @@
           </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>
@@ -137,10 +137,8 @@
             <th><nobr>地址状态</nobr></th>
             <th><nobr>时间</nobr></th>
             <th><nobr>操作</nobr></th>
-          </tr>
         </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>
@@ -156,7 +154,6 @@
               <button type="button" name="button" class="btn btn-link"
                       @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
             </td>
-          </tr>
         </template>
         <template partial='foot'></template>
       </data-grid>
@@ -174,11 +171,58 @@
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>
   </modal>
-</template>
+
+  <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 { PagedList } from 'vue-client'
-
+  import {HttpResetClass} from 'vue-client'
 
   let readyGen = async function (self) {
     self.getfield = self.config.excelHeaders
@@ -218,7 +262,25 @@
 
         //文件上传弹框
         showFile: false,
-        showrightchange:true
+        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: '地址列表',
@@ -234,6 +296,9 @@
     ready(){
       readyGen(this)
       this.search()
+      this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
+      this.initareas(`f_filialeid = '${this.f_filialeids}'`)
+      this.$refs.paged.$refs.grid.selectInit()
     },
     methods: {
       getotherfooter() {
@@ -311,11 +376,177 @@
       //清空
       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) {

package/src/filiale/WEINAN/AreaList.vue

@@ -40,6 +40,7 @@
             </div>
             <div class="col-sm-4 form-group button-range">
               <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button class="button_search button_spacing" @click="$parent.$parent.batchDelete()">批量删除</button>
               <button v-if="!$parent.$parent.f_special" class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('小区')">添加小区</button>
               <button v-if="$parent.$parent.f_special"class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('单位')">添加单位</button>
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -94,9 +95,8 @@
 
 
       </criteria>
-      <data-grid  :model="model" partial='list'  class="list_area table_sy" v-ref:grid>
+      <data-grid  :model="model" partial='list'  class="list_area table_sy" v-ref:grid :optional="true">
         <template partial='head'>
-          <tr>
             <th><nobr>序号</nobr></th>
             <th v-if="false"><nobr>省份</nobr></th>
             <th v-if="false"><nobr>城市</nobr></th>
@@ -113,16 +113,13 @@
             <th v-if="$parent.$parent.$parent.f_special"><nobr>联系人</nobr></th>
             <th v-if="$parent.$parent.$parent.f_special"><nobr>联系电话</nobr></th>
             <!--非民用单位信息结束-->
-            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>安装位置</nobr></th>
+            <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>户数</nobr></th>
             <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>片区/管理站 </nobr></th>
             <th><nobr>操作人</nobr></th>
             <th><nobr>操作日期</nobr></th>
             <th><nobr>操作</nobr></th>
-
-          </tr>
         </template>
         <template partial='body'>
-          <tr>
             <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
             <td style="text-align:center" v-if="false"><nobr>{{row.f_province}}</nobr></td>
             <td style="text-align:center" v-if="false"><nobr>{{row.f_city}}</nobr></td>
@@ -135,7 +132,7 @@
             <td  v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkname}}</nobr></td>
             <td  v-if="$parent.$parent.$parent.f_special"  style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
             <!--非民用单位信息结束-->
-            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_position}}</nobr></td>
+            <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.addressnum}}</nobr></td>
             <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_slice_area}}</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>
@@ -146,11 +143,32 @@
                       style="padding: 5px 12px"
                       @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
             </nobr></td>
-          </tr>
         </template>
         <template partial='foot'></template>
       </data-grid>
     </criteria-paged>
+    <modal :show="showDelete"  large backdrop="false" :width="900">
+      <header slot="modal-header" class="modal-header">
+        <p class="bg-info text-center" style="padding: 8px;">请选择目标小区</p>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <validator name='v'>
+          <div  class="col-sm-6 form-group ">
+            <label class="font_normal_body">小区名称</label>
+            <input type="text" style="width:41%" v-show="false" v-validate:f_residential_area_id='{required: true }' v-model="areamodel.f_residential_area_id">
+            <v-select :value.sync="areamodel.f_residential_area_id" :value-single="true"
+                      @change="areaChange"
+                      :options='areaslist' placeholder='请选择'
+                      close-on-select search="true">
+            </v-select>
+          </div>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button v-show="showDelete" type="button" class="button_search button_spacing" @click='confirmDelete()' :disabled='!$v.valid'>确认</button>
+        <button v-show="showDelete" type="button" class="button_clear button_spacing" @click='cancelDelete()'>取消</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -171,7 +189,20 @@
         f_orgid: '',
         handmonth:[{label:'全部',value:''},{label:'单月',value:'单月'},{label:'双月',value:'双月'}],
         housetype:[{label:'全部',value:''},{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
-        position:this.$appdata.getParam('安装位置')?[{label:'全部',value:''},...this.$appdata.getParam('安装位置')]:[{label:'全部',value:''}]
+        position:this.$appdata.getParam('安装位置')?[{label:'全部',value:''},...this.$appdata.getParam('安装位置')]:[{label:'全部',value:''}],
+        //初始化小区数据
+        areaslist:[],
+        // 目标小区数据
+        areamodel: {
+          f_residential_area_id: '',
+          f_pcd: '',
+          f_pcd_id: '',
+          f_street: '',
+          f_street_id: '',
+          f_slice_area: '',
+          f_residential_area: ''
+        },
+        showDelete: false,
       }
     },
     title: '小区管理',
@@ -249,7 +280,89 @@
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeids = val[0]
-      }
+      },
+      async batchDelete () {
+        if (this.f_filialeids) {
+          if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
+            this.showDelete = true
+            let condition = `a.f_orgid = '${this.f_filialeids}'`
+            let req = await this.$resetpost('rs/sql/address_getresidential', {
+              data: {
+                condition: condition
+              }
+            }, {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
+          } else {
+            this.$showAlert('请至少选择一项！', 'warning', 2000)
+          }
+        }else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      confirmDelete () {
+        let msg = {
+          resolveMsg: '批量删除成功',
+          rejectMsg: '批量删除失败！'
+        }
+        let oldAreaIds = []
+        // 获取要批量删除的小区数据
+        this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
+          oldAreaIds[n] = row.id
+        })
+        this.$resetpost('rs/logic/batchDelete',{
+          data:{
+            areamodel:this.areamodel,
+            oldAreaIds:oldAreaIds,
+            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
+          }
+        },msg)
+        this.$refs.paged.$refs.grid.selectInit()
+        this.$refs.paged.$refs.cri.search()
+        this.areamodel.f_residential_area_id = ''
+        this.showDelete = false
+      },
+      cancelDelete () {
+        this.$refs.paged.$refs.grid.selectInit()
+        this.$refs.paged.$refs.cri.search()
+        this.areamodel.f_residential_area_id = ''
+        this.showDelete = false
+      },
+      areaChange(val){
+        console.log("小区变化",val)
+        let selectArea // 选中的小区数据
+        for (let row of this.areaslist) {
+          if (val == row.value) {
+            selectArea = row.data
+            break
+          }
+        }
+        if (selectArea) {
+          this.areamodel.f_residential_area_id = selectArea.id
+          this.areamodel.f_pcd = selectArea.f_pcd
+          this.areamodel.f_pcd_id = selectArea.f_pcd_id
+          this.areamodel.f_street = selectArea.f_street
+          this.areamodel.f_street_id = selectArea.f_street_id
+          this.areamodel.f_slice_area = selectArea.f_slice_area
+          this.areamodel.f_residential_area = selectArea.f_residential_area
+        }
+        this.$nextTick(() => {
+          this.$resetValidation()
+        })
+      },
     },
     watch:{