From 425b33a6bdaae3d9d1adc83f596ef215b102b600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 13 Jun 2024 16:52:34 +0800
Subject: [PATCH] xg

---
 src/layout/index.vue                          |   4 +
 src/views/system/specialDiseaseNode/index.vue |   5 +-
 src/views/system/taskExecuteRecord/index.vue  | 321 ++++++------------
 3 files changed, 111 insertions(+), 219 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index d2ec797..b76fd4e 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -71,6 +71,10 @@ export default {
   flex: 20;
 }
 
+::v-deep .el-table__fixed-right {
+  height: 100% !important;
+}
+
 ::v-deep .el-table::before {
   display: none !important;
 }
diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue
index b2128f7..e566a13 100644
--- a/src/views/system/specialDiseaseNode/index.vue
+++ b/src/views/system/specialDiseaseNode/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="container">
     <el-descriptions title="编辑主路径" />
     <div class="title">
       <el-tag>主路径</el-tag>
@@ -972,4 +972,7 @@ export default {
 ::v-deep .el-card {
   margin-top: 20px !important;
 }
+.container{
+  padding: 20px;
+}
 </style>
diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue
index 90183e4..a81e792 100644
--- a/src/views/system/taskExecuteRecord/index.vue
+++ b/src/views/system/taskExecuteRecord/index.vue
@@ -1,102 +1,43 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="100px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="执行时间" prop="startDate" label-width="110px">
-        <el-date-picker
-          v-model="intentionalTime"
-          @change="pickerChangeFn"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          style="width: 300px"
-          value-format="yyyy-MM-dd"
-          clearable
-          end-placeholder="结束日期"
-        >
+        <el-date-picker v-model="intentionalTime" @change="pickerChangeFn" type="daterange" range-separator="至"
+          start-placeholder="开始日期" style="width: 300px" value-format="yyyy-MM-dd" clearable end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="医院" prop="hospitalAgencyId">
-        <el-select
-          v-model="queryParams.hospitalAgencyId"
-          filterable
-          placeholder="请选择医院"
-          style="width: 200px"
-          clearable
-        >
+        <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px" clearable>
           <!-- @clear="clearhospitalAgency" -->
-          <el-option
-            v-for="item in hospitalAgencylist"
-            :key="item.id"
-            :label="item.agencyName"
-            :value="item.id"
-          >
+          <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item label="就诊方式" prop="visitMethod">
-        <el-select
-          v-model="queryParams.visitMethod"
-          placeholder="请选择就诊方式"
-          clearable
-        >
-          <el-option
-            v-for="dict in dict.type.visit_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable>
+          <el-option v-for="dict in dict.type.visit_type" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
 
       <el-form-item label="就诊流水号" prop="visitSerialNumber">
-        <el-input
-          v-model="queryParams.visitSerialNumber"
-          placeholder="请输入就诊流水号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
 
       <el-form-item label="患者姓名" prop="patientName">
-        <el-input
-          v-model="queryParams.patientName"
-          placeholder="请输入患者姓名"
-          clearable
-          style="width: 200px"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable style="width: 200px"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="任务名称" prop="manageRouteName">
-        <el-input
-          v-model="queryParams.manageRouteName"
-          placeholder="请输入任务名称"
-          clearable
-          style="width: 200px"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.manageRouteName" placeholder="请输入任务名称" clearable style="width: 200px"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
     <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -142,160 +83,93 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row> -->
-
-    <el-table
-      v-loading="loading"
-      :data="taskExecuteRecordList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" 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="wardName" />
-      <!-- <el-table-column label="门诊/住院号" align="center" prop="patientName" />
+    <div style="flex: 20;  overflow-y: scroll;width:100%;">
+      <el-table v-loading="loading" :data="taskExecuteRecordList" @selection-change="handleSelectionChange"
+        v-horizontal-scroll="'always'">
+        <el-table-column type="selection" width="55" 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="wardName" />
+        <!-- <el-table-column label="门诊/住院号" align="center" prop="patientName" />
       <el-table-column label="手术名称" align="center" prop="patientName" /> -->
-      <el-table-column label="执行人姓名" align="center" prop="executePerson" />
-      <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" ? "术后" : "" }}
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="管理任务名称"
-        align="center"
-        prop="manageRouteName"
-      >
-      </el-table-column>
-      <el-table-column
-        label="入院时间"
-        align="center"
-        prop="admissionTime"
-        width="180"
-      >
-        <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"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.dischargeTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="就诊方式" align="center" prop="visitMethod">
-        <template slot-scope="scope">
-          <span
-            >{{ scope.row.visitMethod == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
-            {{ scope.row.visitMethod == "BE_HOSPITALIZED" ? "住院" : "" }}
-          </span>
-        </template></el-table-column
-      >
-      <el-table-column label="任务名称" align="center" prop="manageRouteName" />
-      <el-table-column
-        label="执行时间"
-        align="center"
-        prop="executeTime"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="任务内容" align="center" prop="taskContent">
-        <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" ? "人工随访" : ""
-            }}
-          </span>
-        </template></el-table-column
-      >
-
-      <!-- <el-table-column label="执行人姓名，手动执行时记录" align="center" prop="executePerson" /> -->
-      <!-- <el-table-column label="任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE" align="center" prop="executeType" /> -->
-      <!-- <el-table-column
+        <el-table-column label="执行人姓名" align="center" prop="executePerson" />
+        <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" ? "术后" : "" }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="管理任务名称" align="center" prop="manageRouteName">
+        </el-table-column>
+        <el-table-column label="入院时间" align="center" prop="admissionTime" width="180">
+          <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" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.dischargeTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="就诊方式" align="center" prop="visitMethod">
+          <template slot-scope="scope">
+            <span>{{ scope.row.visitMethod == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
+              {{ scope.row.visitMethod == "BE_HOSPITALIZED" ? "住院" : "" }}
+            </span>
+          </template></el-table-column>
+        <el-table-column label="任务名称" align="center" prop="manageRouteName" />
+        <el-table-column label="执行时间" align="center" prop="executeTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="任务内容" align="center" prop="taskContent">
+          <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" ? "人工随访" : "" }}
+            </span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="执行人姓名，手动执行时记录" align="center" prop="executePerson" /> -->
+        <!-- <el-table-column label="任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE" align="center" prop="executeType" /> -->
+        <!-- <el-table-column
         label="任务推送方式"
         align="center"
         prop="executeRemark"
       /> -->
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        fixed="right"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-notebook-2"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:taskExecuteRecord:edit']"
-            >详情</el-button
-          >
-          <!-- <el-button
+        <el-table-column label="操作" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" icon="el-icon-notebook-2" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:taskExecuteRecord:edit']">详情</el-button>
+            <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:taskExecuteRecord:remove']"
           >删除</el-button> -->
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
   </div>
 </template>
 
@@ -531,7 +405,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -546,3 +420,14 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.container {
+  padding: 20px;
+  overflow-y: scroll;
+  height: calc(100vh - 84px);
+}
+
+::v-deep .el-table--scrollable-x .el-table__body-wrapper {
+  overflow-x: scroll;
+}
+</style>
\ No newline at end of file