From 5c097acdaff7d15616062214483a9609bc2bd86c Mon Sep 17 00:00:00 2001
From: zhangqi <2794379662@qq.com>
Date: Wed, 21 Apr 2021 10:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=9F=A5=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/CA/UnitApply.vue | 48 ++++++++++++++++++++++++++++++--------
 src/views/CA/UserApply.vue | 46 +++++++++++++++++++++++++++++-------
 2 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/src/views/CA/UnitApply.vue b/src/views/CA/UnitApply.vue
index 124e7b1..9271d41 100644
--- a/src/views/CA/UnitApply.vue
+++ b/src/views/CA/UnitApply.vue
@@ -228,15 +228,13 @@
           {{ unitApply.unitName
           }}<a-tag
             style="margin-left:4px;"
-            :color="['orange', 'green', 'red'][unitApply.status]"
-            >{{
-              ["进行中", "已成功", "已失败"][unitApply.status] || "未申领"
-            }}</a-tag
+            :color="status[userApply.status].color"
+            >{{ status[userApply.status].text }}</a-tag
           >
         </template>
         <template #extra>
           <a-button
-            v-if="unitApply.status == 2"
+            v-if="unitApply.status == -3"
             type="link"
             @click="modifyOrder(unitApply)"
             :disabled="disabledModify"
@@ -470,9 +468,9 @@ export default {
         var current = toRaw(unitApplyList.value).find(
           p => p.id == progressingId
         );
-        if (current.status == null) {
+        if (current.status == 0) {
           await sendUnitApply(progressingId);
-        } else if (current.status == 0) {
+        } else if (current.status == 2) {
           await queryUnitApply(progressingId);
         }
       }
@@ -624,13 +622,13 @@ export default {
       }
       unitApplyList.value = unitApplyListRes.data;
       const current = unitApplyListRes.data.find(
-        d => d.status == null || d.status == 0
+        d => [0, 1, 2].indexOf(d.status) > -1
       );
       if (current) {
         progressingId = current.id;
         initPage(current);
       } else {
-        const successApply = unitApplyListRes.data.find(d => d.status == 1);
+        const successApply = unitApplyListRes.data.find(d => d.status == 3);
         if (successApply) {
           isSuccess.value = true;
         } else {
@@ -676,7 +674,37 @@ export default {
       isSuccess,
       modifyOrder,
       router: useRouter(),
-      progressingId
+      progressingId,
+      status: {
+        0: {
+          color: "orange",
+          text: "未申领"
+        },
+        1: {
+          color: "orange",
+          text: "审核通过"
+        },
+        "-1": {
+          color: "red",
+          text: "审核拒绝"
+        },
+        2: {
+          color: "orange",
+          text: "进行中"
+        },
+        3: {
+          color: "green",
+          text: "申请通过"
+        },
+        "-3": {
+          color: "red",
+          text: "申请拒绝"
+        },
+        4: {
+          color: "red",
+          text: "已失效"
+        }
+      }
     };
   }
 };
diff --git a/src/views/CA/UserApply.vue b/src/views/CA/UserApply.vue
index 5b337c9..f56fa2f 100644
--- a/src/views/CA/UserApply.vue
+++ b/src/views/CA/UserApply.vue
@@ -105,16 +105,14 @@
       v-for="userApply in userApplyList"
       :key="userApply.id"
       size="small"
-      style="margin-top:10px"
+      style="margin-top: 10px"
     >
       <template #title>
         {{ userApply.idCardName
         }}<a-tag
-          style="margin-left:4px"
-          :color="['orange', 'green', 'red'][userApply.status]"
-          >{{
-            ["进行中", "已成功", "已失败"][userApply.status] || "未申领"
-          }}</a-tag
+          style="margin-left: 4px"
+          :color="applyStatus[userApply.status].color"
+          >{{ applyStatus[userApply.status].text }}</a-tag
         >
       </template>
       <p>身份证号:{{ userApply.idCardNo }}</p>
@@ -195,7 +193,37 @@ export default {
       disableEdit: true,
       currentApplyId: 0,
       isSuccess: false,
-      router: this.$router
+      router: this.$router,
+      applyStatus: {
+        0: {
+          color: "orange",
+          text: "未申领"
+        },
+        1: {
+          color: "orange",
+          text: "审核通过"
+        },
+        "-1": {
+          color: "red",
+          text: "审核拒绝"
+        },
+        2: {
+          color: "orange",
+          text: "进行中"
+        },
+        3: {
+          color: "green",
+          text: "申请通过"
+        },
+        "-3": {
+          color: "red",
+          text: "申请拒绝"
+        },
+        4: {
+          color: "red",
+          text: "已失效"
+        }
+      }
     };
   },
   methods: {
@@ -317,13 +345,13 @@ export default {
     }
     this.organizeList = organizeInfo.data;
     this.userApplyList = userApplyList.data;
-    var success = this.userApplyList.find(p => p.status === 1);
+    var success = this.userApplyList.find(p => p.status === 3);
     if (success) {
       this.isSuccess = true;
       return;
     }
     var current = this.userApplyList.find(
-      p => p.status === null || p.status === 0
+      p => [0, 1, 2].indexOf(p.status) > -1
     );
     if (current) {
       this.form.idCardName = current.idCardName;