address-client 3.0.24-78 → 3.0.24-aode

package/src/components/UserAddress.vue

@@ -1,18 +1,18 @@
 <template>
-  <div class="auto" id="userAddress" style="height:80%">
+  <div class="auto" style="height:80%">
     <validator name='v'>
       <p class="bg-info text-center" style="padding: 8px;">{{usertype ? '特殊地址管理' : '民用地址管理'}}</p>
       <div class="auto select-overspread form-horizontal">
-        <div class="form-group" v-if="!usertype&&!model.id&&!config.hasnumber">
+        <div class="form-group" v-if="!usertype&&!model.id">
           <input type="radio" id="true" value="one" v-model="onedata">
-          <label for="true">单户</label>
+          <label for="one">单户</label>
           <input type="radio" id="false" value="more" v-model="onedata">
-          <label for="false">多户</label>
+          <label for="more">多户</label>
         </div>
         <!--单个录入-->
         <div v-if="onedata=='one'" class="row">
           <div class="col-sm-6 form-group "
-               :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']" v-if="!usertype">
+               :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">省&ensp;市&ensp;区</label>
             <input type="text" style="width:41%" v-show="false" v-model="model.f_pcd_id"
             >
@@ -21,16 +21,6 @@
                       close-on-select search="true"  @change="pcdChange" :disabled="!usertype">
             </v-select>
           </div>
-          <div class="col-sm-6 form-group "
-               :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']" v-if="usertype">
-            <label class="font_normal_body">省&ensp;市&ensp;区</label>
-            <input type="text" style="width:41%" v-show="false" v-model="model.f_pcd_id"  v-validate:f_pcd_id='{required: true }'
-            >
-            <v-select :value.sync="model.f_pcd_id" :value-single="true"
-                      :options='pcdslist' placeholder='请选择'
-                      close-on-select search="true"  @change="pcdChange" :disabled="!usertype">
-            </v-select>
-          </div>
 
           <div class="col-sm-6 form-group " v-if="!usertype"
                :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
@@ -45,7 +35,7 @@
           <div class="col-sm-6 form-group " v-if="usertype"
                :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
             <label class="font_normal_body">街道名称</label>
-            <input type="text" style="width:41%" v-show="false" v-model="model.f_street_id" v-validate:f_street_id='{required: true }'
+            <input type="text" style="width:41%" v-show="false" v-model="model.f_street_id"
             >
             <v-select :value.sync="model.f_street_id" :value-single="true"
                       :options='streetslist' placeholder='请选择'
@@ -54,10 +44,10 @@
             </v-select>
           </div>
           <div  class="col-sm-6 form-group " v-if="!usertype"
-                :class="[$v.f_residential_area_id1.required ? 'has-error' : 'has-success']">
+                :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="model.f_residential_area_id"
-                   v-validate:f_residential_area_id1='{required: true }'>
+                   v-validate:f_residential_area_id='{required: true }'>
             <v-select :value.sync="model.f_residential_area_id" :value-single="true"
                       :options='areaslist' placeholder='请选择'
                       @change="areaChange"
@@ -65,20 +55,13 @@
             </v-select>
           </div>
 
-          <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='请选择'
-                      @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']">
+
+          <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_area1='{required: true }'>
-            <v-select :value.sync="model.slice_area" v-model="model.slice_area" :value-single="true"
+                   v-validate:slice='{required: true }'>
+            <v-select :value.sync="model.slice_area" v-model="model.slice_area"
                       :options='sliceArea' placeholder='片区/管理站' filer-key="name"
                       close-on-select v-ref:slice>
             </v-select>
@@ -121,41 +104,12 @@
                       close-on-select>
             </v-select>
           </div>
-          <div v-if="!usertype" class="col-sm-8 form-group ">
-            <label class="font_normal_body">经&ensp;纬&ensp;度</label>
-            <input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
-            <input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>
-            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
-          </div>
-
           <div v-if="usertype" class="col-sm-12 form-group "
                :class="[$v.f_address.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">详细地址</label>
             <input type="text" style="width:80%" v-model="model.f_address" class="input_search" placeholder="详细地址"
                    v-validate:f_address='{required: true }'/>
           </div>
