From 00cd04e103893f279d9ae95b323584eee3f75228 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Fri, 31 Jul 2020 11:12:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(ticket):=20=E4=BF=AE=E5=A4=8DMerge=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E9=80=A0=E6=88=90=E7=9A=84=E7=BC=96=E8=AF=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tickets/TicketDetail/TicketDetail.vue     | 37 +++++++++----------
 src/views/tickets/TicketListTable.vue         |  2 +-
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/views/tickets/TicketDetail/TicketDetail.vue b/src/views/tickets/TicketDetail/TicketDetail.vue
index f60ba3847..7588c39aa 100644
--- a/src/views/tickets/TicketDetail/TicketDetail.vue
+++ b/src/views/tickets/TicketDetail/TicketDetail.vue
@@ -32,23 +32,23 @@
                 </div>
               </div>
             </div>
-          </div>
-        </template>
-        <el-form ref="comments" :model="form" label-width="45px" style="padding-top: 20px">
-          <el-form-item :label="$t('tickets.reply')">
-            <el-input v-model="form.comments" :autosize="{ minRows: 4 }" type="textarea" />
-          </el-form-item>
-          <el-form-item style="float: right">
-            <template v-if="hasActionPerm">
-              <el-button :disabled="object.status === 'closed'" type="primary" size="small" @click="handleApprove"><i class="fa fa-check" />{{ $t('tickets.Accept') }}</el-button>
-              <el-button :disabled="object.status === 'closed'" type="danger" size="small" @click="handleReject"><i class="fa fa-ban" />{{ $t('tickets.Reject') }}</el-button>
-            </template>
-            <el-button :disabled="object.status === 'closed'" type="warning" size="small" @click="handleClosed"><i class="fa fa-times" />{{ $t('tickets.Close') }}</el-button>
-            <el-button :disabled="object.status === 'closed'" type="info" size="small" @click="handleComment"><i class="fa fa-pencil" />{{ $t('tickets.Comment') }}</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </DetailCard>
+          </template>
+          <el-form ref="comments" :model="form" label-width="45px" style="padding-top: 20px">
+            <el-form-item :label="$t('tickets.reply')">
+              <el-input v-model="form.comments" :autosize="{ minRows: 4 }" type="textarea" />
+            </el-form-item>
+            <el-form-item style="float: right">
+              <template v-if="hasActionPerm">
+                <el-button :disabled="object.status === 'closed'" type="primary" size="small" @click="handleApprove"><i class="fa fa-check" />{{ $t('tickets.Accept') }}</el-button>
+                <el-button :disabled="object.status === 'closed'" type="danger" size="small" @click="handleReject"><i class="fa fa-ban" />{{ $t('tickets.Reject') }}</el-button>
+              </template>
+              <el-button :disabled="object.status === 'closed'" type="warning" size="small" @click="handleClosed"><i class="fa fa-times" />{{ $t('tickets.Close') }}</el-button>
+              <el-button :disabled="object.status === 'closed'" type="info" size="small" @click="handleComment"><i class="fa fa-pencil" />{{ $t('tickets.Comment') }}</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </DetailCard>
+    </el-col>
   </el-row>
 </template>
 
@@ -71,8 +71,7 @@ export default {
   },
   data() {
     return {
-      
-      : this.object.status === 'open' ? STATUS_MAP[this.object.status] : STATUS_MAP[this.object.action],
+      statusMap: this.object.status === 'open' ? STATUS_MAP[this.object.status] : STATUS_MAP[this.object.action],
       imageUrl: require('@/assets/img/admin.png'),
       form: {
         comments: ''
diff --git a/src/views/tickets/TicketListTable.vue b/src/views/tickets/TicketListTable.vue
index 93f184d53..e5d570dbf 100644
--- a/src/views/tickets/TicketListTable.vue
+++ b/src/views/tickets/TicketListTable.vue
@@ -48,7 +48,7 @@ export default {
           },
           {
             prop: 'type_display',
-            label: this.$t('tickets.type')
+            label: this.$t('tickets.type'),
             width: '110px'
           },
           {