address-client 3.2.20 → 3.2.23

package/src/filiale/shanggao/UserAddress.vue

@@ -28,13 +28,13 @@
             >
             <v-select :value.sync="model.f_pcd_id" :value-single="true"
                       :options='pcdslist' placeholder='请选择'
-                      close-on-select search="true"  @change="pcdChange" :disabled="!usertype">
+                      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']">
-            <label class="font_normal_body">街道/乡镇</label>
+            <label class="font_normal_body">大片区号</label>
             <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"
@@ -44,13 +44,12 @@
           </div>
           <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>
+            <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 }'
             >
             <v-select :value.sync="model.f_street_id" :value-single="true"
                       :options='streetslist' placeholder='请选择'
-                      @change="streetChange"
-                      close-on-select search="true" :disabled="!usertype">
+                      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']">
@@ -75,8 +74,11 @@
             </v-select>
           </div>
 
-          <div  class="col-sm-6 form-group " v-if="usertype">
+          <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='areaschoice' placeholder='请选择'
                       @change="areaChange"
@@ -94,13 +96,28 @@
               close-on-select>
             </v-select>
           </div>
-          <div class="col-sm-6 form-group" :class="[$v.f_building_id.required ? 'has-error' : 'has-success']">
+          <div  v-if="!usertype" class="col-sm-6 form-group" :class="[$v.f_building_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="$refs.f_building_id.selectedItems" v-validate:f_building_id='{required: true }'>
+            <v-select :value.sync="model.f_building_id" v-model="model.f_building_id" :value-single="true"
+                      :options='buildingList' placeholder='请选择地址编码' close-on-select v-ref:f_building_id>
+            </v-select>
+          </div>
+          <div  v-if="usertype" class="col-sm-6 form-group" :class="[$v.f_building_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="$refs.f_building_id.selectedItems" v-validate:f_building_id='{required: true }'>
             <v-select :value.sync="model.f_building_id" v-model="model.f_building_id" :value-single="true"
-                      :options='buildingList' placeholder='楼号' close-on-select v-ref:f_building_id>
+                      :options='buildingList' placeholder='请选择地址编码' close-on-select v-ref:f_building_id>
             </v-select>
           </div>
+          <div v-if="!usertype" class="col-sm-6 form-group ">
+            <label for="f_address" class="font_normal_body">楼&emsp;&emsp;栋</label>
+            <input type="text" style="width:40%" v-model="model.f_building" class="input_search"
+                   placeholder="楼栋"/>
+            <input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
+            />
+
+          </div>
           <div v-if="!usertype" class="col-sm-6 form-group ">
             <label for="f_address" class="font_normal_body">单&emsp;&emsp;元</label>
             <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
@@ -442,7 +459,7 @@
       contractsyanzheng(){
         console.log(this.model.f_contracts_number.length)
         if (this.model.f_contracts_number.length != 5){
-          this.$showAlert('请输入正确的位数', 'warning', 2000)
+          this.$showAlert('合同顺序号为5位，请输入正确的位数', 'warning', 2000)
           this.model.f_contracts_number = ''
         }
       },
@@ -570,14 +587,16 @@
             id: row.id
           })
         })
+        console.log('4444444',redata)
         this.buildingList=redata
       },
       //省/市/区变化
       async pcdChange(val){
         // 只有添加特殊地址时才级联
-        if (!this.usertype) {
+        console.log("省/市/区变化1",val)
+
           return
-        }
+
         console.log("省/市/区变化",val)
         if(val){
           //那就把[小区，街道]重新组织一下
@@ -612,9 +631,11 @@
         this.$resetValidation()
       },
       //小区变化
-      areaChange(val){
+      async areaChange(val){
         console.log("小区变化",val)
         // 选择小区后级联出省市区和街道
+        console.log('1111:',this.areaslist)
+        // console.log('2222:',row)
         let selectArea // 选中的小区数据
         for (let row of this.areaslist) {
           if (val == row.value) {
@@ -622,6 +643,7 @@
             break
           }
         }
+        console.log('selectArea:',selectArea)
         if (selectArea) {
           this.model.f_street_id = selectArea.f_street_id
           this.model.f_pcd_id = selectArea.f_pcd_id
@@ -794,15 +816,17 @@
           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.model.f_building= '0'+ this.$refs.f_building_id.selectedItems
+            this.model.f_building_id= '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_building_id = this.$refs.f_building_id.selectedItems
           }
+          // this.model.f_building_suffix=''
+          // if (!this.model.f_building) {
+          //   this.$showMessage('请填写楼栋数据!!!')
+          //   return
+          // }
+          console.log('this.model.f_building_id:',this.model.f_building_id)
+          console.log('this.model.f_building:',this.model.f_building)
           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)

package/src/filiale/shanggao/sale.js

@@ -5,6 +5,7 @@ let specialComp = {
   'street-list': (resolve) =>{ require(['./StreetList'], resolve) },
 'user-address': (resolve) =>{ require(['./UserAddress'], resolve) },
   'area-list': (resolve) => { require(['./AreaList'], resolve) },
+'address-list': (resolve) =>{ require(['./AddressList'], resolve) },
   'add-area-msg': (resolve) =>{ require(['./AddAreaMsg'], resolve) },
 'building-list': (resolve) =>{ require(['./BuildingList'], resolve) }
 }

package/src/main.js

@@ -1,21 +1,21 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import { sale } from 'sale-client'
-import address from './address'
-
-Vue.config.silent = true
-
-/** **************************通用组件******************************/
-all()
-address('qianneng')
-system(false)
-sale()
-require('system-clients/src/styles/less/bootstrap.less')
-
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import { sale } from 'sale-client'
+import address from './address'
+
+Vue.config.silent = true
+
+/** **************************通用组件******************************/
+all()
+address('qianneng')
+system(false)
+sale()
+require('system-clients/src/styles/less/bootstrap.less')
+
+
+new Vue({
+  el: 'body',
+  components: { App }
+})