From bac7cef23cffa41458de63e87ff726bbd1ffdffe Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 13 Jan 2021 16:49:38 +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

---
 src/i18n/langs/cn.json                        |  2 ++
 src/i18n/langs/en.json                        |  2 ++
 .../Detail/TicketDetail.vue                   | 25 +++++++++++++++++++
 .../RequestAssetPerm/Detail/TicketDetail.vue  | 25 +++++++++++++++++++
 .../components/GenericTicketDetail.vue        |  6 +++++
 5 files changed, 60 insertions(+)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 25c25088d..07af3361e 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -813,6 +813,8 @@
     "user": "用户",
     "Status": "状态",
     "Open": "待处理",
+    "OrgName":"组织名称",
+    "AssignedInfo":"审批信息",
     "OpenTicket": "创建工单",
     "HandleTicket": "处理工单",
     "FinishedTicket": "完成工单",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index e68c6834c..c7a8b00f0 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -784,6 +784,7 @@
     "AssignedMe": "Assigned me",
     "Assignee": "Assignee",
     "RequestPerm":"Request Perm",
+    "AssignedInfo":"Assigned Info",
     "OpenTicket": "Open Ticket",
     "HandleTicket": "Handle Ticket",
     "FinishedTicket": "Finished Ticket",
@@ -804,6 +805,7 @@
     "user": "User",
     "Status": "Status",
     "Open": "Open",
+    "OrgName":"Org name",
     "IP": "IP",
     "Hostname": "Hostname",
     "Asset": "Asset",
diff --git a/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
index 8f4e3ad36..5d9a79a8e 100644
--- a/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue
@@ -3,6 +3,7 @@
     :object="object"
     :detail-card-items="detailCardItems"
     :special-card-items="specialCardItems"
+    :assigned-card-items="assignedCardItems"
     :approve="handleApprove"
     :close="handleClose"
     :reject="handleReject"
@@ -120,6 +121,10 @@ export default {
           key: this.$t('tickets.Assignee'),
           value: (this.object.processor_display === 'No') ? '' : this.object.processor_display
         },
+        {
+          key: this.$t('tickets.OrgName'),
+          value: this.object.org_name
+        },
         {
           key: this.$t('common.dateCreated'),
           value: toSafeLocalDateStr(this.object.date_created)
@@ -158,6 +163,26 @@ export default {
         }
       ]
     },
+    assignedCardItems() {
+      return [
+        {
+          key: this.$t('applications.appName'),
+          value: this.object.meta.approve_applications
+        },
+        {
+          key: this.$t('tickets.SystemUser'),
+          value: this.object.meta.approve_system_users
+        },
+        {
+          key: this.$t('common.dateStart'),
+          value: toSafeLocalDateStr(this.object.meta.approve_date_start)
+        },
+        {
+          key: this.$t('common.dateExpired'),
+          value: toSafeLocalDateStr(this.object.meta.approve_date_expired)
+        }
+      ]
+    },
     hasActionPerm() {
       return this.object.assignees.indexOf(this.$store.state.users.profile.id) !== -1
     }
diff --git a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
index af56aeae7..ba101a932 100644
--- a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
+++ b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
@@ -3,6 +3,7 @@
     :object="object"
     :detail-card-items="detailCardItems"
     :special-card-items="specialCardItems"
+    :assigned-card-items="assignedCardItems"
     :approve="handleApprove"
     :close="handleClose"
     :reject="handleReject"
@@ -117,6 +118,10 @@ export default {
           key: this.$t('tickets.Assignee'),
           value: (this.object.processor_display === 'No') ? '' : this.object.processor_display
         },
+        {
+          key: this.$t('tickets.OrgName'),
+          value: this.object.org_name
+        },
         {
           key: this.$t('common.dateCreated'),
           value: toSafeLocalDateStr(this.object.date_created)
@@ -155,6 +160,26 @@ export default {
         }
       ]
     },
+    assignedCardItems() {
+      return [
+        {
+          key: this.$t('assets.Asset'),
+          value: this.object.meta.approve_assets
+        },
+        {
+          key: this.$t('tickets.SystemUser'),
+          value: this.object.meta.approve_system_users
+        },
+        {
+          key: this.$t('common.dateStart'),
+          value: toSafeLocalDateStr(this.object.meta.approve_date_start)
+        },
+        {
+          key: this.$t('common.dateExpired'),
+          value: toSafeLocalDateStr(this.object.meta.approve_date_expired)
+        }
+      ]
+    },
     hasActionPerm() {
       return this.object.assignees.indexOf(this.$store.state.users.profile.id) !== -1
     }
diff --git a/src/views/tickets/components/GenericTicketDetail.vue b/src/views/tickets/components/GenericTicketDetail.vue
index 2fa6804e7..376ce7059 100644
--- a/src/views/tickets/components/GenericTicketDetail.vue
+++ b/src/views/tickets/components/GenericTicketDetail.vue
@@ -3,6 +3,7 @@
     <el-col :span="17">
       <Details :detail-card-items="detailCardItems" :title="$t('common.BasicInfo')" />
       <Details :detail-card-items="specialCardItems" :title="$t('common.ApplyInfo')" />
+      <Details v-if="object.action === 'approve'" :detail-card-items="assignedCardItems" :title="$t('tickets.AssignedInfo')" />
       <slot id="MoreDetails" />
       <Comments :object="object" v-bind="$attrs" />
     </el-col>
@@ -31,7 +32,12 @@ export default {
     detailCardItems: {
       type: Array,
       default: () => ([])
+    },
+    assignedCardItems: {
+      type: Array,
+      default: () => ([])
     }
+
   },
   data() {
     return {}