From e9fd59ce78ed2d09bb476c5f115b3da1f09addad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Fri, 13 Oct 2023 18:06:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E6=80=A7=E5=8C=96=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/volunteer/gxhzs/gxhzsff/index.vue | 31 +++++++++++++++++----
 src/views/volunteer/gxhzs/mygxhzs/index.vue | 30 ++++++++++++++++----
 2 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/views/volunteer/gxhzs/gxhzsff/index.vue b/src/views/volunteer/gxhzs/gxhzsff/index.vue
index bfe92e9..aebe0b4 100644
--- a/src/views/volunteer/gxhzs/gxhzsff/index.vue
+++ b/src/views/volunteer/gxhzs/gxhzsff/index.vue
@@ -26,10 +26,15 @@
         <template slot-scope="scope">
           <span
             :style="{
-              color: scope.row.status == 1 ? '#67C23A' : '#F56C6C',
+              color:
+                scope.row.status == 1
+                  ? '#67C23A'
+                  : scope.row.status == 2 && scope.row.type == 2
+                  ? '#E6A23C'
+                  : '#F56C6C',
             }"
           >
-            {{ scope.row.status == 1 ? "已发放" : "未发放" }}
+            {{ filterIissuanceStatus(scope.row) }}
           </span>
         </template>
       </el-table-column>
@@ -87,7 +92,7 @@
           <div class="info-item">
             <div class="item-lable">状态:</div>
             <div class="item-value">
-              {{ form.status == 1 ? "已发放" : "未发放" }}
+              {{ filterIissuanceStatus(form) }}
             </div>
           </div>
           <div class="info-form-title">
@@ -113,9 +118,9 @@
         <el-button type="warning" @click="submitPaper()"
           >发放纸制证书</el-button
         >
-        <el-button type="primary" @click="submitElectron()"
+        <!-- <el-button type="primary" @click="submitElectron()"
           >发放电子证书</el-button
-        >
+        > -->
       </div>
     </el-dialog>
     <!-- 纸制证书 -->
@@ -172,7 +177,7 @@
               </div>
               <div class="list-left">
                 <div>状态：</div>
-                <div>{{ form.status == 1 ? "已发放" : "未发放" }}</div>
+                <div>{{ filterIissuanceStatus(form) }}</div>
               </div>
             </div>
           </div>
@@ -283,6 +288,19 @@ export default {
     });
   },
   methods: {
+    /**状态过滤 */
+    filterIissuanceStatus(row) {
+      if (row.status == 2 && !row.type) {
+        return "未发放";
+      } else if (
+        (row.status == 1 && row.type == 1) ||
+        (row.status == 1 && row.type == 2)
+      ) {
+        return "已发放";
+      } else if (row.status == 2 && row.type == 2) {
+        return "已申请";
+      }
+    },
     /**下载电子证书 */
     downloadContentAsImage() {
       const content = this.$refs.zs; // 获取目标<div>的DOM节点
@@ -349,6 +367,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         let data = {
+          status: 1,
           courierCompanies: this.form.courierCompanies,
           id: this.form.id,
           trackingNumber: this.form.trackingNumber,
diff --git a/src/views/volunteer/gxhzs/mygxhzs/index.vue b/src/views/volunteer/gxhzs/mygxhzs/index.vue
index f11431d..6f2462f 100644
--- a/src/views/volunteer/gxhzs/mygxhzs/index.vue
+++ b/src/views/volunteer/gxhzs/mygxhzs/index.vue
@@ -27,9 +27,14 @@
               type="text"
               size="mini"
               :style="{
-                color: item.status == 1 ? '#67C23A' : '#F56C6C',
+                color:
+                  item.status == 1
+                    ? '#67C23A'
+                    : item.status == 2 && item.type == 2
+                    ? '#E6A23C'
+                    : '#F56C6C',
               }"
-              >{{ item.status == 1 ? "已发放" : "未发放" }}</el-button
+              >{{ filterIissuanceStatus(item) }}</el-button
             >
             <el-button
               type="text"
@@ -89,7 +94,7 @@
               </div>
               <div class="list-left">
                 <div>状态：</div>
-                <div>{{ form.status == 1 ? "已发放" : "未发放" }}</div>
+                <div>{{ filterIissuanceStatus(form) }}</div>
               </div>
             </div>
           </div>
@@ -217,6 +222,19 @@ export default {
     });
   },
   methods: {
+    /**状态过滤 */
+    filterIissuanceStatus(row) {
+      if (row.status == 2 && !row.type) {
+        return "未发放";
+      } else if (
+        (row.status == 1 && row.type == 1) ||
+        (row.status == 1 && row.type == 2)
+      ) {
+        return "已发放";
+      } else if (row.status == 2 && row.type == 2) {
+        return "已申请";
+      }
+    },
     /**电子 */
     submitElectron() {
       //status  type
@@ -226,13 +244,13 @@ export default {
       let _this = this;
       let title = "";
       if (this.radio == 1) {
-        title = `您确定要申请“${this.currentRow.name}”电子证书吗？`;
+        title = `您确定要申请“${this.currentRow.certificateName}”电子证书吗？`;
       } else {
-        title = `您确定要申请“${this.currentRow.name}”纸质证书吗？`;
+        title = `您确定要申请“${this.currentRow.certificateName}”纸质证书吗？`;
       }
       this.$modal.confirm(title).then(function () {
         let data = {
-          status: _this.radio == 1 ? 1 : 2, //1.发放 2.未
+          status: _this.radio, //1.发放 2.未
           id: _this.currentRow.id,
           type: _this.radio, //	1:电子证书 2:纸制证书
         };