-          <div v-if="usertype" class="col-sm-8 form-group ">
-            <label class="font_normal_body">经&ensp;纬&ensp;度</label>
-            <input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
-            <input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>
-            &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
-          </div>
-          <div class="col-sm-6 form-group " v-if="config.hasnumber"
-               :class="[$v.f_standard_number.required ? 'has-error' : 'has-success']">
-            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;规范号</label>
-            <input type="text"  v-model="model.f_standard_number"
-                   @change="standardyanzheng"
-                   class="input_search" style="width:60%" placeholder="地址规范号"
-                   v-validate:f_standard_number='{required: true }'>
-          </div>
-          <div class="col-sm-6 form-group " v-if="config.hasnumber"
-               :class="[$v.f_contracts_number.required ? 'has-error' : 'has-success']">
-            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;合同号</label>
-            <input type="text"  v-model="model.f_contracts_number"
-                   @change="contractsyanzheng"
-                   class="input_search" style="width:60%" placeholder="合同顺序号"
-                   v-validate:f_contracts_number='{required: true }'>
-          </div>
           <div class="col-sm-12 form-group">
             <label  class="font_normal_body " >备&emsp;&emsp;注</label>
             <textarea class="input_textarea" rows="3" style="margin-top: 25px; width:80%;height: auto;" v-model="model.f_comments"></textarea>
@@ -203,7 +157,7 @@
             <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" v-model="model.slice_area" :value-single="true"
+            <v-select :value.sync="model.slice_area" v-model="model.slice_area"
                       :options='sliceArea' placeholder='片区/管理站' filer-key="name"
                       close-on-select v-ref:slice>
             </v-select>
@@ -282,15 +236,6 @@
                    v-validate:f_room_end='{integernum: true ,dctest: [model.f_room_start, ">=" ]}'/>
             <input type="text" style="width:17%" v-model="model.f_room_suffix" class="input_search"/>
           </div>
-          <div class="col-sm-6 form-group">
-            <label class="font_normal_body">地址状态</label>
-            <v-select :value.sync="model.f_address_state" :value-single="true"
-                      class="select_list select"
-                      condition="f_address_state = '{}'"
-                      :options='addresstate' placeholder='地址状态'
-                      close-on-select>
-            </v-select>
-          </div>
           <div class="col-sm-10 form-group ">
             <p class="navbar-text" style="margin-left: 10%">说明: 层数输入1,门牌号输入001。产生的最终门牌号显示1001</p>
           </div>
@@ -307,19 +252,6 @@
         </div>
       </div>
     </validator>
-
-    <modal :show.sync="isshow"  large backdrop="false" :width="900">
-      <header slot="modal-header" class="modal-header">
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <amap-location :islocationclearmark="false"  dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button v-show="isshow" type="button" class="button_clear btn-gn" @click='closeModal'>取消</button>
-        <button v-show="isshow" type="button" class="button_clear btn-gn" @click='confirmLocation'>确认</button>
-      </footer>
-    </modal>
-
   </div>
 </template>
 
