修改

src/views/manage/manualReview/index.vue

@@ -6,8 +6,8 @@
       <el-tab-pane label="已忽略" name="DISAGREE"></el-tab-pane>
     </el-tabs>
     <div ref="topform" class="form">
-      <SearchFilter labelWidth="90px" :labelWidths="310" size="small" @search="handleQuery"
+      <SearchFilter labelWidth="90px" :labelWidths="310" size="small" @search="handleQuery" @reset="resetQuery"
-        @reset="resetQuery" @minShowCtrol="getMaxTableHeight">
+        @minShowCtrol="getMaxTableHeight">
         <el-form-item label="患者姓名" prop="patientName">
           <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
             style="width: 220px" />
@@ -175,7 +175,7 @@ export default {
         dischargeMethod: null,
         patientSource: null,
         routeCheckStatus: "UNAUDITED",
-        serviceStatus:'SERVICE_CENTER',
+        serviceStatus: 'SERVICE_CENTER',
       },
       dischargeTime: [],
       admissionTime: [],
@@ -295,30 +295,30 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       // 未审核
-      if(this.queryParams.routeCheckStatus == "UNAUDITED"){
+      if (this.queryParams.routeCheckStatus == "UNAUDITED") {
         this.queryParams = {
-        pageNum: 1,
+          pageNum: 1,
-        pageSize: 10,
+          pageSize: 10,
-       routeCheckStatus:'UNAUDITED',
+          routeCheckStatus: 'UNAUDITED',
-       serviceStatus:'SERVICE_CENTER',
+          serviceStatus: 'SERVICE_CENTER',
 
-      }
+        }
-      }else if(this.queryParams.routeCheckStatus == "AGREE"){//已审核
+      } else if (this.queryParams.routeCheckStatus == "AGREE") {//已审核
         this.queryParams = {
-        pageNum: 1,
+          pageNum: 1,
-        pageSize: 10,
+          pageSize: 10,
-       routeCheckStatus:'AGREE',
+          routeCheckStatus: 'AGREE',
-       serviceStatus:'SERVICE_CENTER',
+          serviceStatus: 'SERVICE_CENTER',
 
-      }
+        }
-      }else if(this.queryParams.routeCheckStatus == "DISAGREE"){//易忽略
+      } else if (this.queryParams.routeCheckStatus == "DISAGREE") {//易忽略
         this.queryParams = {
-        pageNum: 1,
+          pageNum: 1,
-        pageSize: 10,
+          pageSize: 10,
-       routeCheckStatus:'DISAGREE',
+          routeCheckStatus: 'DISAGREE',
-       serviceStatus:'SERVICE_CENTER',
+          serviceStatus: 'SERVICE_CENTER',
 
-      }
+        }
       }
       this.signTime = [];
       this.admissionTime = [];
@@ -466,4 +466,7 @@ export default {
   padding-top: 0 !important;
 }
 
+::v-deep .el-table__fixed-right::before {
+  height: 0px !important;
+}
 </style>

src/views/manage/patientInfo/index.vue

@@ -4,196 +4,80 @@
       <div class="card-table">
         <div :class="type == 'card' ? 'bluediv' : ''" @click="typeitem">
           <img src="../../../assets/manage/kapian.png" alt="" />
-          <img
+          <img src="../../../assets/manage/bluekapian.png" alt="" v-if="type == 'card'" />
-            src="../../../assets/manage/bluekapian.png"
-            alt=""
-            v-if="type == 'card'"
-          />
         </div>
         <div :class="type == 'table' ? 'bluediv' : ''" @click="typeitemtable">
           <img src="../../../assets/manage/liebiao.png" alt="" />
-          <img
+          <img src="../../../assets/manage/blueliebiao.png" alt="" v-if="type == 'table'" />
-            src="../../../assets/manage/blueliebiao.png"
-            alt=""
-            v-if="type == 'table'"
-          />
         </div>
       </div>
-      <SearchFilter
+      <SearchFilter :labelWidths="280" style="width: calc(100% - 80px)" :widths="80" size="small" @search="handleQuery"
-        :labelWidths="280"
+        @reset="resetQuery" @minShowCtrol="getMaxTableHeight">
-        style="width: calc(100% - 80px)"
-        :widths="80"
-        size="small"
-        @search="handleQuery"
-        @reset="resetQuery"
-        @minShowCtrol="getMaxTableHeight"
-      >
         <el-form-item label="患者姓名" prop="patientName">
-          <el-input
+          <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
-            v-model="queryParams.patientName"
+            style="width: 200px" />
-            placeholder="请输入患者姓名"
-            clearable
-            @keyup.enter.native="handleQuery"
-            style="width: 200px"
-          />
         </el-form-item>
         <el-form-item label="患者电话" prop="patientPhone">
-          <el-input
+          <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
-            v-model="queryParams.patientPhone"
+            style="width: 200px" />
-            placeholder="请输入患者电话"
-            clearable
-            @keyup.enter.native="handleQuery"
-            style="width: 200px"
-          />
         </el-form-item>
         <el-form-item label="身份证号" prop="cardNo">
-          <el-input
+          <el-input v-model="queryParams.cardNo" placeholder="请输入患者身份证号" clearable @keyup.enter.native="handleQuery"
-            v-model="queryParams.cardNo"
+            style="width: 200px" />
-            placeholder="请输入患者身份证号"
-            clearable
-            @keyup.enter.native="handleQuery"
-            style="width: 200px"
-          />
         </el-form-item>
         <el-form-item label="诊断" prop="mainDiagnosis">
-          <el-input
+          <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width: 200px"
-            v-model="queryParams.mainDiagnosis"
+            @keyup.enter.native="handleQuery" />
-            placeholder="请选择诊断"
-            clearable
-            style="width: 200px"
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
         <el-form-item label="患者来源" prop="patientSource">
-          <el-select
+          <el-select v-model="queryParams.patientSource" placeholder="请选择患者来源" clearable style="width: 200px">
-            v-model="queryParams.patientSource"
+            <el-option v-for="dict in dict.type.patient_source" :key="dict.value" :label="dict.label"
-            placeholder="请选择患者来源"
+              :value="dict.value" />
-            clearable
-            style="width: 200px"
-          >
-            <el-option
-              v-for="dict in dict.type.patient_source"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="就诊方式" prop="visitMethod">
-          <el-select
+          <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width: 200px">
-            v-model="queryParams.visitMethod"
+            <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label"
-            placeholder="请选择就诊方式"
+              :value="dict.value" />
-            clearable
-            style="width: 200px"
-          >
-            <el-option
-              v-for="dict in dict.type.visit_method"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="就诊时间" prop="visitDateStart">
-          <el-date-picker
+          <el-date-picker v-model="visitDate" type="daterange" range-separator="至" start-placeholder="开始日期"
-            v-model="visitDate"
+            style="width: 200px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            style="width: 200px"
-            value-format="yyyy-MM-dd"
-            end-placeholder="结束日期"
-          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select
+          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 200px"
-            v-model="queryParams.hospitalAgencyId"
+            clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
-            filterable
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            placeholder="请选择医院"
-            style="width: 200px"
-            clearable
-            @clear="clearhospitalAgency"
-            @change="changehospitalAgency"
-          >
-            <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="campusAgencyId">
-          <el-select
+          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 200px" clearable
-            v-model="queryParams.campusAgencyId"
+            @clear="clearcampusAgency" @change="changecampusAgency">
-            filterable
+            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            placeholder="请选择院区"
-            style="width: 200px"
-            clearable
-            @clear="clearcampusAgency"
-            @change="changecampusAgency"
-          >
-            <el-option
-              v-for="item in campusAgencylist"
-              :key="item.id"
-              :label="item.agencyName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="科室" prop="departmentId">
-          <el-select
+          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 200px" clearable
-            v-model="queryParams.departmentId"
+            @clear="cleardepartment" @change="changedepartment">
-            filterable
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            placeholder="请选择科室"
-            style="width: 200px"
-            clearable
-            @clear="cleardepartment"
-            @change="changedepartment"
-          >
-            <el-option
-              v-for="item in departmentlist"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="病区" prop="wardId">
-          <el-select
+          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
-            v-model="queryParams.wardId"
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            filterable
-            placeholder="请选择病区"
-            style="width: 200px"
-            clearable
-          >
-            <el-option
-              v-for="item in wardlist"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="主治医生" prop="attendingPhysicianId">
-          <el-select
+          <el-select v-model="queryParams.attendingPhysicianId" style="width: 200px" filterable placeholder="请选择主治医生"
-            v-model="queryParams.attendingPhysicianId"
+            clearable>
-            style="width: 200px"
+            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
-            filterable
+              :value="item.userId">
-            placeholder="请选择主治医生"
-            clearable
-          >
-            <el-option
-              v-for="item in attendingPhysicianlist"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
-            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -204,19 +88,10 @@
       </SearchFilter>
     </div>
     <div ref="table" v-if="type == 'table'">
