address-client 3.2.9 → 3.2.13

package/src/filiale/qianneng/CityManage.vue

@@ -0,0 +1,81 @@
+<template>
+  <div id="unit" class="flex-row " :class="{'binary':areaShow}">
+    <div :class="{'basic-main':!areaShow,'binary-left':areaShow}">
+      <street-list @select-changed="selected" :f_filialeids.sync="f_filialeids" v-ref:arealist></street-list>
+    </div>
+    <div v-show="areaShow" class="binary-right">
+      <add-street-pcd v-ref:addstreetpcd :areatype.sync="areatype" :operation='operation'
+                      :f_filialeids.sync="f_filialeids" :row="row"></add-street-pcd>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '街道管理',
+    components: {},
+    data () {
+      return {
+        //分公司id串
+        f_filialeids: this.$login.f.orgid,
+        areaShow: false,
+        areatype: '街道',
+        jSuthority: this.$login.r,
+
+      }
+    },
+    props: {},
+    methods: {
+      selected (obj) {
+        console.log("this.loogin.r",this.$login.r.includes('街道信息修改'))
+        if (!this.jSuthority.includes('街道信息修改')) {
+          return
+        }
+        if (obj.val && obj.val.id) {
+          if (obj.val.f_filialeid != this.f_filialeids) {
+            this.refresh()
+            return
+          }
+          this.$refs.addstreetpcd.cleardara()
+          this.areatype = '街道'
+          this.areaShow = true
+          this.$refs.addstreetpcd.operation = 'modify'
+          this.$refs.addstreetpcd.streetmodel = Object.assign({}, obj.val)
+          this.$refs.addstreetpcd.initdata()
+        }
+      },
+      async refresh () {
+        this.areaShow = false
+        await this.$refs.arealist.$refs.paged.$refs.cri.search()
+      },
+
+
+    },
+    events: {
+      'add' (areatype) {
+        this.style = 'col-sm-3 '
+        this.areaShow = true
+        this.$refs.addstreetpcd.cleardara()
+        this.$refs.addstreetpcd.operation = 'add'
+        this.$refs.addstreetpcd.areatype = areatype
+        this.$refs.addstreetpcd.initdata()
+      },
+      'modify' (area) {
+        this.style = 'col-sm-2 '
+      },
+      'confirm' () {
+        this.style = 'col-sm-2 '
+
+        this.refresh()
+      },
+      'cancel' () {
+        this.style = 'col-sm-2 '
+
+        this.areaShow = false
+        this.$refs.arealist.$refs.paged.$refs.cri.search()
+      }
+    }
+  }
+</script>
+
+

package/src/filiale/qianneng/UserAddress.vue

@@ -53,13 +53,23 @@
                       close-on-select search="true" :disabled="!usertype">
             </v-select>
           </div>
+          <div class="col-sm-6 form-group " :class="[$v.slice_area1.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">片&emsp;&emsp;区</label>
+            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
+                   v-validate:slice_area1='{required: true }'>
+            <v-select :value.sync="model.slice_area[0].name" v-model="model.slice_area[0].name" :value-single="true"
+                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+                      @change="sliceChange(model.slice_area)"
+                      close-on-select v-ref:slice>
+            </v-select>
+          </div>
           <div  class="col-sm-6 form-group " v-if="!usertype"
                 :class="[$v.f_residential_area_id1.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">小区名称</label>
             <input type="text" style="width:41%" v-show="false" v-model="model.f_residential_area_id"
                    v-validate:f_residential_area_id1='{required: true }'>
             <v-select :value.sync="model.f_residential_area_id" :value-single="true"
-                      :options='areaslist' placeholder='请选择'
+                      :options='areaschoice' placeholder='请选择'
                       @change="areaChange"
                       close-on-select search="true">
             </v-select>
@@ -68,21 +78,13 @@
           <div  class="col-sm-6 form-group " v-if="usertype">
             <label class="font_normal_body">小区名称</label>
             <v-select :value.sync="model.f_residential_area_id" :value-single="true"
