Commit 11f99742 authored by 徐一鸣's avatar 徐一鸣

云资源管理优化

parent fddf2745
...@@ -289,6 +289,7 @@ export default { ...@@ -289,6 +289,7 @@ export default {
label: "用户申请时间", label: "用户申请时间",
prop: "apply_time", prop: "apply_time",
align: "center", align: "center",
width: 180,
}, },
{ {
label: "审批状态", label: "审批状态",
......
...@@ -557,6 +557,8 @@ export default { ...@@ -557,6 +557,8 @@ export default {
label: "资源调整结果", label: "资源调整结果",
align: "center", align: "center",
getText(item) { getText(item) {
if (item.apply_type === 0) return "-";
return ["未通过", "待审批", "通过"][ return ["未通过", "待审批", "通过"][
(item.approve_update_state || 0) + 1 (item.approve_update_state || 0) + 1
]; ];
...@@ -903,6 +905,8 @@ export default { ...@@ -903,6 +905,8 @@ export default {
label: "资源调整结果", label: "资源调整结果",
align: "center", align: "center",
getText(item) { getText(item) {
if (item.apply_type === 0) return "-";
return ["未通过", "待审批", "通过"][ return ["未通过", "待审批", "通过"][
(item.approve_update_state || 0) + 1 (item.approve_update_state || 0) + 1
]; ];
...@@ -923,7 +927,7 @@ export default { ...@@ -923,7 +927,7 @@ export default {
{ {
getLabel(item) { getLabel(item) {
if (item.approve_state !== 1) { if (item.approve_state !== 1) {
return ""; return "-";
} }
return (item.approve_state === 1 && item.use_uid === "") ? "分配" : "已分配"; return (item.approve_state === 1 && item.use_uid === "") ? "分配" : "已分配";
......
...@@ -506,6 +506,7 @@ export default { ...@@ -506,6 +506,7 @@ export default {
label: "用户申请时间", label: "用户申请时间",
prop: "apply_time", prop: "apply_time",
align: "center", align: "center",
width: 180,
}, },
{ {
label: "操作", label: "操作",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment