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

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

@@ -442,7 +442,7 @@ export default {
         //   this.cOptions.forEach(el=>{
         //    this.formData.extDistrictName_SDK=el[this.formData.extDistrict_SDK]
         // })
-      this.formData.ExtCustomerType_SDK=111
+      this.formData.extCustomerType_SDK=111
       this.btnloading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
         this.btnloading=false

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

@@ -287,7 +287,7 @@
             </el-form-item>
           </el-col>
           <el-col  :span="12"  class="padding-bottom">
-            <el-form-item label="签约产品组:" prop="extProductGroup_KUT" label-width="120px"  >
+            <el-form-item label="签约产品组:" prop="extProductGroup_KUT" label-width="120px">
               <el-select v-model="formData.extProductGroup_KUT" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in bOptions"
@@ -299,7 +299,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="11"  :offset="1" class="padding-bottom">
-            <el-form-item label="签约总代:" prop="extTotalAgent_KUT" label-width="100px" >
+            <el-form-item label="签约总代:" prop="extTotalAgent_KUT" label-width="100px">
              <el-select v-model="formData.extTotalAgent_KUT" style="width: 91%" multiple filterable placeholder="请选择" no-match-text="无匹配数据">
                 <el-option
                   v-for="item in cOptions"
@@ -338,7 +338,7 @@
         </el-row>
           <el-row>
         <el-col align="center">
-          <el-button type="primary" :loading="loading" @click="handleApprove()">提交</el-button>
+          <el-button type="primary" :loading="btnloading" @click="handleApprove()">提交</el-button>
         </el-col>
       </el-row>
       </el-form>
@@ -407,7 +407,7 @@ export default {
       formInline: {},
       recordList: [],
       tableData: [],
-      loading:false,
+      btnloading:false,
       fileList:[],
       countryOptions:[],
       cityOptions:[],
@@ -521,6 +521,7 @@ export default {
 			     this.formData.extDistrictName_SDK=obj.Name//获取的 name
 			     this.formData.extDistrict_SDK=value//获取的 id
    },
+   
     createLovTable() {
       this.dialogTableVisible = true
     },
@@ -551,19 +552,15 @@ export default {
         const ExtTotalAgent_KUT=this.formData.extTotalAgent_KUT.toString()
         this.formData.extProductGroup_KUT=ExtProductGroup_KUT
         this.formData.extTotalAgent_KUT=ExtTotalAgent_KUT
-        this.loading=true
+        this.btnloading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
-         this.loading=false
-        if(resp.results.length<40){
+            this.btnloading=false
            this.$message.success('提交成功！')
-            this.handleClickGoBack()
-        }else{
-          this.loading=false
-          this.$message.error('提交失败！')
-        }
+           this.$router.back()
+       
       })
           } else {
-            this.loading=false
+            this.btnloading=false
             this.$message.warning('请输入必填信息！')
           }
         });