update:个人ca更新

src/views/CA/UnitApply.composition.vue

@@ -224,9 +224,13 @@
       <Card size="small">
         <template #title>
           {{ unitApply.unitName
-          }}<Tag :color="['orange', 'green', 'red'][unitApply.status]">{{
+          }}<Tag
-            ["进行中", "已成功", "已失败"][unitApply.status] || "未申领"
+            style="margin-left:4px;"
-          }}</Tag>
+            :color="['orange', 'green', 'red'][unitApply.status]"
+            >{{
+              ["进行中", "已成功", "已失败"][unitApply.status] || "未申领"
+            }}</Tag
+          >
         </template>
         <template #extra>
           <Button

src/views/CA/UserApply.vue

@@ -1,6 +1,23 @@
 <template>
   <div class="ca-apply">
+    <Result
+      v-if="isSuccess"
+      status="success"
+      title="您已经完成个人数字证书申领"
+      sub-title="已经申领过数字证书的个人无法再次申领，如需补办请联系管理人员"
+    >
+      <template #extra>
+        <!-- <Button type="primary">
+        申请补办
+      </Button> -->
+        <Button @click="router.back()" type="primary"> 返回 </Button>
+        <Button style="margin-left: 10px" @click="showDrawer"
+          >历史提交记录</Button
+        >
+      </template>
+    </Result>
     <Form
+      v-else
       ref="ruleForm"
       :model="form"
       :label-col="labelCol"
@@ -44,10 +61,31 @@
     placement="right"
     :closable="false"
     v-model:visible="drawVisible"
+    width="350px"
   >
-    <p v-for="userApply in userApplyList" :key="userApply.id">
+    <Card
-      {{ `${userApply.idCardName}-${userApply.phone}-${userApply.unitName}` }}
+      v-for="userApply in userApplyList"
-    </p>
+      :key="userApply.id"
+      size="small"
+      style="margin-top:10px"
+    >
+      <template #title>
+        {{ userApply.idCardName
+        }}<Tag
+          style="margin-left:4px"
+          :color="['orange', 'green', 'red'][userApply.status]"
+          >{{
+            ["进行中", "已成功", "已失败"][userApply.status] || "未申领"
+          }}</Tag
+        >
+      </template>
+      <template #extra>
+        <Button type="link" @click="goCertUrl(userApply.id)">前往</Button>
+      </template>
+      <p>身份证号:{{ userApply.idCardNo }}</p>
+      <p>手机号码:{{ userApply.phone }}</p>
+      <p v-if="userApply.dealReason">拒绝理由:{{ userApply.dealReason }}</p>
+    </Card>
   </Drawer>
 </template>
 <style lang="less" scoped>
@@ -56,7 +94,17 @@
 }
 </style>
 <script>
-import { Form, Input, Button, Select, message, Drawer } from "ant-design-vue";
+import {
+  Form,
+  Input,
+  Button,
+  Select,
+  message,
+  Drawer,
+  Result,
+  Card,
+  Tag
+} from "ant-design-vue";
 import { get, post } from "@/services/http";
 import regex from "@/services/regex";
 export default {
@@ -98,7 +146,9 @@ export default {
       organizeList: [],
       drawVisible: false,
       disableEdit: true,
-      currentApplyId: 0
+      currentApplyId: 0,
+      isSuccess: false,
+      router: this.$router
     };
   },
   methods: {
@@ -123,9 +173,9 @@ export default {
         );
       }
     },
-    async goCertUrl() {
+    async goCertUrl(id) {
       const res = await get("/api2/CA/GetRedirectUrl", {
-        applyId: this.currentApplyId
+        applyId: id || this.currentApplyId
       });
       if (res.errorCode == 0) {
         // window.open(res.data);
@@ -148,7 +198,14 @@ export default {
               "已授权，请等待证书发放",
               "已发放，申领已完成",
               "已拒绝，请重新申请或联系管理员"
-            ][status]
+            ][status],
+          (onclose = this.goCertUrl)
+          // (onclose = async () => {
+          //   if (status === 1 || status === 2 || status === 3)
+          //     this.isSuccess = true;
+          //   else if (status === 4) location.reload();
+          //   else await this.goCertUrl();
+          // })
         );
       } else {
         await this.goCertUrl();
@@ -162,7 +219,10 @@ export default {
     Button,
     Select,
     Option: Select.Option,
-    Drawer
+    Drawer,
+    Result,
+    Card,
+    Tag
   },
   created: async function() {
     //获取所在组织信息和个人数字认证信息
@@ -175,6 +235,11 @@ export default {
     }
     this.organizeList = organizeInfo.data;
     this.userApplyList = userApplyList.data;
+    var success = this.userApplyList.find(p => p.status === 1);
+    if (success) {
+      this.isSuccess = true;
+      return;
+    }
     var current = this.userApplyList.find(
       p => p.status === null || p.status === 0
     );