From 10ae82f28015732da9165fd09b69162115aef03c Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 21 Jan 2025 16:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/components/Taskprocess.vue | 74 ++++++++++++---------
 src/views/manage/taskmanagement/index.vue   |  2 +-
 src/views/system/followupsee/index.vue      | 20 +++---
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/src/views/manage/components/Taskprocess.vue b/src/views/manage/components/Taskprocess.vue
index 530add7..43ca072 100644
--- a/src/views/manage/components/Taskprocess.vue
+++ b/src/views/manage/components/Taskprocess.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="headernewhandel">
     <!-- 左侧 -->
-    <div :class="isshow  ? 'left' : 'noleft'">
+    <div :class="isshow ? 'left' : 'noleft'">
       <el-tabs v-model="activeName" @tab-click="handleClick" v-if="isshow">
         <el-tab-pane
           label="任务详情"
@@ -9,11 +9,7 @@
           v-if="$route.query.taskNodeType == 'PHONE_OUTBOUND'"
         >
           <div class="nexttime">
-            <el-form
-              ref="formlist"
-              :model="formlist"
-              label-width="110px"
-            >
+            <el-form ref="formlist" :model="formlist" label-width="110px">
               <el-form-item label="电话" prop="patientPhone">
                 <el-input
                   disabled
@@ -68,14 +64,14 @@
               <el-form-item label="第二次拨打时间" prop="secondTime ">
                 <el-input
                   disabled
-                  v-model="formlist.secondTime "
+                  v-model="formlist.secondTime"
                   placeholder="请输入第二次拨打时间"
                 />
               </el-form-item>
               <el-form-item label="第三次拨打时间" prop="thirdTime ">
                 <el-input
                   disabled
-                  v-model="formlist.thirdTime "
+                  v-model="formlist.thirdTime"
                   placeholder="请输入第三次拨打时间"
                 />
               </el-form-item>
@@ -91,7 +87,6 @@
                   placeholder=""
                 />
               </el-form-item>
-
             </el-form>
           </div>
         </el-tab-pane>
@@ -156,7 +151,7 @@
             <span v-if="item.questionType == 'FEEDBACK_BLANKS_SUBJECT'"
               >（反馈填空题）</span
             >
-            
+
             <span v-if="item.questionType == 'COMBINATION_SCORING_SUBJECT'"
               >（组合打分题）</span
             >
