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

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

@@ -94,7 +94,7 @@
                      v-if="formData.ExtProcessNode_SDK==1">提交</el-button>
         </template>
       </ele-form-section>
-      <div class="table-contain">
+      <div class="table-contain" v-if="id">
         <PersonalInFo :addBtnStart='formData.ExtProcessNode_SDK!=1'
                       :isShowEditBtn='formData.ExtProcessNode_SDK==1'
                       :dedeleBtnStart="formData.ExtProcessNode_SDK!=1"

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

@@ -282,7 +282,8 @@
         </el-row>
         <el-row>
           <el-col align="center">
-            <el-button v-if="isShow" type="primary"
+            <el-button v-if="isShow"
+                       type="primary"
                        :loading="btnloading"
                        @click="handleApprove">提交</el-button>
           </el-col>
@@ -367,17 +368,19 @@ export default {
         extDistrict_SDK: [{ required: true, message: '请选择区' }],
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],
-        extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' }],
+        extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' },
+        { pattern: /^1[3-9]\d{9}$/, message: '手机号格式错误' },],
         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' }],
+        extUnisPhone_SDK: [{ required: true, message: '请输入Unis业务负责人电话', trigger: 'blur' },
+        { pattern: /^1[3-9]\d{9}$/, message: '手机号格式错误' }],
         file: [{ required: true, message: '请上传附件' }],
         extUnisEmail_SDK: [{ required: true, message: '请输入Unis业务负责人邮箱', trigger: 'blur' },
         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
       },
       dialogTableVisible: false,
-      isShow:true,
+      isShow: true,
       TotalRecords: 0,
       page: {
         pageSize: 10,
@@ -474,7 +477,7 @@ export default {
           this.$request(Customer.searchUrl, this.paramsToFormData(this.formData)).then((resp) => {
             this.btnloading = false
             this.$message.success('提交成功！')
-            this.isShow=false
+            this.isShow = false
           }).catch((err) => {
             this.btnloading = false
           })

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

@@ -171,7 +171,7 @@
           </el-input>
         </template>
       </ele-form-section>
-      <div class="table-contain">
+      <div class="table-contain" v-if="id">
         <PersonalInFo :addBtnStart='!formData.ExtProcessNode_SDK==1'
                       :isShowEditBtn='formData.ExtProcessNode_SDK==1'
                       :dedeleBtnStart="!formData.ExtProcessNode_SDK==1"

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

@@ -380,7 +380,8 @@
         </el-row>
         <el-row>
           <el-col align="center">
-            <el-button v-if="isShow" type="primary"
+            <el-button v-if="isShow"
+                       type="primary"
                        :loading="btnloading"
                        @click="handleApprove()">提交</el-button>
           </el-col>
@@ -470,15 +471,18 @@ export default {
         extDistrict_SDK: [{ required: true, message: '请选择区' }],
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],
-        extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' }],
+        extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' },
+        { pattern: /^1[3-9]\d{9}$/, message: '手机号格式错误' }],
         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' }],
+        extUnisPhone_SDK: [{ required: true, message: '请输入Unis业务负责人电话', trigger: 'blur' },
+        { pattern: /^1[3-9]\d{9}$/, message: '手机号格式错误' }],
         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' }],
+        extBusinessPhone_SDK: [{ required: true, message: '请输入商务负责人电话', trigger: 'blur' },
+        { pattern: /^1[3-9]\d{9}$/, message: '手机号格式错误' }],
         extBusinessEmail_SDK: [{ required: true, message: '请输入商务负责人邮箱', trigger: 'blur' },
         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
         extChannelType_SDK: [{ required: true, message: '请选择签约渠道类型', trigger: 'change' }],
@@ -487,7 +491,7 @@ export default {
         file: [{ required: true, message: '请上传附件' }],
       },
       dialogTableVisible: false,
-      isShow:true,
+      isShow: true,
       TotalRecords: 0,
       page: {
         pageSize: 10,
@@ -498,9 +502,9 @@ export default {
   },
   watch: {
     extProvince_SDK(newName, oldName) {
-       if(newName!=oldName){
-         this.formData.extCity_SDK=[]
-         this.formData.extDistrict_SDK=[]
+      if (newName != oldName) {
+        this.formData.extCity_SDK = []
+        this.formData.extDistrict_SDK = []
       }
     }
   },
@@ -641,7 +645,7 @@ export default {
           this.$request(Customer.searchUrl, this.paramsToFormData(this.formData)).then((resp) => {
             this.btnloading = false
             this.$message.success('提交成功！')
-            this.isShow=false
+            this.isShow = false
           }).catch((err) => {
             this.btnloading = false
           })