一次性证书

src/views/volunteer/yzczs/myycxhd/index.vue

@@ -31,7 +31,11 @@
         <template slot-scope="scope">
           <span
             :style="{
-              color: scope.row.issuanceStatus ? '#67C23A' : '#F56C6C',
+              color: scope.row.issuanceStatus
+                ? '#67C23A'
+                : scope.row.issuanceStatus == false && scope.row.type == 2
+                ? '#E6A23C'
+                : '#F56C6C',
             }"
           >
             {{ filterIissuanceStatus(scope.row) }}
@@ -94,7 +98,7 @@
               </div>
               <div class="list-left">
                 <div>状态：</div>
-                <div>{{ form.issuanceStatus ? "已发放" : "未发放" }}</div>
+                <div>{{ filterIissuanceStatus(form) }}</div>
               </div>
             </div>
           </div>
@@ -236,6 +240,19 @@ export default {
     });
   },
   methods: {
+    /**状态过滤 */
+    filterIissuanceStatus(row) {
+      if (row.issuanceStatus == false && row.type == null) {
+        return "未发放";
+      } else if (
+        (row.issuanceStatus == true && row.type == 1) ||
+        (row.issuanceStatus == true && row.type == 2)
+      ) {
+        return "已发放";
+      } else if (row.issuanceStatus == false && row.type == 2) {
+        return "已申请";
+      }
+    },
     /**电子 */
     submitElectron() {
       let _this = this;

src/views/volunteer/yzczs/ycxzsff/index.vue

@@ -27,10 +27,14 @@
         <template slot-scope="scope">
           <span
             :style="{
-              color: scope.row.issuanceStatus ? '#67C23A' : '#F56C6C',
+              color: scope.row.issuanceStatus
+                ? '#67C23A'
+                : scope.row.issuanceStatus == false && scope.row.type == 2
+                ? '#E6A23C'
+                : '#F56C6C',
             }"
           >
-            {{ scope.row.issuanceStatus | filerIssuanceStatus }}
+            {{ filterIissuanceStatus(scope.row) }}
           </span>
         </template>
       </el-table-column>
@@ -47,7 +51,7 @@
             size="mini"
             type="text"
             @click="handleFabu(scope.row)"
-            v-if="scope.row.issuanceStatus == false"
+            v-if="scope.row.issuanceStatus == false && scope.row.type == 2"
             >发放</el-button
           >
         </template>
@@ -173,12 +177,15 @@
               </div>
               <div class="list-left">
                 <div>状态：</div>
-                <div>{{ form.issuanceStatus ? "已发放" : "未发放" }}</div>
+                <div>{{ filterIissuanceStatus(form) }}</div>
               </div>
             </div>
           </div>
         </div>
-        <div class="logisticsInfo" v-show="form.type == 2">
+        <div
+          class="logisticsInfo"
+          v-show="form.type == 2 && form.issuanceStatus == true"
+        >
           <div class="title">
             <img src="@/assets/images/huodong.png" alt="" />
             <span>纸制证书</span>
@@ -196,7 +203,10 @@
             </div>
           </div>
         </div>
-        <div class="logisticsInfo" v-show="form.type == 1">
+        <div
+          class="logisticsInfo"
+          v-show="form.type == 1 && form.issuanceStatus == true"
+        >
           <div class="title">
             <img src="@/assets/images/huodong.png" alt="" />
             <span>电子证书</span>
@@ -289,7 +299,7 @@ export default {
     /**状态过滤 */
     filterIissuanceStatus(row) {
       if (row.issuanceStatus == false && row.type == null) {
-        return "未发放";
+        return "未申请";
       } else if (
         (row.issuanceStatus == true && row.type == 1) ||
         (row.issuanceStatus == true && row.type == 2)
@@ -373,6 +383,7 @@ export default {
           id: this.form.id,
           trackingNumber: this.form.trackingNumber,
           type: 2, //	1:电子证书 2:纸制证书
+          issuanceStatus: true,
         };
         this.subIssue(data);
       });