From b7b6ea74712d1446dfd95fe0246db292af296504 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 18 Sep 2023 18:17:06 +0800
Subject: [PATCH] style seo

---
 src/components/doctorCheck/ButtonList.vue     |   9 +-
 .../doctorCheck/PatientRegisterList.vue       | 329 ++++++++---------
 .../doctorCheck/PatientRegisterListBak.vue    | 335 ++++++++++++++++++
 .../patientRegister/PatientRegisterList.vue   |   8 +-
 src/components/report/CusOrgOCX.vue           |  53 +--
 .../report/PatientRegisterQueryNobtn.vue      |   2 +-
 src/components/sumDoctorCheck/ButtonList.vue  |   9 +-
 src/views/report/checkStatus.vue              | 102 +++---
 8 files changed, 587 insertions(+), 260 deletions(-)
 create mode 100644 src/components/doctorCheck/PatientRegisterListBak.vue

diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index 1f46f51..eef631d 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -39,10 +39,15 @@
         <div class="listBtn">
             <el-button type="primary" class="btnClass" @click="addSummary">新增小结</el-button>
         </div>
-        <!-- 人员档案列表 -->
-        <el-dialog title="人员档案列表" :visible.sync="doctorCheck.doctorCheckDialogVisible" width="1000px">
+        <!-- 体检人员列表 
+        <el-dialog title="体检人员列表" :visible.sync="doctorCheck.doctorCheckDialogVisible" width="1000px">
             <PatientRegisterList win="doctorCheck" />
         </el-dialog>
+        -->
+        <el-drawer title="体检人员列表" :visible.sync="doctorCheck.doctorCheckDialogVisible" direction="rtl" 
+          :wrapperClosable="false">
+          <PatientRegisterList win="doctorCheck" />
+        </el-drawer>
     </div>
 </template>
 <script>
diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index a8a6cc1..d2243d0 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -1,24 +1,12 @@
 <template>
   <div>
     <!-- 查询条件 -->
-    <div style="display: flex; flex-wrap: wrap; width: 100%">
-      <div class="block query">
-        <span class="demonstration">登记日期：</span>
-        <el-date-picker v-model="patientRegister.query.dateRange" type="daterange" align="right" unlink-panels
-          range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" size="small"
-          style="width: 240px">
-        </el-date-picker>
-      </div>
+    <div style="display: flex; flex-wrap: wrap; width: 100%;height:120px;" >
       <div class="query">
-        <span>条码号：</span>
-        <el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable
-          style="width: 150px" />
-      </div>
-      <div class="query">
-        <span>档案号：</span>
-        <el-input placeholder="档案号" v-model="patientRegister.query.patientNo" size="small" clearable
-          style="width: 135px" />
-      </div>
+        <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:280px;" size="small" disabled>          
+          <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true" style="font-size: 20px;"></el-button>
+        </el-input>
+      </div>      
       <div class="query">
         <span>姓名：</span>
         <el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
@@ -32,149 +20,139 @@
         </el-select>
       </div>
       <div class="query">
-        <span>身份证号：</span>
-        <el-input placeholder="身份证号" v-model="patientRegister.query.idCardNo" size="small" clearable
-          style="width: 180px" />
-      </div>
-      <div class="query">
-        <el-cascader v-model="patientRegister.query.customerOrgId" :options="patientRegister.customerOrgTreeAll" :props="{
-          checkStrictly: true,
-          expandTrigger: 'hover',
-          ...customerOrg.treeprops,
-        }" :show-all-levels="false" size="small" clearable placeholder="请选择单位">
-        </el-cascader>
-        <el-checkbox v-model="patientRegister.query.customerOrgFlag">单位作为查询条件</el-checkbox>
-      </div>
-      <div class="query">
-        <span>状态：</span>
+        <span>检查状态：</span>
         <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
           size="small">
           <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
           </el-option>
         </el-select>
+        <el-select v-model="patientRegister.query.isAudit" placeholder="请选择" clearable style="width: 75px"
+            size="small">
+            <el-option label="未审核" value="N"/>
+            <el-option label="已审核" value="Y"/>
+          </el-select>
       </div>