-      <el-table
+      <el-table :max-height="maxTableHeight" v-loading="loading" :data="patientInfoList">
-        :max-height="maxTableHeight"
-        v-loading="loading"
-        :data="patientInfoList"
-      >
         <el-table-column label="序号" type="index" width="48" align="center" />
         <el-table-column label="患者姓名" align="center" prop="patientName" />
-        <el-table-column
+        <el-table-column label="患者电话" align="center" prop="patientPhone" width="120" />
-          label="患者电话"
-          align="center"
-          prop="patientPhone"
-          width="120"
-        />
         <el-table-column label="性别" align="center" prop="sex">
           <template slot-scope="scope">
             {{ scope.row.sex == "MALE" ? "男" : "" }}
@@ -224,12 +99,7 @@
           </template>
         </el-table-column>
         <el-table-column label="年龄" align="center" prop="age" />
-        <el-table-column
+        <el-table-column label="出生日期" align="center" prop="birthDate" width="130" />
-          label="出生日期"
-          align="center"
-          prop="birthDate"
-          width="130"
-        />
         <!-- <el-table-column label="签约状态" align="center" prop="signStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sign_status" :value="scope.row.signStatus" />
@@ -241,68 +111,28 @@
         </template>
       </el-table-column> -->
         <!-- <el-table-column label="开证医生" align="center" prop="certificateIssuingDoctor" /> -->
-        <el-table-column
+        <el-table-column label="就诊时间" align="center" prop="visitDate" width="130">
-          label="就诊时间"
-          align="center"
-          prop="visitDate"
-          width="130"
-        >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.visitDate, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
         <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
         <!-- <el-table-column label="入院时间" align="center" prop="admissionTime" width='130' /> -->
-        <el-table-column
+        <el-table-column label="医院" align="center" prop="hospitalAgencyName" width="130" />
-          label="医院"
+        <el-table-column label="院区" align="center" prop="campusAgencyName" width="130" />
-          align="center"
+        <el-table-column label="科室名称" align="center" prop="departmentName" width="130" />
-          prop="hospitalAgencyName"
+        <el-table-column label="病区名称" align="center" prop="wardName" width="130" />
-          width="130"
+        <el-table-column label="住院/门诊号" align="center" prop="inHospitalNumber" width="130" />
-        />
+        <el-table-column label="主治医生" align="center" prop="attendingPhysicianName" />
-        <el-table-column
-          label="院区"
-          align="center"
-          prop="campusAgencyName"
-          width="130"
-        />
-        <el-table-column
-          label="科室名称"
-          align="center"
-          prop="departmentName"
-          width="130"
-        />
-        <el-table-column
-          label="病区名称"
-          align="center"
-          prop="wardName"
-          width="130"
-        />
-        <el-table-column
-          label="住院/门诊号"
-          align="center"
-          prop="inHospitalNumber"
-          width="130"
-        />
-        <el-table-column
-          label="主治医生"
-          align="center"
-          prop="attendingPhysicianName"
-        />
         <el-table-column label="就诊方式" align="center" prop="visitMethod">
           <template slot-scope="scope">
-            <dict-tag
+            <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
-              :options="dict.type.visit_method"
-              :value="scope.row.visitMethod"
-            />
           </template>
         </el-table-column>
         <!-- <el-table-column label="出院方式" align="center" prop="dischargeMethod" /> -->
         <el-table-column label="患者来源" align="center" prop="patientSource">
           <template slot-scope="scope">
-            <dict-tag
+            <dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" />
-              :options="dict.type.patient_source"
-              :value="scope.row.patientSource"
-            />
           </template>
         </el-table-column>
         <el-table-column label="住址" align="center" prop="address" />
@@ -313,33 +143,17 @@
             v-hasPermi="['manage:patientInfo:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['manage:patientInfo:remove']">删除</el-button> -->
-            <el-button
+            <el-button size="mini" type="text" @click="handleAuthRole(scope.row)">详情</el-button>
-              size="mini"
+            <el-button size="mini" type="text" @click="handleedit(scope.row)">画像编辑</el-button>
-              type="text"
-              @click="handleAuthRole(scope.row)"
-              >详情</el-button
-            >
-            <el-button size="mini" type="text" @click="handleedit(scope.row)"
-              >画像编辑</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
     </div>
     <div ref="table" v-else-if="type == 'card'">
-      <cardlist
+      <cardlist :maxTableHeight="maxTableHeight" :patientInfoList="patientInfoList"></cardlist>
-        :maxTableHeight="maxTableHeight"
-        :patientInfoList="patientInfoList"
-      ></cardlist>
     </div>
-    <myPagination
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-      v-show="total > 0"
+      :indexFromWrap="queryParams.pageNum" :indexFrom="indexFrom" @updateCPage="updateCPage"></myPagination>
-      :total="total"
-      :pageSize="queryParams.pageSize"
-      :indexFromWrap="queryParams.pageNum"
-      :indexFrom="indexFrom"
-      @updateCPage="updateCPage"
-    ></myPagination>
   </div>
 </template>
 
@@ -734,10 +548,6 @@ export default {
   overflow: hidden;
 }
 