@@ -339,12 +271,6 @@
     title: '用户地址添加',
     data () {
       return {
-        //模态框是否显示
-        isshow: false,
-        //接收位置
-        templng: '', //临时经度
-        templat: '' , //临时纬度
-
         //初始化省市区数据
         pcdslist:[],
         //初始化街道数据
@@ -352,7 +278,6 @@
         //初始化街道数据
         areaslist:[],
         config:{
-          hasnumber:false,
           f_building_suffix: '号楼',
           f_unit_suffix: '单元',
           f_floor_suffix: '层',
@@ -367,7 +292,6 @@
           f_street: '',
           f_residential_area: '',
           f_slice_area: '',
-          slice_area:'',
           f_building: '',
           f_building_start: '',
           f_building_end: '',
@@ -390,8 +314,6 @@
           f_company: '',
           //单位地址
           f_company_address: '',
-          f_lng: '',  //经度
-          f_lat: '' //纬度
         },
         //判读是否为单个数据录入
         onedata: 'one',
@@ -411,209 +333,140 @@
     ready(){
       this.initdata()
       getAreaConfig(this)
-      this.model.f_building_suffix=this.config.f_building_suffix
-      this.model.f_unit_suffix=this.config.f_unit_suffix
-      this.model.f_floor_suffix=this.config.f_floor_suffix
-      this.model.f_room_suffix=this.config.f_room_suffix
     },
     methods: {
-      standardyanzheng() {
-        console.log(this.model.f_standard_number.length)
-        if (this.model.f_standard_number.length != 2){
-          this.$showAlert('请输入正确的位数', 'warning', 2000)
-          this.model.f_standard_number = ''
-        }
-      },
-      contractsyanzheng(){
-        console.log(this.model.f_contracts_number.length)
-        if (this.model.f_contracts_number.length != 5){
-          this.$showAlert('请输入正确的位数', 'warning', 2000)
-          this.model.f_contracts_number = ''
-        }
-      },
       async initdata(){
-        this.model.f_address_state = '已通气'
-        this.initAreas(this.f_filialeids)
-        // 添加特殊地址选省市区
-
-        this.initpcds(` f_orgid = '${this.f_filialeids}'`)
-        this.initstreets(` f_orgid = '${this.f_filialeids}' `)
-        this.initareas(` f_orgid = '${this.f_filialeids}'`)
-
-      },
-
-      // 初始化片区
-      async initAreas (val) {
-        if (val) {
-          let getAllArea = await this.$resetpost('/rs/search', {
-            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-            userid: this.$login.f.id
-          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-
-          let arr = getAllArea.data.filter((res) => {
-            return res.parentid == val
-          })
-          console.log('过滤之后的片区', arr)
-          this.sliceArea = []
-          arr.forEach((res) => {
-            this.sliceArea.push({label: res.name, value: res.name})
-          })
+    this.model.f_address_state = ['已通气']
+    this.initAreas(this.f_filialeids)
+    // 添加特殊地址选省市区
+
+    this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
+    this.initstreets(` f_filialeid = '${this.f_filialeids}' `)
+    this.initareas(` f_filialeid = '${this.f_filialeids}'`)
+
+  },
+
+  // 初始化片区
+  async initAreas (val) {
+    if (val) {
+      this.sliceArea = [];
+      let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
+        data:{
+          items: '*',
+          tablename: 't_zone',
+          orderitem: 'id',
+          condition: ` parentid = ${val}`
         }
-      },
-      //初始化省市区,添加街道
-      async initpcds(pconditon){
-        this.pcdslist = []
-        let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
-          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
-          }
+      }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+
+      if(getAllArea.data){
+        getAllArea.data.forEach((res) => {
+          this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
         })
-        this.streetslist=redata
-      },
-      //初始化小区添加小区
-      async initareas(pconditon){
-        // if(this.usertype){
-        //   pconditon=pconditon+` and  f_special='1' `
-        // }
-        this.areaslist = []
-        let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
-          data: {
-            items: '*',
-            tablename: 't_area',
-            orderitem: 'id',
-            condition: pconditon
+      }
+    }
+  },
+  //初始化省市区,添加街道
+  async initpcds(pconditon){
+    this.pcdslist = []
+    let HttpReset = new HttpResetClass()
+    let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+      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){
+    // if(this.usertype){
+    //   pconditon=pconditon+` and  f_special='1' `
+    // }
+    this.areaslist = []
+    let HttpReset = new HttpResetClass()
+    let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+      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 (!this.usertype) {
+      return
+    }else{
+      this.model.f_address=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd
+    }
+    console.log("省/市/区变化",val)
+    if(val){
+      //那就把[小区，街道]重新组织一下
+      await this.initstreets(`  f_pcd_id ='${val}' `)
+      if(this.model.f_street_id){
+        if (this.findbyid(this.streetslist,this.model.f_street_id)) {
+          let pcd_id=this.findbyid(this.streetslist,this.model.f_street_id).f_pcd_id
+          if(pcd_id!=val){
+            this.model.f_street_id=''
           }
-        }, {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 (!this.usertype) {
-          return
+        } else {
+          this.model.f_street_id=''
         }
-        console.log("省/市/区变化",val)
-        if(val){
-          //那就把[小区，街道]重新组织一下
-          await this.initstreets(`  f_pcd_id ='${val}' `)
-          if(this.model.f_street_id){
-            if (this.findbyid(this.streetslist,this.model.f_street_id)) {
-              let pcd_id=this.findbyid(this.streetslist,this.model.f_street_id).f_pcd_id
-              if(pcd_id!=val){
-                this.model.f_street_id=''
-              }
-            } else {
-              this.model.f_street_id=''
-            }
-
-            //那就把[小区，街道]重新组织一下
-            if (this.model.f_street_id) {
-              await this.initareas(` f_street_id ='${this.model.f_street_id}' `)
-              if(this.model.f_residential_area_id){
-                if (this.findbyid(this.areaslist,this.model.f_residential_area_id)) {
-                  let pcd_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_pcd_id
-                  if(pcd_id!=val){
-                    this.model.f_residential_area_id=''
-                  }
-                } else {
-                  this.model.f_residential_area_id=''
-                }
 
-              }
-            }
-          }
-        }
-        this.$resetValidation()
-      },
-      //小区变化
-      areaChange(val){
-        console.log("小区变化",val)
-        // 选择小区后级联出省市区和街道
-        let selectArea // 选中的小区数据
-        for (let row of this.areaslist) {
-          if (val == row.value) {
-            selectArea = row.data
-            break
-          }
-        }
-        if (selectArea) {
-          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
-          // 拼接地址
-          this.model.f_address = `${selectArea.f_street}${selectArea.f_residential_area}`
-        }
-        this.$nextTick(() => {
-          this.$resetValidation()
-        })
-      },
-      //街道变化
-      async streetChange(val){
-        console.log("街道变化",val)
-        if(this.streetslist[0]) {
-          var street=''
-          this.streetslist.forEach((item)=>{
-            if(item.id===val){
-              street=item.label
-            }
-          })
-          this.model.f_address = street
-        }
-        if(val){
-          //那就把[小区]重新组织一下
-          await this.initareas(` f_street_id ='${val}' `)
+        //那就把[小区，街道]重新组织一下
+        if (this.model.f_street_id) {
+          await this.initareas(` f_street_id ='${this.model.f_street_id}' `)
           if(this.model.f_residential_area_id){
             if (this.findbyid(this.areaslist,this.model.f_residential_area_id)) {
-              let street_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_street_id
-              if(street_id!=val){
+              let pcd_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_pcd_id
+              if(pcd_id!=val){
                 this.model.f_residential_area_id=''
               }
             } else {
@@ -622,243 +475,264 @@
 
           }
         }
-        this.$resetValidation()
-      },
-
-      getorg (val) {
-        this.f_orgid = val[0]
-      },
-
-      //处理批量地址信息
-      dealaddlist(){
-        try {
-          var resultlist=[]
-          for (var i = parseInt(this.model.f_building_start); i <= parseInt(this.model.f_building_end); i++) {
-            for (var j = parseInt(this.model.f_unit_start); j <= parseInt(this.model.f_unit_end); j++) {
-              for (var m = parseInt(this.model.f_floor_start); m <= parseInt(this.model.f_floor_end); m++) {
-                for (var n = parseInt(this.model.f_room_start); n <= parseInt(this.model.f_room_end); n++) {
-                  //预备一个空的json
-                  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
-                  // 目前房号都按两位处理 如： 101室 201室 110室
-                  if ((n+'').length == 1) {
-                    data.f_room = data.f_room_prefix + m + '0' + n
-                  } else {
-                    data.f_room = data.f_room_prefix + m + '' + n
-                  }
-                  data.f_filialeid = this.f_filialeids
-                  data.f_operator = this.$login.f.name
-                  data.f_operatorid = this.$login.f.id
-                  data.f_orgid = this.$login.f.orgid
-                  data.f_orgname = this.$login.f.orgs
-                  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_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_residential_area +
-                    data.f_building + data.f_building_suffix
-                    + 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
+      }
+    }
+    this.$resetValidation()
+  },
+  //小区变化
+  areaChange(val){
+    console.log("小区变化",val)
+
+    // 选择小区后级联出省市区和街道
+    let selectArea // 选中的小区数据
+    for (let row of this.areaslist) {
+      if (val == row.value) {
+        selectArea = row.data
+
+        break
+      }
+    }
+    if (selectArea) {
+      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 = [{name: selectArea.f_slice_area, code: selectArea.f_area_code}]
+    }
+    this.$nextTick(() => {
+      this.$resetValidation()
+    })
+  },
+  //街道变化
+  async streetChange(val){
+    console.log("街道变化",val)
+    if(this.streetslist[0]) {
+      var street=''
+      this.streetslist.forEach((item)=>{
+        if(item.id===val){
+        street=item.label
+      }
+    })
+      if(this.usertype && this.findbyid(this.pcdslist,this.model.f_pcd_id)!= null){
+        this.model.f_address =this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd+street
+      }else{
+        this.model.f_address = street
+      }
 
-                  }
-                  resultlist.push(data)
-                }
-              }
-            }
-          }
-          this.addresslist=resultlist
-        } catch (e) {
-          console.log(e)
-          this.$showAlert('输出数据有误，请检查', 'warning', 2000)
-        }
-      },
-      //保存多个
-      async confirmall(){
-        this.dealaddlist()
-        if(this.addresslist.length>0){
-          let msg = {
-            resolveMsg: '地址保存成功',
-            rejectMsg: '地址保存失败'
-          }
-          this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗？，如有已经存在的，将会重复添加！！！', ['confirm', 'cancel']).then((res) => {
-            if (res === 'confirm') {
-              this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
-                this.cleardara()
-                this.$dispatch('confirm')
-              })
-            }
-          })
-        }
-      },
-      //保存
-      async confirm(){
-        if(this.onedata=='one'){
-          await this.saveonedata()
-        }
-        this.cleardara()
-        this.$dispatch('confirm')
-      },
-      //保存一户信息
-      async saveonedata(){
-        this.model.f_create_person= this.$login.f.name
-        this.model.f_filialeid = this.f_filialeids
-        this.model.f_operator = this.$login.f.name
-        this.model.f_operatorid = this.$login.f.id
-        this.model.f_orgid = this.$login.f.orgid
-        this.model.f_orgname = this.$login.f.orgs
-        this.model.f_depid = this.$login.f.depids
-        this.model.f_depname = this.$login.f.deps
-        console.log("片区：",this.model.slice_area)
-        if (this.model.slice_area ) {
-          if (this.model.slice_area instanceof Array) {
-            console.log("修改",this.model.slice_area)
-            this.model.f_slice_area = this.model.slice_area[0].name
-          }else{
-            console.log("保存",this.model.slice_area)
-            this.model.f_slice_area = this.model.slice_area
+    }
+    if(val){
+      //那就把[小区]重新组织一下
+      await this.initareas(` f_street_id ='${val}' `)
+      if(this.model.f_residential_area_id){
+        if (this.findbyid(this.areaslist,this.model.f_residential_area_id)) {
+          let street_id=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_street_id
+          if(street_id!=val){
+            this.model.f_residential_area_id=''
           }
-        }
-        if (this.usertype) {
-          //非民用
-          this.model.f_special='1'
-          this.model.f_building_suffix=''
-          this.model.f_unit_suffix=''
-          this.model.f_floor_suffix=''
-          this.model.f_room_suffix=''
-          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 : ''
         } else {
-          //民用
-          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_address = this.model.f_street + this.model.f_residential_area +  (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)
-      },
-      cancel(){
-        this.cleardara()
-        this.$dispatch('cancel')
-      },
-      cleardara(){
-        this.model= {
-          f_pcd_id: '',
-          f_street_id: '',
-          f_residential_area_id: '',
-          f_pcd: '',
-          f_comments:'',
-          f_street: '',
-          f_residential_area: '',
-          f_slice_area: '',
-          slice_area: '',
-          f_building: '',
-          f_building_start: '',
-          f_building_end: '',
-          f_building_prefix: '',
-          f_building_suffix: this.config.f_building_suffix,
-          f_unit: '',
-          f_unit_start: '',
-          f_unit_end: '',
-          f_unit_prefix: '',
-          f_unit_suffix: this.config.f_unit_suffix,
-          f_floor: '',
-          f_floor_start: '',
-          f_floor_end: '',
-          f_floor_prefix: '',
-          f_floor_suffix: this.config.f_floor_suffix,
-          f_room: '',
-          f_room_start: '',
-          f_room_end: '',
-          f_room_prefix: '',
-          f_room_suffix: this.config.f_room_suffix,
-          //详细地址
-          f_address: '',
-          //单位名称
-          f_company: '',
-          //单位地址
-          f_company_address: '',
-          f_lng: '',
-          f_lat: ''
+          this.model.f_residential_area_id=''
         }
-        // this.pcdslist = []
-        // this.streetslist = []
-        // this.areaslist = []
-      },
 
-      //根据名字找数据
-      findbyid(list,name){
-        var result
-        list.forEach((row, n) => {
-          if(name==row.value){
-            result= row.data
-          }
-        })
-        return result
-      },
-      openModal () {
-        this.isshow = true
-      },
-      closeModal () {
-        this.isshow = false;
-      },
-      getmylocation (res) {
-        this.templng = res.position.lng
-        this.templat = res.position.lat
-      },
-      confirmLocation () {
-        this.model.f_lat = this.templat
-        this.model.f_lng = this.templng
-        this.isshow = false
       }
-    },
-    watch: {
-      //分公司变化
-      'f_filialeids'(){
-        if (this.model.f_filialeid) {
-          if (this.model.f_filialeid != this.f_filialeids) {
-            this.$dispatch('cancel')
+    }
+    this.$resetValidation()
+  },
+
+  getorg (val) {
+    this.f_orgid = val[0]
+  },
+
+  //处理批量地址信息
+  dealaddlist(){
+    try {
+      var resultlist=[]
+      for (var i = parseInt(this.model.f_building_start); i <= parseInt(this.model.f_building_end); i++) {
+        for (var j = parseInt(this.model.f_unit_start); j <= parseInt(this.model.f_unit_end); j++) {
+          for (var m = parseInt(this.model.f_floor_start); m <= parseInt(this.model.f_floor_end); m++) {
+            for (var n = parseInt(this.model.f_room_start); n <= parseInt(this.model.f_room_end); n++) {
+              //预备一个空的json
+              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
+              // 目前房号都按两位处理 如： 101室 201室 110室
+              if ((n+'').length == 1) {
+                data.f_room = data.f_room_prefix + m + '0' + n
+              } else {
+                data.f_room = data.f_room_prefix + m + '' + n
+              }
+              data.f_filialeid = this.f_filialeids
+              data.f_operator = this.$login.f.name
+              data.f_operatorid = this.$login.f.id
+              data.f_orgid = this.$login.f.orgid
+              data.f_orgname = this.$login.f.orgs
+              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_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_residential_area +
+                data.f_building + data.f_building_suffix
+                + 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) {
+                if (this.model.slice_area.length > 0) {
+                  data.f_slice_area = this.model.slice_area[0].name
+                  data.f_area_code = this.model.slice_area[0].code
+                }
+              }
+              resultlist.push(data)
+            }
           }
         }
-        this.cleardara()
-        this.initdata()
-      },
-      'row'(){
-        this.onedata='one'
       }
-    },
-    computed: {
-      //地址状态下拉框
-      addresstate() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
+      this.addresslist=resultlist
+    } catch (e) {
+      console.log(e)
+      this.$showAlert('输出数据有误，请检查', 'warning', 2000)
+    }
+  },
+  //保存多个
+  async confirmall(){
+    this.dealaddlist()
+    if(this.addresslist.length>0){
+      let msg = {
+        resolveMsg: '地址保存成功',
+        rejectMsg: '地址保存失败'
       }
+      this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗？，如有已经存在的，将会重复添加！！！', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+        this.$resetpost('rs/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
+          this.cleardara()
+          this.$dispatch('confirm')
+        })
+      }
+    })
     }
-  }
-</script>
-<style lang="less">
-  #userAddress{
-    #addboxmap {
-      height: 300px;
+  },
+  //保存
+  async confirm(){
+    if(this.onedata=='one'){
+      await this.saveonedata()
+    }
+    this.cleardara()
+    this.$dispatch('confirm')
+  },
+  //保存一户信息
+  async saveonedata(){
+    this.model.f_create_person= this.$login.f.name
+    this.model.f_filialeid = this.f_filialeids
+    this.model.f_operator = this.$login.f.name
+    this.model.f_operatorid = this.$login.f.id
+    this.model.f_orgid = this.$login.f.orgid
+    this.model.f_orgname = this.$login.f.orgs
+    this.model.f_depid = this.$login.f.depids
+    this.model.f_depname = this.$login.f.deps
+    if (this.model.slice_area) {
+      if (this.model.slice_area.length > 0) {
+        this.model.f_slice_area = this.model.slice_area[0].name
+        this.model.f_area_code = this.model.slice_area[0].code
+      }
+    }
+    if (this.usertype) {
+      //非民用
+      this.model.f_special='1'
+      this.model.f_building_suffix=''
+      this.model.f_unit_suffix=''
+      this.model.f_floor_suffix=''
+      this.model.f_room_suffix=''
+      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
+    } else {
+      //民用
+      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_address = this.model.f_street + this.model.f_residential_area +  (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
     }
-    .glyphicon:hover {
-      color: red;
+    await this.$resetpost('rs/logic/address_updateuseraddress', this.model)
+  },
+  cancel(){
+    this.cleardara()
+    this.$dispatch('cancel')
+  },
+  cleardara(){
+    this.model= {
+      f_pcd_id: '',
+      f_street_id: '',
+      f_residential_area_id: '',
+      f_pcd: '',
+      f_comments:'',
+      f_street: '',
+      f_residential_area: '',
+      f_slice_area: '',
+      f_building: '',
+      f_building_start: '',
+      f_building_end: '',
+      f_building_prefix: '',
+      f_building_suffix: this.config.f_building_suffix,
+      f_unit: '',
+      f_unit_start: '',
+      f_unit_end: '',
+      f_unit_prefix: '',
+      f_unit_suffix: this.config.f_unit_suffix,
+      f_floor: '',
+      f_floor_start: '',
+      f_floor_end: '',
+      f_floor_prefix: '',
+      f_floor_suffix: this.config.f_floor_suffix,
+      f_room: '',
+      f_room_start: '',
+      f_room_end: '',
+      f_room_prefix: '',
+      f_room_suffix: this.config.f_room_suffix,
+      //详细地址
+      f_address: '',
+      //单位名称
+      f_company: '',
+      //单位地址
+      f_company_address: '',
     }
-    .glyphicon {
-      color: blue;
-      cursor: pointer;
+    // this.pcdslist = []
+    // this.streetslist = []
+    // this.areaslist = []
+  },
+
+  //根据名字找数据
+  findbyid(list,name){
+    var result
+    list.forEach((row, n) => {
+      if(name==row.value){
+      result= row.data
+    }
+  })
+    return result
+  },
+  },
+  watch: {
+    //分公司变化
+    'f_filialeids'(){
+      if (this.model.f_filialeid) {
+        if (this.model.f_filialeid != this.f_filialeids) {
+          this.$dispatch('cancel')
+        }
+      }
+      this.cleardara()
+      this.initdata()
+    },
+    'row'(){
+      this.onedata='one'
+    }
+  },
+  computed: {
+    //地址状态下拉框
+    addresstate() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
     }
   }
-</style>
-
-
-
-
+  }
+</script>