From 6d7cd13eecd3a6f176d310986b4750b0c407e3a1 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 21 五月 2025 14:40:43 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/record/detailpage/index.vue |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index e02d87d..55dd174 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -798,17 +798,25 @@
         isFinish: false,
       }).then((res) => {
         if (res.code === 200) {
+          // 閽堝鍐嶆闅忚鏈嶅姟杩涜鍒犻櫎缁撴灉璧嬪��
           if (this.again && res.data.upScriptResult) {
-            this.tableDatatop = res.data.upScriptResult;
-          } else {
-            this.tableDatatop = res.data.scriptResult;
+            res.data.upScriptResult.forEach((itemA) => {
+              const itemB = res.data.scriptResult.find(
+                (item) => item.scriptContent === itemA.scriptContent
+              );
+              if (itemB) {
+                itemB.scriptResult = itemA.scriptResult;
+              }
+            });
           }
+          this.tableDatatop = res.data.scriptResult;
+
           this.tableDatatop.forEach((item) => {
             if (item.scriptType == 2) item.scriptResult = [];
-            if (item.scriptResult && item.scriptType != 2) {
+            if (item.scriptResultId && item.scriptType != 2) {
               item.isoption = 3;
               item.scriptResult = item.scriptResult;
-            } else if (item.scriptResult && item.scriptType == 2) {
+            } else if (item.scriptResultId && item.scriptType == 2) {
               item.scriptResult = item.scriptResult.split("&");
               item.isoption = 3;
             }
@@ -1415,10 +1423,11 @@
   color: #02a7f0 !important;
 }
 .el-message-box__btns button:nth-child(2) {
-    margin-left: 10px;
-    background-color:#f57676;
-    border-color:#f57676
-}.mulsz {
+  margin-left: 10px;
+  background-color: #f57676;
+  border-color: #f57676;
+}
+.mulsz {
   font-size: 25px;
   margin-top: 20px;
 }

--
Gitblit v1.9.3