From bc4f471492a66fae219711b81e11e7f54ee06d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 3 Jul 2024 14:56:34 +0800
Subject: [PATCH 1/5] xg

---
 src/views/manage/blacklist/index.vue       |  20 ++---
 src/views/manage/manualReview/index.vue    |  12 ++-
 src/views/manage/patientInfo/index.vue     | 100 ++++++++++-----------
 src/views/manage/preHospitalized/index.vue |  92 +++++++++----------
 src/views/manage/signRecord/index.vue      |  58 ++++++------
 src/views/manage/visitin/index.vue         |  70 +++++++--------
 src/views/manage/visitout/index.vue        |  70 +++++++--------
 src/views/system/followup/index.vue        |  46 +++++-----
 8 files changed, 240 insertions(+), 228 deletions(-)

diff --git a/src/views/manage/blacklist/index.vue b/src/views/manage/blacklist/index.vue
index 74938c1..d499e2d 100644
--- a/src/views/manage/blacklist/index.vue
+++ b/src/views/manage/blacklist/index.vue
@@ -10,6 +10,14 @@
           <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
+        <el-form-item label="异常原因" prop="abnormalCauseValue">
+          <el-select v-model="queryParams.abnormalCauseValue" filterable placeholder="请输入异常原因" style="width:200px"
+            clearable>
+            <el-option v-for="item in abnormalCauselist" :key="item.id" :label="item.abnormalCauseValue"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="医院" prop="hospitalAgencyId">
           <el-select v-model="queryParams.hospitalAgencyId" filterable placeholder="请选择医院" style="width:200px" clearable
             @clear="clearhospitalAgency" @change="changehospitalAgency">
@@ -17,27 +25,19 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="院区" prop="campusAgencyId">
           <el-select v-model="queryParams.campusAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="科室" prop="departmentId">
           <el-select v-model="queryParams.departmentId" filterable placeholder="请选择科室" style="width:200px" clearable>
             <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="abnormalCauseValue">
-          <el-select v-model="queryParams.abnormalCauseValue" filterable placeholder="请输入异常原因" style="width:200px"
-            clearable>
-            <el-option v-for="item in abnormalCauselist" :key="item.id" :label="item.abnormalCauseValue"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <!-- (CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接) -->
         <!-- <el-form-item label="来源" prop="blacklistSource">
         <el-select v-model="queryParams.blacklistSource" placeholder="请选择来源" clearable>
diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue
index d363e97..3c5f681 100644
--- a/src/views/manage/manualReview/index.vue
+++ b/src/views/manage/manualReview/index.vue
@@ -37,21 +37,21 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="院区" prop="campusAgencyId">
           <el-select v-model="queryParams.campusAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="科室" prop="departmentId">
           <el-select v-model="queryParams.departmentId" filterable 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" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="病区" prop="wardId">
           <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
             <el-option v-for="item in wardlist" :key="item.id" :label="item.departmentName" :value="item.id">
             </el-option>
@@ -97,7 +97,7 @@
           <template slot-scope="scope">
             {{ scope.row.portaitCheckStatus == "AGREE" ? "审核通过" : "" }}
             {{ scope.row.portaitCheckStatus == "DISAGREE" ? "已忽略" : "" }}
-            {{ scope.row.portaitCheckStatus ==null ? "未审核" : "" }}
+            {{ scope.row.portaitCheckStatus == null ? "未审核" : "" }}
           </template>
         </el-table-column>
         <el-table-column label="路径审核状态" align="center" prop="routeCheckStatus" width="100">
