address-client 3.2.84 → 3.2.86

package/src/components/StreetList.vue

@@ -71,6 +71,7 @@
             <th><nobr>省份</nobr></th>
             <th><nobr>城市</nobr></th>
             <th><nobr>区/县</nobr></th>
+            <th><nobr>街道办</nobr></th>
             <th><data-order field="f_iscity" name="地区类型"
                             :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
             <th><nobr>街道/乡镇</nobr></th>
@@ -88,6 +89,7 @@
             <td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street_manage_name}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_street_number}}</nobr></td>
@@ -133,6 +135,7 @@
             'f_province':'省份',
             'f_city':'城市',
             'f_district':'区/县',
+            'f_street_manage_name':'街道办',
             'f_street':'街道名称',
             'f_org_name':'分公司',
             'streenum':'小区数量'

package/src/components/StreetManage.vue

@@ -0,0 +1,68 @@
+<template>
+  <div id="unit" class="flex-row " :class="{'binary':streetManageShow}">
+    <div :class="{'basic-main':!streetManageShow,'binary-left':streetManageShow}">
+      <street-manage-list @select-changed="selected"
+                          :f_filialeids.sync="f_filialeids"
+                          v-ref:streetmanage>
+      </street-manage-list>
+    </div>
+    <div v-show="streetManageShow" class="binary-right">
+      <add-street-manage-msg v-ref:addstreetmanage
+                             :f_filialeids.sync="f_filialeids">
+      </add-street-manage-msg>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '街道办管理',
+  components: {},
+  data() {
+    return {
+      //分公司id串
+      f_filialeids: this.$login.f.orgid,
+      streetManageShow: false
+    }
+  },
+  props: {},
+  methods: {
+    selected(obj) {
+      if (obj.val && obj.val.id) {
+        if (obj.val.f_filialeid != this.f_filialeids) {
+          this.refresh()
+          return
+        }
+        this.streetManageShow = true
+        this.$refs.addstreetmanage.businesstype = '修改' + obj.val.f_street_manage_name
+        this.$refs.addstreetmanage.streetmanagemodel = Object.assign({},obj.val)
+        this.$refs.addstreetmanage.initdata()
+      }
+    },
+    async refresh() {
+      this.streetManageShow = false
+      await this.$refs.streetmanage.$refs.paged.$refs.cri.search()
+    }
+  },
+  events: {
+    'add'(areatype) {
+      this.style = 'col-sm-3 '
+      this.streetManageShow = true
+      this.$refs.addstreetmanage.businesstype = '增加'
+      this.$refs.addstreetmanage.clearData()
+      this.$refs.addstreetmanage.initdata()
+    },
+    'confirm'() {
+      this.style = 'col-sm-2 '
+      this.refresh()
+    },
+    'cancel'() {
+      this.style = 'col-sm-2 '
+      this.streetManageShow = false
+      this.$refs.streetmanage.$refs.paged.$refs.cri.search()
+    }
+  }
+}
+</script>
+
+

package/src/components/StreetManageList.vue

