From d7feb3dac412ef8cfd39e3dbceb269c7483eb508 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 12 May 2020 19:42:14 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=88=9D=E6=AD=A5=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86=E8=AF=A6=E6=83=85=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailCard/index.vue           |   1 +
 src/i18n/langs/cn/tickets.json                |   4 +-
 src/views/tickets/TicketDetail.vue            |  17 --
 .../tickets/TicketDetail/TicketDetail.vue     | 178 ++++++++++++++++++
 src/views/tickets/TicketDetail/index.vue      |  36 ++++
 src/views/tickets/index.js                    |   5 +-
 6 files changed, 221 insertions(+), 20 deletions(-)
 delete mode 100644 src/views/tickets/TicketDetail.vue
 create mode 100644 src/views/tickets/TicketDetail/TicketDetail.vue
 create mode 100644 src/views/tickets/TicketDetail/index.vue

diff --git a/src/components/DetailCard/index.vue b/src/components/DetailCard/index.vue
index f139abc41..4800c9e07 100644
--- a/src/components/DetailCard/index.vue
+++ b/src/components/DetailCard/index.vue
@@ -7,6 +7,7 @@
           <ItemValue :value="item.value" :item="item" :callback="item.callback" />
         </div></el-col>
       </el-row>
+      <slot />
     </div>
   </IBox>
 </template>
diff --git a/src/i18n/langs/cn/tickets.json b/src/i18n/langs/cn/tickets.json
index d6f9843c2..661feb46c 100644
--- a/src/i18n/langs/cn/tickets.json
+++ b/src/i18n/langs/cn/tickets.json
@@ -5,5 +5,7 @@
   "status": "状态",
   "date": "日期",
   "MyTickets": "我的工单",
-  "AssignedMe": "待处理"
+  "AssignedMe": "待处理",
+  "Assignees": "待处理人",
+  "Assignee": "处理人"
 }
