From e936836c504a81c2441fe914a9689ecf06258eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Mon, 12 Aug 2024 16:37:33 +0800
Subject: [PATCH] =?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/record/record.vue           | 53 ++++++++++++++------
 src/views/system/taskExecuteRecord/index.vue | 10 ++--
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/views/system/record/record.vue b/src/views/system/record/record.vue
index 43bb443..d41ca15 100644
--- a/src/views/system/record/record.vue
+++ b/src/views/system/record/record.vue
@@ -23,6 +23,7 @@
         <div class="age">
           {{ list.age }}
         </div>
+
         <div class="source">
           <div
             class="item"
@@ -59,6 +60,11 @@
           <div>身份证号：{{ list.cardNo }}</div>
           <div>患者电话：{{ list.patientPhone }}</div>
           <div style="width: 50%">出生日期：{{ list.birthDate }}</div>
+          <el-button
+            style="float: right; position: absolute; right: 18px; top: 41px"
+            @click="goback"
+            >返回</el-button
+          >
         </div>
         <div class="bottom">
           <!-- <div>注册时间：{{ $route.query.createTime }}</div> -->
@@ -102,7 +108,7 @@
       </div> -->
       <div style="display: flex">
         <!-- 出院记录 -->
-        <div style="overflow: auto;width: 26%;">
+        <div style="overflow: auto; width: 26%">
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="入院记录" name="first">
               <div v-html="list.inHospitalInfo"></div>
@@ -400,7 +406,10 @@
                 </span>
               </el-form-item>
               <br />
-              <el-form-item label="短信发送情况" prop="phoneMessageNodeExecuteResultStatus">
+              <el-form-item
+                label="短信发送情况"
+                prop="phoneMessageNodeExecuteResultStatus"
+              >
                 <el-input
                   disabled
                   v-model="formlist.phoneMessageNodeExecuteResultStatus"
@@ -408,9 +417,12 @@
                 />
               </el-form-item>
               <br />
-              <el-form-item label="短信模板内容" prop="phoneMessageTemplateContent">
+              <el-form-item
+                label="短信模板内容"
+                prop="phoneMessageTemplateContent"
+              >
                 <el-input
-                disabled
+                  disabled
                   type="textarea"
                   v-model="formlist.phoneMessageTemplateContent"
                   style="width: 500px"
@@ -518,7 +530,7 @@ export default {
     Editorxj,
     Scriptpreview,
   },
-  name: "patientdetails",
+  name: "record",
   // components: { },
   data() {
     return {
@@ -576,12 +588,16 @@ export default {
         if (response.data) {
           this.formlist = response.data;
           this.formlist.phoneRedialTimes = response.data.phoneRedialTimes;
-          if(this.formlist.phoneMessageNodeExecuteResultStatus=='SUCCESS'){
-            this.formlist.phoneMessageNodeExecuteResultStatus='成功'
-          }else if(this.formlist.phoneMessageNodeExecuteResultStatus=='FAILURE'){
-            this.formlist.phoneMessageNodeExecuteResultStatus='失败'
-          }else if(this.formlist.phoneMessageNodeExecuteResultStatus=='EXPIRED'){
-            this.formlist.phoneMessageNodeExecuteResultStatus='超期作废'
+          if (this.formlist.phoneMessageNodeExecuteResultStatus == "SUCCESS") {
+            this.formlist.phoneMessageNodeExecuteResultStatus = "成功";
+          } else if (
+            this.formlist.phoneMessageNodeExecuteResultStatus == "FAILURE"
+          ) {
+            this.formlist.phoneMessageNodeExecuteResultStatus = "失败";
+          } else if (
+            this.formlist.phoneMessageNodeExecuteResultStatus == "EXPIRED"
+          ) {
+            this.formlist.phoneMessageNodeExecuteResultStatus = "超期作废";
           }
           this.infolistMESSAGE();
           this.infolistword();
@@ -596,6 +612,15 @@ export default {
     }
   },
   methods: {
+    goback() {
+      this.$store
+        .dispatch("tagsView/delView", this.$route)
+        .then(({ visitedViews }) => {
+          this.$router.push({
+            path: "/task/taskExecuteRecord",
+          });
+        });
+    },
     scriptlook(e) {
       if (e == null || e == "") {
         this.$message.error("暂无话术图");
@@ -721,9 +746,9 @@ export default {
     },
 
     info() {
-      var obj={
-        patientId:this.$route.query.patientId
-      }
+      var obj = {
+        patientId: this.$route.query.patientId,
+      };
       selectVisitRecord(obj).then((res) => {
         this.list = res.data;
       });
diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue
index f181c98..b563295 100644
--- a/src/views/system/taskExecuteRecord/index.vue
+++ b/src/views/system/taskExecuteRecord/index.vue
@@ -141,7 +141,7 @@ import { selectAgencyList } from "@/api/manage/selectAgencyList";
 import SearchFilter from '../../components/SearchForm.vue'
 
 export default {
-  name: "TaskExecuteRecord",
+  name: "taskExecuteRecord",
   dicts: ["visit_method"],
   components: { SearchFilter },
   data() {
@@ -209,11 +209,14 @@ export default {
     };
   },
   mounted() {
-    this.getList();
-    this.selectAgencyinfo();
+
     this.getMaxTableHeight()
     this.screenChange()
   },
+  created(){
+    this.getList();
+    this.selectAgencyinfo();
+  },
   methods: {
     updateCPage(index, size) {
       this.queryParams.pageNum = index
@@ -330,6 +333,7 @@ export default {
       this.$router.push({
         path: "/task/record",
         query: {
+          pageNum: this.queryParams.pageNum,
           path: "/task/taskExecuteRecord",
           patientId: row.id,
           manageRouteNodeId: row.manageRouteNodeId,