address-client 3.2.37 → 3.2.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.37",
+  "version": "3.2.39",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/filiale/qianneng/UserAddress.vue

@@ -124,7 +124,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="门牌号"
-                   v-validate:f_room='{required: true }'/>
+                   @change="roomChange" v-validate:f_room='{required: true }'/>
           </div>
           <div class="col-sm-6 form-group">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;地址状态</label>
@@ -137,7 +137,9 @@
           </div>
           <div v-if="!usertype" class="col-sm-6 form-group">
             <label for="f_address" class="font_normal_body">&emsp;&emsp;&nbsp;地址杂项</label>
-            <input type="text" style="width:60%" v-model="model.f_room_suffix" placeholder="地址杂项" class="input_search"/>
+            <input type="text" style="width:60%" v-model="model.f_room_suffix" placeholder="地址杂项"
+                   @change="roomChange"
+                   class="input_search"/>
           </div>
           <div v-if="!usertype" class="col-sm-8 form-group ">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;经&ensp;纬&ensp;度</label>
@@ -154,10 +156,10 @@
           </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">&emsp;&emsp;&nbsp;详细地址</label>
             <input type="text" style="width:80%" v-model="model.f_address" class="input_search" placeholder="详细地址"
-                   v-validate:f_address='{required: true }' disabled="true"/>
+                   disabled="true"/>
           </div>
           <div v-if="usertype" class="col-sm-8 form-group ">
             <label class="font_normal_body">&emsp;&emsp;&nbsp;经&ensp;纬&ensp;度</label>
@@ -389,7 +391,7 @@
         areaschoice:[],
         // 楼栋数据
         buildingList: [],
-        iscity:[{label:'市区',value:'市区'},{label:'乡镇',value:'乡镇'},{label:'全部',value:''}],
+        iscity:[{label:'全部',value:''},{label:'市区',value:'市区'},{label:'乡镇',value:'乡镇'}],
         config:{
           hasnumber:false,
           f_building_suffix: '号楼',
@@ -402,6 +404,9 @@
           f_street_id: '',
           f_comments:'',
           f_residential_area_id: '',
+          f_province: '',
+          f_city: '',
+          f_district: '',
           f_pcd: '',
           f_street: '',
           f_residential_area: '',
@@ -448,11 +453,11 @@
       }
     },
     props: ['f_filialeids', 'row','operation','usertype'],
-   async ready(){
+    async ready(){
       this.initdata()
-      // getAreaConfig(this)
-     //打印config
-     console.log(this.config)
+      getAreaConfig(this)
+      //打印config
+      console.log(this.config)
       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
@@ -478,7 +483,7 @@
           })
         }else{
           this.areaslist.forEach((item)=>{
-              this.areaschoice.push(item)
+            this.areaschoice.push(item)
           })
         }
       },
@@ -528,7 +533,7 @@
         await this.initareas(` f_orgid = '${this.f_filialeids}'`)
         this.areaschoice = []
         this.areaslist.forEach((item)=>{
-            this.areaschoice.push(item)
+          this.areaschoice.push(item)
         })
       },
 
@@ -725,6 +730,75 @@
           this.$resetValidation()
         })
       },
+      roomChange(val){
+        console.log("this.model==：",this.model, this.pcdslist)
+        console.log("this.pcdslist==：",this.pcdslist[0].data, this.pcdslist[0].data.f_district)
+        console.log("this.areaschoice==：",this.areaschoice[0].data)
+        console.log("this.pcd==：",this.model.f_pcd, this.model.f_pcd_id)
+        console.log("this.street==：",this.model.f_street,this.model.f_street_id)
+        console.log("this.area==：",this.model.f_area,this.model.f_residential_area_id)
+        this.model.f_district = this.pcdslist ? this.pcdslist[0].data.f_district : ''
+        console.log("this.model.f_district==：",this.model.f_district)
+        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
+          } if (this.model.slice_area instanceof Object) {
+            console.log("修改",this.model.slice_area)
+            this.model.f_slice_area = Object.values(this.model.slice_area)[0].name
+          } else{
+            console.log("保存",this.model.slice_area)
+            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'
+          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 : ''
+          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
+          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
+          if (( this.$refs.f_building_id.selectedItems+'').length == 1 && this.$refs.f_building_id.selectedItems!= '无') {
+            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('请选择楼栋数据!!!')
+            return
+          }
+          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
+        }
+      },
       //街道变化
       async streetChange(val){
         console.log("街道变化",val)
@@ -1030,7 +1104,3 @@
     }
   }
 </style>
-
-
-
-