From 3af6811c72f6d465428e10d1bd5a9401a470ab09 Mon Sep 17 00:00:00 2001
From: zyna <chenjidemenglin20@126.com>
Date: Sat, 6 Jan 2024 21:04:58 +0800
Subject: [PATCH] =?UTF-8?q?crm=E8=81=94=E7=B3=BB=E4=BA=BA=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/contact/index.ts                  |   5 +
 src/views/crm/contact/ContactForm.vue         |   3 +-
 .../crm/contact/detail/ContactDetailsInfo.vue | 131 +++++++++---------
 src/views/crm/contact/detail/index.vue        |  21 ++-
 4 files changed, 90 insertions(+), 70 deletions(-)

diff --git a/src/api/crm/contact/index.ts b/src/api/crm/contact/index.ts
index d0da7231..44eebe80 100644
--- a/src/api/crm/contact/index.ts
+++ b/src/api/crm/contact/index.ts
@@ -80,3 +80,8 @@ export const createContactBusinessList = async (data: ContactBusinessReqVO) => {
 export const deleteContactBusinessList = async (data: ContactBusinessReqVO) => {
   return await request.delete({ url: `/crm/contact/delete-business-list`, data })
 }
+
+// 查询联系人操作日志
+export const getOperateLogPage = async (params: any) => {
+  return await request.get({ url: '/crm/contact/operate-log-page', params })
+}
\ No newline at end of file
diff --git a/src/views/crm/contact/ContactForm.vue b/src/views/crm/contact/ContactForm.vue
index e6fcb0da..5ff5e747 100644
--- a/src/views/crm/contact/ContactForm.vue
+++ b/src/views/crm/contact/ContactForm.vue
@@ -136,7 +136,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <!-- TODO @zyna：解决下 ide 报错 -->
       <el-row>
         <el-col :span="12">
           <el-form-item label="直属上级" prop="parentId">
@@ -233,7 +232,7 @@ const ownerUserList = ref<any[]>([])
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 // TODO 芋艿：统一的客户选择面板
 const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
-const allContactList = ref([]) // 所有联系人列表
+const allContactList = ref<ContactApi.ContactVO[]>([]) // 所有联系人列表
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
diff --git a/src/views/crm/contact/detail/ContactDetailsInfo.vue b/src/views/crm/contact/detail/ContactDetailsInfo.vue
index 77d42cee..238a1883 100644
--- a/src/views/crm/contact/detail/ContactDetailsInfo.vue
+++ b/src/views/crm/contact/detail/ContactDetailsInfo.vue
@@ -1,69 +1,70 @@
 <template>
-  <!-- TODO @zyna：少了一个外边框 -->
-  <el-collapse v-model="activeNames">
-    <el-collapse-item name="basicInfo">
-      <template #title>
-        <span class="text-base font-bold">基本信息</span>
-      </template>
-      <el-descriptions :column="4">
-        <el-descriptions-item label="姓名">
-          {{ contact.name }}
-        </el-descriptions-item>
-        <el-descriptions-item label="客户">
-          {{ contact.customerName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="手机">
-          {{ contact.mobile }}
-        </el-descriptions-item>
-        <el-descriptions-item label="座机">
-          {{ contact.telephone }}
-        </el-descriptions-item>
-        <el-descriptions-item label="邮箱">
-          {{ contact.email }}
-        </el-descriptions-item>
-        <el-descriptions-item label="QQ">
-          {{ contact.qq }}
-        </el-descriptions-item>
-        <el-descriptions-item label="微信">
-          {{ contact.wechat }}
-        </el-descriptions-item>
-        <el-descriptions-item label="下次联系时间">
-          {{ contact.nextTime ? formatDate(contact.nextTime) : '空' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="所在地">
-          {{ contact.areaName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="详细地址">
-          {{ contact.address }}
-        </el-descriptions-item>
-        <el-descriptions-item label="性别">
-          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="contact.sex" />
-        </el-descriptions-item>
-        <el-descriptions-item label="备注">
-          {{ contact.remark }}
-        </el-descriptions-item>
-      </el-descriptions>
-    </el-collapse-item>
-    <el-collapse-item name="systemInfo">
-      <template #title>
-        <span class="text-base font-bold">系统信息</span>
-      </template>
-      <el-descriptions :column="2">
-        <el-descriptions-item label="负责人">
-          {{ contact.ownerUserName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="创建人">
-          {{ contact.creatorName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="创建时间">
-          {{ contact.createTime ? formatDate(contact.createTime) : '空' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="更新时间">
-          {{ contact.updateTime ? formatDate(contact.updateTime) : '空' }}
-        </el-descriptions-item>
-      </el-descriptions>
-    </el-collapse-item>
-  </el-collapse>
+  <ContentWrap>
+    <el-collapse v-model="activeNames">
+      <el-collapse-item name="basicInfo">
+        <template #title>
+          <span class="text-base font-bold">基本信息</span>
+        </template>
+        <el-descriptions :column="4">
+          <el-descriptions-item label="姓名">
+            {{ contact.name }}
+          </el-descriptions-item>
+          <el-descriptions-item label="客户">
+            {{ contact.customerName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="手机">
+            {{ contact.mobile }}
+          </el-descriptions-item>
+          <el-descriptions-item label="座机">
+            {{ contact.telephone }}
+          </el-descriptions-item>
+          <el-descriptions-item label="邮箱">
+            {{ contact.email }}
+          </el-descriptions-item>
+          <el-descriptions-item label="QQ">
+            {{ contact.qq }}
+          </el-descriptions-item>
+          <el-descriptions-item label="微信">
+            {{ contact.wechat }}
+          </el-descriptions-item>
+          <el-descriptions-item label="下次联系时间">
+            {{ contact.nextTime ? formatDate(contact.nextTime) : '空' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="所在地">
+            {{ contact.areaName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="详细地址">
+            {{ contact.detailAddress }}
+          </el-descriptions-item>
+          <el-descriptions-item label="性别">
+            <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="contact.sex" />
+          </el-descriptions-item>
+          <el-descriptions-item label="备注">
+            {{ contact.remark }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+      <el-collapse-item name="systemInfo">
+        <template #title>
+          <span class="text-base font-bold">系统信息</span>
+        </template>
+        <el-descriptions :column="2">
+          <el-descriptions-item label="负责人">
+            {{ contact.ownerUserName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="创建人">
+            {{ contact.creatorName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="创建时间">
+            {{ contact.createTime ? formatDate(contact.createTime) : '空' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="更新时间">
+            {{ contact.updateTime ? formatDate(contact.updateTime) : '空' }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+    </el-collapse>
+  </ContentWrap>
 </template>
 <script setup lang="ts">
 import * as ContactApi from '@/api/crm/contact'
diff --git a/src/views/crm/contact/detail/index.vue b/src/views/crm/contact/detail/index.vue
index 1525ddea..ea2da034 100644
--- a/src/views/crm/contact/detail/index.vue
+++ b/src/views/crm/contact/detail/index.vue
@@ -5,7 +5,9 @@
       <el-tab-pane label="详细资料">
         <ContactDetailsInfo :contact="contact" />
       </el-tab-pane>
-      <el-tab-pane label="操作日志" lazy>TODO 待开发</el-tab-pane>
+      <el-tab-pane label="操作日志">
+        <OperateLogV2 :log-list="logList" />
+      </el-tab-pane>
       <el-tab-pane label="团队成员" lazy>
         <PermissionList :biz-id="contact.id!" :biz-type="BizTypeEnum.CRM_CONTACT" />
       </el-tab-pane>
@@ -20,7 +22,6 @@
   </el-col>
 </template>
 <script setup lang="ts">
-import { ElMessage } from 'element-plus' // TODO @zyna：使用 hook 引入 message
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import * as ContactApi from '@/api/crm/contact'
 import ContactDetailsHeader from '@/views/crm/contact/detail/ContactDetailsHeader.vue'
@@ -28,6 +29,7 @@ import ContactDetailsInfo from '@/views/crm/contact/detail/ContactDetailsInfo.vu
 import BusinessList from '@/views/crm/business/components/BusinessList.vue' // 商机列表
 import PermissionList from '@/views/crm/permission/components/PermissionList.vue' // 团队成员列表（权限）
 import { BizTypeEnum } from '@/api/crm/permission'
+import { OperateLogV2VO } from '@/api/system/operatelog'
 
 defineOptions({ name: 'CrmContactDetail' })
 
@@ -41,11 +43,24 @@ const getContactData = async (id: number) => {
   loading.value = true
   try {
     contact.value = await ContactApi.getContact(id)
+    await getOperateLog(id)
   } finally {
     loading.value = false
   }
 }
-
+const logList = ref<OperateLogV2VO[]>([]) // 操作日志列表
+/**
+ * 获取操作日志
+ */
+const getOperateLog = async (contactId: number) => {
+  if (!contactId) {
+    return
+  }
+  const data = await ContactApi.getOperateLogPage({
+    bizId: contactId
+  })
+  logList.value = data.list
+}
 /** 初始化 */
 const { delView } = useTagsViewStore() // 视图操作
 const { currentRoute } = useRouter() // 路由