From 261d8b2aa4775b8453dc2368eb1ecb78e8ee4cbf Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 30 Dec 2023 17:06:09 +0800
Subject: [PATCH] =?UTF-8?q?crm-=E5=AE=A2=E6=88=B7=EF=BC=9A=E9=9B=86?=
 =?UTF-8?q?=E6=88=90=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/customer/index.ts                    | 4 ++--
 src/api/system/operatelog/index.ts               | 7 ++++---
 src/components/OperateLogV2/src/OperateLogV2.vue | 8 ++++----
 src/views/crm/customer/detail/index.vue          | 7 ++++++-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index bedb61f5..50eebd64 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -69,6 +69,6 @@ export const queryAllList = async () => {
 }
 
 // 查询客户操作日志
-export const getOperateLog = async (id: number) => {
-  return await request.get({ url: `/crm/customer/operate-log?id=` + id })
+export const getOperateLogPage = async (params) => {
+  return await request.get({ url: '/crm/customer/operate-log-page', params })
 }
diff --git a/src/api/system/operatelog/index.ts b/src/api/system/operatelog/index.ts
index cb47d18c..0ebe0d33 100644
--- a/src/api/system/operatelog/index.ts
+++ b/src/api/system/operatelog/index.ts
@@ -29,10 +29,11 @@ export type OperateLogV2VO = {
   traceId: string
   userType: number
   userId: number
-  module: string
-  name: string
+  userName: string
+  type: string
+  subType: string
   bizId: number
-  content: string
+  action: string
   extra: string
   requestMethod: string
   requestUrl: string
diff --git a/src/components/OperateLogV2/src/OperateLogV2.vue b/src/components/OperateLogV2/src/OperateLogV2.vue
index dd9e8cdf..cb5663b2 100644
--- a/src/components/OperateLogV2/src/OperateLogV2.vue
+++ b/src/components/OperateLogV2/src/OperateLogV2.vue
@@ -4,14 +4,14 @@
       <el-timeline-item
         v-for="(log, index) in logDataList"
         :key="index"
-        :timestamp="formatDate(log.createTime!)"
+        :timestamp="formatDate(log.createTime)"
         placement="top"
       >
         <div class="el-timeline-right-content">
           <el-row>
             <el-col :span="24" class="mb-10px">
               =======================
-              <el-tag class="mr-10px" type="success">{{ log.creatorName }}</el-tag>
+              <el-tag class="mr-10px" type="success">{{ log.userName }}</el-tag>
               <span>{{ log.title }}</span>
               =======================
             </el-col>
@@ -91,11 +91,11 @@ const renderTags = (content: string) => {
 }
 const initLog = () => {
   logDataList.value = props.logList.map((logItem) => {
-    const keyValue = renderTags(logItem.content)
+    const keyValue = renderTags(logItem.action)
     // 挂载数据
     logItem.contentStrList = keyValue[0]
     if (keyValue[0][0] === '从') {
-      logItem.title = logItem.name
+      logItem.title = logItem.subType
     } else {
       logItem.title = keyValue[0][0]
       logItem.contentStrList.splice(0, 1)
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index 626d30ae..e8d73582 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -66,7 +66,12 @@ const getOperateLog = async (customerId: number) => {
   if (!customerId) {
     return
   }
-  logList.value = await CustomerApi.getOperateLog(customerId)
+  const data = await CustomerApi.getOperateLogPage({
+    pageNo: 1,
+    pageSize: 10,
+    bizId: customerId
+  })
+  logList.value = data.list
 }
 /** 初始化 */
 const { delView } = useTagsViewStore() // 视图操作