github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-23 12:07:38 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复工单详情问题

Browse Source
This commit is contained in:
Orange
2021-01-13 19:03:22 +08:00
parent 49054e5dc0
commit 86b9fc8f5a
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
View File

@@ -84,7 +84,7 @@ export default {
url: `/api/v1/assets/system-users/?org_id=${(this.object.org_id === '') url: `/api/v1/assets/system-users/?org_id=${(this.object.org_id === '')
? 'DEFAULT' ? 'DEFAULT'
: this.object.org_id : this.object.org_id
}&protocol=${(this.object.meta.apply_type === 'remote_app') }&protocol=${(this.object.meta.apply_category === 'remote_app')
? 'rdp' ? 'rdp'
: this.object.meta.apply_type : this.object.meta.apply_type
}`, }`,
@@ -167,11 +167,11 @@ export default {
return [ return [
{ {
key: this.$t('applications.appName'), key: this.$t('applications.appName'),
value: this.object.meta.approve_applications value: this.object.meta.approve_applications_display
}, },
{ {
key: this.$t('tickets.SystemUser'), key: this.$t('tickets.SystemUser'),
value: this.object.meta.approve_system_users value: this.object.meta.approve_system_users_display
}, },
{ {
key: this.$t('common.dateStart'), key: this.$t('common.dateStart'),

8
src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue
View File

@@ -148,9 +148,9 @@ export default {
}, },
methods: { methods: {
performSubmit(validValues) { performSubmit(validValues) {
console.log(validValues)
const meta = {} const meta = {}
const applications = validValues.apply_application_group const applications = validValues.apply_application_group
const systemUser = validValues.apply_system_user_group
if (applications) { if (applications) {
meta.apply_application_group = applications.split(',') meta.apply_application_group = applications.split(',')
} }
@@ -158,8 +158,10 @@ export default {
delete validValues['apply_application_group'] delete validValues['apply_application_group']
} }
if (validValues.apply_system_user_group) { if (systemUser) {
meta.apply_system_user_group = validValues.apply_system_user_group meta.apply_system_user_group = systemUser.split(',')
}
if (systemUser === '') {
delete validValues['apply_system_user_group'] delete validValues['apply_system_user_group']
} }

4
src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
View File

@@ -164,11 +164,11 @@ export default {
return [ return [
{ {
key: this.$t('assets.Asset'), key: this.$t('assets.Asset'),
value: this.object.meta.approve_assets value: this.object.meta.approve_assets_display
}, },
{ {
key: this.$t('tickets.SystemUser'), key: this.$t('tickets.SystemUser'),
value: this.object.meta.approve_system_users value: this.object.meta.approve_system_users_display
}, },
{ {
key: this.$t('common.dateStart'), key: this.$t('common.dateStart'),

2
src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue
View File

@@ -116,7 +116,7 @@ export default {
} }
if (validValues.apply_system_user_group) { if (validValues.apply_system_user_group) {
meta.apply_system_user_group = validValues.apply_system_user_group meta.apply_system_user_group = validValues.apply_system_user_group.split(',')
delete validValues['apply_system_user_group'] delete validValues['apply_system_user_group']
} }