diff --git a/src/pages/workbench/fwgl/approveWorkspace.vue b/src/pages/workbench/fwgl/approveWorkspace.vue index 98e26d54a1528ad542dcc5509e9be5c8ed49f871..7da2f493fa764b3288db645fee5b18caa9579a35 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 1771755e83e3547f26914e6ae8829e9eb43c54f7..7d54766b2b337e11245fdc929cd5d6846b09d0e9 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 e1c4d26ae9dc75ad76b650825afdc0d1f24799fa..d2763294315e5a38cbd75b58c79be09c07458e51 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: "操作",