From 847d3a331b7511ddc6a13d77c07b13100dc39d1c Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Thu, 9 Feb 2023 18:05:37 +0800
Subject: [PATCH] perf: ticket bug
---
src/views/tickets/BaseTicketList.vue | 4 ++--
.../RequestAssetPerm/Detail/TicketDetail.vue | 13 ++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/views/tickets/BaseTicketList.vue b/src/views/tickets/BaseTicketList.vue
index 9cd23ce8c..478f7ccf2 100644
--- a/src/views/tickets/BaseTicketList.vue
+++ b/src/views/tickets/BaseTicketList.vue
@@ -34,8 +34,8 @@ export default {
url: this.url,
columnsExclude: ['process_map', 'rel_snapshot'],
columnsShow: {
- min: ['title', 'type', 'state', 'actions'],
- default: ['title', 'type', 'state', 'status', 'actions']
+ min: ['title', 'serial_num', 'type', 'state', 'date_created'],
+ default: ['title', 'serial_num', 'type', 'state', 'status', 'date_created']
},
columnsMeta: {
serial_num: {
diff --git a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
index b275a534b..08eb8f208 100644
--- a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
@@ -19,7 +19,7 @@
-
+
@@ -119,14 +119,14 @@ export default {
return [
{
key: this.$tc('perms.Node'),
- value: object.apply_nodes.map(item => item.value).join(', ')
+ value: object.apply_nodes.map(item => item.name).join(', ')
},
{
key: this.$tc('tickets.Asset'),
value: object.apply_assets.map(item => item.name).join(', ')
},
{
- key: this.$tc('assets.Accounts'),
+ key: this.$tc('perms.Account'),
value: object.apply_accounts.join(', ')
},
{
@@ -146,7 +146,6 @@ export default {
assignedCardItems() {
const vm = this
const { object } = this
- const rel_snapshot = object.rel_snapshot
return [
{
key: this.$tc('tickets.PermissionName'),
@@ -162,14 +161,14 @@ export default {
},
{
key: this.$tc('perms.Node'),
- value: rel_snapshot.apply_nodes.map(item => item.value).join(', ')
+ value: object.apply_nodes.map(item => item.name).join(', ')
},
{
key: this.$tc('assets.Asset'),
- value: rel_snapshot.apply_assets.map(item => item.name).join(', ')
+ value: object.apply_assets.map(item => item.name).join(', ')
},
{
- key: this.$tc('perms.Accounts'),
+ key: this.$tc('perms.Account'),
value: (object.apply_accounts || []).join(', ')
},
{