-::v-deep .el-table__fixed,
-::v-deep .el-table__fixed-right {
-}
-
 .card-table {
   width: 80px;
   height: 30px;

src/views/manage/preHospitalized/index.vue

@@ -653,17 +653,17 @@ export default {
           familyMemberPhone: row.familyMemberPhone,
           cardNo: row.cardNo,
           address: row.address,
-          mainDiagnosis:row.mainDiagnosis,
+          mainDiagnosis: row.mainDiagnosis,
-          hospitalAgencyName:row.hospitalAgencyName,
+          hospitalAgencyName: row.hospitalAgencyName,
-          campusAgencyName:row.campusAgencyName,
+          campusAgencyName: row.campusAgencyName,
-          departmentName:row.departmentName,
+          departmentName: row.departmentName,
-          wardName:row.wardName,
+          wardName: row.wardName,
-          certificateIssuingDoctorName:row.certificateIssuingDoctorName,
+          certificateIssuingDoctorName: row.certificateIssuingDoctorName,
-          appointmentTreatmentGroup:row.appointmentTreatmentGroup,
+          appointmentTreatmentGroup: row.appointmentTreatmentGroup,
-          responsibleNurse:row.responsibleNurse,
+          responsibleNurse: row.responsibleNurse,
-          registrationNo:row.registrationNo,
+          registrationNo: row.registrationNo,
-          registrationDate:row.registrationDate,
+          registrationDate: row.registrationDate,
-          appointmentDate:row.appointmentDate,
+          appointmentDate: row.appointmentDate,
 
           sex: row.sex,
           birthDate: row.birthDate,
@@ -1174,20 +1174,22 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .small-padding .cell{
+::v-deep .small-padding .cell {
   text-align: end !important;
   padding-right: 11px;
-
-
 }
-::v-deep .el-table th.el-table__cell > .cell{
+
+::v-deep .el-table th.el-table__cell>.cell {
   display: contents;
 }
-::v-deep .el-table--medium .el-table__cell{
-  text-align: center;
 
+::v-deep .el-table--medium .el-table__cell {
+  text-align: center;
 }
 
+::v-deep .el-table__fixed-right::before {
+  height: 0px !important;
+}
 
 .divtitle {
   font-size: 16px;

src/views/manage/signRecord/index.vue

@@ -7,62 +7,23 @@
       <!-- <el-tab-pane label="待续签" name="WAIT_CONTINUOUS_SIGN"></el-tab-pane> -->
     </el-tabs>
     <div ref="topform" class="form">
-      <SearchFilter
+      <SearchFilter :labelWidths="310" labelWidth="110px" size="small" @search="handleQuery" @reset="resetQuery"
-      :labelWidths="310"  labelWidth="110px" 
+        @minShowCtrol="getMaxTableHeight" v-show="showSearch">
-        size="small"
-        @search="handleQuery"
-        @reset="resetQuery"
-        @minShowCtrol="getMaxTableHeight"
-        v-show="showSearch"
-      >
         <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px"> -->
-        <el-form-item
+        <el-form-item label="加入意向时间" prop="intentionalTimeStart" label-width="110px"
-          label="加入意向时间"
+          v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">
-          prop="intentionalTimeStart"
+          <el-date-picker v-model="intentionalTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-          label-width="110px"
+            style="width: 220px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-          v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'"
-        >
-          <el-date-picker
-            v-model="intentionalTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            style="width: 220px"
-            value-format="yyyy-MM-dd"
-            end-placeholder="结束日期"
-          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="签约时间" prop="signTimeStart" v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">
-          label="签约时间"
+          <el-date-picker v-model="signTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-          prop="signTimeStart"
+            style="width: 220px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-          v-if="queryParams.serviceStatus == 'SERVICE_CENTER'"
-        >
-          <el-date-picker
-            v-model="signTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            style="width: 220px"
-            value-format="yyyy-MM-dd"
-            end-placeholder="结束日期"
-          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item
+        <el-form-item label="到期时间" prop="serviceEndTimeStart" v-if="queryParams.serviceStatus == 'SERVICE_END'">
-          label="到期时间"
+          <el-date-picker v-model="serviceEndTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-          prop="serviceEndTimeStart"
+            style="width: 220px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-          v-if="queryParams.serviceStatus == 'SERVICE_END'"
-        >
-          <el-date-picker
-            v-model="serviceEndTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            style="width: 220px"
-            value-format="yyyy-MM-dd"
-            end-placeholder="结束日期"
-          >
           </el-date-picker>
         </el-form-item>
         <!-- <el-form-item label="提交时间" prop="submissionTimeStart" v-if="queryParams.serviceStatus == 'WAIT_CONTINUOUS_SIGN'">
@@ -72,18 +33,9 @@
       </el-form-item> -->
         <!-- 门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
         <el-form-item label="就诊方式" prop="visitMethod">
-          <el-select
+          <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width: 220px">
-            v-model="queryParams.visitMethod"
+            <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label"
-            placeholder="请选择就诊方式"
+              :value="dict.value" />
-            clearable
-            style="width: 220px"
-          >
-            <el-option
-              v-for="dict in dict.type.visit_method"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="签约时诊断" prop="signDiagnosis">
@@ -91,115 +43,48 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
         <el-form-item label="意向来源" prop="intentionalSource">
-          <el-input
+          <el-input v-model="queryParams.intentionalSource" placeholder="请输入意向来源" clearable style="width: 220px"
-            v-model="queryParams.intentionalSource"
+            @keyup.enter.native="handleQuery" />
-            placeholder="请输入意向来源"
-            clearable
-            style="width: 220px"
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
         <el-form-item label="开单医生" prop="billingDoctorName">
-          <el-input
+          <el-input v-model="queryParams.billingDoctorName" placeholder="请输入开单医生姓名" clearable style="width: 220px"
-            v-model="queryParams.billingDoctorName"
+            @keyup.enter.native="handleQuery" />
-            placeholder="请输入开单医生姓名"
-            clearable
-            style="width: 220px"
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
         <el-form-item label="患者姓名" prop="patientName">
-          <el-input
+          <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery"
-            v-model="queryParams.patientName"
+            style="width: 220px" />
-            placeholder="请输入患者姓名"
-            clearable
-            @keyup.enter.native="handleQuery"
-            style="width: 220px"
-          />
         </el-form-item>
         <el-form-item label="患者电话" prop="patientPhone">
-          <el-input
+          <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
-            v-model="queryParams.patientPhone"
+            style="width: 220px" />
-            placeholder="请输入患者电话"
-            clearable
-            @keyup.enter.native="handleQuery"
-            style="width: 220px"
-          />
         </el-form-item>
         <!-- <el-form-item label="身份证号" prop="cardNo">
         <el-input v-model="queryParams.cardNo" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
         <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select
+          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 220px"
-            v-model="queryParams.hospitalAgencyId"
+            clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
-            filterable
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            placeholder="请选择医院"
-            style="width: 220px"
-            clearable
-            @clear="clearhospitalAgency"
-            @change="changehospitalAgency"
-          >
-            <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="campusAgencyId">
-          <el-select
+          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 220px" clearable
-            v-model="queryParams.campusAgencyId"
+            @clear="clearcampusAgency" @change="changecampusAgency">
-            filterable
+            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            placeholder="请选择院区"
-            style="width: 220px"
-            clearable
-            @clear="clearcampusAgency"
-            @change="changecampusAgency"
-          >
-            <el-option
-              v-for="item in campusAgencylist"
-              :key="item.id"
-              :label="item.agencyName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="科室" prop="departmentId">
-          <el-select
+          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 220px" clearable
-            v-model="queryParams.departmentId"
+            @clear="cleardepartment" @change="changedepartment">
-            filterable
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            placeholder="请选择科室"
-            style="width: 220px"
-            clearable
-            @clear="cleardepartment"
-            @change="changedepartment"
-          >
-            <el-option
-              v-for="item in departmentlist"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="病区" prop="wardId">
-          <el-select
+          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 220px" clearable>
-            v-model="queryParams.wardId"
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            filterable
-            placeholder="请选择病区"
-            style="width: 220px"
-            clearable
-          >
-            <el-option
-              v-for="item in wardlist"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -211,16 +96,10 @@
       </el-form> -->
       </SearchFilter>
     </div>
-    <div
+    <div ref="mb8" class="mb8" v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">
-      ref="mb8"
-      class="mb8"
-      v-if="queryParams.serviceStatus == 'SERVICE_CENTER'"
-    >
       <el-row :gutter="10" class="">
         <el-col :span="1.5">
-          <el-button type="primary" plain size="mini" @click="addTask"
+          <el-button type="primary" plain size="mini" @click="addTask">手动创建任务</el-button>
-            >手动创建任务</el-button
-          >
         </el-col>
         <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
@@ -238,341 +117,151 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['manage:signRecord:export']">导出</el-button>
       </el-col> -->
-        <right-toolbar
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-        ></right-toolbar>
       </el-row>
     </div>
     <div ref="table">
       <div v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">
-        <el-table
+        <el-table :max-height="maxTableHeight" v-loading="loading" :data="signRecordList"
-          :max-height="maxTableHeight"
+          @selection-change="handleSelectionChange">
-          v-loading="loading"
+          <el-table-column label="序号" type="index" width="48" align="center" />
-          :data="signRecordList"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            label="序号"
-            type="index"
-            width="48"
-            align="center"
-          />
           <el-table-column label="姓名" align="center" prop="patientName" />
-          <el-table-column
+          <el-table-column label="电话" align="center" prop="patientPhone" width="130" />
-            label="电话"
+          <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="130" />
-            align="center"
-            prop="patientPhone"
-            width="130"
-          />
-          <el-table-column
-            label="就诊流水号"
-            align="center"
-            prop="visitSerialNumber"
-            width="130"
-          />
           <el-table-column label="诊断" align="center" prop="signDiagnosis" />
-          <el-table-column
+          <el-table-column label="医院" align="center" prop="hospitalAgencyName" width="130" />
-            label="医院"
+          <el-table-column label="院区" align="center" prop="campusAgencyName" />
-            align="center"
-            prop="hospitalAgencyName"
-            width="130"
-          />
-          <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="visitMethod">
             <template slot-scope="scope">
-              <dict-tag
+              <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
-                :options="dict.type.visit_method"
-                :value="scope.row.visitMethod"
-              />
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="意向来源" align="center" prop="intentionalSource">
-            label="意向来源"
-            align="center"
-            prop="intentionalSource"
-          >
             <template slot-scope="scope">
-              <dict-tag
+              <dict-tag :options="dict.type.sign_intentional_source" :value="scope.row.intentionalSource" />
-                :options="dict.type.sign_intentional_source"
-                :value="scope.row.intentionalSource"
-              />
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="加入意向时间" align="center" prop="intentionalTime" width="180">
-            label="加入意向时间"
-            align="center"
-            prop="intentionalTime"
-            width="180"
-          >
             <template slot-scope="scope">
               <span>{{ formatDate(scope.row.intentionalTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="开单医生" align="center" prop="billingDoctorName" />
-            label="开单医生"
-            align="center"
-            prop="billingDoctorName"
-          />
           <el-table-column label="金额" align="center" prop="price" />
           <el-table-column label="缴费状态" align="center" prop="paymentStatus">
             <template slot-scope="scope">
-              <span
+              <span>{{ scope.row.paymentStatus == "PAID" ? "已缴费" : "" }}
-                >{{ scope.row.paymentStatus == "PAID" ? "已缴费" : "" }}
                 {{ scope.row.paymentStatus == "UNPAID_FEES" ? "未缴费" : "" }}
               </span>
             </template>
           </el-table-column>
           <el-table-column label="签约时长" align="center" prop="serviceCycle">
             <template slot-scope="scope">
-              <span
+              <span>{{ scope.row.packageTerm
-                >{{ scope.row.packageTerm
+                }}{{ scope.row.packageTermUnit }}</span>
-                }}{{ scope.row.packageTermUnit }}</span
-              >
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="签约状态" align="center" prop="signStatus"
-            label="签约状态"
+            v-if="queryParams.serviceStatus == 'SERVICE_END'">
-            align="center"
-            prop="signStatus"
-            v-if="queryParams.serviceStatus == 'SERVICE_END'"
-          >
             <template slot-scope="scope">
               {{ scope.row.signStatus == "SEPARATE_SIGN" ? "取消签约" : "" }}
               {{ scope.row.signStatus == "EXPIRE_SIGN" ? "过期" : "" }}
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-            fixed="right"
-            width="160"
-          >
             <template slot-scope="scope">
-              <el-button
+              <el-button size="mini" type="text" @click="handlenewsign(scope.row)"
-                size="mini"
+                v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">签约</el-button>
-                type="text"
-                @click="handlenewsign(scope.row)"
-                v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'"
-                >签约</el-button
-              >
             </template>
           </el-table-column>
         </el-table>
       </div>
       <div v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">
-        <el-table
+        <el-table :max-height="maxTableHeight" v-loading="loading" :data="signRecordList" highlight-current-row
-          :max-height="maxTableHeight"
+          @current-change="singleElection" @selection-change="handleSelectionChange">
-          v-loading="loading"
+          <el-table-column label="序号" type="index" width="48" align="center" />
-          :data="signRecordList"
-          highlight-current-row
-          @current-change="singleElection"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            label="序号"
-            type="index"
-            width="48"
-            align="center"
-          />
           <el-table-column label="姓名" align="center" prop="patientName" />
-          <el-table-column
+          <el-table-column label="电话" align="center" prop="patientPhone" width="130" />
-            label="电话"
+          <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="130" />
-            align="center"
-            prop="patientPhone"
-            width="130"
-          />
-          <el-table-column
-            label="就诊流水号"
-            align="center"
-            prop="visitSerialNumber"
-            width="130"
-          />
           <el-table-column label="诊断" align="center" prop="signDiagnosis" />
-          <el-table-column
+          <el-table-column label="医院" align="center" prop="hospitalAgencyName" width="130" />
-            label="医院"
+          <el-table-column label="院区" align="center" prop="campusAgencyName" />
-            align="center"
-            prop="hospitalAgencyName"
-            width="130"
-          />
-          <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="visitMethod">
             <template slot-scope="scope">
-              <dict-tag
+              <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
-                :options="dict.type.visit_method"
-                :value="scope.row.visitMethod"
-              />
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="患者来源" align="center" prop="intentionalSource">
-            label="患者来源"
-            align="center"
-            prop="intentionalSource"
-          >
             <template slot-scope="scope">
-              <dict-tag
+              <dict-tag :options="dict.type.sign_intentional_source" :value="scope.row.intentionalSource" />
-                :options="dict.type.sign_intentional_source"
-                :value="scope.row.intentionalSource"
-              />
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="签约时间" align="center" prop="signTime" width="180">
-            label="签约时间"
-            align="center"
-            prop="signTime"
-            width="180"
-          >
             <template slot-scope="scope">
               <span>{{ formatDate(scope.row.signTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="服务包名称" align="center" prop="packageName" width="130">
-            label="服务包名称"
-            align="center"
-            prop="packageName"
-            width="130"
-          >
             <template slot-scope="scope">
               <span>{{ scope.row.packageName }}</span>
             </template>
           </el-table-column>
           <el-table-column label="签约时长" align="center" prop="serviceCycle">
             <template slot-scope="scope">
-              <span
+              <span>{{ scope.row.packageTerm
-                >{{ scope.row.packageTerm
+                }}{{ scope.row.packageTermUnit }}</span>
-                }}{{ scope.row.packageTermUnit }}</span
-              >
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-            fixed="right"
-            width="160"
-          >
             <template slot-scope="scope">
-              <el-button
+              <el-button size="mini" type="text" @click="handleAuthRole(scope.row)" v-if="queryParams.serviceStatus == 'SERVICE_CENTER' ||
-                size="mini"
+      queryParams.serviceStatus == 'SERVICE_END'
-                type="text"
+      ">详情</el-button>
-                @click="handleAuthRole(scope.row)"
-                v-if="
-                  queryParams.serviceStatus == 'SERVICE_CENTER' ||
-                  queryParams.serviceStatus == 'SERVICE_END'
-                "
-                >详情</el-button
-              >
               <!-- <el-button size="mini" type="text" @click="handledata(scope.row)">生成数据</el-button> -->
-              <el-button
+              <el-button size="mini" type="text" @click="handleDelete(scope.row)"
-                size="mini"
+                v-if="queryParams.serviceStatus == 'SERVICE_CENTER'">取消签约</el-button>
-                type="text"
+              <el-button size="mini" type="text" @click="handleContinue(scope.row)" v-if="queryParams.serviceStatus == 'SERVICE_CENTER' ||
-                @click="handleDelete(scope.row)"
+      queryParams.serviceStatus == 'SERVICE_END'
-                v-if="queryParams.serviceStatus == 'SERVICE_CENTER'"
+      ">续约</el-button>
-                >取消签约</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                @click="handleContinue(scope.row)"
-                v-if="
-                  queryParams.serviceStatus == 'SERVICE_CENTER' ||
-                  queryParams.serviceStatus == 'SERVICE_END'
-                "
-                >续约</el-button
-              >
             </template>
           </el-table-column>
         </el-table>
       </div>
       <div v-if="queryParams.serviceStatus == 'SERVICE_END'">
-        <el-table
+        <el-table :max-height="maxTableHeight" v-loading="loading" :data="signRecordList"
-          :max-height="maxTableHeight"
+          @selection-change="handleSelectionChange">
-          v-loading="loading"
+          <el-table-column label="序号" type="index" width="48" align="center" />
-          :data="signRecordList"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            label="序号"
-            type="index"
-            width="48"
-            align="center"
-          />
           <el-table-column label="姓名" align="center" prop="patientName" />
-          <el-table-column
+          <el-table-column label="电话" align="center" prop="patientPhone" width="130" />
-            label="电话"
+          <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="130" />
-            align="center"
-            prop="patientPhone"
-            width="130"
-          />
-          <el-table-column
-            label="就诊流水号"
-            align="center"
-            prop="visitSerialNumber"
-            width="130"
-          />
           <el-table-column label="诊断" align="center" prop="signDiagnosis" />
-          <el-table-column
+          <el-table-column label="医院" align="center" prop="hospitalAgencyName" width="130" />
-            label="医院"
+          <el-table-column label="院区" align="center" prop="campusAgencyName" />
-            align="center"
-            prop="hospitalAgencyName"
-            width="130"
-          />
-          <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="visitMethod">
             <template slot-scope="scope">
-              <dict-tag
+              <dict-tag :options="dict.type.visit_method" :value="scope.row.visitMethod" />
-                :options="dict.type.visit_method"
-                :value="scope.row.visitMethod"
-              />
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="患者来源" align="center" prop="intentionalSource">
-            label="患者来源"
-            align="center"
-            prop="intentionalSource"
-          >
             <template slot-scope="scope">
-              <dict-tag
+              <dict-tag :options="dict.type.sign_intentional_source" :value="scope.row.intentionalSource" />
-                :options="dict.type.sign_intentional_source"
-                :value="scope.row.intentionalSource"
-              />
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="服务包名称" align="center" prop="packageName" width="130">
-            label="服务包名称"
-            align="center"
-            prop="packageName"
-            width="130"
-          >
             <template slot-scope="scope">
               <span>{{ scope.row.packageName }}</span>
             </template>
           </el-table-column>
           <el-table-column label="签约时长" align="center" prop="serviceCycle">
             <template slot-scope="scope">
-              <span
+              <span>{{ scope.row.packageTerm
-                >{{ scope.row.packageTerm
+                }}{{ scope.row.packageTermUnit }}</span>
-                }}{{ scope.row.packageTermUnit }}</span
-              >
             </template>
           </el-table-column>
           <el-table-column label="签约状态" align="center" prop="signStatus">
@@ -581,34 +270,14 @@
               {{ scope.row.signStatus == "EXPIRE_SIGN" ? "过期" : "" }}
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-            fixed="right"
-            width="160"
-          >
             <template slot-scope="scope">
-              <el-button
+              <el-button size="mini" type="text" @click="handleAuthRole(scope.row)" v-if="queryParams.serviceStatus == 'SERVICE_CENTER' ||
-                size="mini"
+      queryParams.serviceStatus == 'SERVICE_END'
-                type="text"
+      ">详情</el-button>
-                @click="handleAuthRole(scope.row)"
+              <el-button size="mini" type="text" @click="handleContinue(scope.row)" v-if="queryParams.serviceStatus == 'SERVICE_CENTER' ||
-                v-if="
+      queryParams.serviceStatus == 'SERVICE_END'
-                  queryParams.serviceStatus == 'SERVICE_CENTER' ||
+      ">续约</el-button>
-                  queryParams.serviceStatus == 'SERVICE_END'
-                "
-                >详情</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                @click="handleContinue(scope.row)"
-                v-if="
-                  queryParams.serviceStatus == 'SERVICE_CENTER' ||
-                  queryParams.serviceStatus == 'SERVICE_END'
-                "
-                >续约</el-button
-              >
             </template>
           </el-table-column>
         </el-table>
@@ -616,13 +285,8 @@
     </div>
     <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
-    <myPagination
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-      v-show="total > 0"
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-      :total="total"
-      :pageSize="queryParams.pageSize"
-      :indexFromWrap="queryParams.pageNum"
-      @updateCPage="updateCPage"
-    ></myPagination>
   </div>
 </template>
 
@@ -1085,17 +749,17 @@ export default {
           familyMemberPhone: row.familyMemberPhone,
           cardNo: row.cardNo,
           address: row.address,
-          mainDiagnosis:row.mainDiagnosis,
+          mainDiagnosis: row.mainDiagnosis,
-          hospitalAgencyName:row.hospitalAgencyName,
+          hospitalAgencyName: row.hospitalAgencyName,
-          campusAgencyName:row.campusAgencyName,
+          campusAgencyName: row.campusAgencyName,
-          departmentName:row.departmentName,
+          departmentName: row.departmentName,
-          wardName:row.wardName,
+          wardName: row.wardName,
-          certificateIssuingDoctorName:row.certificateIssuingDoctorName,
+          certificateIssuingDoctorName: row.certificateIssuingDoctorName,
-          appointmentTreatmentGroup:row.appointmentTreatmentGroup,
+          appointmentTreatmentGroup: row.appointmentTreatmentGroup,
-          responsibleNurse:row.responsibleNurse,
+          responsibleNurse: row.responsibleNurse,
-          registrationNo:row.registrationNo,
+          registrationNo: row.registrationNo,
-          registrationDate:row.registrationDate,
+          registrationDate: row.registrationDate,
-          appointmentDate:row.appointmentDate,
+          appointmentDate: row.appointmentDate,
 
           sex: row.sex,
           birthDate: row.birthDate,
@@ -1182,7 +846,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .el-table__body tr.current-row > td.el-table__cell {
+::v-deep .el-table__body tr.current-row>td.el-table__cell {
   background-color: #409eff;
   color: #fff;
 
@@ -1191,6 +855,10 @@ export default {
   }
 }
 
+::v-deep .el-table__fixed-right::before {
+  height: 0px !important;
+}
+
 .app-container {
   padding-top: 0 !important;
 }

src/views/manage/visitin/index.vue

@@ -687,17 +687,17 @@ export default {
           familyMemberPhone: row.familyMemberPhone,
           cardNo: row.cardNo,
           address: row.address,
-          mainDiagnosis:row.mainDiagnosis,
+          mainDiagnosis: row.mainDiagnosis,
-          hospitalAgencyName:row.hospitalAgencyName,
+          hospitalAgencyName: row.hospitalAgencyName,
-          campusAgencyName:row.campusAgencyName,
+          campusAgencyName: row.campusAgencyName,
-          departmentName:row.departmentName,
+          departmentName: row.departmentName,
-          wardName:row.wardName,
+          wardName: row.wardName,
-          certificateIssuingDoctorName:row.certificateIssuingDoctorName,
+          certificateIssuingDoctorName: row.certificateIssuingDoctorName,
-          appointmentTreatmentGroup:row.appointmentTreatmentGroup,
+          appointmentTreatmentGroup: row.appointmentTreatmentGroup,
-          responsibleNurse:row.responsibleNurse,
+          responsibleNurse: row.responsibleNurse,
-          registrationNo:row.registrationNo,
+          registrationNo: row.registrationNo,
-          registrationDate:row.registrationDate,
+          registrationDate: row.registrationDate,
-          appointmentDate:row.appointmentDate,
+          appointmentDate: row.appointmentDate,
 
           sex: row.sex,
           birthDate: row.birthDate,
@@ -1218,19 +1218,23 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .small-padding .cell{
+::v-deep .small-padding .cell {
   text-align: end !important;
   padding-right: 11px;
-
-
 }
-::v-deep .el-table th.el-table__cell > .cell{
+
+::v-deep .el-table th.el-table__cell>.cell {
   display: contents;
 }
-::v-deep .el-table--medium .el-table__cell{
-  text-align: center;
 
+::v-deep .el-table--medium .el-table__cell {
+  text-align: center;
 }
+
+::v-deep .el-table__fixed-right::before {
+  height: 0px !important;
+}
+
 .divtitle {
   font-size: 16px;
   font-weight: 600;

src/views/system/followup/index.vue

@@ -1,79 +1,36 @@
 <template>
   <div class="app-container" ref="layout">
-    <el-tabs
+    <el-tabs v-model="queryParams.nodeExecuteStatus" @tab-click="handleClick" style="flex: 1">
-      v-model="queryParams.nodeExecuteStatus"
-      @tab-click="handleClick"
-      style="flex: 1"
-    >
       <el-tab-pane label="未执行" name="UNEXECUTED"></el-tab-pane>
       <el-tab-pane label="已执行" name="EXECUTED"></el-tab-pane>
     </el-tabs>
     <div ref="topform" class="form">
-      <SearchFilter labelWidth="90px" :labelWidths="310" size="small" @search="handleQuery"
+      <SearchFilter labelWidth="90px" :labelWidths="310" size="small" @search="handleQuery" @reset="resetQuery"
-        @reset="resetQuery" @minShowCtrol="getMaxTableHeight" @fold="fold">
+        @minShowCtrol="getMaxTableHeight" @fold="fold">
         <el-form-item label="执行时间" prop="startDate">
-          <el-date-picker
+          <el-date-picker v-model="intentionalTime" type="daterange" range-separator="至" start-placeholder="开始日期"
-            v-model="intentionalTime"
+            style="width: 220px" value-format="yyyy-MM-dd" end-placeholder="结束日期" @change="chooseTime">
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            style="width: 220px"
-            value-format="yyyy-MM-dd"
-            end-placeholder="结束日期"
-            @change="chooseTime"
-          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="姓名" prop="patientName">
-          <el-input
+          <el-input style="width: 220px" v-model="queryParams.patientName" placeholder="请输入姓名" clearable
-          style="width: 220px"
+            @keyup.enter.native="handleQuery" />
-            v-model="queryParams.patientName"
-            placeholder="请输入姓名"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
         <el-form-item label="电话" prop="patientPhone">
-          <el-input
+          <el-input style="width: 220px" v-model="queryParams.patientPhone" placeholder="请输入电话" clearable
-          style="width: 220px"
+            @keyup.enter.native="handleQuery" />
-            v-model="queryParams.patientPhone"
-            placeholder="请输入电话"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
         <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select
+          <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width: 220px"
-            v-model="queryParams.hospitalAgencyId"
+            clearable @clear="clearhospitalAgency" @change="changehospitalAgency">
-            filterable
+            <el-option v-for="item in hospitalAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            placeholder="请选择医院"
-            style="width: 220px"
-            clearable
-            @clear="clearhospitalAgency"
-            @change="changehospitalAgency"
-          >
-            <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
+          <el-select style="width: 220px" v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable>
-          style="width: 220px"
+            <el-option v-for="dict in dict.type.visit_method" :key="dict.value" :label="dict.label"
-            v-model="queryParams.visitMethod"
+              :value="dict.value" />
-            placeholder="请选择就诊方式"
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.visit_method"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="就诊类型" prop="suitRange">
@@ -83,13 +40,8 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
-          <el-input
+          <el-input style="width: 220px" v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" clearable
-          style="width: 220px"
+            @keyup.enter.native="handleQuery" />
-            v-model="queryParams.visitSerialNumber"
-            placeholder="请输入就诊流水号"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
         <!-- <el-form-item label="门诊/出院时间" prop="intentionalTimeStart">
           <el-date-picker @change="mzchange" v-model="mzTime" type="daterange" range-separator="至"
@@ -102,106 +54,44 @@
           </el-date-picker>
         </el-form-item> -->
         <el-form-item label="诊断" prop="mainDiagnosis">
-          <el-input
+          <el-input style="width: 220px" v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable
-          style="width: 220px"
+            @keyup.enter.native="handleQuery" />
-            v-model="queryParams.mainDiagnosis"
-            placeholder="请选择诊断"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
         </el-form-item>
         <el-form-item label="院区" prop="campusAgencyId">
-          <el-select
+          <el-select v-model="queryParams.campusAgencyId" filterable placeholder="请选择院区" style="width: 220px" clearable
-            v-model="queryParams.campusAgencyId"
+            @clear="clearcampusAgency" @change="changecampusAgency">
-            filterable
+            <el-option v-for="item in campusAgencylist" :key="item.id" :label="item.agencyName" :value="item.id">
-            placeholder="请选择院区"
-            style="width: 220px"
-            clearable
-            @clear="clearcampusAgency"
-            @change="changecampusAgency"
-          >
-            <el-option
-              v-for="item in campusAgencylist"
-              :key="item.id"
-              :label="item.agencyName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="科室" prop="departmentId">
-          <el-select
+          <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width: 220px" clearable
-            v-model="queryParams.departmentId"
+            @clear="cleardepartment" @change="changedepartment">
-            filterable
+            <el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            placeholder="请选择科室"
-            style="width: 220px"
-            clearable
-            @clear="cleardepartment"
-            @change="changedepartment"
-          >
-            <el-option
-              v-for="item in departmentlist"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="病区" prop="wardId">
-          <el-select
+          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 220px" clearable>
-            v-model="queryParams.wardId"
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
-            filterable
-            placeholder="请选择病区"
-            style="width: 220px"
-            clearable
-          >
-            <el-option
-              v-for="item in wardlist"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.id"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="主治医生" prop="attendingPhysicianId">
-          <el-select
+          <el-select v-model="queryParams.attendingPhysicianId" style="width: 220px" filterable placeholder="请选择主治医生"
-            v-model="queryParams.attendingPhysicianId"
+            clearable>
-            style="width: 220px"
+            <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
-            filterable
+              :value="item.userId">
-            placeholder="请选择主治医生"
-            clearable
-          >
-            <el-option
-              v-for="item in attendingPhysicianlist"
-              :key="item.userId"
-              :label="item.nickName"
-              :value="item.userId"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="任务名称" prop="manageRouteName">
-          <el-input
+          <el-input v-model="queryParams.manageRouteName" placeholder="请输入任务名称" clearable style="width: 220px"
-            v-model="queryParams.manageRouteName"
+            @keyup.enter.native="handleQuery" />
-            placeholder="请输入任务名称"
+          <span style="margin-left: 13px;" v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED' && foldshow == true">
-            clearable
+            <el-switch class="switchStyle" v-model="timeSignshow" active-color="#1890ff" inactive-color="#5AC1A1"
-            style="width: 220px"
+              active-text="全部" inactive-text="待办" @change="changeswitch" />
-            @keyup.enter.native="handleQuery"
+          </span>
-          />
-          <span style="margin-left: 13px;" v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED' &&foldshow==true">
-          <el-switch
-
-            class="switchStyle"
-            v-model="timeSignshow"
-            active-color="#1890ff"
-            inactive-color="#5AC1A1"
-            active-text="全部"
-            inactive-text="待办"
-            @change="changeswitch"
-          />
-        </span>
         </el-form-item>
         <!-- <el-form-item
           label=""
@@ -222,33 +112,13 @@
       </SearchFilter>
     </div>
     <div ref="table">
-      <el-table
+      <el-table :max-height="maxTableHeight" v-loading="loading" :data="taskExecuteRecordList"
-        :max-height="maxTableHeight"
+        @selection-change="handleSelectionChange">
-        v-loading="loading"
-        :data="taskExecuteRecordList"
-        @selection-change="handleSelectionChange"
-      >
         <!-- <el-table-column type="selection" width="35"  align="center" /> -->
-          <el-table-column label="序号" type="index" width="48" align="center" />
+        <el-table-column label="序号" type="index" width="48" align="center" />
-        <el-table-column
+        <el-table-column label="姓名" align="center" prop="patientName" width="80" :show-overflow-tooltip="true" />
-          label="姓名"
+        <el-table-column label="电话" align="center" prop="patientPhone" width="110" />
-          align="center"
+        <el-table-column label="性别" align="center" prop="visitSerialNumber" width="48">
-          prop="patientName"
-          width="80"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="电话"
-          align="center"
-          prop="patientPhone"
-          width="110"
-        />
-        <el-table-column
-          label="性别"
-          align="center"
-          prop="visitSerialNumber"
-          width="48"
-        >
           <template slot-scope="scope">
             {{ scope.row.sex == "MALE" ? "男" : "" }}
             {{ scope.row.sex == "FEMALE" ? "女" : "" }}
@@ -262,26 +132,15 @@
           </template>
         </el-table-column>
         <!-- <el-table-column label="院区" align="center" prop="campusAgencyName" /> -->
-        <el-table-column
+        <el-table-column label="科室/病区" align="center" prop="departmentName" :show-overflow-tooltip="true" width="100">
-          label="科室/病区"
-          align="center"
-          prop="departmentName"
-          :show-overflow-tooltip="true"
-          width="100"
-        >
           <template slot-scope="scope">
             {{ scope.row.departmentName }}
             {{ scope.row.wardName }}
           </template>
         </el-table-column>
         <!-- <el-table-column label="病区名称" align="center" prop="wardName" /> -->
-        <el-table-column
+        <el-table-column :render-header="renderHeader" label="门诊|住院号/就诊流水号" align="center" width="120"
-          :render-header="renderHeader"
+          :show-overflow-tooltip="true">
-          label="门诊|住院号/就诊流水号"
-          align="center"
-          width="120"
-          :show-overflow-tooltip="true"
-        >
           <template slot-scope="scope">
             {{ scope.row.inHospitalNumber }}<br />
             {{ scope.row.visitSerialNumber }}
@@ -294,29 +153,16 @@
           width="120"
           :show-overflow-tooltip="true"
         /> -->
-        <el-table-column
+        <el-table-column label="诊断" align="center" prop="mainDiagnosis" width="120" :show-overflow-tooltip="true" />
-          label="诊断"
-          align="center"
-          prop="mainDiagnosis"
-          width="120"
-          :show-overflow-tooltip="true"
-        />
         <el-table-column label="手术名称" align="center" prop="surgicalName" />
-        <el-table-column
+        <el-table-column label="主治医生" align="center" prop="attendingPhysicianName" width="80"
-          label="主治医生"
+          :show-overflow-tooltip="true" />
-          align="center"
-          prop="attendingPhysicianName"
-          width="80"
-          :show-overflow-tooltip="true"
-        />
         <el-table-column label="就诊方式" align="center" prop="visitMethod">
           <template slot-scope="scope">
-            <span
+            <span>{{ scope.row.visitMethod == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
-              >{{ scope.row.visitMethod == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
               {{ scope.row.visitMethod == "BE_IN_HOSPITAL" ? "住院" : "" }}
             </span>
-          </template></el-table-column
+          </template></el-table-column>
-        >
         <!-- <el-table-column label="就诊类型" align="center" prop="suitRange" width="80">
           <template slot-scope="scope">
             <span>
@@ -325,171 +171,95 @@
               {{ scope.row.suitRange == "DISCHARGE" ? "出院" : "" }}
             </span>
           </template></el-table-column> -->
-        <el-table-column
+        <el-table-column label="入院时间" align="center" prop="admissionTime" width="100">
-          label="入院时间"
-          align="center"
-          prop="admissionTime"
-          width="100"
-        >
           <template slot-scope="scope">
             {{
-              scope.row.visitMethod == "BE_IN_HOSPITAL"
+      scope.row.visitMethod == "BE_IN_HOSPITAL"
-                ? parseTime(scope.row.admissionTime, "{y}-{m}-{d}")
+        ? parseTime(scope.row.admissionTime, "{y}-{m}-{d}")
-                : ""
+        : ""
-            }}
+    }}
             <!-- <span>{{  parseTime(scope.row.admissionTime, "{y}-{m}-{d}") }}</span> -->
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="门诊/出院时间" align="center" prop="visitTime" width="105">
-          label="门诊/出院时间"
-          align="center"
-          prop="visitTime"
-          width="105"
-        >
           <template slot-scope="scope">
             <span>
               {{
-                scope.row.visitMethod == "OUTPATIENT_SERVICE"
+        scope.row.visitMethod == "OUTPATIENT_SERVICE"
-                  ? parseTime(scope.row.visitTime, "{y}-{m}-{d}")
+          ? parseTime(scope.row.visitTime, "{y}-{m}-{d}")
-                  : ""
+          : ""
-              }}
+      }}
               {{
-                scope.row.visitMethod == "BE_IN_HOSPITAL"
+        scope.row.visitMethod == "BE_IN_HOSPITAL"
-                  ? parseTime(scope.row.dischargeTime, "{y}-{m}-{d}")
+          ? parseTime(scope.row.dischargeTime, "{y}-{m}-{d}")
-                  : ""
+          : ""
-              }}
+      }}
             </span>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="路径名称" align="center" prop="manageRouteName" width="110">
-          label="路径名称"
-          align="center"
-          prop="manageRouteName"
-          width="110"
-        >
         </el-table-column>
-        <el-table-column
+        <el-table-column label="任务节点" align="center" prop="routeNodeName" width="110">
-          label="任务节点"
-          align="center"
-          prop="routeNodeName"
-          width="110"
-        >
           <template slot-scope="scope">
-            <span v-if="scope.row.routeNodeName == 'AFTER_DISCHARGE'"
+            <span v-if="scope.row.routeNodeName == 'AFTER_DISCHARGE'">出院后<span v-if="scope.row.routeNodeDay">第{{
-              >出院后<span v-if="scope.row.routeNodeDay"
+      scope.row.routeNodeDay }}天</span></span>
-                >第{{ scope.row.routeNodeDay }}天</span
+            <span v-if="scope.row.routeNodeName == 'AFTER_ADMISSION'">入院后<span v-if="scope.row.routeNodeDay">第{{
-              ></span
+      scope.row.routeNodeDay }}天</span></span>
-            >
+            <span v-if="scope.row.routeNodeName == 'AFTER_CONSULTATION'">就诊后<span v-if="scope.row.routeNodeDay">第{{
-            <span v-if="scope.row.routeNodeName == 'AFTER_ADMISSION'"
+      scope.row.routeNodeDay }}天</span></span>
-              >入院后<span v-if="scope.row.routeNodeDay"
+            <span v-if="scope.row.routeNodeName == 'AFTER_VISIT_DISCHARGE'">就诊/出院后<span
-                >第{{ scope.row.routeNodeDay }}天</span
+                v-if="scope.row.routeNodeDay">第{{ scope.row.routeNodeDay }}天</span></span>
-              ></span
+            <span v-if="scope.row.routeNodeName == 'PREOPERATIVE'">术前<span v-if="scope.row.routeNodeDay">第{{
-            >
+      scope.row.routeNodeDay }}天</span></span>
-            <span v-if="scope.row.routeNodeName == 'AFTER_CONSULTATION'"
+            <span v-if="scope.row.routeNodeName == 'POSTOPERATIVE'">术后<span v-if="scope.row.routeNodeDay">第{{
-              >就诊后<span v-if="scope.row.routeNodeDay"
+      scope.row.routeNodeDay }}天</span></span>
-                >第{{ scope.row.routeNodeDay }}天</span
-              ></span
-            >
-            <span v-if="scope.row.routeNodeName == 'AFTER_VISIT_DISCHARGE'"
-              >就诊/出院后<span v-if="scope.row.routeNodeDay"
-                >第{{ scope.row.routeNodeDay }}天</span
-              ></span
-            >
-            <span v-if="scope.row.routeNodeName == 'PREOPERATIVE'"
-              >术前<span v-if="scope.row.routeNodeDay"
-                >第{{ scope.row.routeNodeDay }}天</span
-              ></span
-            >
-            <span v-if="scope.row.routeNodeName == 'POSTOPERATIVE'"
-              >术后<span v-if="scope.row.routeNodeDay"
-                >第{{ scope.row.routeNodeDay }}天</span
-              ></span
-            >
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="任务内容" align="center" prop="taskNodeType" :show-overflow-tooltip="true">
-          label="任务内容"
-          align="center"
-          prop="taskNodeType"
-          :show-overflow-tooltip="true"
-        >
           <template slot-scope="scope">
             <span>
               {{ scope.row.taskNodeType == "PHONE_OUTBOUND" ? "电话外呼" : "" }}
               {{
-                scope.row.taskNodeType == "QUESTIONNAIRE_SCALE"
+      scope.row.taskNodeType == "QUESTIONNAIRE_SCALE"
-                  ? "问卷量表"
+        ? "问卷量表"
-                  : ""
+        : ""
-              }}
+    }}
               {{
-                scope.row.taskNodeType == "PROPAGANDA_ARTICLE" ? "宣教文章" : ""
+        scope.row.taskNodeType == "PROPAGANDA_ARTICLE" ? "宣教文章" : ""
-              }}
+      }}
               {{ scope.row.taskNodeType == "TEXT_REMIND" ? "文字提醒" : "" }}
               <!-- {{ scope.row.taskType == "ARTIFICIAL_FOLLOW_UP" ? "人工随访" : "" }} -->
             </span>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED'" label="计划时间" align="center" prop="planTime"
-        v-if="queryParams.nodeExecuteStatus=='UNEXECUTED'"
+          width="95">
-        label="计划时间"
-          align="center"
-          prop="planTime"
-          width="95"
-
-        >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.planTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column v-if="queryParams.nodeExecuteStatus == 'EXECUTED'" label="执行时间" align="center" prop="executeTime"
-        v-if="queryParams.nodeExecuteStatus=='EXECUTED'"
+          width="95">
-        label="执行时间"
-          align="center"
-          prop="executeTime"
-          width="95"
-        >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
         <!-- <el-table-column label="随访模板" align="center" prop="templateName" width="110">
         </el-table-column> -->
-        <el-table-column
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-          fixed="right"
-        >
           <template slot-scope="scope">
-            <el-button
+            <el-button v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED'" size="mini" type="text"
-              v-if="queryParams.nodeExecuteStatus == 'UNEXECUTED'"
+              icon="el-icon-bank-card" @click="handleUpdate(scope.row)">处理</el-button>
-              size="mini"
+            <el-button v-if="queryParams.nodeExecuteStatus == 'EXECUTED'" size="mini" type="text"
-              type="text"
+              icon="el-icon-notebook-2" @click="handleadtail(scope.row)">详情</el-button>
-              icon="el-icon-bank-card"
-              @click="handleUpdate(scope.row)"
-              >处理</el-button
-            >
-            <el-button
-              v-if="queryParams.nodeExecuteStatus == 'EXECUTED'"
-              size="mini"
-              type="text"
-              icon="el-icon-notebook-2"
-              @click="handleadtail(scope.row)"
-              >详情</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
     </div>
     <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
-    <myPagination
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-      v-show="total > 0"
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-      :total="total"
-      :pageSize="queryParams.pageSize"
-      :indexFromWrap="queryParams.pageNum"
-      @updateCPage="updateCPage"
-    ></myPagination>
   </div>
 </template>
 <script>
@@ -502,11 +272,11 @@ import SearchFilter from '../../components/SearchForm.vue'
 export default {
   name: "Followup22",
   dicts: ["visit_method"],
-  components:{SearchFilter},
+  components: { SearchFilter },
 
   data() {
     return {
-      foldshow:null,
+      foldshow: null,
       maxTableHeight: undefined,
       // 随访时间
       intentionalTime: [],
@@ -549,7 +319,7 @@ export default {
         pageSize: 10,
         timeSign: "TODAY",
         nodeExecuteStatus: "UNEXECUTED",
-        patientPhone:null,
+        patientPhone: null,
 
         followStartTime: null,
         followEndTime: null,
@@ -658,7 +428,7 @@ export default {
         this.queryParams.timeSign = null;
       } else {
         this.queryParams.timeSign = "TODAY";
-          this.timeSignshow = false;
+        this.timeSignshow = false;
       }
       console.log(this.queryParams.nodeExecuteStatus, "nodeExecuteStatus");
       this.getList();
@@ -1047,7 +817,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1071,8 +841,8 @@ export default {
         this.getBoxPadding(layoutDiv) -
         this.getBoxHeight(formDiv);
     },
-    fold(e){
+    fold(e) {
-      this.foldshow=e
+      this.foldshow = e
     },
     // 屏幕resize监听
     screenChange() {
@@ -1147,17 +917,24 @@ export default {
     z-index: 9 !important;
     left: 20px !important;
   }
+
   .el-switch__label--right {
     z-index: 9;
     left: -3px;
   }
+
   .el-switch__label.is-active {
     display: block !important;
     color: #fff;
   }
+
   .el-switch__core,
   .el-switch__label {
     width: 60px !important;
   }
 }
+
+::v-deep .el-table__fixed-right::before {
+  height: 0px !important;
+}
 </style>

src/views/system/taskExecuteRecord/index.vue

@@ -426,4 +426,7 @@ export default {
 //   height: 15px !important;
 //   bottom: 8vh !important;
 // } */
+::v-deep .el-table__fixed-right::before {
+  height: 0px !important;
+}
 </style>