From 5391b149b035a7f3ec06155bc1e0109d0af5d123 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Wed, 29 Jul 2020 11:28:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=91=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=8A=B6=E6=80=81fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/imgs/ic_cancel.png                 | Bin 0 -> 1471 bytes
 .../fwgl/organizationCloudResource.vue        |  20 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 src/assets/imgs/ic_cancel.png

diff --git a/src/assets/imgs/ic_cancel.png b/src/assets/imgs/ic_cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad6ffd50fe121a487f05e797cb7f10fa8558bafb
GIT binary patch
literal 1471
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNY@uLosb^?v
zX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*8A=6l&%Q8sV9F
zDf#8anqWP?zE+-j#U+V($*G<$wn{)#^fEJ3tQ;*|oei8Ejhsx~EDQ}@9UTqK++0oE
zER8H3Eu0K29btN1@{>z*Q}aq-dQ%X3jdAJ)C5PMspv^9+MVV!(DQ-pixe8!!TV>*Q
zivdpapn6kqyTuTvUVWfr^g)q}6xlE#U<v{;;Yk<BfhYddJYb410w(S6dnZ>jFfi$R
zx;TbZ+?o?&>n{>0Vr$JL&1L7L5a!W#^$3&W1&xbLQw6lP7~aTGygDghZL2-g(j#wk
zHZW?hy`Uk{ET9~prNqj$VxvKziOPm<wTg4qpP#KwQ9L$#&Ry&8kN5n3cgMPO?#plu
zCGigJi~kp%_%^Y^t4GMcOkIWNV!$=K)JyI^tJ^Kw|E5lQk$x{|O8cZ6Q$5Q+d{+!?
zTx(;nouej#^;&&Yy|3v6uExj58$K=Jt2#MHZj$Y1QN~p%Z7U9a;`)%mbRt)Ly=o*|
z$$WOc_Nq&oZ;u2i7(L4K`IJzTFXUNw`<O<UrJ1?nBEQ4CrZOK>&nYMq*kQ>q<=1TK
zShJrhU3bqYu38c7viI1=57*|YMMg6FZDBC~rQ4_gl#NOKy#B7?-d7imri!>7Ygm8(
z&r7eI?6eQk+1aU+pU<e6t^f6Ue)j6sjO%7v-CMn=D*4a9!|~3IUILvQEH7JCCVjP7
z9_Lc|XFUu19<Q3t=Swzh+%;?Uk<e#V&z7vZlsTW-IAT&rN7KVCe*^vVc%wb0``W4Z
z^7_pdx@fz2o5{_@$t^rHV!zlH+D_KZ`Otjx)|(EuFV{>a=%2CK(fCJv=Z&|^qNNMn
zMBfTrKfB}f#lsCLFYmE@suWu5G2epe@s{YC&Km~=*}lZG`fX?2I%jf&VrtHZgHhLN
zF8$Iu*>+O$)V|Bj^{lrZ`TUx4bMB`U>vKV(U8j3?w*KxB$@w3DUt>}C4w<(L*}`^z
m?yT^;qb}#J+xfJgftf+uV(TsI`cnr%MXIN(pUXO@geCytMk#;*

literal 0
HcmV?d00001

diff --git a/src/pages/workbench/fwgl/organizationCloudResource.vue b/src/pages/workbench/fwgl/organizationCloudResource.vue
index 7cd8bf9..c1d584a 100644
--- a/src/pages/workbench/fwgl/organizationCloudResource.vue
+++ b/src/pages/workbench/fwgl/organizationCloudResource.vue
@@ -443,11 +443,25 @@ 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)
+          ) {
+            return require("@/assets/imgs/ic_cancel.png");
+          }
+
           return item.state == 1
             ? require("@/assets/imgs/ic_true.png")
             : 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)
+          ) {
+            return "审批未通过";
+          }
+
           return item.state == 1 ? "运行中" : "该工作区域已被禁用";
         },
       },
@@ -522,6 +536,12 @@ export default {
               return item.state == 1 ? "禁用" : "启用";
             },
             callback: this.stateAction,
+            disabledRule(item) {
+              return (
+                (item.apply_type === 0 && item.approve_state === -1) ||
+                (item.apply_type === 1 && item.approve_update_state === -1)
+              );
+            },
           },
           {
             label: "移除",
-- 
2.26.0