@@ -0,0 +1,225 @@
+<template>
+  <div class="flex" @keyup.enter="search">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' @sort="sort()" v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">组织机构</label>
+              <res-select restype='organization'
+                          @res-select="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.curorgid'>
+              </res-select>
+            </div>
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">街道办名称</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street_manage_name"
+                      condition="f_street_manage_name like '%{}%'" placeholder="街道办名称"/>
+            </div>
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">街道办编号</label>
+              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street_manage_number"
+                      condition="f_street_manage_number = '{}'" placeholder="街道办编号"/>
+            </div>
+            <div  class="col-sm-4 form-group button-range">
+              <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_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/exportfile"
+                            sql-name="manage_getStreetManageList"
+                            template-name='街道办信息查询导出'
+                            :choose-col="true"></export-excel>
+              <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">省&emsp;&emsp;份</label>
+              <input  type="text"    style="width:60%" class="input_search" v-model="model.f_province"
+                      condition="f_province like '%{}%'" placeholder="省份"
+                      :size="model.f_province ? model.f_province.length*2 : 6"/>
+            </div>
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">城&emsp;&emsp;市</label>
+              <input  type="text" style="width:60%" class="input_search" v-model="model.f_city"
+                      condition="f_city like '%{}%'" placeholder="城市"
+                      :size="model.f_city ? model.f_city.length*2 : 6"/>
+            </div>
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">区&emsp;&emsp;县</label>
+              <input  type="text" style="width:60%" class="input_search"  v-model="model.f_district"
+                      condition="f_district like '%{}%'" placeholder="区县"
+                      :size="model.f_district ? model.f_district.length*2 : 6"/>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' class="list_area table_sy" 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><data-order field="f_address" name="地址"
+                            :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
+            <th><nobr>分公司</nobr></th>
+            <th title="该街道办下现有的街道数"><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_province}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street_manage_name}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_street_manage_number}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_orgname}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.streetnum}}</nobr></td>
+            <td style="text-align:center">
+              <nobr>
+              <button v-if="!row.streetmanageid"
+                      type="button"
+                      name="button"
+                      class="btn btn-danger"
+                      style="padding: 5px 12px"
+                      @click.stop="$parent.$parent.$parent.delete(row)">
+                    删除
+              </button>
+              </nobr>
+            </td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  let readyGen = async function (self) {
+    self.getfield = self.config.excelHeaders
+  }
+  export default {
+    data () {
+      return {
+        criteriaShow: false,
+        model: new PagedList('rs/sql/address_getStreetManageList',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_iscity,f_street_manage_name desc'`}),
+        addflag: false,
+        getfield: {},
+        //排序
+        orderitem:'f_city,f_iscity,f_street_manage_name desc',
+        addtitle:'',
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: '',
+        config: {
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_province':'省份',
+            'f_city':'城市',
+            'f_district':'区/县',
+            'f_street_manage_name':'街道办名称',
+            'f_orgname':'分公司',
+            'streetnum':'街道数量'
+          }
+        },
+        orderFields: {
+          f_operate_date: 'no'
+        },
+      }
+    },
+    title: '街道办管理',
+    ready(){
+      readyGen(this)
+      this.search()
+    },
+    methods: {
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async delete(row){
+        if(row.id >= 0 ){
+          var id = row.id
+          let useraredss = await this.$resetpost('rs/sql/address_singleTable',
+            {data: {
+                items: 'id',
+                tablename: 't_street',
+                condition: `f_street_manage_id=${id}`}
+            },
+            {resolveMsg: null, rejectMsg: null})
+          if(useraredss.data.length>0){
+            this.$showAlert('该街道办下已有街道信息,无法删除!','warning',1000)
+          }else{
+            this.$resetdelete('rs/entity/t_street_manage', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+              this.$dispatch('cancel')
+            })
+          }
+        }
+      },
+      add(val){
+        if (this.f_filialeids) {
+          this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add',val)
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        args.condition = `${args.condition}`
+        this.model.search(args.condition, args.model)
+      },
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      }
+    },
+    computed: {
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}`,
+          orderitem: this.orderitem ? `${this.orderitem}` : " id desc"
+        }
+      }
+    },
+    events:{
+      'sort' (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        console.log("field",field, rule)
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      },
+    },
+  }
+</script>

package/src/filiale/qianneng/UserAddress.vue

@@ -142,7 +142,7 @@
                :class="[$v.f_room.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">&emsp;&emsp;&nbsp;门&ensp;牌&ensp;号</label>
             <input type="text" style="width:40%" v-model="model.f_room" class="input_search" placeholder="门牌号"
-                   @change="roomChange" v-validate:f_room='{required: true }'/>
+                   @change="roomChange" />
           </div>
           <div class="col-sm-6 form-group">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;地址状态</label>
@@ -736,13 +736,17 @@
           this.model.f_street_id = selectArea.f_street_id
           this.model.f_pcd_id = selectArea.f_pcd_id
           this.initstreets(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_street_id}' `)
