From 11f99742f153ac630f0c0953680e4aa917bfa37d Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 16 Jul 2020 16:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/approveWorkspace.vue          | 1 +
 src/pages/workbench/fwgl/fwglList.vue                  | 6 +++++-
 src/pages/workbench/fwgl/organizationCloudResource.vue | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/workbench/fwgl/approveWorkspace.vue b/src/pages/workbench/fwgl/approveWorkspace.vue
index 98e26d5..7da2f49 100644
--- a/src/pages/workbench/fwgl/approveWorkspace.vue
+++ b/src/pages/workbench/fwgl/approveWorkspace.vue
@@ -289,6 +289,7 @@ export default {
         label: "用户申请时间",
         prop: "apply_time",
         align: "center",
+        width: 180,
       },
       {
         label: "审批状态",
diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 1771755..7d54766 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -557,6 +557,8 @@ export default {
             label: "资源调整结果",
             align: "center",
             getText(item) {
+              if (item.apply_type === 0) return "-";
+
               return ["未通过", "待审批", "通过"][
                 (item.approve_update_state || 0) + 1
               ];
@@ -903,6 +905,8 @@ export default {
             label: "资源调整结果",
             align: "center",
             getText(item) {
+              if (item.apply_type === 0) return "-";
+
               return ["未通过", "待审批", "通过"][
                 (item.approve_update_state || 0) + 1
               ];
@@ -923,7 +927,7 @@ export default {
               {
                 getLabel(item) {
                   if (item.approve_state !== 1) {
-                    return "";
+                    return "-";
                   }
 
                   return (item.approve_state === 1 && item.use_uid === "") ? "分配" : "已分配";
diff --git a/src/pages/workbench/fwgl/organizationCloudResource.vue b/src/pages/workbench/fwgl/organizationCloudResource.vue
index e1c4d26..d276329 100644
--- a/src/pages/workbench/fwgl/organizationCloudResource.vue
+++ b/src/pages/workbench/fwgl/organizationCloudResource.vue
@@ -506,6 +506,7 @@ export default {
         label: "用户申请时间",
         prop: "apply_time",
         align: "center",
+        width: 180,
       },
       {
         label: "操作",
-- 
2.26.0