From 5de8371d1333b7ae53c0c96c199ba974a0c54d76 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Wed, 29 Jul 2020 18:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E8=B5=84=E6=BA=90=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/fwglList.vue         | 20 ++++---------------
 .../fwgl/organizationCloudResource.vue        | 10 ++--------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 5b7d3eb..92fc240 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -502,10 +502,7 @@ export default {
             align: "center",
             type: "image-tooltip",
             getImage(item) {
-              if (
-                (item.apply_type === 0 && item.approve_state === -1) ||
-                (item.apply_type === 1 && item.approve_update_state === -1)
-              ) {
+              if (item.apply_type === 0 && item.approve_state === -1) {
                 return require("@/assets/imgs/ic_cancel.png");
               }
 
@@ -514,10 +511,7 @@ export default {
                 : require("@/assets/imgs/ic_failed.png");
             },
             getTooltip(item) {
-              if (
-                (item.apply_type === 0 && item.approve_state === -1) ||
-                (item.apply_type === 1 && item.approve_update_state === -1)
-              ) {
+              if (item.apply_type === 0 && item.approve_state === -1) {
                 return "审批未通过";
               }
 
@@ -873,10 +867,7 @@ export default {
             align: "center",
             type: "image-tooltip",
             getImage(item) {
-              if (
-                (item.apply_type === 0 && item.approve_state === -1) ||
-                (item.apply_type === 1 && item.approve_update_state === -1)
-              ) {
+              if (item.apply_type === 0 && item.approve_state === -1) {
                 return require("@/assets/imgs/ic_cancel.png");
               }
 
@@ -885,10 +876,7 @@ export default {
                 : require("@/assets/imgs/ic_failed.png");
             },
             getTooltip(item) {
-              if (
-                (item.apply_type === 0 && item.approve_state === -1) ||
-                (item.apply_type === 1 && item.approve_update_state === -1)
-              ) {
+              if (item.apply_type === 0 && item.approve_state === -1) {
                 return "审批未通过";
               }
 
diff --git a/src/pages/workbench/fwgl/organizationCloudResource.vue b/src/pages/workbench/fwgl/organizationCloudResource.vue
index c1d584a..14115e6 100644
--- a/src/pages/workbench/fwgl/organizationCloudResource.vue
+++ b/src/pages/workbench/fwgl/organizationCloudResource.vue
@@ -443,10 +443,7 @@ export default {
         align: "center",
         type: "image-tooltip",
         getImage(item) {
-          if (
-            (item.apply_type === 0 && item.approve_state === -1) ||
-            (item.apply_type === 1 && item.approve_update_state === -1)
-          ) {
+          if (item.apply_type === 0 && item.approve_state === -1) {
             return require("@/assets/imgs/ic_cancel.png");
           }
 
@@ -455,10 +452,7 @@ export default {
             : require("@/assets/imgs/ic_failed.png");
         },
         getTooltip(item) {
-          if (
-            (item.apply_type === 0 && item.approve_state === -1) ||
-            (item.apply_type === 1 && item.approve_update_state === -1)
-          ) {
+          if (item.apply_type === 0 && item.approve_state === -1) {
             return "审批未通过";
           }
 
-- 
2.26.0