-    </div>
-
-    <!-- 人员列表 -->
-    <div style="display: flex;margin-top: 10px;">
-      <el-table :data="dataList" border width="100%" height="430" row-key="id" size="small"
-        class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="dataList">
-        <el-table-column type="selection" width="40">
-
-        </el-table-column>
-        <el-table-column prop="completeFlag" label="体检进度">
-          <template slot-scope="scope">
-            <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isLock" label="锁住">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="customerOrgParentName" label="单位" width="180">
-          <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="customerOrgName" label="部门" width="180">
-          <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="patientName" label="姓名" />
-        <el-table-column prop="sexId" label="性别">
-          <template slot-scope="scope">
-            <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="age" label="年龄" />
-        <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
-        <el-table-column prop="patientNo" label="档案号" />
-        <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
-        <el-table-column label="分组/套餐" width="150">
-          <template slot-scope="scope">
-            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
-              {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
-            </div>
-            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
-              {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="nationId" label="民族">
-          <template slot-scope="scope">
-            <div>
-              {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="idNo" label="身份证" width="150" />
-        <el-table-column prop="birthDate" label="出生日期" width="100">
-          <template slot-scope="scope">
-            <div v-if="scope.row.birthDate">
-              {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="email" label="邮箱" width="100" />
-        <el-table-column prop="mobileTelephone" label="手机" width="100" />
-        <el-table-column prop="telephone" label="电话" width="100" />
-        <el-table-column prop="address" label="地址" width="300" />
-        <el-table-column prop="medicalCardNo" label="体检卡号" />
-        <el-table-column prop="jobCardNo" label="工卡号" />
-        <el-table-column prop="maritalStatusId" label="婚姻状况">
-          <template slot-scope="scope">
-            <div>
-              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="medicalTypeId" label="体检类别">
-          <template slot-scope="scope">
-            <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
-              {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="personnelTypeId" label="人员类别">
-          <template slot-scope="scope">
-            <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
-              {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="jobPost" label="职务" />
-        <el-table-column prop="jobTitle" label="职称" />
-        <el-table-column prop="salesman" label="介绍人" />
-        <el-table-column prop="isVip" label="是否VIP">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="creatorName" label="登记人" />
-        <el-table-column prop="creationTime" label="登记日期" width="100">
-          <template slot-scope="scope">
-            <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isUpload" label="是否上传">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div style="margin-left: 10px">
-        <div class="listBtn">
-          <el-button type="primary" @click="query">查询</el-button>
-        </div>
-        <div class="listBtn">
-          <el-button type="danger" @click="close">关闭</el-button>
-        </div>
+      <div class="query">
+        <el-button type="primary" @click="query" size="small">查询</el-button>
       </div>
     </div>
 
+    <!-- 人员列表 -->    
+    <el-table :data="dataList" border width="100%" height="430" row-key="id" size="small"
+      :height="window.pageHeight - 80 - 120"
+      class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="dataList">
+      <el-table-column type="selection" width="40">
+
+      </el-table-column>
+      <el-table-column prop="completeFlag" label="体检进度">
+        <template slot-scope="scope">
+          <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="isLock" label="锁住">
+        <template slot-scope="scope">
+          <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="customerOrgParentName" label="单位" width="180">
+        <template slot-scope="scope">
+          <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="customerOrgName" label="部门" width="180">
+        <template slot-scope="scope">
+          <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="patientName" label="姓名" />
+      <el-table-column prop="sexId" label="性别">
+        <template slot-scope="scope">
+          <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="age" label="年龄" />
+      <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
+      <el-table-column prop="patientNo" label="档案号" />
+      <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
+      <el-table-column label="分组/套餐" width="150">
+        <template slot-scope="scope">
+          <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+            {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+          </div>
+          <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+            {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="nationId" label="民族">
+        <template slot-scope="scope">
+          <div>
+            {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="idNo" label="身份证" width="150" />
+      <el-table-column prop="birthDate" label="出生日期" width="100">
+        <template slot-scope="scope">
+          <div v-if="scope.row.birthDate">
+            {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="email" label="邮箱" width="100" />
+      <el-table-column prop="mobileTelephone" label="手机" width="100" />
+      <el-table-column prop="telephone" label="电话" width="100" />
+      <el-table-column prop="address" label="地址" width="300" />
+      <el-table-column prop="medicalCardNo" label="体检卡号" />
+      <el-table-column prop="jobCardNo" label="工卡号" />
+      <el-table-column prop="maritalStatusId" label="婚姻状况">
+        <template slot-scope="scope">
+          <div>
+            {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="medicalTypeId" label="体检类别">
+        <template slot-scope="scope">
+          <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
+            {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="personnelTypeId" label="人员类别">
+        <template slot-scope="scope">
+          <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
+            {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="jobPost" label="职务" />
+      <el-table-column prop="jobTitle" label="职称" />
+      <el-table-column prop="salesman" label="介绍人" />
+      <el-table-column prop="isVip" label="是否VIP">
+        <template slot-scope="scope">
+          <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="creatorName" label="登记人" />
+      <el-table-column prop="creationTime" label="登记日期" width="100">
+        <template slot-scope="scope">
+          <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="isUpload" label="是否上传">
+        <template slot-scope="scope">
+          <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
+        </template>
+      </el-table-column>
+    </el-table>    
+
+    <!--通用选单位、体检次数、分组的控件-->
+    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
+      :close-on-click-modal="false" :append-to-body="true" width="800px" height="600px">
+      <CusOrgOCX/>
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -185,11 +163,13 @@ import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import Camera from "../../components/patientRegister/Camera.vue";
+import CusOrgOCX from "../../components/report/CusOrgOCX.vue"
 
 export default {
   components: {
     PatientRegisterEdit,
     Camera,
+    CusOrgOCX,
   },
   props: ['win'],
   data() {
@@ -198,38 +178,7 @@ export default {
       multipleSelection: [], //选中的数据列表
       dialogVisible: false,
       dialogCamera: false,
-
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
+ 
     };
   },
 
@@ -238,7 +187,7 @@ export default {
   //挂载完成
   mounted() { },
   computed: {
-    ...mapState(["dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck"]),
+    ...mapState(["window", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck","report"]),
   },
   methods: {
     ...mapMutations(['doctorCheckPrBaseInit', 'sumPREditInit']),
@@ -320,6 +269,18 @@ export default {
 };
 </script>
 <style scoped>
+/* 输入框相关设置*/
+::v-deep .el-input__inner {
+  padding-left: 2px;
+  padding-right: 15px;
+}
+::v-deep .el-input__icon{
+  width: 15px; /* 输入框下拉箭头或清除图标 默认 25 */
+}
+
+::v-deep .el-input-group__append{
+  padding: 0 5px; /* 控件默认 0 20px;*/
+}
 .box {
   display: flex;
 }
diff --git a/src/components/doctorCheck/PatientRegisterListBak.vue b/src/components/doctorCheck/PatientRegisterListBak.vue
new file mode 100644
index 0000000..a8a6cc1
--- /dev/null
+++ b/src/components/doctorCheck/PatientRegisterListBak.vue
@@ -0,0 +1,335 @@
+<template>
+  <div>
+    <!-- 查询条件 -->
+    <div style="display: flex; flex-wrap: wrap; width: 100%">
+      <div class="block query">
+        <span class="demonstration">登记日期：</span>
+        <el-date-picker v-model="patientRegister.query.dateRange" type="daterange" align="right" unlink-panels
+          range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" size="small"
+          style="width: 240px">
+        </el-date-picker>
+      </div>
+      <div class="query">
+        <span>条码号：</span>
+        <el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable
+          style="width: 150px" />
+      </div>
+      <div class="query">
+        <span>档案号：</span>
+        <el-input placeholder="档案号" v-model="patientRegister.query.patientNo" size="small" clearable
+          style="width: 135px" />
+      </div>
+      <div class="query">
+        <span>姓名：</span>
+        <el-input placeholder="姓名" v-model="patientRegister.query.patientName" size="small" clearable
+          style="width: 100px" />
+      </div>
+      <div class="query">
+        <span>性别：</span>
+        <el-select v-model="patientRegister.query.sex" placeholder="请选择" clearable style="width: 80px" size="small">
+          <el-option v-for="item in dict.forSex" :key="item.id" :label="item.displayName" :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+      <div class="query">
+        <span>身份证号：</span>
+        <el-input placeholder="身份证号" v-model="patientRegister.query.idCardNo" size="small" clearable
+          style="width: 180px" />
+      </div>
+      <div class="query">
+        <el-cascader v-model="patientRegister.query.customerOrgId" :options="patientRegister.customerOrgTreeAll" :props="{
+          checkStrictly: true,
+          expandTrigger: 'hover',
+          ...customerOrg.treeprops,
+        }" :show-all-levels="false" size="small" clearable placeholder="请选择单位">
+        </el-cascader>
+        <el-checkbox v-model="patientRegister.query.customerOrgFlag">单位作为查询条件</el-checkbox>
+      </div>
+      <div class="query">
+        <span>状态：</span>
+        <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
+          size="small">
+          <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+    </div>
+
+    <!-- 人员列表 -->
+    <div style="display: flex;margin-top: 10px;">
+      <el-table :data="dataList" border width="100%" height="430" row-key="id" size="small"
+        class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="dataList">
+        <el-table-column type="selection" width="40">
+
+        </el-table-column>
+        <el-table-column prop="completeFlag" label="体检进度">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isLock" label="锁住">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgParentName" label="单位" width="180">
+          <template slot-scope="scope">
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerOrgName" label="部门" width="180">
+          <template slot-scope="scope">
+            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="patientName" label="姓名" />
+        <el-table-column prop="sexId" label="性别">
+          <template slot-scope="scope">
+            <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="age" label="年龄" />
+        <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
+        <el-table-column prop="patientNo" label="档案号" />
+        <el-table-column prop="medicalTimes" label="体检次数"></el-table-column>
+        <el-table-column label="分组/套餐" width="150">
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+              {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+            </div>
+            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+              {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="nationId" label="民族">
+          <template slot-scope="scope">
+            <div>
+              {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="idNo" label="身份证" width="150" />
+        <el-table-column prop="birthDate" label="出生日期" width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.birthDate">
+              {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="email" label="邮箱" width="100" />
+        <el-table-column prop="mobileTelephone" label="手机" width="100" />
+        <el-table-column prop="telephone" label="电话" width="100" />
+        <el-table-column prop="address" label="地址" width="300" />
+        <el-table-column prop="medicalCardNo" label="体检卡号" />
+        <el-table-column prop="jobCardNo" label="工卡号" />
+        <el-table-column prop="maritalStatusId" label="婚姻状况">
+          <template slot-scope="scope">
+            <div>
+              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="medicalTypeId" label="体检类别">
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
+              {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="personnelTypeId" label="人员类别">
+          <template slot-scope="scope">
+            <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
+              {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="jobPost" label="职务" />
+        <el-table-column prop="jobTitle" label="职称" />
+        <el-table-column prop="salesman" label="介绍人" />
+        <el-table-column prop="isVip" label="是否VIP">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="creatorName" label="登记人" />
+        <el-table-column prop="creationTime" label="登记日期" width="100">
+          <template slot-scope="scope">
+            <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isUpload" label="是否上传">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div style="margin-left: 10px">
+        <div class="listBtn">
+          <el-button type="primary" @click="query">查询</el-button>
+        </div>
+        <div class="listBtn">
+          <el-button type="danger" @click="close">关闭</el-button>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState, mapMutations } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
+
+import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
+import Camera from "../../components/patientRegister/Camera.vue";
+
+export default {
+  components: {
+    PatientRegisterEdit,
+    Camera,
+  },
+  props: ['win'],
+  data() {
+    return {
+      dataList: [], //列表数据
+      multipleSelection: [], //选中的数据列表
+      dialogVisible: false,
+      dialogCamera: false,
+
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+
+  created() { },
+
+  //挂载完成
+  mounted() { },
+  computed: {
+    ...mapState(["dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck"]),
+  },
+  methods: {
+    ...mapMutations(['doctorCheckPrBaseInit', 'sumPREditInit']),
+
+
+    //点击体检次数行
+    rowick(row) {
+      this.doctorCheckPrBaseInit()
+      this.doctorCheck.prBase.patientRegisterNo = row.patientRegisterNo
+      objCopy(row, this.doctorCheck.prBase)        //基本信息
+
+      this.sumPREditInit()
+      objCopy(row, this.sumDoctorCheck.sumPREdit)  //总检信息
+    },
+
+    ldddw(arrayData, key, value, display) {
+      return dddw(arrayData, key, value, display);
+    },
+
+    lmoment(date, forMat) {
+      return moment(new Date(date)).format(forMat);
+    },
+
+    //查询
+    query() {
+      let body = {}
+
+      console.log(`this.patientRegister.query`, this.patientRegister.query)
+
+      if (this.patientRegister.query.customerOrgFlag) {
+        if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId[0]
+      }
+
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+
+      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+
+      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+
+      //StartDate EndDate
+      if (this.patientRegister.query.dateRange) {
+        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
+        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
+      }
+
+
+      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+
+      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+
+      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+
+
+      console.log('/api/app/patientregister/getlistinfilter', body)
+      postapi('/api/app/patientregister/getlistinfilter', body)
+        .then((res) => {
+          this.dataList = res.data;
+        });
+    },
+
+
+    //关闭
+    close() {
+      //console.log('this.win',this.win)
+      if (this.win == 'doctorCheck') {
+        this.doctorCheck.doctorCheckDialogVisible = false
+      } else {
+        this.sumDoctorCheck.sumDoctorCheckDialogVisible = false
+      }
+
+    },
+
+  },
+
+  //监听事件
+  watch: {
+
+  },
+};
+</script>
+<style scoped>
+.box {
+  display: flex;
+}
+
+.query {
+  margin-left: 5px;
+  margin-bottom: 2px;
+}
+
+.listBtn {
+  margin-top: 10px;
+}
+</style>
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index f00b9f9..797effa 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -624,7 +624,7 @@ export default {
 
 
       console.log('/api/app/patientregister/getlistinfilter', body)
-      
+
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
@@ -1148,6 +1148,12 @@ export default {
   padding-right: 1px;
 }
 
+/* 表格：单元格 行间距*/
+::v-deep .el-table__cell {
+  padding-top: 2px;   /* 表格：单元格 行间距，默认 8px */
+  padding-bottom: 2px; /* 表格：单元格 行间距，默认 8px */
+}
+
 ::v-deep .el-table td.el-table__cell {
   padding-left: 1px;
   padding-right: 1px;
diff --git a/src/components/report/CusOrgOCX.vue b/src/components/report/CusOrgOCX.vue
index 89d9715..59cdf33 100644
--- a/src/components/report/CusOrgOCX.vue
+++ b/src/components/report/CusOrgOCX.vue
@@ -1,14 +1,15 @@
 <template>
   <div style="display: flex;">
-    <div style="width: 150px;height:500px;margin-top: -30px;overflow: scroll;border: 1px solid;">
+    <div style="width: 180px;height:520px;margin-top: -30px;overflow: scroll;border: 1px solid;">
       <el-tree :data="patientRegister.customerOrgTreeAll" :props="customerOrg.treeprops" @node-click="handleNode" />
     </div>
-    <div style="display: block;width:650px;margin-top: -30px; margin-left: 5px;">
+    <div style="display: block;width:620px;margin-top: -30px; margin-left: 5px;">
       <el-table :data="dataCusOrgOCX" border height="450" highlight-current-row @row-dblclick="rowDblclick" size="small">
-        <el-table-column prop="customerOrgName" label="体检单位" width="130"/>
+        <el-table-column prop="customerOrgName" label="体检单位" width="150"/>
+        <el-table-column prop="customerOrgName" label="体检单位" width="150"/>
         <el-table-column prop="customerOrgId" label="次数" width="50" align="center">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.customerOrgRegister" placeholder="次数" style="width: 50px" size="small"
+            <el-select v-model="scope.row.customerOrgRegister" placeholder="次数" style="width: 50px;" size="small"
               :disabled="!useCusOrg || scope.row.customerOrgId == dict.personOrgId"
               @change="changeMedicalTimes(scope.$index)" value-key="id">
               <el-option v-for="item in scope.row.customerOrgRegisterList" :key="item.id" :label="item.medicalTimes"
@@ -16,6 +17,7 @@
             </el-select>
           </template>
         </el-table-column>
+        <!-- 
         <el-table-column prop="dateType" label="日期方式" width="85" align="center">
           <template slot-scope="scope">
             <el-select v-model="scope.row.dateType" placeholder="请选择" filterable clearable size="small">
@@ -25,20 +27,21 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="startDate" label="起始日期" width="80" align="center">
+        -->
+        <el-table-column prop="startDate" label="起始日期" width="90" align="center">
           <template slot-scope="scope">
             <el-date-picker v-model="scope.row.startDate" type="date" placeholder="截止日期" size="small" />
           </template>
         </el-table-column>
-        <el-table-column prop="endDate" label="截止日期" width="80" align="center">
+        <el-table-column prop="endDate" label="截止日期" width="90" align="center">
           <template slot-scope="scope">
             <el-date-picker v-model="scope.row.endDate" type="date" placeholder="截止日期" size="small" />
           </template>
         </el-table-column>
-        <el-table-column prop="customerOrgGroupIds" label="分组" width="180">
+        <el-table-column prop="customerOrgGroupIds" label="分组" width="200">
           <template slot-scope="scope">
             <el-select v-model="scope.row.customerOrgGroupIds" multiple collapse-tags filterable clearable
-              style="width:210px;" placeholder="请选择分组" size="small"
+              style="width:196px;" placeholder="请选择分组" size="small" 
               @focus="getCustGroup(scope.$index, scope.row.customerOrgRegister.id)"
               :disabled="!useCusOrg || scope.row.customerOrgId == dict.personOrgId">
               <el-option v-for="item in scope.row.customerOrgGroupList" :key="item.value" :label="item.displayName"
@@ -389,24 +392,34 @@ export default {
 <style lang="scss" scoped>
 ::v-deep .el-input__inner {
   /*text-align: center;*/
-  padding-left: 1px;
-  padding-right: 1px;
+  padding-left: 2px;
+  padding-right: 15px;
+}
+::v-deep .el-input__icon{
+  width: 15px; /* 输入框下拉箭头或清除图标 默认 25 */
 }
 
-::v-deep .el-table th.el-table__cell {
-  /*text-align: center;*/
-  padding-left: 1px;
-  padding-right: 1px;
+/* 表格 表头 列间距控制 */
+::v-deep .el-table th.el-table__cell>.cell{
+  text-align: center;  /* 表格 表头 对齐方式，默认 left */
+  padding-right: 2px;  /* 表格 表头 列间距控制，默认 10px */
+  padding-left: 2px;  /* 表格 表头 列间距控制，默认 10px */
 }
 
-::v-deep .el-table td.el-table__cell {
-  padding-left: 1px;
-  padding-right: 1px;
+/* 表格 表体 首列左间距控制 */
+::v-deep .el-table--border .el-table__cell:first-child .cell {
+  padding-left: 2px; /* 表格 表体 首列左间距控制，默认 10px */
 }
 
-::v-deep .el-table .cell {
-  padding-left: 1px;
-  padding-right: 1px;
+/* 表格 行列间距控制 ，默认 10 px*/
+::v-deep .el-table__cell {
+  padding: 2px 2px 2px 2px;   /* 上，右，下，左 */
+}
+
+
+::v-deep .cell {
+  padding-left: 2px;
+  padding-right: 2px;
 }
 
 ::v-deep .el-icon-date:before {
diff --git a/src/components/report/PatientRegisterQueryNobtn.vue b/src/components/report/PatientRegisterQueryNobtn.vue
index bafd8f7..2f608f6 100644
--- a/src/components/report/PatientRegisterQueryNobtn.vue
+++ b/src/components/report/PatientRegisterQueryNobtn.vue
@@ -72,7 +72,7 @@
     </div>
     <!--通用选单位、体检次数、分组的控件-->
     <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
-      :close-on-click-modal="false" width="840px" height="600px">
+      :close-on-click-modal="false" width="800px" height="600px">
       <CusOrgOCX/>
     </el-dialog>
   </div>
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 8138ef6..70347a0 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -33,10 +33,15 @@
         <div class="listBtn">
             <el-button type="primary" class="btnClass" @click="intervene">干预措施</el-button>
         </div>
-        <!-- 人员档案列表 -->
-        <el-dialog title="人员档案列表" :visible.sync="sumDoctorCheck.sumDoctorCheckDialogVisible" width="1000px">
+        <!-- 体检人员列表
+        <el-dialog title="体检人员列表" :visible.sync="sumDoctorCheck.sumDoctorCheckDialogVisible" width="1000px">
             <PatientRegisterList win="sumDoctorCheck" />
         </el-dialog>
+         -->
+        <el-drawer title="体检人员列表" :visible.sync="sumDoctorCheck.sumDoctorCheckDialogVisible" direction="rtl" 
+          :wrapperClosable="false">
+          <PatientRegisterList win="sumDoctorCheck" />
+        </el-drawer>
 
     </div>
 </template>
diff --git a/src/views/report/checkStatus.vue b/src/views/report/checkStatus.vue
index f359e33..4962348 100644
--- a/src/views/report/checkStatus.vue
+++ b/src/views/report/checkStatus.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card>      
       <div class="publiccss">组合项目检查状态</div>
-      <div :style="'display: block; width:' + (window.pageWidth - 80) + 'px;margin-top:20px'">
+      <div :style="'display: block; width:' + (window.pageWidth - 82) + 'px;margin-top:20px'">
         <div style="display: flex; flex-wrap: wrap; height:35px;">
           <div class="query">
             <span>体检单位：</span>
@@ -28,55 +28,57 @@
           <div class="query">
             <el-button type="primary" @click="btnQuery" size="small">查询</el-button>
           </div>
-        </div>  
-        <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
-          row-key="id" size="small" highlight-current-row ref="dataList" >
-          <el-table-column prop="asbitemName" label="组合项目名称" width="120"/>          
-          <el-table-column prop="checkCompleteFlag" label="检查状态" width="70" >
-            <template slot-scope="scope">
-              <div>{{ dddw(dict.checkCompleteFlag, 'id', scope.row.checkCompleteFlag, 'displayName') }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="isCharge" label="收费状态" width="70" >
-            <template slot-scope="scope">
-              <div>{{ scope.row.checkCompleteFlag == 'Y' ? '已收费':'未收费' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="standardPrice" label="标准价格" width="70"/> 
-          <el-table-column prop="chargePrice" label="应收价格" width="70"/> 
-          <el-table-column prop="patientRegisterNo" label="人员条码号" width="130"/> 
-          <el-table-column prop="patientNo" label="档案号" width="130"/>
-          <el-table-column prop="medicalTimes" label="体检次数" width="70"/>
-          <el-table-column prop="customerOrgParentName" label="单位" width="180">
-            <template slot-scope="scope">
-              <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="customerOrgName" label="部门" width="180">
-            <template slot-scope="scope">
-              <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="分组/套餐" width="150">
-            <template slot-scope="scope">
-              <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
-                {{ dddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
-              </div>
-              <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
-                {{ dddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="patientName" label="姓名" width="80"/>
-          <el-table-column prop="sexId" label="性别">
-            <template slot-scope="scope">
-              <div>{{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="age" label="年龄" />
-          <el-table-column prop="mobileTelephone" label="手机" width="100" />
-          <el-table-column prop="telephone" label="电话" width="100" />          
-        </el-table>
+        </div>
+        <div>
+          <el-table :data="dataList" border :height="window.pageHeight < 600 ? 360 : window.pageHeight - 240"
+            row-key="id" size="small" highlight-current-row ref="dataList" >
+            <el-table-column prop="asbitemName" label="组合项目名称" width="120"/>          
+            <el-table-column prop="checkCompleteFlag" label="检查状态" width="70" >
+              <template slot-scope="scope">
+                <div>{{ dddw(dict.checkCompleteFlag, 'id', scope.row.checkCompleteFlag, 'displayName') }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="isCharge" label="收费状态" width="70" >
+              <template slot-scope="scope">
+                <div>{{ scope.row.checkCompleteFlag == 'Y' ? '已收费':'未收费' }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="standardPrice" label="标准价格" width="70"/> 
+            <el-table-column prop="chargePrice" label="应收价格" width="70"/> 
+            <el-table-column prop="patientRegisterNo" label="人员条码号" width="130"/> 
+            <el-table-column prop="patientNo" label="档案号" width="130"/>
+            <el-table-column prop="medicalTimes" label="体检次数" width="70"/>
+            <el-table-column prop="customerOrgParentName" label="单位" width="180">
+              <template slot-scope="scope">
+                <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="customerOrgName" label="部门" width="180">
+              <template slot-scope="scope">
+                <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="分组/套餐" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+                  {{ dddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+                </div>
+                <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+                  {{ dddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="patientName" label="姓名" width="80"/>
+            <el-table-column prop="sexId" label="性别">
+              <template slot-scope="scope">
+                <div>{{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="age" label="年龄" />
+            <el-table-column prop="mobileTelephone" label="手机" width="100" />
+            <el-table-column prop="telephone" label="电话" width="100" />          
+          </el-table>
+        </div>        
       </div>
     </el-card> 
     <!--通用选单位、体检次数、分组的控件-->