-                      :options='areaslist' placeholder='请选择'
+                      :options='areaschoice' placeholder='请选择'
                       @change="areaChange"
                       close-on-select search="true">
             </v-select>
           </div>
 
-          <div class="col-sm-6 form-group " :class="[$v.slice_area1.required ? 'has-error' : 'has-success']">
-            <label class="font_normal_body">片&emsp;&emsp;区</label>
-            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
-                   v-validate:slice_area1='{required: true }'>
-            <v-select :value.sync="model.slice_area[0].name" v-model="model.slice_area[0].name" :value-single="true"
-                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"
-                      close-on-select v-ref:slice>
-            </v-select>
-          </div>
+
           <div class="col-sm-6 form-group " v-if="!usertype">
             <label class="font_normal_body">地区类型</label>
             <v-select
@@ -196,6 +198,16 @@
                       close-on-select search="true" :disabled="!usertype">
             </v-select>
           </div>
+          <div class="col-sm-6 form-group " :class="[$v.slice.required ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">片&emsp;&emsp;区</label>
+            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
+                   v-validate:slice='{required: true }'>
+            <v-select :value.sync="model.slice_area[0].name" v-model="model.slice_area[0].name" :value-single="true"
+                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+                      @change="sliceChange(model.slice_area)"
+                      close-on-select v-ref:slice>
+            </v-select>
+          </div>
           <div class="col-sm-6 form-group "
                :class="[$v.f_residential_area_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">小区名称</label>
@@ -203,19 +215,11 @@
                    v-validate:f_residential_area_id='{required: true }'>
             <v-select :value.sync="model.f_residential_area_id" :value-single="true"
                       @change="areaChange"
-                      :options='areaslist' placeholder='请选择'
+                      :options='areaschoice' placeholder='请选择'
                       close-on-select search="true">
             </v-select>
           </div>
-          <div class="col-sm-6 form-group " :class="[$v.slice.required ? 'has-error' : 'has-success']">
-            <label class="font_normal_body">片&emsp;&emsp;区</label>
-            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
-                   v-validate:slice='{required: true }'>
-            <v-select :value.sync="model.slice_area[0].name" v-model="model.slice_area[0].name" :value-single="true"
-                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"
-                      close-on-select v-ref:slice>
-            </v-select>
-          </div>
+
 
           <div class="col-sm-6 form-group "
                :class="[$v.f_building_start.integernum || $v.f_building_start.dctest ?'has-error' : 'has-success']">
@@ -359,6 +363,7 @@
         streetslist:[],
         //初始化街道数据
         areaslist:[],
+        areaschoice:[],
         // 楼栋数据
         buildingList: [],
         iscity:[{label:'市区',value:'市区'},{label:'乡镇',value:'乡镇'},{label:'全部',value:''}],
@@ -419,7 +424,7 @@
       }
     },
     props: ['f_filialeids', 'row','operation','usertype'],
