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

src/views/customers/potential-customers/constant.js

@@ -25,23 +25,23 @@ const tableConfig = {
         }, scope.row.ID)
       }
     },
-    ExtProductGroup_SDK: {
-      label: '签约产品组',
-      showInSearch: true,
-      type: 'select',
-      fixed: 'left',
-      isOptions:'true',
-      options: async data => {
-        const res = await searchProduct({code:'ExtProductGroup_SDK',module:'Customer'})
-        var result = res.map(item => {
-          return {
-            text: item.content,
-            value: item.keyword
-          }
-        })
-        return result
-      },
-    },
+    // ExtProductGroup_SDK: {
+    //   label: '签约产品组',
+    //   showInSearch: true,
+    //   type: 'select',
+    //   fixed: 'left',
+    //   isOptions:'true',
+    //   options: async data => {
+    //     const res = await searchProduct({code:'ExtProductGroup_SDK',module:'Customer'})
+    //     var result = res.map(item => {
+    //       return {
+    //         text: item.content,
+    //         value: item.keyword
+    //       }
+    //     })
+    //     return result
+    //   },
+    // },
   },
   columns: {
     ExtCustomerID_SDK: {

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

@@ -20,6 +20,7 @@
                           label-width="150px"
                           >
               <el-input v-model="formData.Name"
+                        readonly
                         placeholder='请选择公司'
                         style="width: 100%">
                 <i slot="suffix"
@@ -151,7 +152,7 @@
                           label-width="150px"
                           prop="extAddressDetail_SDK">
               <el-input v-model="formData.extAddressDetail_SDK"
-                        placeholder=""
+                        placeholder="街道,道路,小区楼栋"
                         autocomplete="off"
                         style="width: 80%"
                         clearable />
@@ -281,7 +282,11 @@
             </el-form-item>
           </el-col>
         </el-row>
-
+        <el-row>
+        <el-col align="center">
+          <el-button type="primary" :loading="loading" @click="handleApprove">提交</el-button>
+        </el-col>
+      </el-row>
       </el-form>
       <el-dialog title="请选择公司"
                  :visible.sync="dialogTableVisible"
@@ -326,11 +331,7 @@
                     :limit.sync="page.pageSize"
                     @pagination="getList" />
       </el-dialog>
-      <el-row>
-        <el-col align="center">
-          <el-button type="primary" @click="handleApprove">提交</el-button>
-        </el-col>
-      </el-row>
+      
 
     </div>
   </div>
@@ -354,6 +355,7 @@ export default {
       formInline: {},
       recordList: [],
       tableData: [],
+      loading:false,
       fileList:[],
       countryOptions:[],
       cityOptions:[],
@@ -369,10 +371,12 @@ export default {
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],  
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],  
         extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' }],  
-        extLeaderEmail_SDK: [{ required: true, message: '请输入公司负责人邮箱', trigger: 'blur' }],  
+        extLeaderEmail_SDK: [{ required: true, message: '请输入公司负责人邮箱', trigger: 'blur' },
+         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],  
         extUnis_SDK: [{ required: true, message: '请输入Unis业务负责人姓名', trigger: 'blur' }],  
         extUnisPhone_SDK: [{ required: true, message: '请输入Unis业务负责人电话', trigger: 'blur' }],  
-        extUnisEmail_SDK: [{ required: true, message: '请输入Unis业务负责人邮箱', trigger: 'blur' }],  
+        extUnisEmail_SDK: [{ required: true, message: '请输入Unis业务负责人邮箱', trigger: 'blur' },
+         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],  
       },
       dialogTableVisible: false,
       TotalRecords:0,
@@ -431,8 +435,27 @@ export default {
     },
     handleApprove(){
       this.formData.ExtCustomerType_SDK=111
+      this.loading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
+        this.loading=false
+         if(resp.state){
            this.$message.success('提交成功！')
+            this.$router.back()
+        }else{
+          this.$message.error('提交失败！')
+        }
+      })
+    },
+     handleClickGoBack() {
+      // const visitedViews = this.$store.state.tagsView.visitedViews
+      // const path = this.$route.path
+      // visitedViews.forEach(function(item, index) {
+      //   if (item.path == path) {
+      //     visitedViews.splice(index, 1)
+      //   }
+      // })
+      this.$store.dispatch('tagsView/delView', this.visitedViews).then((visitedViews) => {
+        this.$router.back()
       })
     },
     paramsToFormData(obj) {

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

@@ -18,6 +18,7 @@
                   class="padding-bottom">
             <el-form-item label="公司全称:"
                           prop="Name"
+                          readonly
                           label-width="150px"
                           >
               <el-input v-model="formData.Name"
@@ -152,7 +153,7 @@
                           label-width="150px"
                           prop="extAddressDetail_SDK">
               <el-input v-model="formData.extAddressDetail_SDK"
-                        placeholder=""
+                        placeholder="街道,道路,小区楼栋"
                         autocomplete="off"
                         style="width: 80%"
                         clearable />
@@ -338,7 +339,7 @@
         </el-row>
           <el-row>
         <el-col align="center">
-          <el-button type="primary" @click="handleApprove(formData)">提交</el-button>
+          <el-button type="primary" :loading="loading" @click="handleApprove(formData)">提交</el-button>
         </el-col>
       </el-row>
       </el-form>
@@ -408,6 +409,7 @@ export default {
       formInline: {},
       recordList: [],
       tableData: [],
+      loading:false,
       fileList:[],
       countryOptions:[],
       cityOptions:[],
@@ -426,13 +428,16 @@ export default {
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],  
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],  
         extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' }],  
-        extLeaderEmail_SDK: [{ required: true, message: '请输入公司负责人邮箱', trigger: 'blur' }],  
+        extLeaderEmail_SDK: [{ required: true, message: '请输入公司负责人邮箱', trigger: 'blur' },
+         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],  
         extUnis_SDK: [{ required: true, message: '请输入Unis业务负责人姓名', trigger: 'blur' }],  
         extUnisPhone_SDK: [{ required: true, message: '请输入Unis业务负责人电话', trigger: 'blur' }],  
-        extUnisEmail_SDK: [{ required: true, message: '请输入Unis业务负责人邮箱', trigger: 'blur' }],  
+        extUnisEmail_SDK: [{ required: true, message: '请输入Unis业务负责人邮箱', trigger: 'blur' },
+         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],  
         extBusiness_SDK: [{ required: true, message: '请输入商务负责人姓名', trigger: 'blur' }],  
         extBusinessPhone_SDK: [{ required: true, message: '请输入商务负责人电话', trigger: 'blur' }],  
-        extBusinessEmail_SDK: [{ required: true, message: '请输入商务负责人邮箱', trigger: 'blur' }],  
+        extBusinessEmail_SDK: [{ required: true, message: '请输入商务负责人邮箱', trigger: 'blur' },
+         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],  
         ExtChannelType_SDK: [{ required: true, message: '请选择签约渠道类型', trigger: 'blur' }],  
         ExtProductGroup_SDK: [{ required: true, message: '请选择签约产品组', trigger: 'blur' }],  
         extTotalAgent_SDK: [{ required: true, message: '请选择签约总代', trigger: 'blur' }],  
@@ -473,7 +478,7 @@ export default {
       })
     },
     getCommon(){
-      const adata={code:'ExtChannelType_SDK',module:'Customer'}
+      const adata={code:'ExtChannelType_SDK',module:'Customer',content:'RSP'}
        this.$request(Common.searchUrl, adata).then((resp) => {
         this.aOptions=resp
       })
@@ -522,9 +527,17 @@ export default {
         // });
           
         this.formData. ExtCustomerType_SDK=101
+        this.loading=true
       this.$request(Customer.searchUrl,this.paramsToFormData(this.formData)).then((resp) => {
+         this.loading=false
+        if(resp.state){
            this.$message.success('提交成功！')
-        //  this.handleClickGoBack()
+            this.handleClickGoBack()
+        }else{
+          this.$message.error('提交失败！')
+        }
+        
+        
       })
     },
       handleClickGoBack() {