From 34d45b2bbf9ce1b3a6450da7cf7afb98d0deeb74 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 12 Aug 2024 16:28:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/taskExecuteRecord/index.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue
index f181c98..8fed7f0 100644
--- a/src/views/system/taskExecuteRecord/index.vue
+++ b/src/views/system/taskExecuteRecord/index.vue
@@ -89,14 +89,13 @@
             <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="任务内容" align="center" prop="taskContent" :show-overflow-tooltip="true">
+        <el-table-column label="任务节点类型" align="center" prop="taskNodeType" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>
-              {{ scope.row.taskContent == "PHONE_OUTBOUND" ? "电话外呼" : "" }}
-              {{ scope.row.taskContent == "QUESTIONNAIRE_SCALE" ? "问卷量表" : "" }}
-              {{ scope.row.taskContent == "PROPAGANDA_ARTICLE" ? "宣教文章" : "" }}
-              {{ scope.row.taskContent == "TEXT_REMIND" ? "文字提醒" : "" }}
-              {{ scope.row.taskContent == "ARTIFICIAL_FOLLOW_UP" ? "人工随访" : "" }}
+              {{ scope.row.taskNodeType == "PHONE_OUTBOUND" ? "电话外呼" : "" }}
+              {{ scope.row.taskNodeType == "QUESTIONNAIRE_SCALE" ? "问卷量表" : "" }}
+              {{ scope.row.taskNodeType == "PROPAGANDA_ARTICLE" ? "宣教文章" : "" }}
+              {{ scope.row.taskNodeType == "TEXT_REMIND" ? "文字提醒" : "" }}
             </span>
           </template>
         </el-table-column>

From 2c3ca76fca50d592437aa5004483d128bc5cb2a2 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 12 Aug 2024 16:32:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/taskExecuteRecord/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue
index 8fed7f0..3e9e099 100644
--- a/src/views/system/taskExecuteRecord/index.vue
+++ b/src/views/system/taskExecuteRecord/index.vue
@@ -56,12 +56,12 @@
         <el-table-column label="管理路径节点名称" align="center" prop="manageRouteNodeName">
           <template slot-scope="scope">
             <span>
-              {{ scope.row.manageRouteName == "AFTER_DISCHARGE" ? "出院后" : "" }}
-              {{ scope.row.manageRouteName == "AFTER_ADMISSION" ? "入院后" : "" }}
-              {{ scope.row.manageRouteName == "AFTER_CONSULTATION" ? "就诊后" : "" }}
-              {{ scope.row.manageRouteName == "AFTER_VISIT_DISCHARGE" ? "就诊/出院后" : "" }}
-              {{ scope.row.manageRouteName == "PREOPERATIVE" ? "术前" : "" }}
-              {{ scope.row.manageRouteName == "POSTOPERATIVE" ? "术后" : "" }}
+              {{ scope.row.manageRouteNodeName == "AFTER_DISCHARGE" ? "出院后" : "" }}
+              {{ scope.row.manageRouteNodeName == "AFTER_ADMISSION" ? "入院后" : "" }}
+              {{ scope.row.manageRouteNodeName == "AFTER_CONSULTATION" ? "就诊后" : "" }}
+              {{ scope.row.manageRouteNodeName == "AFTER_VISIT_DISCHARGE" ? "就诊/出院后" : "" }}
+              <!-- {{ scope.row.manageRouteName == "PREOPERATIVE" ? "术前" : "" }}
+              {{ scope.row.manageRouteName == "POSTOPERATIVE" ? "术后" : "" }} -->
             </span>
           </template>
         </el-table-column>