Merge branch 'liuxin' into develop

src/pages/userBind/np/naturePerson.vue

@@ -86,12 +86,47 @@
               v-model="baseInfo.address_on_resident_booklit"
               readonly
               placeholder="上传身份证自动填充"
+              class="auto"
             >
           </item>
           <item>
             <div slot="name" class="required">手机号码</div>
             <input slot="content" v-model="baseInfo.cell_phone" placeholder="请输入手机号码" >
           </item>
+          <item :showArrow="true">
+            <div slot="name" class="required">省份</div>
+            <input
+              slot="content"
+              v-model="baseInfo.province_name"
+              placeholder="请选择"
+              type="text"
+              readonly
+              onfocus="this.blur()"
+              @click="selectProvince()"
+            >
+          </item><item :showArrow="true">
+            <div slot="name" class="required">城市</div>
+            <input
+              slot="content"
+              v-model="baseInfo.city_name"
+              placeholder="请选择"
+              type="text"
+              readonly
+              onfocus="this.blur()"
+              @click="selectCity()"
+            >
+          </item><item :showArrow="true">
+            <div slot="name" class="required">区县</div>
+            <input
+              slot="content"
+              v-model="baseInfo.district_name"
+              placeholder="请选择"
+              type="text"
+              readonly
+              onfocus="this.blur()"
+              @click="selectDistrict()"
+            >
+          </item>
           <item>
             <div slot="name" class="required">居住地址</div>
             <input slot="content" v-model="baseInfo.living_address" placeholder="请输入居住地址" >