@@ -190,6 +190,9 @@ export default {
   created() {
     if (localStorage.getItem('manualReviewquery')) {
       this.queryParams = JSON.parse(localStorage.getItem('manualReviewquery'))
+      this.queryParams.hospitalAgencyId = undefined
+      this.queryParams.campusAgencyId = undefined
+      this.queryParams.departmentId = undefined
     }
     this.getList();
     this.selectAgencyinfo();
@@ -349,6 +352,7 @@ export default {
       // })
       //医生
       this.usergetListinfo();
+      this.getMaxTableHeight();
     },
     //选中院区获取科室
     changecampusAgency(id) {
diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue
index 79d0fe2..5b43393 100644
--- a/src/views/manage/patientInfo/index.vue
+++ b/src/views/manage/patientInfo/index.vue
@@ -19,56 +19,6 @@
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select v-model="queryParams.hospitalAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" 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="outpatientNumber">
-        <el-input v-model="queryParams.outpatientNumber" placeholder="请输入门诊号" clearable style="width:200px"
-          @keyup.enter.native="handleQuery" />
-      </el-form-item> -->
-        <!-- <el-form-item label="出生日期" prop="birthDate">
-        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
-          style="width:200px" placeholder="请选择出生日期">
-        </el-date-picker>
-      </el-form-item> -->
-        <!-- 预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT -->
-        <!-- <el-form-item label="患者类型" prop="patientType">
-        <el-select v-model="queryParams.patientType" placeholder="请选择患者类型" clearable style="width:200px">
-          <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
-      </el-form-item> -->
-        <el-form-item label="主治医生" prop="attendingPhysicianId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.attendingPhysicianId" style="width:200px" filterable 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="surgicalName">
         <el-input v-model="queryParams.surgicalName" placeholder="请输入手术名称" clearable @keyup.enter.native="handleQuery"
           style="width:200px" />
@@ -92,6 +42,56 @@
         </el-date-picker>
       </el-form-item> -->
         <!-- ，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="queryParams.hospitalAgencyId" filterable 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 v-model="queryParams.campusAgencyId" filterable 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 v-model="queryParams.departmentId" filterable 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 v-model="queryParams.wardId" 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="outpatientNumber">
+        <el-input v-model="queryParams.outpatientNumber" placeholder="请输入门诊号" clearable style="width:200px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+        <!-- <el-form-item label="出生日期" prop="birthDate">
+        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
+          style="width:200px" placeholder="请选择出生日期">
+        </el-date-picker>
+      </el-form-item> -->
+        <!-- 预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT -->
+        <!-- <el-form-item label="患者类型" prop="patientType">
+        <el-select v-model="queryParams.patientType" placeholder="请选择患者类型" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item> -->
+        <el-form-item label="主治医生" prop="attendingPhysicianId">
+          <el-select v-model="queryParams.attendingPhysicianId" style="width:200px" filterable 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>
           <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>
diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue
index 4ff09a1..6277382 100644
--- a/src/views/manage/preHospitalized/index.vue
+++ b/src/views/manage/preHospitalized/index.vue
@@ -33,52 +33,6 @@
         <!-- <el-form-item label="诊断" prop="mainDiagnosis">
         <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
-      </el-form-item> -->
-        <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select v-model="queryParams.hospitalAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
-            <el-option v-for="item in wardlist" :key="item.id" :label="item.wardName" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="开证医生" prop="certificateIssuingDoctor" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.certificateIssuingDoctorId" filterable placeholder="请选择主治医生"
-            style="width: 200px" 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="birthDate">
-        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
-          style="width:200px" placeholder="请选择出生日期">
-        </el-date-picker>
-      </el-form-item> -->
-        <!-- 预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT -->
-        <!-- <el-form-item label="患者类型" prop="patientType">
-        <el-select v-model="queryParams.patientType" placeholder="请选择患者类型" clearable style="width:200px">
-          <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
       </el-form-item> -->
         <el-form-item label="预约治疗组" prop="appointmentTreatmentGroup">
           <el-input v-model="queryParams.appointmentTreatmentGroup" placeholder="请输入预约治疗组" clearable
@@ -101,6 +55,52 @@
         <!-- <el-form-item label="出院方式" prop="dischargeMethod">
         <el-input v-model="queryParams.dischargeMethod" placeholder="请输入出院方式" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="queryParams.hospitalAgencyId" filterable 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 v-model="queryParams.campusAgencyId" filterable 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 v-model="queryParams.departmentId" filterable 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 v-model="queryParams.wardId" filterable placeholder="请选择病区" style="width: 200px" clearable>
+            <el-option v-for="item in wardlist" :key="item.id" :label="item.wardName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开证医生" prop="certificateIssuingDoctor">
+          <el-select v-model="queryParams.certificateIssuingDoctorId" filterable placeholder="请选择主治医生"
+            style="width: 200px" 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="birthDate">
+        <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
+          style="width:200px" placeholder="请选择出生日期">
+        </el-date-picker>
+      </el-form-item> -->
+        <!-- 预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT -->
+        <!-- <el-form-item label="患者类型" prop="patientType">
+        <el-select v-model="queryParams.patientType" placeholder="请选择患者类型" clearable style="width:200px">
+          <el-option v-for="dict in dict.type.patient_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
       </el-form-item> -->
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue
index 494639e..8bef6e0 100644
--- a/src/views/manage/signRecord/index.vue
+++ b/src/views/manage/signRecord/index.vue
@@ -29,33 +29,6 @@
           style="width:300px" value-format="yyyy-MM-dd" 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
-            @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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" 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>
         <!-- 门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL -->
         <el-form-item label="就诊方式" prop="visitMethod">
           <el-select v-model="queryParams.visitMethod" placeholder="请选择就诊方式" clearable style="width:200px">
@@ -86,6 +59,33 @@
         <!-- <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 v-model="queryParams.hospitalAgencyId" filterable 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 v-model="queryParams.campusAgencyId" filterable 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 v-model="queryParams.departmentId" filterable 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 v-model="queryParams.wardId" 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>
           <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>
@@ -357,6 +357,9 @@ export default {
   created() {
     if (localStorage.getItem('signRecordquery')) {
       this.queryParams = JSON.parse(localStorage.getItem('signRecordquery'))
+      this.queryParams.hospitalAgencyId = undefined
+      this.queryParams.campusAgencyId = undefined
+      this.queryParams.departmentId = undefined
     }
     this.selectAgencyinfo();
   },
@@ -621,6 +624,7 @@ export default {
       this.queryParams.departmentId = null
       this.queryParams.wardId = null
       this.queryParams.certificateIssuingDoctorId = null
+      this.getMaxTableHeight();
       // })
     },
     //选中院区获取科室
diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue
index edaab93..0c2800f 100644
--- a/src/views/manage/visitin/index.vue
+++ b/src/views/manage/visitin/index.vue
@@ -34,41 +34,6 @@
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width: 200px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select v-model="queryParams.hospitalAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" 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="attendingPhysician" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width: 200px"
-            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="visitSerialNumber">
           <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width: 200px" />
         </el-form-item>
@@ -100,6 +65,41 @@
         <el-input v-model="queryParams.dischargeMethod" placeholder="请输入出院方式" clearable style="width:200px"
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="queryParams.hospitalAgencyId" filterable 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 v-model="queryParams.campusAgencyId" filterable 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 v-model="queryParams.departmentId" filterable 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 v-model="queryParams.wardId" 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="attendingPhysician">
+          <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width: 200px"
+            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>
           <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>
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index 2fa1f90..3ac6145 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -29,41 +29,6 @@
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="医院" prop="hospitalAgencyId">
-          <el-select v-model="queryParams.hospitalAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" 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="attendingPhysician" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px"
-            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="visitSerialNumber">
           <el-input v-model="queryParams.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
         </el-form-item>
@@ -77,6 +42,41 @@
           <el-input v-model="queryParams.surgicalName" placeholder="请输入手术名称" clearable @keyup.enter.native="handleQuery"
             style="width:200px" />
         </el-form-item>
+        <el-form-item label="医院" prop="hospitalAgencyId">
+          <el-select v-model="queryParams.hospitalAgencyId" filterable 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 v-model="queryParams.campusAgencyId" filterable 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 v-model="queryParams.departmentId" filterable 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 v-model="queryParams.wardId" 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="attendingPhysician">
+          <el-select v-model="queryParams.attendingPhysicianId" filterable placeholder="请选择主治医生" style="width:200px"
+            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="birthDate">
         <el-date-picker clearable v-model="queryParams.birthDate" type="date" value-format="yyyy-MM-dd"
           style="width:200px" placeholder="请选择出生日期">
diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue
index 1cfb393..0ece974 100644
--- a/src/views/system/followup/index.vue
+++ b/src/views/system/followup/index.vue
@@ -25,26 +25,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="院区" prop="campusAgencyId" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.campusAgencyId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.departmentId" filterable 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" v-if="queryParams.hospitalAgencyId">
-          <el-select v-model="queryParams.wardId" 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="suitRange">
           <el-select v-model="queryParams.suitRange" placeholder="请选择就诊类型" clearable @change="change">
             <el-option v-for="item in visitoptions" :key="item.value" :label="item.label" :value="item.value">
@@ -69,7 +49,27 @@
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="主治医生" prop="attendingPhysicianId" v-if="queryParams.hospitalAgencyId">
+        <el-form-item label="院区" prop="campusAgencyId">
+          <el-select v-model="queryParams.campusAgencyId" filterable 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 v-model="queryParams.departmentId" filterable 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 v-model="queryParams.wardId" 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 v-model="queryParams.attendingPhysicianId" style="width: 200px" filterable placeholder="请选择主治医生"
             clearable>
             <el-option v-for="item in attendingPhysicianlist" :key="item.userId" :label="item.nickName"
@@ -254,6 +254,9 @@ export default {
   created() {
     if (localStorage.getItem('followupquery')) {
       this.queryParams = JSON.parse(localStorage.getItem('followupquery'))
+      this.queryParams.hospitalAgencyId = undefined
+      this.queryParams.campusAgencyId = undefined
+      this.queryParams.departmentId = undefined
     }
     this.getList();
     this.selectAgencyinfo();
@@ -347,6 +350,7 @@ export default {
       // })
       //医生
       this.usergetListinfo();
+      this.getMaxTableHeight();
     },
     //选中院区获取科室
     changecampusAgency(id) {

From 9adf76cf1b1977e86ca6d15a9088acc8c9aa15a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 3 Jul 2024 14:58:21 +0800
Subject: [PATCH 2/5] xg

---
 src/views/manage/patientInfo/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue
index 5b43393..ed7616e 100644
--- a/src/views/manage/patientInfo/index.vue
+++ b/src/views/manage/patientInfo/index.vue
@@ -10,11 +10,6 @@
           <el-input v-model="queryParams.patientPhone" placeholder="请输入患者电话" clearable @keyup.enter.native="handleQuery"
             style="width:200px" />
         </el-form-item>
-        <el-form-item label="就诊时间" prop="visitDateStart">
-          <el-date-picker v-model="visitDate" type="daterange" range-separator="至" start-placeholder="开始日期"
-            style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="诊断" prop="mainDiagnosis">
           <el-input v-model="queryParams.mainDiagnosis" placeholder="请选择诊断" clearable style="width:200px"
             @keyup.enter.native="handleQuery" />
@@ -36,6 +31,11 @@
               :value="dict.value" />
           </el-select>
         </el-form-item>
+        <el-form-item label="就诊时间" prop="visitDateStart">
+          <el-date-picker v-model="visitDate" type="daterange" range-separator="至" start-placeholder="开始日期"
+            style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
         <!-- <el-form-item label="入院时间" prop="admissionTimeStart">
         <el-date-picker v-model="admissionTime" type="daterange" range-separator="至" start-placeholder="开始日期"
           style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">

From 5e6ed09fe5150087e13ea591a33d5a24813e2c27 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 3 Jul 2024 16:55:53 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=86=E5=88=86?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8+=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/manage/labelfieldinfo.js          |   8 +
 src/views/manage/labelfieldinfo/index.vue | 543 ++++++++++++++--------
 src/views/system/partition/index.vue      | 424 +++++++++++++----
 3 files changed, 709 insertions(+), 266 deletions(-)

diff --git a/src/api/manage/labelfieldinfo.js b/src/api/manage/labelfieldinfo.js
index 021ad52..afc46f4 100644
--- a/src/api/manage/labelfieldinfo.js
+++ b/src/api/manage/labelfieldinfo.js
@@ -8,6 +8,14 @@ export function listLabelfieldinfo(query) {
         params: query
     })
 }
+// 左侧查询
+export function taskTypeGrouping(query) {
+    return request({
+        url: '/manage/labelfieldinfo/taskTypeGrouping ',
+        method: 'get',
+        params: query
+    })
+}
 
 // 查询标签字段信息详细
 export function getLabelfieldinfo(id) {
diff --git a/src/views/manage/labelfieldinfo/index.vue b/src/views/manage/labelfieldinfo/index.vue
index 3c27864..fcefa55 100644
--- a/src/views/manage/labelfieldinfo/index.vue
+++ b/src/views/manage/labelfieldinfo/index.vue
@@ -1,185 +1,204 @@
 <template>
   <div class="app-container" ref="layout">
-    <div ref="topform" class="form">
-      <el-form
-        :model="queryParams"
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="68px"
-      >
-        <el-form-item label="字段名称" prop="fieldName">
-          <el-input
-            v-model="queryParams.fieldName"
-            placeholder="请输入字段名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="字段类型" label-width="100px" prop="fieldType">
-          <el-select
-            v-model="queryParams.fieldType"
-            placeholder="请选择字段类型"
-            clearable
+    <el-row :gutter="20">
+      <el-col :span="5" :xs="24">
+        <div class="left" ref="box">
+          <el-collapse
+            v-model="activeNames"
+            @change="handleChange"
+            v-for="(item, index) in list"
+            :key="index"
           >
-            <el-option
-              v-for="item in options"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!-- <el-form-item label="字段编码" prop="fieldCode">
-        <el-input
-          v-model="queryParams.fieldCode"
-          placeholder="请输入字段编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="字段排序" prop="fieldSort">
-        <el-input
-          v-model="queryParams.fieldSort"
-          placeholder="请输入字段排序"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="字段备注信息" prop="fieldRemark">
-        <el-input
-          v-model="queryParams.fieldRemark"
-          placeholder="请输入字段备注信息"
-          clearable
-          @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-collapse-item :name="item.taskTypeId">
+              <template slot="title">
+                {{ item.taskTypeName }}
+                <!-- {{item}} -->
+              </template>
+              <el-table :data="item.taskPartitionDictList" style="width: 100%" :show-header="false"   >
+                <el-table-column prop="" label="">
+                  <template slot-scope="scope">
+                    <!-- <div
+                      class="zljcard"
+                      v-for="(aitem, aindex) in scope.row.items"
+                      :key="aindex"
+                    > -->
+                    <div @click="clickitem(scope.row)" :class="itemid == scope.row.id ? 'allactive' : 'collitem'" highlight-current-row>
+                      {{ scope.row.taskPartitionName }}
+                    </div>
+                    <!-- </div> -->
+                  </template>
+                </el-table-column>
+                <!-- <template slot="title">
+                  {{ item.name }}
+                </template>
+                <div v-for="(aitem, aindex) in item.items" :key="aindex">
+                  <div class="collitem">{{ aitem.keyname }}</div>
+                </div> -->
+              </el-table>
+            </el-collapse-item>
+          </el-collapse>
+        </div>
+      </el-col>
+      <el-col :span="19" :xs="24">
+        <div ref="topform" class="form">
+          <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="68px"
           >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
-          >
-        </el-form-item>
-      </el-form>
-    </div>
-    <div ref="mb8" class="mb8">
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['manage:labelfieldinfo:add']"
-            >新增</el-button
-          >
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['manage:labelfieldinfo:edit']"
-            >修改</el-button
-          >
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['manage:labelfieldinfo:remove']"
-            >删除</el-button
-          >
-        </el-col>
-        <right-toolbar
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-        ></right-toolbar>
-      </el-row>
-    </div>
-    <div ref="table">
-      <el-table
-        :max-height="maxTableHeight"
-        v-loading="loading"
-        :data="labelfieldinfodata"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="字段名称" align="center" prop="fieldName" />
-        <el-table-column label="字段编码" align="center" prop="fieldCode" />
-        <el-table-column label="字段类型" align="center" prop="fieldType">
-          <template slot-scope="scope">
-            {{ scope.row.fieldType == "STRING" ? "默认字符串" : "" }}
-            {{ scope.row.fieldType == "INT" ? "整型" : "" }}
-            {{ scope.row.fieldType == "DECIMAL" ? "数值" : "" }}
-            {{ scope.row.fieldType == "ENUM" ? "枚举" : "" }}
-          </template>
-        </el-table-column>
-        <el-table-column label="字段排序" align="center" prop="fieldSort" />
-        <el-table-column
-          label="字段备注信息"
-          align="center"
-          prop="fieldRemark"
-          :show-overflow-tooltip="true"
-        />
+            <el-form-item label="字段名称" prop="fieldName">
+              <el-input
+                v-model="queryParams.fieldName"
+                placeholder="请输入字段名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="字段类型" label-width="100px" prop="fieldType">
+              <el-select
+                v-model="queryParams.fieldType"
+                placeholder="请选择字段类型"
+                clearable
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
 
-        <el-table-column
-          label="任务细分"
-          align="center"
-          prop="taskPartitionDictName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-        >
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['manage:labelfieldinfo:edit']"
-              >修改</el-button
+            <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-form-item>
+          </el-form>
+        </div>
+        <div ref="mb8" class="mb8">
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="['manage:labelfieldinfo:add']"
+                >新增</el-button
+              >
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="success"
+                plain
+                icon="el-icon-edit"
+                size="mini"
+                :disabled="single"
+                @click="handleUpdate"
+                v-hasPermi="['manage:labelfieldinfo:edit']"
+                >修改</el-button
+              >
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="danger"
+                plain
+                icon="el-icon-delete"
+                size="mini"
+                :disabled="multiple"
+                @click="handleDelete"
+                v-hasPermi="['manage:labelfieldinfo:remove']"
+                >删除</el-button
+              >
+            </el-col>
+            <right-toolbar
+              :showSearch.sync="showSearch"
+              @queryTable="getList"
+            ></right-toolbar>
+          </el-row>
+        </div>
+        <div ref="table">
+          <el-table
+            :max-height="maxTableHeight"
+            v-loading="loading"
+            :data="labelfieldinfodata"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="字段名称" align="center" prop="fieldName" />
+            <el-table-column label="字段编码" align="center" prop="fieldCode" />
+            <el-table-column label="字段类型" align="center" prop="fieldType">
+              <template slot-scope="scope">
+                {{ scope.row.fieldType == "STRING" ? "默认字符串" : "" }}
+                {{ scope.row.fieldType == "INT" ? "整型" : "" }}
+                {{ scope.row.fieldType == "DECIMAL" ? "数值" : "" }}
+                {{ scope.row.fieldType == "ENUM" ? "枚举" : "" }}
+              </template>
+            </el-table-column>
+            <el-table-column label="字段排序" align="center" prop="fieldSort" />
+            <el-table-column
+              label="字段备注信息"
+              align="center"
+              prop="fieldRemark"
+              :show-overflow-tooltip="true"
+            />
+
+            <el-table-column
+              label="任务细分"
+              align="center"
+              prop="taskPartitionDictName"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
             >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['manage:labelfieldinfo:remove']"
-              >删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="['manage:labelfieldinfo:edit']"
+                  >修改</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['manage:labelfieldinfo:remove']"
+                  >删除</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
-      v-show="total > 0"
-      :total="total"
-      :pageSize="queryParams.pageSize"
-      :indexFromWrap="queryParams.pageNum"
-      @updateCPage="updateCPage"
-    ></myPagination>
+        <myPagination
+          v-show="total > 0"
+          :total="total"
+          :pageSize="queryParams.pageSize"
+          :indexFromWrap="queryParams.pageNum"
+          @updateCPage="updateCPage"
+        ></myPagination>
+      </el-col>
+    </el-row>
 
     <!-- 添加标签字段信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body>
@@ -511,8 +530,7 @@
         :max-height="maxTableHeight"
         v-loading="loading"
         :data="partitionList"
-        @cell-dblclick="nurseclickzx" 
-
+        @cell-dblclick="nurseclickzx"
         @selection-change="handleSelectionChange"
       >
         <el-table-column label="请选择" width="100" align="center">
@@ -624,7 +642,7 @@
         :max-height="maxTableHeight"
         v-loading="loading"
         :data="taskTypeList"
-        @cell-dblclick="nurseclicktype" 
+        @cell-dblclick="nurseclicktype"
         @selection-change="handleSelectionChange"
       >
         <el-table-column label="请选择" width="100" align="center">
@@ -678,7 +696,7 @@
 </template>
 
 <script>
-import { listLabelfieldinfo, getLabelfieldinfo, delLabelfieldinfo, addLabelfieldinfo, updateLabelfieldinfo } from "@/api/manage/labelfieldinfo";
+import { listLabelfieldinfo, getLabelfieldinfo, delLabelfieldinfo, addLabelfieldinfo, updateLabelfieldinfo,taskTypeGrouping } from "@/api/manage/labelfieldinfo";
 import { listPartition } from "@/api/system/partition";
 import { getAgencytype } from "@/api/system/agency";
 import { listTaskType } from "@/api/system/taskType";
@@ -688,6 +706,80 @@ export default {
   name: "Labelfieldinfo",
   data() {
     return {
+      itemid:null,
+
+      list:[],
+      // listdata: {
+      //   list: [
+      //     {
+      //       name: '一致性 Consistency',
+      //       id: '1',
+      //       items: [{
+      //         lable: '1',
+      //         keyname: '与现实生活一致'
+      //       },
+      //       {
+      //         lable: '2',
+      //         keyname: '在界面中一致'
+      //       }
+      //       ]
+      //     },
+      //     {
+      //       name: '一致性',
+      //       id: '2',
+
+      //       items: [{
+      //         lable: '3',
+      //         keyname: '与现实生活一致'
+      //       },
+      //       {
+      //         lable: '4',
+      //         keyname: '在界面中一致'
+      //       }, {
+      //         lable: '5',
+      //         keyname: '在界面中一致'
+      //       }
+      //       ]
+      //     },
+      //     {
+      //       name: '一致性',
+      //       id: '3',
+
+      //       items: [{
+      //         lable: '6',
+      //         keyname: '与现实生活一致'
+      //       },
+      //       {
+      //         lable: '7',
+      //         keyname: '在界面中一致'
+      //       }, {
+      //         lable: '8',
+      //         keyname: '在界面中一致'
+      //       }
+      //       ]
+      //     },
+      //     {
+      //       name: '一致性',
+      //       id: '4',
+
+      //       items: [{
+      //         lable: '6',
+      //         keyname: '与现实生活一致'
+      //       },
+      //       {
+      //         lable: '7',
+      //         keyname: '在界面中一致'
+      //       }, {
+      //         lable: '8',
+      //         keyname: '在界面中一致'
+      //       }
+      //       ]
+      //     },
+
+      //   ]
+
+      // },
+      activeNames: [],
       innerVisible: false,//任务细分
       // 任务细分字典表格数据
       partitionList: [],
@@ -835,17 +927,34 @@ export default {
         // ],
 
       },
+      currentRow:null,
     };
   },
   created() {
     this.getList();
     this.infolistword();
+    this.getListleft();
+
   },
   mounted() {
     this.getMaxTableHeight()
-    this.screenChange()
+    // this.screenChange()
+
   },
   methods: {
+    // 左侧点击事件
+    clickitem(row){
+      console.log(row,'row');
+      this.queryParams.taskPartitionDictId=row.id
+      this.itemid = this.queryParams.taskPartitionDictId;
+    this.getList();
+
+
+
+    },
+    handleChange(val) {
+      console.log(val);
+    },
     updateCPage(index, size) {
       this.queryParams.pageNum = index
       this.queryParams.pageSize = size
@@ -868,6 +977,22 @@ export default {
         this.options = res.data;
       });
     },
+    // 左侧查询
+    getListleft() {
+      this.loading = true;
+      taskTypeGrouping().then(response => {
+        console.log(response,'response')
+        this.list = response.data;
+              this.list.forEach(e => {
+        this.activeNames.push(e.taskTypeId);
+        console.log(this.activeNames, 'this.activeNames')
+
+      })
+        // this.totaltype = response.total;
+        // this.loading = false;
+      });
+    },
+
     /** 查询任务类型字典列表 */
     getListType() {
       this.loading = true;
@@ -897,15 +1022,15 @@ export default {
     },
     // 任务细分弹框
     clickinnerVisible(aitem, index) {
-      if (this.taskTypeId == ''|| !aitem.taskTypeId) {
+      if (this.taskTypeId == '' || !aitem.taskTypeId) {
         this.$modal.msgError("请先选择任务类型");
       } else {
         this.nnerVisibleindex = index;
         this.taskPartitionDictId = aitem.taskPartitionDictId ? aitem.taskPartitionDictId : '';
         this.innerVisible = true;
       }
-      if(aitem.taskTypeId){
-      this.queryParamstask.taskTypeId=aitem.taskTypeId
+      if (aitem.taskTypeId) {
+        this.queryParamstask.taskTypeId = aitem.taskTypeId
       }
       this.getListpartit();
 
@@ -965,10 +1090,10 @@ export default {
           row.taskTypeName;
         this.form.labelFieldInfoList[this.nnerVisibleindex].taskTypeId =
           row.id;
-          this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictName ='请选择任务细分',
-        this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictId = '';
+        this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictName = '请选择任务细分',
+          this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictId = '';
         // this.form.taskPartitionDictName = '请选择任务细分',
-          this.taskPartitionDictId = '';
+        this.taskPartitionDictId = '';
 
       } else if (this.titleup == '修改标签字段信息') {
         this.form.taskTypeName = row.taskTypeName;
@@ -1002,7 +1127,7 @@ export default {
         fieldCode: null,
 
       };
-      this.taskTypeId=''
+      this.taskTypeId = ''
       if (this.form.labelFieldInfoList.length == 5) {
         this.$message.error("最多批量添加5条");
       } else {
@@ -1050,10 +1175,14 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryParams.taskPartitionDictId=null;
       this.getList();
+      // this.getListleft()
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.itemid=null;
+
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -1212,6 +1341,46 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+/* 设置被点击行的背景颜色 */
+
+
+// ::v-deep .el-table__body tr.current-row>td{
+//     background-color: #92cbf1!important;
+//      color: #fff;
+//   }
+ ::v-deep .el-collapse-item__header{
+  font-size: 15px;
+    font-weight: 600;
+ }
+::v-deep .el-collapse-item__wrap {
+  border-bottom: none;
+}
+
+::v-deep table td.el-table__cell:last-child {
+  // border-bottom: 1px solid #dfe6ec;
+  border-bottom: none;
+  }
+  ::v-deep .el-table::before{
+    height: 0px !important;
+  }
+.left {
+  height: calc(100vh - 119px);
+  overflow-y: auto;
+  overflow-x: hidden;
+  .collitem {
+    // width: 100%;
+    // height: 45px;
+    // padding: 10px;
+    margin-left: 15px;
+  }
+  .allactive{
+    width: 100%;
+    height: 45px;
+    padding: 10px;
+    background: #e8f4ff;
+
+  }
+}
 ::v-deep .el-dialog__body {
   padding-bottom: 60px !important;
 }
diff --git a/src/views/system/partition/index.vue b/src/views/system/partition/index.vue
index 9206abf..0f637d1 100644
--- a/src/views/system/partition/index.vue
+++ b/src/views/system/partition/index.vue
@@ -1,66 +1,209 @@
 <template>
   <div class="app-container" ref="layout">
-    <div ref="topform" class="form">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="任务细分名称" prop="taskPartitionName">
-          <el-input v-model="queryParams.taskPartitionName" placeholder="请输入任务细分名称" clearable
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="任务细分编码" prop="taskPartitionCode">
-          <el-input v-model="queryParams.taskPartitionCode" placeholder="请输入任务细分编码" clearable
-            @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-form-item>
-      </el-form>
-    </div>
-    <div ref="mb8" class="mb8">
-      <el-row :gutter="10" class="">
-        <el-col :span="1.5">
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-            v-hasPermi="['system:partition:add']">新增</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-            v-hasPermi="['system:partition:edit']">修改</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-            v-hasPermi="['system:partition:remove']">删除</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-    </div>
-    <div ref="table">
-      <el-table :max-height="maxTableHeight" v-loading="loading" :data="partitionList"
-        @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="taskTypeId" /> -->
-        <el-table-column label="任务类型名称" align="center" prop="taskTypeName" />
-        <el-table-column label="任务细分名称" align="center" prop="taskPartitionName" />
-        <el-table-column label="任务细分编码" align="center" prop="taskPartitionCode" />
-        <el-table-column label="二级分类描述" align="center" prop="secondClassifyDescribe" :show-overflow-tooltip="true" />
-        <el-table-column label="执行时间" align="center" prop="executionTime" width="180">
-        </el-table-column>
-        <el-table-column label="任务细分排序" align="center" prop="taskPartitionSort" />
-        <el-table-column label="任务细分备注" align="center" prop="taskPartitionRemark" :show-overflow-tooltip="true" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:partition:edit']">修改</el-button>
-            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-              v-hasPermi="['system:partition:remove']">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+    <el-row :gutter="20">
+      <el-col :span="5" :xs="24">
+        <div class="left" ref="box">
+          <div class="name">任务类型名称</div>
+          <div>
+            <el-input
+              v-model="name"
+              placeholder="请输入科室名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </div>
+          <div class="listitem">
+            <div
+              :class="taskid == null ? 'allactive' : 'all'"
+              @click="itemdata()"
+            >
+              全部
+            </div>
+            <!-- <span class="count">{{ count }}</span> -->
+          </div>
+          <div
+            class="listitem"
+            v-for="(item, index) in options"
+            :key="index"
+            @click="itemdata(item)"
+          >
+            <div :class="taskid == item.id ? 'allactive' : 'all'">
+              {{ item.taskTypeName }}
+            </div>
+            <!-- <span class="count">{{ item.countNum }}</span> -->
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="19" :xs="24">
+        <div ref="topform" class="form">
+          <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+          >
+            <el-form-item label="任务细分名称" prop="taskPartitionName">
+              <el-input
+                v-model="queryParams.taskPartitionName"
+                placeholder="请输入任务细分名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="任务细分编码" prop="taskPartitionCode">
+              <el-input
+                v-model="queryParams.taskPartitionCode"
+                placeholder="请输入任务细分编码"
+                clearable
+                @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-form-item>
+          </el-form>
+        </div>
+        <div ref="mb8" class="mb8">
+          <el-row :gutter="10" class="">
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="['system:partition:add']"
+                >新增</el-button
+              >
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="success"
+                plain
+                icon="el-icon-edit"
+                size="mini"
+                :disabled="single"
+                @click="handleUpdate"
+                v-hasPermi="['system:partition:edit']"
+                >修改</el-button
+              >
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="danger"
+                plain
+                icon="el-icon-delete"
+                size="mini"
+                :disabled="multiple"
+                @click="handleDelete"
+                v-hasPermi="['system:partition:remove']"
+                >删除</el-button
+              >
+            </el-col>
+            <right-toolbar
+              :showSearch.sync="showSearch"
+              @queryTable="getList"
+            ></right-toolbar>
+          </el-row>
+        </div>
+        <div ref="table">
+          <el-table
+            :max-height="maxTableHeight"
+            v-loading="loading"
+            :data="partitionList"
+            @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="taskTypeId" /> -->
+            <el-table-column
+              label="任务细分名称"
+              align="center"
+              prop="taskPartitionName"
+            />
+            <el-table-column
+              label="任务类型名称"
+              align="center"
+              prop="taskTypeName"
+            />
+           
+            <el-table-column
+              label="任务细分编码"
+              align="center"
+              prop="taskPartitionCode"
+            />
+            <el-table-column
+              label="二级分类描述"
+              align="center"
+              prop="secondClassifyDescribe"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="执行时间"
+              align="center"
+              prop="executionTime"
+              width="180"
+            >
+            </el-table-column>
+            <el-table-column
+              label="任务细分排序"
+              align="center"
+              prop="taskPartitionSort"
+            />
+            <el-table-column
+              label="任务细分备注"
+              align="center"
+              prop="taskPartitionRemark"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="['system:partition:edit']"
+                  >修改</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['system:partition:remove']"
+                  >删除</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 v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
+        <myPagination
+          v-show="total > 0"
+          :total="total"
+          :pageSize="queryParams.pageSize"
+          :indexFromWrap="queryParams.pageNum"
+          @updateCPage="updateCPage"
+        ></myPagination>
+      </el-col>
+    </el-row>
 
     <!-- 添加或修改任务细分字典对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -68,44 +211,94 @@
         <!-- <el-form-item label="任务类型表id" prop="taskTypeId">
           <el-input v-model="form.taskTypeId" placeholder="请输入任务类型表id" />
         </el-form-item> -->
-        <el-form-item label="任务细分编码" prop="taskPartitionCode" v-if="form.taskPartitionCode">
-          <el-input disabled v-model="form.taskPartitionCode" placeholder="请输入任务细分编码" />
+        <el-form-item
+          label="任务细分编码"
+          prop="taskPartitionCode"
+          v-if="form.taskPartitionCode"
+        >
+          <el-input
+            disabled
+            v-model="form.taskPartitionCode"
+            placeholder="请输入任务细分编码"
+          />
         </el-form-item>
         <el-form-item label="任务类型名称" prop="taskTypeName">
-          <el-select v-model="form.taskTypeId" placeholder="请选择" @change="change" style="width: 350px">
-            <el-option v-for="item in options" :key="item.id" :label="item.taskTypeName" :value="item.id">
+          <el-select
+            v-model="form.taskTypeId"
+            placeholder="请选择"
+            @change="change"
+            style="width: 350px"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.taskTypeName"
+              :value="item.id"
+            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="任务细分名称" prop="taskPartitionName">
-          <el-input v-model="form.taskPartitionName" placeholder="请输入任务细分名称" />
+          <el-input
+            v-model="form.taskPartitionName"
+            placeholder="请输入任务细分名称"
+          />
         </el-form-item>
         <el-form-item label="执行时间" prop="executionTime">
-          <el-time-select style="width: 350px" placeholder="执行时间" v-model="form.executionTime" :picker-options="{
-        start: '08:00',
-        step: '00:30',
-        end: '23:30',
-      }"></el-time-select>
+          <el-time-select
+            style="width: 350px"
+            placeholder="执行时间"
+            v-model="form.executionTime"
+            :picker-options="{
+              start: '08:00',
+              step: '00:30',
+              end: '23:30',
+            }"
+          ></el-time-select>
         </el-form-item>
         <el-form-item label="任务细分排序" prop="taskPartitionSort">
-          <el-input-number v-model="form.taskPartitionSort" controls-position="right" :min="0" placeholder="请输入任务细分排序"
-            style="width: 350px" />
+          <el-input-number
+            v-model="form.taskPartitionSort"
+            controls-position="right"
+            :min="0"
+            placeholder="请输入任务细分排序"
+            style="width: 350px"
+          />
         </el-form-item>
         <el-form-item label="任务细分备注" prop="taskPartitionRemark">
-          <el-input v-model="form.taskPartitionRemark" placeholder="请输入任务细分备注" />
+          <el-input
+            v-model="form.taskPartitionRemark"
+            placeholder="请输入任务细分备注"
+          />
         </el-form-item>
         <el-form-item label="模板类型">
-          <el-select v-model="form.templateType" placeholder="请选择模板类型" style="width: 350px;">
-            <el-option v-for="dict in dict.type.template_type" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+          <el-select
+            v-model="form.templateType"
+            placeholder="请选择模板类型"
+            style="width: 350px"
+          >
+            <el-option
+              v-for="dict in dict.type.template_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="二级分类描述" prop="secondClassifyDescribe">
-          <el-input type="textarea" v-model="form.secondClassifyDescribe" placeholder="请输入二级分类描述" />
+          <el-input
+            type="textarea"
+            v-model="form.secondClassifyDescribe"
+            placeholder="请输入二级分类描述"
+          />
         </el-form-item>
         <div class="textareanew">
           <el-form-item label="文本类型" prop="taskPartitionContent">
-            <el-input type="textarea" v-model="form.taskPartitionContent" placeholder="请输入文本类型" />
+            <el-input
+              type="textarea"
+              v-model="form.taskPartitionContent"
+              placeholder="请输入文本类型"
+            />
           </el-form-item>
         </div>
       </el-form>
@@ -119,12 +312,15 @@
 
 <script>
 import { listPartition, getPartition, delPartition, addPartition, updatePartition, selectTaskTypeList } from "@/api/system/partition";
+import { listTaskType} from "@/api/system/taskType";
 
 export default {
   name: "Partition",
   dicts: ['template_type'],
   data() {
     return {
+      name: '',
+      taskid: null,
       maxTableHeight: undefined,
       // 遮罩层
       loading: true,
@@ -157,6 +353,13 @@ export default {
         taskPartitionSort: null,
         taskPartitionRemark: null,
       },
+      querydepartmen: {
+        taskTypeName: "",
+
+        // pageNum: 1,
+        // pageSize: 10,
+
+      },
       // 表单参数
       form: {},
       options: [],
@@ -174,6 +377,14 @@ export default {
       }
     };
   },
+  watch: {
+    name(val) {
+      console.log(val,'name')
+      this.querydepartmen.taskTypeName = val
+      this.getlistselect();
+    },
+
+  },
   created() {
     this.getList();
     this.getlistselect();
@@ -197,9 +408,22 @@ export default {
         this.loading = false;
       });
     },
+    itemdata(item) {
+      if(item){
+        this.taskid = item.id
+      this.queryParams.taskTypeId = item.id
+
+      }else{
+        this.taskid = null
+
+      this.queryParams.taskTypeId = null
+      }
+
+      this.getList()
+    },
     // 任务类型名称下拉框
     getlistselect() {
-      selectTaskTypeList().then(response => {
+      selectTaskTypeList(this.querydepartmen).then(response => {
         this.options = response.data;
       });
     },
@@ -241,6 +465,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.taskid = null;
+      this.queryParams.taskTypeId=null
       this.handleQuery();
     },
     // 多选框选中数据
@@ -253,6 +479,7 @@ export default {
     handleAdd() {
       this.reset();
       this.form.executionTime = null;
+      this.querydepartmen.taskTypeName=null,
       this.getlistselect();
       this.open = true;
       this.title = "添加任务细分字典";
@@ -339,4 +566,43 @@ export default {
 .textareanew .el-textarea__inner {
   height: 100px;
 }
+.left {
+  height: calc(100vh - 119px);
+  overflow: auto;
+
+  .name {
+    font-weight: 700;
+    margin-bottom: 10px;
+  }
+
+  .listitem {
+    width: 100%;
+    height: 50px;
+    border-bottom: 1px solid #dcdfe6;
+
+    .count {
+      display: inline-block;
+      position: relative;
+      // right: -172px;
+      left: 210px;
+      color: #a4a6aa;
+      top: -35px;
+      font-size: 13px;
+    }
+
+    .all {
+      height: 50px;
+      line-height: 50px;
+      padding-left: 13px;
+    }
+
+    .allactive {
+      background: #e8f4ff;
+      height: 50px;
+      line-height: 50px;
+      padding-left: 13px;
+      border-left: 3px solid #4d9de7;
+    }
+  }
+}
 </style>

From c58f5968a44557e961851a6cfca3e3f62034cac9 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 3 Jul 2024 17:29:02 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/labelfieldinfo/index.vue | 114 ++++++++++++++--------
 1 file changed, 74 insertions(+), 40 deletions(-)

diff --git a/src/views/manage/labelfieldinfo/index.vue b/src/views/manage/labelfieldinfo/index.vue
index fcefa55..ff194f3 100644
--- a/src/views/manage/labelfieldinfo/index.vue
+++ b/src/views/manage/labelfieldinfo/index.vue
@@ -3,6 +3,11 @@
     <el-row :gutter="20">
       <el-col :span="5" :xs="24">
         <div class="left" ref="box">
+          <!-- <div :class="itemid=='' ? 'all' : 'all'" @click="allclick"> -->
+          <div class="all" @click="allclick">
+
+            全部
+          </div>
           <el-collapse
             v-model="activeNames"
             @change="handleChange"
@@ -14,7 +19,11 @@
                 {{ item.taskTypeName }}
                 <!-- {{item}} -->
               </template>
-              <el-table :data="item.taskPartitionDictList" style="width: 100%" :show-header="false"   >
+              <el-table
+                :data="item.taskPartitionDictList"
+                style="width: 100%"
+                :show-header="false"
+              >
                 <el-table-column prop="" label="">
                   <template slot-scope="scope">
                     <!-- <div
@@ -22,7 +31,10 @@
                       v-for="(aitem, aindex) in scope.row.items"
                       :key="aindex"
                     > -->
-                    <div @click="clickitem(scope.row)" :class="itemid == scope.row.id ? 'allactive' : 'collitem'" highlight-current-row>
+                    <div
+                      @click="clickitem(scope.row)"
+                      :class="itemid == scope.row.id ? 'allactive' : 'collitem'"
+                    >
                       {{ scope.row.taskPartitionName }}
                     </div>
                     <!-- </div> -->
@@ -138,6 +150,12 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column type="selection" width="55" align="center" />
+            <el-table-column
+              label="任务细分"
+              align="center"
+              prop="taskPartitionDictName"
+              :show-overflow-tooltip="true"
+            />
             <el-table-column label="字段名称" align="center" prop="fieldName" />
             <el-table-column label="字段编码" align="center" prop="fieldCode" />
             <el-table-column label="字段类型" align="center" prop="fieldType">
@@ -149,19 +167,14 @@
               </template>
             </el-table-column>
             <el-table-column label="字段排序" align="center" prop="fieldSort" />
-            <el-table-column
+            <!-- <el-table-column
               label="字段备注信息"
               align="center"
               prop="fieldRemark"
               :show-overflow-tooltip="true"
-            />
+            /> -->
 
-            <el-table-column
-              label="任务细分"
-              align="center"
-              prop="taskPartitionDictName"
-              :show-overflow-tooltip="true"
-            />
+           
             <el-table-column
               label="操作"
               align="center"
@@ -696,7 +709,7 @@
 </template>
 
 <script>
-import { listLabelfieldinfo, getLabelfieldinfo, delLabelfieldinfo, addLabelfieldinfo, updateLabelfieldinfo,taskTypeGrouping } from "@/api/manage/labelfieldinfo";
+import { listLabelfieldinfo, getLabelfieldinfo, delLabelfieldinfo, addLabelfieldinfo, updateLabelfieldinfo, taskTypeGrouping } from "@/api/manage/labelfieldinfo";
 import { listPartition } from "@/api/system/partition";
 import { getAgencytype } from "@/api/system/agency";
 import { listTaskType } from "@/api/system/taskType";
@@ -706,9 +719,9 @@ export default {
   name: "Labelfieldinfo",
   data() {
     return {
-      itemid:null,
+      itemid: null,
 
-      list:[],
+      list: [],
       // listdata: {
       //   list: [
       //     {
@@ -927,7 +940,7 @@ export default {
         // ],
 
       },
-      currentRow:null,
+      currentRow: null,
     };
   },
   created() {
@@ -942,12 +955,18 @@ export default {
 
   },
   methods: {
+    // 全部点击事件
+    allclick() {
+      this.itemid = ''
+      this.queryParams.taskPartitionDictId=null
+      this.getList();
+    },
     // 左侧点击事件
-    clickitem(row){
-      console.log(row,'row');
-      this.queryParams.taskPartitionDictId=row.id
+    clickitem(row) {
+      console.log(row, 'row');
+      this.queryParams.taskPartitionDictId = row.id
       this.itemid = this.queryParams.taskPartitionDictId;
-    this.getList();
+      this.getList();
 
 
 
@@ -981,15 +1000,13 @@ export default {
     getListleft() {
       this.loading = true;
       taskTypeGrouping().then(response => {
-        console.log(response,'response')
+        console.log(response, 'response')
         this.list = response.data;
-              this.list.forEach(e => {
-        this.activeNames.push(e.taskTypeId);
-        console.log(this.activeNames, 'this.activeNames')
+        this.list.forEach(e => {
+          this.activeNames.push(e.taskTypeId);
+          console.log(this.activeNames, 'this.activeNames')
 
-      })
-        // this.totaltype = response.total;
-        // this.loading = false;
+        })
       });
     },
 
@@ -1175,13 +1192,13 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.queryParams.taskPartitionDictId=null;
+      this.queryParams.taskPartitionDictId = null;
       this.getList();
       // this.getListleft()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.itemid=null;
+      this.itemid = null;
 
       this.resetForm("queryForm");
       this.handleQuery();
@@ -1343,42 +1360,59 @@ export default {
 <style lang="scss" scoped>
 /* 设置被点击行的背景颜色 */
 
-
 // ::v-deep .el-table__body tr.current-row>td{
 //     background-color: #92cbf1!important;
 //      color: #fff;
 //   }
- ::v-deep .el-collapse-item__header{
+::v-deep .el-collapse-item__header {
   font-size: 15px;
-    font-weight: 600;
- }
+  font-weight: 600;
+}
 ::v-deep .el-collapse-item__wrap {
   border-bottom: none;
 }
 
-::v-deep table td.el-table__cell:last-child {
-  // border-bottom: 1px solid #dfe6ec;
-  border-bottom: none;
-  }
-  ::v-deep .el-table::before{
-    height: 0px !important;
-  }
+
+::v-deep .el-table::before {
+  height: 0px !important;
+}
 .left {
   height: calc(100vh - 119px);
   overflow-y: auto;
   overflow-x: hidden;
+  ::v-deep table td.el-table__cell:last-child {
+  // border-bottom: 1px solid #dfe6ec;
+  border-bottom: none;
+}
+  .clickall {
+    // width: 167px;
+    height: 48px;
+    line-height: 48px;
+    background: #e8f4ff;
+
+    /* background: red; */
+    font-size: 15px;
+    font-weight: 600;
+  }
+  .all {
+    // width: 167px;
+    height: 48px;
+    line-height: 48px;
+    /* background: red; */
+    font-size: 15px;
+    font-weight: 600;
+  }
   .collitem {
     // width: 100%;
     // height: 45px;
     // padding: 10px;
     margin-left: 15px;
   }
-  .allactive{
+  .allactive {
     width: 100%;
     height: 45px;
     padding: 10px;
     background: #e8f4ff;
-
   }
 }
 ::v-deep .el-dialog__body {

From da134cb65010ec16153d1dab12a5e449376c415d Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 3 Jul 2024 17:32:47 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/system/partition/index.vue b/src/views/system/partition/index.vue
index 0f637d1..41ddf76 100644
--- a/src/views/system/partition/index.vue
+++ b/src/views/system/partition/index.vue
@@ -7,7 +7,7 @@
           <div>
             <el-input
               v-model="name"
-              placeholder="请输入科室名称"
+              placeholder="请输入任务类型名称"
               clearable
               @keyup.enter.native="handleQuery"
             />