Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/views/login/city-register/index.vue

@@ -99,9 +99,9 @@
                   :offset="1"
                   class="padding-bottom">
             <el-form-item label="省份:"
-                          prop="extProvince_SDK"
+                          prop="provinceID"
                           label-width="80px">
-              <el-select v-model="formData.extProvince_SDK"
+              <el-select v-model="formData.provinceID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择省份"
@@ -117,10 +117,10 @@
           <el-col :span="7"
                   class="padding-bottom">
             <el-form-item label="市:"
-                          prop="extCity_SDK"
+                          prop="cityID"
                           label-width="80px"
-                          required>
-              <el-select v-model="formData.extCity_SDK"
+                          >
+              <el-select v-model="formData.cityID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择市"
@@ -135,14 +135,13 @@
           <el-col :span="7"
                   class="padding-bottom">
             <el-form-item label="区:"
-                          prop="extDistrict_SDK"
+                          prop="districID"
                           label-width="80px"
-                          required>
-              <el-select v-model="formData.extDistrict_SDK"
+                          >
+              <el-select v-model="formData.districID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择区"
-                         no-match-text="无匹配数据"
                          @change="handleSelectDis">
                 <el-option v-for="item in disOptions"
                            :key="item.Code"
@@ -352,7 +351,11 @@ export default {
   },
   data() {
     return {
-      formData: {},
+      formData: {
+        provinceID:'',
+      cityID:'',
+      districID:'',
+      },
       inputEnter: false,
       countryArea: '',
       title: '城市代理商注册',
@@ -369,9 +372,9 @@ export default {
         extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
         // extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)',trigger:'blur' }],
         extCorporateName_SDK: [{ required: true, message: '请输入法人', trigger: 'blur' }],
-        extProvince_SDK: [{ required: true, message: '请选择省份' }],
-        extCity_SDK: [{ required: true, message: '请选择市' }],
-        extDistrict_SDK: [{ required: true, message: '请选择区' }],
+        provinceID: [{ required: true, message: '请选择省份', trigger:''  }],
+        cityID: [{ required: true, message: '请选择市', trigger:''  }],
+        districID: [{ required: true, message: '请选择区', trigger:'' }],
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],
         extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' },
@@ -396,7 +399,7 @@ export default {
     }
   },
   watch: {
-
+     
   },
   computed: {
     visitedViews() {
@@ -429,6 +432,8 @@ export default {
       })
     },
     handleSelect(value) {
+      this.formData.cityID=''
+      this.formData.districID=''
       const app = { provinceCode: value }
       this.$request(Country.searchCity, app).then((resp) => {
         this.cityOptions = resp.results
@@ -437,10 +442,12 @@ export default {
       obj = this.countryOptions.find((item) => {//这里的userList就是上面遍历的数据源
         return item.Code === value;//筛选出匹配数据
       });
+    
       this.formData.extProvinceName_SDK = obj.Name//获取的 name
       this.formData.extProvince_SDK = value//获取的 id
     },
     handleSelectCity(value) {
+     this.formData.districID=''
       const app = { cityCode: value }
       this.$request(Country.searchDis, app).then((resp) => {
         this.disOptions = resp.results

src/views/login/prov-register/index.vue

@@ -100,9 +100,9 @@
                   :offset="1"
                   class="padding-bottom">
             <el-form-item label="省份:"
-                          prop="extProvince_SDK"
+                          prop="provinceID"
                           label-width="80px">
-              <el-select v-model="formData.extProvince_SDK"
+              <el-select v-model="formData.provinceID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择省份"
@@ -118,9 +118,9 @@
           <el-col :span="7"
                   class="padding-bottom">
             <el-form-item label="市:"
-                          prop="extCity_SDK"
+                          prop="cityID"
                           label-width="80px">
-              <el-select v-model="formData.extCity_SDK"
+              <el-select v-model="formData.cityID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择市"
@@ -135,9 +135,9 @@
           <el-col :span="7"
                   class="padding-bottom">
             <el-form-item label="区:"
-                          prop="extDistrict_SDK"
+                          prop="districID"
                           label-width="80px">
-              <el-select v-model="formData.extDistrict_SDK"
+              <el-select v-model="formData.districID"
                          style="width: 91%"
                          filterable
                          placeholder="请选择区"
@@ -452,7 +452,10 @@ export default {
     return {
       formData: {
         extProductGroup_KUT: [],
-        extTotalAgent_KUT: []
+        extTotalAgent_KUT: [],
+         provinceID:'',
+         cityID:'',
+         districID:'',
       },
       inputEnter: false,
       countryArea: '',
@@ -471,9 +474,9 @@ export default {
         extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
         // extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)' }],
         extCorporateName_SDK: [{ required: true, message: '请输入法人', trigger: 'blur' }],
-        extProvince_SDK: [{ required: true, message: '请选择省份' }],
-        extCity_SDK: [{ required: true, message: '请选择市' }],
-        extDistrict_SDK: [{ required: true, message: '请选择区' }],
+        provinceID: [{ required: true, message: '请选择省份' }],
+        cityID: [{ required: true, message: '请选择市' }],
+        districID: [{ required: true, message: '请选择区' }],
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],
         extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' },
@@ -563,6 +566,8 @@ export default {
       })
     },
     handleSelect(value) {
+      this.formData.cityID=''
+      this.formData.districID=''
       const app = { provinceCode: value }
       this.$request(Country.searchCity, app).then((resp) => {
         this.cityOptions = resp.results
@@ -575,6 +580,7 @@ export default {
       this.formData.extProvince_SDK = value//获取的 id
     },
     handleSelectCity(value) {
+      this.formData.districID=''
       const app = { cityCode: value }
       this.$request(Country.searchDis, app).then((resp) => {
         this.disOptions = resp.results