@@ -230,12 +265,15 @@ export default {
       isSelected: false,
       tabNum: 0,
       from: false,
+      cityList: [],
+      provinceList: [],
       upload_list: [],
       typeList: [],
       backList: [],
       bankList: [],
       maritalList: [],
       getBankList: [],
+      districtList: [],
       bank: {
         bank_account_num: '',
         bank_account_name: '',
@@ -251,6 +289,10 @@ export default {
         bp_type: '',
         bp_class: this.$route.params.bp_class,
         bp_name: '',
+        province_name: '',
+        province_id: '',
+        city_name: '',
+        city_id: '',
         id_card_no: null,
         cell_phone: null,
         living_address: '',
@@ -258,6 +300,8 @@ export default {
         marital_status: '',
         academic_background: '',
         bp_name_sp: '',
+        district_id: '',
+        district_name: '',
         spouse_phone: '',
         working_place_sp: '',
         address_sp: '',
@@ -317,6 +361,7 @@ export default {
     this.getEducationBackground()
     this.getMarital()
     this.getBankInfo()
+    this.getProvince()
     if (this.$route.params.status === 'APPROVED') {
       this.isApproved = true
     }
@@ -639,6 +684,105 @@ export default {
         },
       })
     },
+    selectProvince (e) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.provinceList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.baseInfo.province_id = obj.bp_type
+          vm.baseInfo.province_name = obj.bp_type_n
+          vm.getCity()
+        },
+      })
+    },
+    selectCity (e) {
+      let vm = this
+      if (vm.baseInfo.province_id === '') {
+        hlsPopup.showLongCenter('请先选择省份')
+      }
+      vm.hlsPopup.selectList({
+        list: vm.cityList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.baseInfo.city_id = obj.bp_type
+          vm.baseInfo.city_name = obj.bp_type_n
+          vm.getDistrict()
+        },
+      })
+    },
+    selectDistrict (e) {
+      let vm = this
+      if ((vm.baseInfo.city_id === '') || (vm.baseInfo.province_id === '')) {
+        hlsPopup.showLongCenter('请先选择城市')
+      }
+      vm.hlsPopup.selectList({
+        list: vm.districtList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.baseInfo.district_id = obj.bp_type
+          vm.baseInfo.district_name = obj.bp_type_n
+        },
+      })
+    },
+    getProvince () {
+      let vm = this
+      let url = process.env.basePath + 'fnd_province_query'
+      let param = {}
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.provinceList = res.lists.map(item => {
+            return {
+              code: item.province_id,
+              code_name: item.province_name,
+            }
+          })
+        }
+      })
+    },
+    getCity () {
+      let vm = this
+      let url = process.env.basePath + 'fnd_city_query'
+      let param = {
+        province_id: vm.baseInfo.province_id,
+      }
+      // vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        // vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.cityList = res.lists.map(item => {
+            return {
+              code: item.city_id,
+              code_name: item.city_name,
+            }
+          })
+        }
+      })
+    },
+    getDistrict () {
+      let vm = this
+      let url = process.env.basePath + 'fnd_district_query'
+      let param = {
+        city_id: vm.baseInfo.city_id,
+      }
+      // vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        // vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.districtList = res.lists.map(item => {
+            return {
+              code: item.district_id,
+              code_name: item.district_name,
+            }
+          })
+        }
+      })
+    },
     getMarital () {
       let vm = this
       let url = process.env.basePath + 'bp_marital_status_query'

src/pages/userBind/org/enterprise.vue

@@ -86,6 +86,40 @@
               slot="content" :readonly="isApproved" v-model="baseInfo.registered_place" class="auto"
               placeholder="上传营业执照自动填充">
           </item>
+          <item :showArrow="true">
+            <div slot="name" class="required">省份</div>
+            <input
+              slot="content"
+              v-model="baseInfo.province_name"
+              placeholder="请选择"
+              type="text"
+              readonly
+              onfocus="this.blur()"
+              @click="selectProvince()"
+            >
+          </item><item :showArrow="true">
+            <div slot="name" class="required">城市</div>
+            <input
+              slot="content"
+              v-model="baseInfo.city_name"
+              placeholder="请选择"
+              type="text"
+              readonly
+              onfocus="this.blur()"
+              @click="selectCity()"
+            >
+          </item><item :showArrow="true">
+            <div slot="name" class="required">区县</div>
+            <input
+              slot="content"
+              v-model="baseInfo.district_name"
+              placeholder="请选择"
+              type="text"
+              readonly
+              onfocus="this.blur()"
+              @click="selectDistrict()"
+            >
+          </item>
           <item>
             <div slot="name" class="font-color required">经营地址</div>
             <input slot="content" v-model="baseInfo.business_address" placeholder="请输入经营地址">
@@ -159,7 +193,7 @@
           <item>
             <div slot="name" class="font-color">姓名</div>
             <input
-              slot="content" :readonly="isApproved" v-model="legal_personMsg.legal_person" placeholder="上传身份证自动填充"
+              slot="content" :readonly="isApproved" v-model="baseInfo.legal_person" placeholder="上传身份证自动填充"
               class="auto">
           </item>
           <item>
@@ -304,6 +338,9 @@ export default {
       invoiceInfo: {},
       maritalList: [],
       getBankList: [],
+      cityList: [],
+      provinceList: [],
+      districtList: [],
       academic_bg_n: '',
       bpClass_flag: false,
       text: '法人代表信息',
@@ -315,11 +352,17 @@ export default {
       type: '请输入业务经办姓名',
       legal_personMsg: {
         id_card_no: null,
-        legal_person: '',
+        // legal_person: '',
         cell_phone: null,
         living_address: '',
       },
       baseInfo: {
+        district_id: '',
+        district_name: '',
+        province_name: '',
+        province_id: '',
+        city_name: '',
+        city_id: '',
         bp_type: '',
         bp_type_n: '',
         bp_name: '',
@@ -407,6 +450,7 @@ export default {
   },
   created () {
     this.getBpType()
+    this.getProvince()
     if (this.$route.params.status === 'APPROVED') {
       this.isApproved = true
     }
@@ -766,7 +810,105 @@ export default {
         this.auth_flag = '已授权'
       }
     },
-
+    selectProvince (e) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.provinceList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.baseInfo.province_id = obj.bp_type
+          vm.baseInfo.province_name = obj.bp_type_n
+          vm.getCity()
+        },
+      })
+    },
+    selectCity (e) {
+      let vm = this
+      if (vm.baseInfo.province_id === '') {
+        hlsPopup.showLongCenter('请先选择省份')
+      }
+      vm.hlsPopup.selectList({
+        list: vm.cityList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.baseInfo.city_id = obj.bp_type
+          vm.baseInfo.city_name = obj.bp_type_n
+          vm.getDistrict()
+        },
+      })
+    },
+    selectDistrict (e) {
+      let vm = this
+      if ((vm.baseInfo.city_id === '') || (vm.baseInfo.province_id === '')) {
+        hlsPopup.showLongCenter('请先选择城市')
+      }
+      vm.hlsPopup.selectList({
+        list: vm.districtList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.baseInfo.district_id = obj.bp_type
+          vm.baseInfo.district_name = obj.bp_type_n
+        },
+      })
+    },
+    getProvince () {
+      let vm = this
+      let url = process.env.basePath + 'fnd_province_query'
+      let param = {}
+      vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.provinceList = res.lists.map(item => {
+            return {
+              code: item.province_id,
+              code_name: item.province_name,
+            }
+          })
+        }
+      })
+    },
+    getCity () {
+      let vm = this
+      let url = process.env.basePath + 'fnd_city_query'
+      let param = {
+        province_id: vm.baseInfo.province_id,
+      }
+      // vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        // vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.cityList = res.lists.map(item => {
+            return {
+              code: item.city_id,
+              code_name: item.city_name,
+            }
+          })
+        }
+      })
+    },
+    getDistrict () {
+      let vm = this
+      let url = process.env.basePath + 'fnd_district_query'
+      let param = {
+        city_id: vm.baseInfo.city_id,
+      }
+      // vm.hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        // vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.districtList = res.lists.map(item => {
+            return {
+              code: item.district_id,
+              code_name: item.district_name,
+            }
+          })
+        }
+      })
+    },
     // 客户类型下拉框
     selectIdType (e) {
       let vm = this
@@ -843,7 +985,7 @@ export default {
           vm.authMsg.auth_person_position = res.info.auth_person_position
           // delete res.info.agent_username
           vm.legal_personMsg.id_card_no = res.info.id_card_no
-          vm.legal_personMsg.legal_person = res.info.legal_person
+          // vm.legal_personMsg.legal_person = res.info.legal_person
           vm.legal_personMsg.cell_phone = res.info.cell_phone
           vm.legal_personMsg.living_address = res.info.living_address
           Object.assign(vm.saveInfo, res.info)