diff --git a/src/views/volunteer/yzczs/myycxhd/index.vue b/src/views/volunteer/yzczs/myycxhd/index.vue
index 83186fd..b77a082 100644
--- a/src/views/volunteer/yzczs/myycxhd/index.vue
+++ b/src/views/volunteer/yzczs/myycxhd/index.vue
@@ -31,7 +31,11 @@
{{ filterIissuanceStatus(scope.row) }}
@@ -94,7 +98,7 @@
状态:
-
{{ form.issuanceStatus ? "已发放" : "未发放" }}
+
{{ filterIissuanceStatus(form) }}
@@ -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;
diff --git a/src/views/volunteer/yzczs/ycxzsff/index.vue b/src/views/volunteer/yzczs/ycxzsff/index.vue
index 24ba348..0d4fac8 100644
--- a/src/views/volunteer/yzczs/ycxzsff/index.vue
+++ b/src/views/volunteer/yzczs/ycxzsff/index.vue
@@ -27,10 +27,14 @@
- {{ scope.row.issuanceStatus | filerIssuanceStatus }}
+ {{ filterIissuanceStatus(scope.row) }}
@@ -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"
>发放
@@ -173,12 +177,15 @@
状态:
-
{{ form.issuanceStatus ? "已发放" : "未发放" }}
+
{{ filterIissuanceStatus(form) }}
-
+
纸制证书
@@ -196,7 +203,10 @@
-
+
电子证书
@@ -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);
});