diff --git a/src/views/tickets/BaseTicketList.vue b/src/views/tickets/BaseTicketList.vue
index 1cf4210ad..b4cfa2153 100644
--- a/src/views/tickets/BaseTicketList.vue
+++ b/src/views/tickets/BaseTicketList.vue
@@ -69,9 +69,12 @@ export default {
}
},
{
- prop: 'type_display',
+ prop: 'type',
label: this.$t('tickets.type'),
- width: '160px'
+ width: '160px',
+ formatter: row => {
+ return row.type.label
+ }
},
{
prop: 'status',
@@ -80,7 +83,7 @@ export default {
width: '90px',
sortable: 'custom',
formatter: row => {
- if (row.status === 'open') {
+ if (row.status.value === 'open') {
return {this.$t('tickets.OpenStatus')}
} else {
return {this.$t('tickets.CloseStatus')}
@@ -102,7 +105,7 @@ export default {
{this.$t('tickets.Pending')}
}
- switch (row.state) {
+ switch (row.state.value) {
case 'approved':
return
{this.$t('tickets.Approved')}
diff --git a/src/views/tickets/CommandConfirm/Detail/TicketDetail.vue b/src/views/tickets/CommandConfirm/Detail/TicketDetail.vue
index 2b65862ee..8c4a8d449 100644
--- a/src/views/tickets/CommandConfirm/Detail/TicketDetail.vue
+++ b/src/views/tickets/CommandConfirm/Detail/TicketDetail.vue
@@ -19,7 +19,7 @@ export default {
},
data() {
return {
- statusMap: this.object.status === 'open' ? STATUS_MAP['pending'] : STATUS_MAP[this.object.state],
+ statusMap: this.object.status.value === 'open' ? STATUS_MAP['pending'] : STATUS_MAP[this.object.state.value],
imageUrl: require('@/assets/img/admin.png'),
form: {
comments: ''
diff --git a/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue b/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue
index 9661ea584..32d90f47e 100644
--- a/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue
+++ b/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue
@@ -19,7 +19,7 @@ export default {
},
data() {
return {
- statusMap: this.object.status === 'open' ? STATUS_MAP['pending'] : STATUS_MAP[this.object.state],
+ statusMap: this.object.status.value === 'open' ? STATUS_MAP['pending'] : STATUS_MAP[this.object.state.value],
imageUrl: require('@/assets/img/admin.png'),
form: {
comments: ''
diff --git a/src/views/tickets/LoginConfirm/Detail/TicketDetail.vue b/src/views/tickets/LoginConfirm/Detail/TicketDetail.vue
index f06bc1564..6d1730827 100644
--- a/src/views/tickets/LoginConfirm/Detail/TicketDetail.vue
+++ b/src/views/tickets/LoginConfirm/Detail/TicketDetail.vue
@@ -19,7 +19,7 @@ export default {
},
data() {
return {
- statusMap: this.object.status === 'open' ? STATUS_MAP['pending'] : STATUS_MAP[this.object.state],
+ statusMap: this.object.status.value === 'open' ? STATUS_MAP['pending'] : STATUS_MAP[this.object.state.value],
imageUrl: require('@/assets/img/admin.png'),
form: {
comments: ''
diff --git a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
index fe72dcbf7..b97cf04a7 100644
--- a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
@@ -20,7 +20,7 @@
-
+
-
+
+
+
@@ -46,12 +54,13 @@ import { formatTime, getDateTimeStamp } from '@/utils/index'
import { toSafeLocalDateStr } from '@/utils/common'
import { STATUS_MAP } from '../../const'
import GenericTicketDetail from '@/views/tickets/components/GenericTicketDetail'
+import AccountFormatter from '@/views/perms/AssetPermission/components/AccountFormatter'
import Select2 from '@/components/FormFields/Select2'
import IBox from '@/components/IBox'
export default {
name: '',
- components: { GenericTicketDetail, IBox, Select2 },
+ components: { GenericTicketDetail, IBox, Select2, AccountFormatter },
props: {
object: {
type: Object,
@@ -60,7 +69,7 @@ export default {
},
data() {
return {
- statusMap: this.object.status === 'open' ? STATUS_MAP['pending'] : STATUS_MAP[this.object.state],
+ statusMap: this.object.status.value === 'open' ? STATUS_MAP['pending'] : STATUS_MAP[this.object.state.value],
requestForm: {
nodes: this.object.apply_nodes,
assets: this.object.apply_assets,
diff --git a/src/views/tickets/TicketDetail/TicketDetail.vue b/src/views/tickets/TicketDetail/TicketDetail.vue
index c06987b6b..6e7a32053 100644
--- a/src/views/tickets/TicketDetail/TicketDetail.vue
+++ b/src/views/tickets/TicketDetail/TicketDetail.vue
@@ -20,7 +20,7 @@ export default {
},
data() {
return {
- statusMap: this.object.status === 'open' ? STATUS_MAP['notified'] : STATUS_MAP[this.object.state],
+ statusMap: this.object.status.value === 'open' ? STATUS_MAP['notified'] : STATUS_MAP[this.object.state.value],
imageUrl: require('@/assets/img/admin.png'),
form: {
comments: ''
@@ -38,7 +38,7 @@ export default {
},
{
key: this.$t('tickets.type'),
- value: object.type_display
+ value: object.type.lable
},
{
key: this.$t('tickets.status'),