From 72440657ab9caf59ba696d454c21178f64bfda65 Mon Sep 17 00:00:00 2001
From: zhangqi <2794379662@qq.com>
Date: Wed, 20 Jan 2021 14:23:13 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=B8=AA=E4=BA=BA=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/regex.js      |  4 ++++
 src/views/CA/UserApply.vue | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 src/services/regex.js

diff --git a/src/services/regex.js b/src/services/regex.js
new file mode 100644
index 0000000..584818b
--- /dev/null
+++ b/src/services/regex.js
@@ -0,0 +1,4 @@
+export default {
+  IdCardNo: /\d{17}[\dX]/,
+  Phone: /1\d{10}/
+};
diff --git a/src/views/CA/UserApply.vue b/src/views/CA/UserApply.vue
index bb38c20..222bd66 100644
--- a/src/views/CA/UserApply.vue
+++ b/src/views/CA/UserApply.vue
@@ -30,7 +30,7 @@
         <Button type="primary" @click="onSubmit" v-if="!disableEdit"
           >前往申领</Button
         >
-        <Button type="primary" @click="onSubmit" v-if="disableEdit"
+        <Button type="primary" @click="goCertUrl" v-if="disableEdit"
           >继续申领流程</Button
         >
         <Button style="margin-left: 10px" @click="showDrawer"
@@ -58,6 +58,8 @@
 <script>
 import { Form, Input, Button, Select, message, Drawer } from "ant-design-vue";
 import { get, post } from "@/services/http";
+import regex from "@/services/regex";
+console.log(regex);
 export default {
   data() {
     return {
@@ -71,7 +73,12 @@ export default {
       },
       rules: {
         idCardNo: [
-          { required: true, message: "请输入18位身份证号码", trigger: "blur" }
+          { required: true, message: "请输入18位身份证号码", trigger: "blur" },
+          {
+            pattern: regex.IdCardNo,
+            message: "输入正确的18位身份证号码",
+            trigger: "blur"
+          }
         ],
         idCardName: [
           { required: true, message: "请输入真实姓名", trigger: "blur" }
@@ -80,13 +87,19 @@ export default {
           { required: true, message: "请选择你的单位名称", trigger: "change" }
         ],
         phone: [
-          { required: true, message: "请输入你的手机号码", trigger: "blur" }
+          { required: true, message: "请输入你的手机号码", trigger: "blur" },
+          {
+            pattern: regex.Phone,
+            message: "请输入正确的11位手机号码",
+            trigger: "blur"
+          }
         ]
       },
       userApplyList: [],
       organizeList: [],
       drawVisible: false,
-      disableEdit: true
+      disableEdit: true,
+      currentApplyId: 0
     };
   },
   methods: {
@@ -104,7 +117,21 @@ export default {
       if (resp.errorCode != 0) {
         message.error(resp.errorMsg);
       } else {
-        message.success("录入完成即将进入申请页面");
+        this.currentApplyId = resp.data;
+        message.success(
+          "录入完成即将进入申请页面",
+          (onclose = () => this.goCertUrl())
+        );
+      }
+    },
+    async goCertUrl() {
+      const res = await get("/api2/CA/GetRedirectUrl", {
+        applyId: this.currentApplyId
+      });
+      if (res.errorCode == 0) {
+        window.open(res.data);
+      } else {
+        message.error(res.errorMsg);
       }
     }
   },
@@ -134,6 +161,7 @@ export default {
       this.form.idCardNo = current.idCardNo;
       this.form.unitName = current.unitName;
       this.form.phone = current.phone;
+      this.currentApplyId = current.id;
     } else {
       this.disableEdit = false;
     }