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

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

@@ -102,7 +102,7 @@
                           prop="extProvinceName_SDK"
                           label-width="80px"
                           >
-              <el-select v-model="formData.extProvinceName_SDK" style="width: 91%" filterable placeholder="请选择省份" no-match-text="无匹配数据" @change="handleSelect">
+              <el-select v-model="formData.extProvinceCode_SDK" style="width: 91%" filterable placeholder="请选择省份" no-match-text="无匹配数据" @change="handleSelect">
                 <el-option
                   v-for="item in countryOptions"
                   :key="item.Code"
@@ -118,7 +118,7 @@
                           prop="extCityName_SDK"
                           label-width="80px"
                           required>
-              <el-select v-model="formData.extCityName_SDK" style="width: 91%" filterable placeholder="请选择市"  @change="handleSelectCity" >
+              <el-select v-model="formData.extCityCode_SDK" style="width: 91%" filterable placeholder="请选择市"  @change="handleSelectCity" >
                 <el-option
                   v-for="item in cityOptions"
                   :key="item.Code"
@@ -134,7 +134,7 @@
                           prop="extDistrictName_SDK"
                           label-width="80px"
                           required>
-              <el-select v-model="formData.extDistrictName_SDK" style="width: 91%" filterable placeholder="请选择区" no-match-text="无匹配数据">
+              <el-select v-model="formData.extDistrictCode_SDK" style="width: 91%" filterable placeholder="请选择区" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in disOptions"
                   :key="item.Code"

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

@@ -103,7 +103,7 @@
                           prop="extProvinceName_SDK"
                           label-width="80px"
                           >
-              <el-select v-model="formData.extProvinceName_SDK" style="width: 91%" filterable placeholder="请选择省份" no-match-text="无匹配数据" @change="handleSelect">
+              <el-select v-model="formData.extProvinceCode_SDK" style="width: 91%" filterable placeholder="请选择省份" no-match-text="无匹配数据" @change="handleSelect">
                 <el-option
                   v-for="item in countryOptions"
                   :key="item.Code"
@@ -119,7 +119,7 @@
                           prop="extCityName_SDK"
                           label-width="80px"
                           >
-              <el-select v-model="formData.extCityName_SDK" style="width: 91%" filterable placeholder="请选择市"  @change="handleSelectCity" >
+              <el-select v-model="formData.extCityCode_SDK" style="width: 91%" filterable placeholder="请选择市"  @change="handleSelectCity" >
                 <el-option
                   v-for="item in cityOptions"
                   :key="item.Code"
@@ -135,7 +135,7 @@
                           prop="extDistrictName_SDK"
                           label-width="80px"
                           >
-              <el-select v-model="formData.extDistrictName_SDK" style="width: 91%" filterable placeholder="请选择区" no-match-text="无匹配数据">
+              <el-select v-model="formData.extDistrictCode_SDK" style="width: 91%" filterable placeholder="请选择区" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in disOptions"
                   :key="item.Code"
@@ -520,6 +520,7 @@ export default {
         this.formData. ExtCustomerType_SDK=101
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
          this.$message.success('提交成功！')
+         window.close();
       })
     },
      paramsToFormData(obj) {
@@ -545,7 +546,7 @@ export default {
       return {'Content-Type': 'multipart/form-data'}
     },
     fileChange(res,file){
-      this.formData.file=(file.raw)
+      this.formData.file=(res.raw)
     },
     onSubmit() {},
     handlePreview() { },