@@ -574,12 +569,12 @@ export default {
             e.questionType == "COMBINATION_MULTIPLE_SUBJECT" ||
             e.questionType == "COMBINATION_SCORING_SUBJECT"
           ) {
-            if(e.whetherScore==true){
+            if (e.whetherScore == true) {
               e.whetherScore = 1;
-            }else if(e.whetherScore==false){
-            e.whetherScore = 0;
+            } else if (e.whetherScore == false) {
+              e.whetherScore = 0;
             }
-          }else{
+          } else {
             e.whetherScore = 0;
           }
           e.questionSubjectOptionList.forEach((el) => {
@@ -604,7 +599,7 @@ export default {
         this.$delete(this.questiondata, "updateTime");
         var score = 0;
         // 单选、多选、打分分值
-        var lengthScore=this.questiondata.questionSubjectList.filter(f=> f.whetherScore == 0)
+        var lengthScore = this.questiondata.questionSubjectList.filter(f => f.whetherScore == 0)
         this.questiondata.questionSubjectList.forEach((e) => {
           if (e.questionSubjectOptionList?.length > 0) {
             e.questionSubjectOptionList.forEach((el) => {
@@ -622,10 +617,10 @@ export default {
               }
 
             });
-            if(lengthScore.length==this.questiondata.questionSubjectList.length){
-            this.questiondata.totalScore = '';
-            }else{
-            this.questiondata.totalScore = score;
+            if (lengthScore.length == this.questiondata.questionSubjectList.length) {
+              this.questiondata.totalScore = '';
+            } else {
+              this.questiondata.totalScore = score;
             }
           }
         });
@@ -677,9 +672,17 @@ export default {
                   this.$store
                     .dispatch("tagsView/delView", this.$route)
                     .then(({ visitedViews }) => {
-                      this.$router.push({
-                        path: "/task/followup",
-                      });
+                      if (this.$route.query.path == "/task/taskmanagement") {
+                        this.$router.push({
+                          path: "/task/taskmanagement",
+                        });
+                      } else {
+                        this.$router.push({
+                          path: "/task/followup",
+                        });
+
+                      }
+
                     });
                 })
                 .catch(() => {
@@ -721,9 +724,16 @@ export default {
                   this.$store
                     .dispatch("tagsView/delView", this.$route)
                     .then(({ visitedViews }) => {
-                      this.$router.push({
-                        path: "/task/followup",
-                      });
+                      if (this.$route.query.path == "/task/taskmanagement") {
+                        this.$router.push({
+                          path: "/task/taskmanagement",
+                        });
+                      } else {
+                        this.$router.push({
+                          path: "/task/followup",
+                        });
+
+                      }
                     });
                 })
                 .catch(() => {
@@ -832,17 +842,16 @@ export default {
   height: calc(100vh - 84px);
   // background-color: #f1f3f5;
   display: flex;
-  ::v-deep .el-tabs__item{
+  ::v-deep .el-tabs__item {
     padding: 0 13px;
   }
-  .nexttime{
+  .nexttime {
     height: calc(100vh - 300px);
     overflow-y: auto;
     overflow-x: hidden;
     // background: aliceblue;
     /* height: 30vh; */
     margin-top: 25px;
-
   }
 
   ::v-deep .el-tabs__header {
@@ -857,7 +866,7 @@ export default {
     margin-top: 20px;
     width: 27%;
     // background: red;
-    ::v-deep .el-form{
+    ::v-deep .el-form {
       padding-right: 9px;
       // margin-left: -14px;
     }
@@ -938,11 +947,10 @@ export default {
   .right_top {
     // width: 39%;
     width: 350px;
-    ::v-deep .el-textarea__inner{
+    ::v-deep .el-textarea__inner {
       width: 338px;
-    height: 250px;
-    margin-top: 10px;
-
+      height: 250px;
+      margin-top: 10px;
     }
   }
 }
diff --git a/src/views/manage/taskmanagement/index.vue b/src/views/manage/taskmanagement/index.vue
index c1c4527..45c6ca1 100644
--- a/src/views/manage/taskmanagement/index.vue
+++ b/src/views/manage/taskmanagement/index.vue
@@ -1507,7 +1507,7 @@
         this.$router.push({
           path: "/task/followupsee",
           query: {
-            path: "/task/followup",
+            path: "/task/taskmanagement",
             patientId: row.patientId,
             taskNodeType: row.taskNodeType,
             templateId: row.templateId,
diff --git a/src/views/system/followupsee/index.vue b/src/views/system/followupsee/index.vue
index d7d8036..318593f 100644
--- a/src/views/system/followupsee/index.vue
+++ b/src/views/system/followupsee/index.vue
@@ -60,10 +60,7 @@
         <el-tab-pane label="签约记录" name="five">
           <signingRecords v-if="activeName == 'five'"></signingRecords>
         </el-tab-pane>
-        <el-tab-pane
-          label="任务处理"
-          name="six"
-        >
+        <el-tab-pane label="任务处理" name="six">
           <keep-alive>
             <Taskprocess v-if="activeName == 'six'" ref="process"></Taskprocess>
           </keep-alive>
@@ -133,9 +130,17 @@ export default {
     },
     // 取消
     cencal() {
-      this.$router.push({
-        path: "/task/followup",
-      });
+      if (this.$route.query.path == "/task/taskmanagement") {
+        this.$router.push({
+          path: "/task/taskmanagement",
+        });
+      } else {
+        this.$router.push({
+          path: "/task/followup",
+        });
+
+      }
+
     },
   },
 };
@@ -275,7 +280,6 @@ export default {
     background-color: #fff;
     margin: 10px auto;
     padding: 10px 0px 10px 20px;
-
   }
   .topheaderup {
     width: 99%;