From fd012023dbd26ab1dcf627d8c59c28ed440ca93b Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Wed, 15 Jul 2020 17:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86fi?=
 =?UTF-8?q?xed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/approveWorkspace.vue | 7 ++++++-
 src/pages/workbench/fwgl/fwglList.vue         | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/workbench/fwgl/approveWorkspace.vue b/src/pages/workbench/fwgl/approveWorkspace.vue
index 04fb2c9..98e26d5 100644
--- a/src/pages/workbench/fwgl/approveWorkspace.vue
+++ b/src/pages/workbench/fwgl/approveWorkspace.vue
@@ -109,7 +109,12 @@ export default {
       let action = (type) => {
         this.$http
           .put("/apaas/service/v3/resource/apply/approve", null, {
-            params: {},
+            params: {
+              apply_id: item.apply_id,
+              apply_type: item.apply_type,
+              cloud_id: item.id,
+              apply_state: type,
+            },
           })
           .then(({ data }) => {
             if (data.success == 1) {
diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 12fa590..0ea9176 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -921,11 +921,11 @@ export default {
             actionList: [
               {
                 getLabel(item) {
-                  return item.use_uid ? "已分配" : "分配";
+                  return item.use_uid !== "" ? "已分配" : "分配";
                 },
                 callback: this.cloudAllot,
                 disabledRule(item) {
-                  return item.use_uid;
+                  return item.use_uid !== "";
                 },
               },
             ],
-- 
2.26.0