From 6e2c7023cba58a60385053fa4326716a7249ef56 Mon Sep 17 00:00:00 2001
From: userName <244140623@qq.com>
Date: Fri, 23 Feb 2024 14:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mts/planDetail/index.vue        | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue b/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue
index 101c2be..719e10b 100644
--- a/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue
+++ b/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue
@@ -88,20 +88,20 @@
             </el-button>
           </el-tooltip> -->
 
-          <el-popover v-if="scope.row.record.length > 0" @before-enter="handleHistory(scope.row, scope.column)" placement="bottom"
-            title="修改历史留痕" :width="200" trigger="hover">
+          <el-popover v-if="handleHisShow(scope.row, scope.column)" @before-enter="handleHistory(scope.row, scope.column)"
+            placement="bottom" title="修改历史留痕" :width="200" trigger="hover">
             <template #reference>
               <el-button link @click="handleDate(scope.column, scope.row)">
                 {{ handleDateColumn(scope.row, scope.column) }}
               </el-button>
             </template>
             <template #default>
-              <li v-for="his in hisRecord">{{ his }}</li>
+              <li v-for="his in hisRecord">{{ his.createTime }}: {{ his.remark }}</li>
             </template>
           </el-popover>
 
-          <el-button v-else link @click="handleDate(scope.column, scope.row)">
-            {{ handleDateColumn(scope.row, scope.column) }}
+          <el-button link @click="handleDate(scope.column, scope.row)" style="opacity:0;" v-else>
+            {{ item.label }}
           </el-button>
         </template>
       </el-table-column>
@@ -314,6 +314,17 @@ function handleDateColumn(row, column) {
   return remark
 }
 
+function handleHisShow(row, column) {
+  if (row.record.length > 0) {
+    for (const item of row.record) {
+      if (item.recordDate == column.label) {
+        return true
+      }
+    }
+  }
+  return false
+}
+
 const hisRecord = ref([])
 async function handleHistory(row, column) {
   let res = []
@@ -323,7 +334,7 @@ async function handleHistory(row, column) {
         const hisList = await listPlanRecordHistory({ recordId: item.id })
 
         for (const his of hisList.rows) {
-          res.push(his.remark)
+          res.push(his)
         }
         break;
       }