From 6d5eb3f44aa8297544074534540b02661dcea6c7 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 13:11:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-procheck-1121' into lsf-dataproduct-1024
---
src/views/fysp/check/components/CompProblemCard.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/fysp/check/components/CompProblemCard.vue b/src/views/fysp/check/components/CompProblemCard.vue
index 35697a3..2b0633f 100644
--- a/src/views/fysp/check/components/CompProblemCard.vue
+++ b/src/views/fysp/check/components/CompProblemCard.vue
@@ -92,8 +92,12 @@
:disabled="!proStatus.deletable"
>鍒犻櫎</el-button
>
- <el-button
- v-if="proStatus.name.indexOf('涓嶉�氳繃') != -1"
+ <!-- 瀹℃牳椹冲洖鎿嶄綔 -->
+ <!-- <el-button
+ v-if="
+ this.problem.extension3 == 'fail' ||
+ this.problem.extension3 == 'change_fail'
+ "
type="danger"
size="small"
@click="revokePro"
@@ -106,12 +110,12 @@
size="small"
@click="rejectPro"
:disabled="!proStatus.checkable"
- >椹冲洖</el-button
- >
+ >瀹℃牳椹冲洖</el-button
+ > -->
<el-button
v-if="
- proStatus.name.indexOf('涓嶉�氳繃') == -1 &&
- proStatus.name.indexOf('閫氳繃') != -1
+ this.problem.extension3 == 'pass' ||
+ this.problem.extension3 == 'change_pass'
"
type="danger"
size="small"
@@ -125,7 +129,7 @@
size="small"
@click="passPro"
:disabled="!proStatus.checkable"
- >閫氳繃</el-button
+ >瀹℃牳閫氳繃</el-button
>
</el-row>
</el-col>
--
Gitblit v1.9.3