From 86b9fc8f5a3ceba7c0e785efe2d08fe6e99cc6c5 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 13 Jan 2021 19:03:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RequestApplicationPerm/Detail/TicketDetail.vue        | 6 +++---
 .../RequestApplicationPermTicketCreateUpdate.vue          | 8 +++++---
 .../tickets/RequestAssetPerm/Detail/TicketDetail.vue      | 4 ++--
 .../RequestAssetPermTicketCreateUpdate.vue                | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
index 5d9a79a8e..68c8a77e5 100644
--- a/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
@@ -84,7 +84,7 @@ export default {
           url: `/api/v1/assets/system-users/?org_id=${(this.object.org_id === '')
             ? 'DEFAULT'
             : this.object.org_id
-          }&protocol=${(this.object.meta.apply_type === 'remote_app')
+          }&protocol=${(this.object.meta.apply_category === 'remote_app')
             ? 'rdp'
             : this.object.meta.apply_type
           }`,
@@ -167,11 +167,11 @@ export default {
       return [
         {
           key: this.$t('applications.appName'),
-          value: this.object.meta.approve_applications
+          value: this.object.meta.approve_applications_display
         },
         {
           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'),
diff --git a/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue b/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue
index 1984c250a..4a6fc8ef8 100644
--- a/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue
+++ b/src/views/tickets/RequestApplicationPerm/RequestApplicationPermTicketCreateUpdate.vue
@@ -148,9 +148,9 @@ export default {
   },
   methods: {
     performSubmit(validValues) {
-      console.log(validValues)
       const meta = {}
       const applications = validValues.apply_application_group
+      const systemUser = validValues.apply_system_user_group
       if (applications) {
         meta.apply_application_group = applications.split(',')
       }
@@ -158,8 +158,10 @@ export default {
         delete validValues['apply_application_group']
       }
 
-      if (validValues.apply_system_user_group) {
-        meta.apply_system_user_group = validValues.apply_system_user_group
+      if (systemUser) {
+        meta.apply_system_user_group = systemUser.split(',')
+      }
+      if (systemUser === '') {
         delete validValues['apply_system_user_group']
       }
 
diff --git a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
index ba101a932..dab303b82 100644
--- a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
@@ -164,11 +164,11 @@ export default {
       return [
         {
           key: this.$t('assets.Asset'),
-          value: this.object.meta.approve_assets
+          value: this.object.meta.approve_assets_display
         },
         {
           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'),
diff --git a/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue b/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue
index f269fdd87..fca69658a 100644
--- a/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue
+++ b/src/views/tickets/RequestAssetPerm/RequestAssetPermTicketCreateUpdate.vue
@@ -116,7 +116,7 @@ export default {
       }
 
       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']
       }