From fa38bd9aa8d76c8c795dc2c1cd1530cd9e0542c5 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 17 Jun 2024 16:46:05 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/manualReview/index.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue
index 23a4fe6..e7f2fcb 100644
--- a/src/views/manage/manualReview/index.vue
+++ b/src/views/manage/manualReview/index.vue
@@ -73,28 +73,28 @@
                 <el-table-column label="序号" type="index" width="50" align="center" />
                 <el-table-column label="患者姓名" align="center" prop="patientName" />
                 <el-table-column label="患者电话" align="center" prop="patientPhone" width='120' />
-                <el-table-column label="性别" align="center" prop="sex">
+                <el-table-column label="性别" align="center" prop="sex" width='50'>
                     <template slot-scope="scope">
                         {{ scope.row.sex == 'MALE' ? '男' : '' }}
                         {{ scope.row.sex == 'FEMALE' ? '女' : '' }}
                     </template>
                 </el-table-column>
-                <el-table-column label="年龄" align="center" prop="age" />
-                <el-table-column label="出生日期" align="center" prop="birthDate" width='130' />
-                <el-table-column label="医院" align="center" prop="hospitalAgencyName" />
-                <el-table-column label="院区" align="center" prop="campusAgencyName" />
-                <el-table-column label="科室名称" align="center" prop="departmentName" />
+                <el-table-column label="年龄" align="center" prop="age" width='50'/>
+                <el-table-column label="出生日期" align="center" prop="birthDate" width='100' />
+                <el-table-column label="医院" align="center" prop="hospitalAgencyName" :show-overflow-tooltip="true"/>
+                <el-table-column label="院区" align="center" prop="campusAgencyName" :show-overflow-tooltip="true"/>
+                <el-table-column label="科室名称" align="center" prop="departmentName" :show-overflow-tooltip="true"/>
                 <el-table-column label="病区名称" align="center" prop="wardName" />
-                <el-table-column label="住院/门诊号" align="center" prop="inHospitalNumber" width='130' />
-                <el-table-column label="患者来源" align="center" prop="patientSource">
+                <el-table-column label="住院/门诊号" align="center" prop="inHospitalNumber" width='105' :show-overflow-tooltip="true" />
+                <el-table-column label="患者来源" align="center" prop="patientSource" width="80">
                     <template slot-scope="scope">
                         <dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" />
                     </template>
                 </el-table-column>
-                <el-table-column label="医生" align="center" prop="attendingPhysicianName" />
-                <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
+                <el-table-column label="医生" align="center" prop="attendingPhysicianName" width="80" :show-overflow-tooltip="true"/>
+                <el-table-column label="诊断" align="center" prop="mainDiagnosis" :show-overflow-tooltip="true" width='100'/>
                 <el-table-column label="手术名称" align="center" prop="surgicalName" />
-                <el-table-column label="出院/就诊时间" align="center" prop="dischargeTime" width='130'>
+                <el-table-column label="出院/就诊时间" align="center" prop="dischargeTime" width="105">
                     <template slot-scope="scope">
                         <span>{{ parseTime(scope.row.dischargeTime, '{y}-{m}-{d}') }}</span>
                     </template>

From a7fd0164d2a79cdb6b28f1ab52b7393188524b52 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 17 Jun 2024 16:47:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/manualReview/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue
index e7f2fcb..0c580b9 100644
--- a/src/views/manage/manualReview/index.vue
+++ b/src/views/manage/manualReview/index.vue
@@ -71,7 +71,7 @@
         <div ref="table">
             <el-table :max-height="maxTableHeight" v-loading="loading" :data="patientInfoList">
                 <el-table-column label="序号" type="index" width="50" align="center" />
-                <el-table-column label="患者姓名" align="center" prop="patientName" />
+                <el-table-column label="患者姓名" align="center" prop="patientName"  width="80"/>
                 <el-table-column label="患者电话" align="center" prop="patientPhone" width='120' />
                 <el-table-column label="性别" align="center" prop="sex" width='50'>
                     <template slot-scope="scope">

From 52328a796641ce978526124cf766d11768bb7cfd Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 17 Jun 2024 16:58:19 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue
index c172099..b09f51b 100644
--- a/src/views/system/taskExecuteRecord/index.vue
+++ b/src/views/system/taskExecuteRecord/index.vue
@@ -45,12 +45,12 @@
         <el-table-column type="selection"  align="center" />
         <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
         <!-- <el-table-column label="患者表id" align="center" prop="patientId" /> -->