diff --git a/src/views/tickets/TicketDetail.vue b/src/views/tickets/TicketDetail.vue
deleted file mode 100644
index 07e48c7f6..000000000
--- a/src/views/tickets/TicketDetail.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <GenericDetailPage />
-</template>
-
-<script>
-import { GenericDetailPage } from '@/layout/components'
-export default {
-  name: 'TicketDetail',
-  components: {
-    GenericDetailPage
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/tickets/TicketDetail/TicketDetail.vue b/src/views/tickets/TicketDetail/TicketDetail.vue
new file mode 100644
index 000000000..ab657bfae
--- /dev/null
+++ b/src/views/tickets/TicketDetail/TicketDetail.vue
@@ -0,0 +1,178 @@
+<template>
+  <el-row>
+    <DetailCard :title="cardTitle" :items="detailCardItems">
+      <div class="feed-activity-list">
+        <div class="feed-element">
+          <a href="#" class="pull-left">
+            <el-avatar :src="imageUrl" class="header-avatar" />
+          </a>
+          <div class="media-body ">
+            <strong>{{ object.user_display }}</strong> <small class="text-muted"> {{ object.date_created }}</small>
+            <br>
+            <small class="text-muted">{{ object.date_created }} </small>
+            <div style="padding-top: 10px">
+              <span v-html="object.body" />
+            </div>
+          </div>
+        </div>
+        <template v-if="object.status === 'closed'">
+          <div v-for="item in comments" :key="item.user_display + item.body">
+            <div class="feed-element">
+              <a href="#" class="pull-left">
+                <el-avatar :src="imageUrl" class="header-avatar" />
+              </a>
+              <div class="media-body ">
+                <strong>{{ item.user_display }}</strong> <small class="text-muted">{{ item.date_created }}</small>
+                <br>
+                <small class="text-muted">{{ item.date_created }}</small>
+                <div style="padding-top: 10px">
+                  {{ item.body }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </template>
+        <el-form ref="comments" :model="form" label-width="80px" style="padding-top: 20px">
+          <el-form-item label="审批备注">
+            <el-input v-model="form.comments" type="textarea" :autosize="{ minRows: 4 }" />
+          </el-form-item>
+          <el-form-item style="float: right">
+            <el-button type="primary" size="small" :disabled="object.status === 'closed'" @click="handleApprove"><i class="fa fa-check" />同意</el-button>
+            <el-button type="warning" size="small" :disabled="object.status === 'closed'" @click="handleReject"><i class="fa fa-ban" />拒绝</el-button>
+            <el-button type="danger" size="small" :disabled="object.status === 'closed'" @click="handleClosed"><i class="fa fa-times" />关闭</el-button>
+            <el-button type="info" size="small" :disabled="object.status === 'closed'" @click="handleComment"><i class="fa fa-pencil" />备注</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </DetailCard>
+  </el-row>
+</template>
+
+<script>
+import { DetailCard } from '@/components'
+
+export default {
+  name: 'TicketDetail',
+  components: {
+    DetailCard
+  },
+  props: {
+    object: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      title: '登录复核a-2(a-2)',
+      imageUrl: require('@/assets/img/admin.png'),
+      form: {
+        comments: ''
+      },
+      comments: []
+    }
+  },
+  computed: {
+    cardTitle() {
+      return this.object.title
+    },
+    detailCardItems() {
+      return [
+        {
+          key: this.$t('tickets.user'),
+          value: this.object.user_display
+        },
+        {
+          key: this.$t('tickets.type'),
+          value: this.object.type_display
+        },
+        {
+          key: this.$t('tickets.status'),
+          value: this.object.status
+        },
+        {
+          key: this.$t('tickets.Assignees'),
+          value: this.object.assignees_display
+        },
+        {
+          key: this.$t('tickets.Assignee'),
+          value: '需要处理'
+        },
+        {
+          key: this.$t('common.DateCreated'),
+          value: this.object.date_created
+        }
+      ]
+    }
+  },
+  mounted() {
+    const url = `/api/v1/tickets/tickets/${this.object.id}/comments/`
+    this.$axios.get(url).then(res => {
+      this.comments = res
+    }).catch(err => this.$message.error(this.$t(err)))
+  },
+  methods: {
+    handleApprove() {
+      console.log('点击同意=====================')
+    },
+    handleReject() {
+      console.log('点击拒绝=====================')
+    },
+    handleClosed() {
+      console.log('点击关闭=====================')
+    },
+    handleComment() {
+      console.log('点击备注=====================')
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .feed-activity-list {
+    padding-top: 20px;
+  }
+  .feed-activity-list .feed-element {
+    border-bottom: 1px solid #e7eaec;
+  }
+  .feed-element:first-child {
+    margin-top: 0;
+  }
+  .feed-element {
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+  .feed-element,
+  .feed-element .media {
+    margin-top: 15px;
+  }
+  .feed-element,
+  .media-body {
+    overflow: hidden;
+  }
+  .feed-element > .pull-left {
+    margin-right: 10px;
+  }
+  .feed-element .header-avatar {
+    width: 38px;
+    height: 38px;
+  }
+  .feed-element .well {
+    border: 1px solid #e7eaec;
+    box-shadow: none;
+    margin-top: 10px;
+    margin-bottom: 5px;
+    padding: 10px 20px;
+    font-size: 11px;
+    line-height: 16px;
+  }
+  .feed-element .actions {
+    margin-top: 10px;
+  }
+  .feed-element .photos {
+    margin: 10px 0;
+  }
+  .text-muted {
+    color: #888888;
+  }
+</style>
diff --git a/src/views/tickets/TicketDetail/index.vue b/src/views/tickets/TicketDetail/index.vue
new file mode 100644
index 000000000..eb5dab932
--- /dev/null
+++ b/src/views/tickets/TicketDetail/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <GenericDetailPage :object.sync="ticket" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners">
+    <component :is="config.activeMenu" :object="ticket" />
+  </GenericDetailPage>
+</template>
+
+<script>
+import { GenericDetailPage, TabPage } from '@/layout/components'
+import TicketDetail from './TicketDetail'
+
+export default {
+  components: {
+    GenericDetailPage,
+    TicketDetail,
+    TabPage
+  },
+  data() {
+    return {
+      ticket: {},
+      config: {
+        activeMenu: 'TicketDetail',
+        submenu: [
+          {
+            title: '工单详情',
+            name: 'TicketDetail'
+          }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/tickets/index.js b/src/views/tickets/index.js
index a86c1c368..0de4c85b6 100644
--- a/src/views/tickets/index.js
+++ b/src/views/tickets/index.js
@@ -8,7 +8,8 @@ export default [
   {
     path: 'tickets/:id',
     name: 'TicketDetail',
-    component: () => import('@/views/tickets/TicketDetail'),
-    meta: { title: 'TicketDetail', icon: 'check-square-o' }
+    component: () => import('@/views/tickets/TicketDetail/index'),
+    meta: { title: 'TicketDetail' },
+    hidden: true
   }
 ]