-          this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `)
-          this.model.slice_area = selectArea.f_slice_area
-          // 拼接地址
-          if(selectArea.f_residential_area !== '无'){
-            this.model.f_address = `${selectArea.f_street}${selectArea.f_residential_area}`
-          }
-          this.getbuildingList(`f_filialeid = '${this.f_filialeids}' and f_residential_area_id ='${selectArea.id}'`)
+          this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `).then(
+            (res)=>{
+              this.model.slice_area = selectArea.f_slice_area
+              // 拼接地址
+              if(selectArea.f_residential_area !== '无'){
+                this.model.f_district=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_district
+                this.model.f_address = `${this.model.f_district}${selectArea.f_street}${selectArea.f_residential_area}`
+              }
+              this.getbuildingList(`f_filialeid = '${this.f_filialeids}' and f_residential_area_id ='${selectArea.id}'`)
+            }
+          )
         }
         this.$nextTick(() => {
           this.$resetValidation()
@@ -788,7 +792,7 @@
           this.model.f_pcd=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd
           this.model.f_street=this.findbyid(this.streetslist,this.model.f_street_id).f_street
           this.model.f_residential_area = this.findbyid(this.areaslist,this.model.f_residential_area_id) ? this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area : ''
-          this.model.f_address = (this.model.f_district ? this.model.f_district : '') + this.model.f_street + (this.model.f_residential_area!='无'?this.model.f_residential_area:'') +  (this.model.f_building&&this.model.f_building!='无'?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
+          this.model.f_address =  (this.model.f_district ? this.model.f_district : '') + this.model.f_street + (this.model.f_residential_area!='无'?this.model.f_residential_area:'') +  (this.model.f_building&&this.model.f_building!='无'?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
         } else {
           //民用
           this.model.f_pcd=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd
@@ -817,7 +821,7 @@
               street=item.label
             }
           })
-          this.model.f_address = street
+          this.model.f_address = (this.model.f_district ? this.model.f_district : '') + street
         }
         if(val){
           //那就把[小区]重新组织一下
@@ -886,9 +890,10 @@
                   data.f_depid = this.$login.f.depids
                   data.f_depname = this.$login.f.deps
                   data.f_pcd=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd
+                  data.f_district=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_district
                   data.f_street=this.findbyid(this.streetslist,this.model.f_street_id).f_street
                   data.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
-                  data.f_address = data.f_street
+                  data.f_address = data.f_district + data.f_street
                     + data.f_residential_area +
                     data.f_building + data.f_building_suffix
                     + data.f_unit + data.f_unit_suffix
@@ -987,7 +992,7 @@
             this.$showMessage('请选择楼栋数据!!!')
             return
           }
-          this.model.f_address = this.model.f_street + (this.model.f_residential_area!='无'?this.model.f_residential_area:'') +  (this.model.f_building&&this.model.f_building!='无'?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
+          this.model.f_address = (this.model.f_district ? this.model.f_district : '') +  this.model.f_street + (this.model.f_residential_area!='无'?this.model.f_residential_area:'') +  (this.model.f_building&&this.model.f_building!='无'?this.model.f_building +this.model.f_building_suffix:'') +  (this.model.f_unit?this.model.f_unit +this.model.f_unit_suffix:'') +  (this.model.f_floor?this.model.f_floor +this.model.f_floor_suffix:'') + this.model.f_room + this.model.f_room_suffix
         }
         await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
       },

package/src/main.js

@@ -9,7 +9,7 @@ Vue.config.silent = true
 
 /** **************************通用组件******************************/
 all()
-address('WEINAN')
+address('')
 system(false)
 ldap()
 // sale()