-        <el-table-column label="患者姓名" align="center" prop="patientName" />
-        <el-table-column label="电话" align="center" prop="patientPhone" />
-        <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber"  />
-        <el-table-column label="医院" align="center" prop="hospitalAgencyName" />
-        <el-table-column label="院区" align="center" prop="campusAgencyName" />
-        <el-table-column label="科室名称" align="center" prop="departmentName" />
+        <el-table-column label="患者姓名" align="center" prop="patientName" width="80"/>
+        <el-table-column label="电话" align="center" prop="patientPhone"  width="120"/>
+        <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="120" :show-overflow-tooltip="true" />
+        <el-table-column label="医院" align="center" prop="hospitalAgencyName" width="105" :show-overflow-tooltip="true"/>
+        <el-table-column label="院区" align="center" prop="campusAgencyName" :show-overflow-tooltip="true"/>
+        <el-table-column label="科室名称" align="center" prop="departmentName" :show-overflow-tooltip="true"/>
         <el-table-column label="病区名称" align="center" prop="wardName" />
         <!-- <el-table-column label="门诊/住院号" align="center" prop="patientName" />
         <el-table-column label="手术名称" align="center" prop="patientName" /> -->
@@ -67,14 +67,14 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column label="管理任务名称" align="center" prop="manageRouteName">
+        <el-table-column label="管理任务名称" align="center" prop="manageRouteName" width="110">
         </el-table-column>
-        <el-table-column label="入院时间" align="center" prop="admissionTime" >
+        <el-table-column label="入院时间" align="center" prop="admissionTime" width="100" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.admissionTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="出院时间" align="center" prop="dischargeTime">
+        <el-table-column label="出院时间" align="center" prop="dischargeTime" width="100">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.dischargeTime, "{y}-{m}-{d}") }}</span>
           </template>
@@ -91,7 +91,7 @@
             <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="任务内容" align="center" prop="taskContent">
+        <el-table-column label="任务内容" align="center" prop="taskContent" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>
               {{ scope.row.taskContent == "PHONE_OUTBOUND" ? "电话外呼" : "" }}

From 925c3531ef86b3beded6c8d7b456b25089f0ecb4 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 17 Jun 2024 18:07:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/followup/index.vue        |  1 +
 src/views/system/followupdetails/index.vue | 22 +++++---
 src/views/system/followupsee/index.vue     | 62 +++++++++-------------
 3 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue
index f8c1a39..702a08f 100644
--- a/src/views/system/followup/index.vue
+++ b/src/views/system/followup/index.vue
@@ -602,6 +602,7 @@ export default {
           taskType: row.taskType,
           templateId: row.templateId,
           manageRouteId: row.manageRouteId,
+          manageRouteNodeId: row.manageRouteNodeId,
 
           visitRecordId: row.visitRecordId,
           taskExecuteRecordId: row.taskExecuteRecordId,
diff --git a/src/views/system/followupdetails/index.vue b/src/views/system/followupdetails/index.vue
index fb4d470..82494f4 100644
--- a/src/views/system/followupdetails/index.vue
+++ b/src/views/system/followupdetails/index.vue
@@ -428,7 +428,7 @@
               <el-form-item label="短信模板：" prop="phone">
                 <span class="spanname">
                   <message
-                  style="width: 200px"
+                  style="width: 200px;height:100px"
                   @on-template="messageontemplateMESSAGE"
                   :templateId="formlist.phoneMessageTemplateId"
                   :templateName="formlist.phoneMessageTemplateName"
@@ -444,10 +444,10 @@
         </div>
       </div>
     </div>
-  </div>
 </template>
   
       <script>
+      import message from "../components/message.vue";
 import { selectFollowPatientInfo, question, addPatientQuestionResult,  selectPhonePush, } from "@/api/system/followupsee";
 import {
   selectPatientQuestionSubmit,
@@ -455,6 +455,9 @@ import {
 import { getScript } from "@/api/manage/script";
 import Cookies from 'js-cookie'
 export default {
+  components: {
+    message,
+  },
   name: "patientdetails",
   data() {
     return {
@@ -463,6 +466,7 @@ export default {
       checked: false,
       formlist: {},
       optionslistS:[],
+      optionslist:[],
       rules: {
         routeHandleRemark: [
           { required: true, message: '请输入任务处理信息', trigger: 'change' }
@@ -646,6 +650,8 @@ export default {
         font-size: 13px;
         color: #64666a;
         .spanname {
+          width: 100%;
+          
           pointer-events: none;
         }
       }
@@ -733,12 +739,12 @@ export default {
          }
        
          .bottomheader {
-           overflow: scroll;
-           width: 99%;
-           height: 100vh;
-           background-color: #fff;
-           margin: 10px auto;
-           padding: 10px 20px;
+          overflow-y: scroll;
+    width: 99%;
+    height: 67vh;
+    background-color: #fff;
+    margin: 10px auto;
+    padding: 10px 20px;
            .sport {
              padding: 10px 50px 10px 10px;
              font-size: 20px;
diff --git a/src/views/system/followupsee/index.vue b/src/views/system/followupsee/index.vue
index da7a559..dde1726 100644
--- a/src/views/system/followupsee/index.vue
+++ b/src/views/system/followupsee/index.vue
@@ -246,11 +246,11 @@
             >
             <!-- <br/> -->
               <el-form-item label="是否接通" prop="phone">
-                <el-radio v-model="formlist.phoneConnectStatus" label="CONNECTED"
-                  >已接通</el-radio
+                <el-radio v-model="formlist.phoneConnectStatus" label="1"
+                  >是</el-radio
                 >
-                <el-radio v-model="formlist.phoneConnectStatus" label="NOTCONNECTED"
-                  >未接通</el-radio
+                <el-radio v-model="formlist.phoneConnectStatus" label="0"
+                  >否</el-radio
                 >
               </el-form-item>
               <br />
@@ -311,10 +311,10 @@
                   inactive-value="0"
                 >
                 </el-switch> -->
-                <el-radio disabled v-model="formlist.phonePushSign" label="1"
+                <el-radio disabled v-model="formlist.routeHandleRemark" label="1"
                   >已开启</el-radio
                 >
-                <el-radio  disabled v-model="formlist.phonePushSign" label="0"
+                <el-radio  disabled v-model="formlist.routeHandleRemark" label="0"
                   >未开启</el-radio
                 >
               </el-form-item>
@@ -366,20 +366,7 @@
                 /> -->
               </el-form-item>
               <br />
-        <div class="pushMethod">
-              <el-form-item label="短信模板：" prop="phone">
-                <span class="spanname">
-                  <message
-                  style="width: 200px"
-                  @on-template="messageontemplateMESSAGE"
-                  :templateId="formlist.phoneMessageTemplateId"
-                  :templateName="formlist.phoneMessageTemplateName"
-                ></message>
-                </span>
-              
-              </el-form-item>
-            </div>
-            <br/>
+          
               <el-form-item label="话术图" prop="phone">
                 <img
                   :src="formlist.scriptFilePath"
@@ -388,6 +375,19 @@
                 />
               </el-form-item>
               <br />
+
+              <el-form-item label="短信模板：" prop="phone">
+                <span class="spanname">
+                  <message
+                  style="width: 200px;height:100px"
+                  @on-template="messageontemplateMESSAGE"
+                  :templateId="formlist.phoneMessageTemplateId"
+                  :templateName="formlist.phoneMessageTemplateName"
+                ></message>
+                </span>
+              
+              </el-form-item>
+          
             </el-form>
           </div>
         </div>
@@ -692,8 +692,6 @@ export default {
               (this.form.diseaseTypeId = this.formlist.diseaseTypeId),
               (this.form.diseaseTypeName = this.formlist.diseaseTypeName),
               (this.form.routeHandleRemark = this.formlist.routeHandleRemark);
-              (this.form.phoneConnectStatus= this.formlist.phoneConnectStatus);
-
             (this.form.visitRecordId = this.$route.query.visitRecordId),
               // console.log(this.form, 'this.form')
               // return
@@ -733,23 +731,13 @@ export default {
 };
 </script>
     <style lang="scss" scoped>
-       .pushMethod {
-        height: 30px;
-        // margin-top: 30px;
-        line-height: 30px;
-        font-size: 13px;
-        color: #64666a;
-        .spanname {
-          pointer-events: none;
-        }
-      }
 ::v-deep .el-input.is-disabled .el-input__inner {
   background: #fff !important;
   color: #606266;
 }
-// .spanname {
-//           pointer-events: none;
-//         }
+.spanname {
+          pointer-events: none;
+        }
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #606266;
   background: #fff;
@@ -830,9 +818,9 @@ export default {
   }
 
   .bottomheader {
-    overflow: scroll;
+    overflow-y: scroll;
     width: 99%;
-    height: 100vh;
+    height: 67vh;
     background-color: #fff;
     margin: 10px auto;
     padding: 10px 20px;