-    ready(){
+   async ready(){
       this.initdata()
       getAreaConfig(this)
       this.model.f_building_suffix=this.config.f_building_suffix
@@ -428,6 +433,20 @@
       this.model.f_room_suffix=this.config.f_room_suffix
     },
     methods: {
+      async sliceChange(slice){
+        this.areaschoice=[]
+        if(slice){
+          this.areaslist.forEach((item)=>{
+            if(item.data.f_slice_area==slice[0].name){
+              this.areaschoice.push(item)
+            }
+          })
+        }else{
+          this.areaslist.forEach((item)=>{
+              this.areaschoice.push(item)
+          })
+        }
+      },
       async changecity(){
         this.areaslist = []
         // this.model.f_residential_area_id = null
@@ -441,7 +460,7 @@
         let redata = []
         req.data.forEach((row) => {
           redata.push({
-            label: row.f_residential_area,
+            label: '['+row.f_street+']'+row.f_residential_area,
             value: row.id,
             data: row,
             id: row.id
@@ -469,8 +488,10 @@
         // 添加特殊地址选省市区
         this.initpcds(` f_orgid = '${this.f_filialeids}'`)
         this.initstreets(` f_orgid = '${this.f_filialeids}' `)
-        this.initareas(` f_orgid = '${this.f_filialeids}'`)
-
+        await this.initareas(` f_orgid = '${this.f_filialeids}'`)
+        this.areaslist.forEach((item)=>{
+            this.areaschoice.push(item)
+        })
         this.buildingList = []
       },
 
@@ -555,7 +576,7 @@
         let redata = []
         req.data.forEach((row) => {
           redata.push({
-            label: row.f_residential_area,
+            label: '['+row.f_street+']'+row.f_residential_area,
             value: row.id,
             data: row,
             id: row.id
@@ -641,7 +662,7 @@
           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
+          // this.model.slice_area = selectArea.f_slice_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}'`)
@@ -696,9 +717,21 @@
                   console.log('批量', this.model)
                   let data=Object.assign({},this.model)
                   data.f_create_person= this.$login.f.name
-                  data.f_building= data.f_building_prefix + i
-                  data.f_unit= data.f_unit_prefix + j
-                  data.f_floor= data.f_floor_prefix + m
+                  if ((i+'').length == 1) {
+                    data.f_building= data.f_building_prefix + '0' +i
+                  } else {
+                    data.f_building= data.f_building_prefix + '' +i
+                  }
+                  if ((j+'').length == 1) {
+                    data.f_unit= data.f_unit_prefix + '0'+j
+                  } else {
+                    data.f_unit= data.f_unit_prefix +''+ j
+                  }
+                  if ((m+'').length == 1) {
+                    data.f_floor= data.f_floor_prefix +'0'+ m
+                  } else {
+                    data.f_floor= data.f_floor_prefix +''+ m
+                  }
                   // 目前房号都按两位处理 如： 101室 201室 110室
                   if ((n+'').length == 1) {
                     data.f_room = data.f_room_prefix + m + '0' + n
@@ -721,10 +754,8 @@
                     + data.f_unit + data.f_unit_suffix
                     + data.f_floor + data.f_floor_suffix
                     + data.f_room + data.f_room_suffix
-                  if (this.model.slice_area) {
-                    data.f_slice_area = this.model.slice_area
+                  data.f_slice_area = data.slice_area[0]?data.slice_area[0].name:data.slice_area
 
-                  }
                   resultlist.push(data)
                 }
               }
@@ -785,6 +816,15 @@
             this.model.f_slice_area = this.model.slice_area
           }
         }
+        if (( this.model.f_unit+'').length == 1) {
+          this.model.f_unit= '0'+ this.model.f_unit
+        }
+        if (( this.model.f_floor+'').length == 1) {
+          this.model.f_floor= '0'+ this.model.f_floor
+        }
+        if (( this.model.f_room+'').length == 1) {
+          this.model.f_room= '0'+ this.model.f_room
+        }
         if (this.usertype) {
           //非民用
           this.model.f_special='1'
@@ -800,7 +840,11 @@
           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).f_residential_area
-          this.model.f_building = this.$refs.f_building_id.selectedItems
+          if (( this.$refs.f_building_id.selectedItems+'').length == 1) {
+            this.model.f_building= '0'+ this.$refs.f_building_id.selectedItems
+          }else{
+            this.model.f_building = this.$refs.f_building_id.selectedItems
+          }
           this.model.f_building_suffix=''
           if (!this.model.f_building) {
             this.$showMessage('请选择楼栋数据!!!')

package/src/filiale/qianneng/sale.js

@@ -1,12 +1,14 @@
-// 分公司特殊组件页面注册
-let specialComp = {
-  //小区列表
-  'area-list': (resolve) => { require(['./AreaList'], resolve) },
-  //地址管理
-  'user-address': (resolve) => { require(['./UserAddress'], resolve) }
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+let specialComp = {
+  //小区列表
+  'area-list': (resolve) => { require(['./AreaList'], resolve) },
+  //地址管理
+  'user-address': (resolve) => { require(['./UserAddress'], resolve) },
+  //街道管理
+  'city-manage': (resolve) => { require(['./CityManage'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+