From 04ed7ceb055f7b28234d6c97fc93dfd41a288162 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 14 Mar 2024 19:05:19 +0800
Subject: [PATCH] doctor

---
 src/components/doctorCheck/ButtonList.vue     |  69 +--
 src/components/doctorCheck/CheckItemList.vue  |   4 +-
 src/components/doctorCheck/CheckPicture.vue   |   2 +-
 src/components/doctorCheck/CheckSumSug.vue    |  14 +-
 .../doctorCheck/RegisterCheckList.vue         |   2 +-
 .../patientRegister/PatientRegisterItem.vue   |   2 +-
 .../patientRegister/PatientRegisterList.vue   | 566 ++++++++----------
 .../patientRegister/customerOrgTreeAll.vue    |  32 +-
 .../patientRegisterAsbItem.vue                | 102 ++--
 .../patientRegister/patientRegisterQuery.vue  |   2 +-
 src/views/customerOrg/patientRegister.vue     |  29 +-
 src/views/doctorCheck/doctorCheck.vue         |  44 +-
 12 files changed, 380 insertions(+), 488 deletions(-)

diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index bdbddd5..ede8c45 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -1,54 +1,54 @@
 <template>
-    <div style="margin-left: 10px;">
-        <div v-show="checkPagePriv(pagePriv.privs,'人员列表')">
-            <el-button type="primary" class="btnClass" @click="prList">人员列表</el-button>
+    <div style="margin-left: 5px;">
+        <div v-show="checkPagePriv(pagePriv.privs,'人员列表')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="prList">人员列表</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'体检日期')">
-            <el-button type="primary" class="btnClass" @click="dialogVisibleSetStartDate = true">体检日期</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'体检日期')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="dialogVisibleSetStartDate = true">体检日期</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'增加人员')">
-            <el-button type="primary" class="btnClass" @click="btnAddPr">增加人员</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'增加人员')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="btnAddPr">增加人员</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'编辑人员')">
-            <el-button type="primary" class="btnClass" @click="btnEditPr">编辑人员</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'编辑人员')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="btnEditPr">编辑人员</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'删除人员')">
-            <el-button type="primary" class="btnClass" @click="btnDelPr">删除人员</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'删除人员')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="btnDelPr">删除人员</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'上一人')">
-            <el-button type="primary" class="btnClass" @click="btnStep(-1)">上一人</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'上一人')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="btnStep(-1)">上一人</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'下一人')">
-            <el-button type="primary" class="btnClass" @click="btnStep(1)">下一人</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'下一人')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="btnStep(1)">下一人</el-button>
         </div>
         <!--
         <div>
             <el-button type="primary" class="btnClass" @click="save">保存结果</el-button>
         </div>
         -->
-        <div v-show="checkPagePriv(pagePriv.privs,'修改结果')">
-            <el-button type="primary" class="btnClass" @click="btnEdit">修改结果</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'修改结果')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="btnEdit">修改结果</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'删除结果')">
-            <el-button type="primary" class="btnClass" @click="btnDel">删除结果</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'删除结果')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="btnDel">删除结果</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'放弃明细项目检查')">
-            <el-button type="primary" class="btnClass" @click="refuseItem" style="font-size:11px;">放弃明细项目检查</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'放弃明细项目检查')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="refuseItem" style="font-size:11px;">放弃明细项目检查</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'删除明细项目')">
-            <el-button type="primary" class="btnClass" @click="delItem">删除明细项目</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'删除明细项目')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="delItem">删除明细项目</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'取消审核')">
-            <el-button type="primary" class="btnClass" @click="unAudit">取消审核</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'取消审核')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="unAudit">取消审核</el-button>
         </div>        
-        <div v-show="checkPagePriv(pagePriv.privs,'历次结果')">
-            <el-button type="primary" class="btnClass" @click="btnCheckHistory">历次结果</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'历次结果')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="btnCheckHistory">历次结果</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'体检报告')">
-            <el-button type="primary" class="btnClass" @click="report">体检报告</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'体检报告')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="report">体检报告</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'总检')">
-            <el-button type="primary" class="btnClass" @click="toSumDoctorCheck">总检</el-button>
+        <div v-show="checkPagePriv(pagePriv.privs,'总检')" class="divBtnClass">
+            <el-button type="primary" class="commonbutton" @click="toSumDoctorCheck">总检</el-button>
         </div>
 
         <!--
@@ -616,10 +616,7 @@ export default {
 <style scoped>
 @import '../../assets/css/global_button.css';
 
-.btnClass {
-    margin-top: 1px;
-    width: 100px;
-    height: 26px;
-    padding: 5px 5px; /*原始 默认值 10px 10px */
+.divBtnClass {
+    margin-top: 5px;    
 }
 </style>
\ No newline at end of file
diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 4e2e0fb..a07cfe8 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -5,8 +5,8 @@
       style="width: 100%"
       :height="
         window.pageHeight < 600
-          ? Math.floor(((420 - 40 - (isCheckPicture ? 110:0)) * 3) / 5)
-          : Math.floor(((window.pageHeight - 260 - 40 - (isCheckPicture ? 110:0)) * 3) / 5)
+          ? Math.floor(((420 - (isCheckPicture ? 110:0)) * 3) / 5)
+          : Math.floor(((window.pageHeight - 260 - (isCheckPicture ? 110:0)) * 3) / 5)
       "
       border highlight-current-row
       @row-click="rowClick" size="small"
diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index 90b241c..e322f80 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -30,7 +30,7 @@
       </div>
     </div>
     <!--  -->
-    <div :style="`overflow-x: scroll;width:${Math.floor((window.pageWidth - 200 - 110 - 45 - 4))}px;`">
+    <div :style="`overflow-x: scroll;width:${Math.floor((window.pageWidth - 200 - 110 - 15 - 4))}px;`">
       <div style="display: flex;">
         <div
           class="demo-image__preview"
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index d23c410..b749523 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -3,7 +3,7 @@
     <div :style="`width:${sumWidth}px;`">
       <el-table id="tableSummary" row-key="id" :data="doctorCheck.checkSummaryList" size="samll"        
         :height="sumHeight"
-        width="100%" border @row-click="rowClick">
+        width="100%" border>
         <el-table-column type="index" width="25" align="center"/>
         <el-table-column prop="summary" label="小结">
           <template slot="header">
@@ -44,7 +44,7 @@
     <div :style="`margin-left:2px;width:${sumWidth}px;`">
       <el-table id="tableSuggestion" row-key="id" :data="doctorCheck.checkSuggestionList" size="samll"
         :height="sumHeight"
-        width="100%" border @row-click="rowClick">
+        width="100%" border>
         <el-table-column type="index" width="25" align="center"/>
         <el-table-column prop="suggestion" label="建议" >
           <template slot-scope="scope">
@@ -62,7 +62,7 @@
     </div>
   </div>
 </template>
-<script lang="ts">
+<script>
 import { mapState } from 'vuex';
 import Sortable from "sortablejs";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
@@ -96,12 +96,12 @@ export default {
 
     //小结宽度
     sumWidth(){
-      return Math.floor((this.window.pageWidth - 200 - 110 - 45 - 4)/2);
+      return Math.floor((this.window.pageWidth - 200 - 110 - 15 - 4)/2);
     },
 
     //小结高度
     sumHeight(){
-      return this.window.pageHeight < 600 ? Math.floor((395 - (this.isCheckPicture ? 110:0))*2/5):Math.floor((this.window.pageHeight - 205 - (this.isCheckPicture ? 110:0))*2/5);
+      return this.window.pageHeight < 600 ? Math.floor((480 - (this.isCheckPicture ? 110:0))*2/5):Math.floor((this.window.pageHeight - 120 - (this.isCheckPicture ? 110:0))*2/5);
     }
   },
 
@@ -145,10 +145,6 @@ export default {
         });
     },
 
-    //选择组合项目
-    rowClick(row) {
-      
-    },
 
     //拖拽
     rowDrop() {
diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index 174b664..e4f8b7d 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -2,7 +2,7 @@
   <div>
     <!-- :row-class-name="tableRowClassName" -->
     <el-table :data="doctorCheck.RegisterCheckList" style="width: 100%" 
-      :height="window.pageHeight < 600 ? 340:window.pageHeight-260"  
+      :height="window.pageHeight < 600 ? 400:window.pageHeight-200"  
       border highlight-current-row ref='doctorCheck_RegisterCheckList'
       @row-click="rowClick">
       <el-table-column prop="asbitemName" label="组合项目" width="198">
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index 47d8e44..0379338 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -79,7 +79,7 @@
             filterable :filter-method="filterMethod" :disabled="isComplete"
             clearable @clear="quickAsb = deepCopy(asbItemQuick)" 
             @change="quickChoosedAsb" default-first-option ref="quickAsbOCX"
-            style="width:150px;text-align: left;padding-right: 15px;">
+            style="width:240px;text-align: left;padding-right: 15px;">
             <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
           </el-select>
         </div>
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 4cbfcf0..1310042 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1,91 +1,73 @@
 <template>
   <div style="display: flex">
-    <div 
-      :style="
-        'margin-left:5px;width:' + (window.pageWidth - 200 - 110 - 35) + 'px;'
-      "
-      @contextmenu.prevent="onContextmenu"
-    >
+    <div :style="'margin-left:5px;width:' + (window.pageWidth - 200 - 110 - 10) + 'px;'" @contextmenu.prevent="onContextmenu">
       <div>
-        <el-table @body-scrolling="load"
-          :data="patientRegister.prList"
-          border  :height="window.pageHeight < 600 ? 226 : Math.floor(((window.pageHeight - 261) * 2) / 3)"
-          highlight-current-row
-          @row-click="rowClick"
-          size="small" row-key="id"
-          @selection-change="handleSelectionChange"
-          @cell-contextmenu="onCellRightClick"
-          ref="info" id="info"
-          :row-class-name="handleRowClassName"
-        >
+        <el-table @body-scrolling="load" :data="patientRegister.prList" border
+          :height="window.pageHeight < 600 ? 248 : Math.floor(((window.pageHeight - 228) * 2) / 3)" highlight-current-row
+          @row-click="rowClick" size="small" row-key="id" @selection-change="handleSelectionChange"
+          @cell-contextmenu="onCellRightClick" ref="info" id="info" :row-class-name="handleRowClassName">
           <!-- 取消勾选，改为选中
           <el-table-column type="selection" width="40" show-overflow-tooltip/>
           :height="window.pageHeight < 600 ? 202 : Math.floor(((window.pageHeight - 302) * 2) / 3)"
           -->
-          <el-table-column
-            v-for="(item, index) in headerCols" 
-            :key="`col_${index}`"          
-            :min-width="dropCol[index].minWidth"
-            :align="dropCol[index].align"
-            :label="item.label" 
-            :prop="dropCol[index].prop"
-            :sortable="dropCol[index].prop == 'sn' ? false:true"
-          >        
-            <template slot-scope="scope">            
-              <div v-if="dropCol[index].prop == 'sn'" >
+          <el-table-column v-for="(item, index) in headerCols" :key="`col_${index}`" :min-width="dropCol[index].minWidth"
+            :align="dropCol[index].align" :label="item.label" :prop="dropCol[index].prop"
+            :sortable="dropCol[index].prop == 'sn' ? false : true">
+            <template slot-scope="scope">
+              <div v-if="dropCol[index].prop == 'sn'">
                 {{ scope.$index + 1 }}
               </div>
-              <div v-else-if="dropCol[index].prop == 'completeFlag'" >
+              <div v-else-if="dropCol[index].prop == 'completeFlag'">
                 {{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}
               </div>
-              <div v-else-if="dropCol[index].prop == 'guidePrintTimes'" >
-                <i class="el-icon-printer"
-                  v-if="scope.row.guidePrintTimes > 0"
-                  style="font-size: 20px; color: green" />
+              <div v-else-if="dropCol[index].prop == 'guidePrintTimes'">
+                <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0" style="font-size: 20px; color: green" />
               </div>
-              <div v-else-if ="dropCol[index].prop == 'isLock'
-                            || dropCol[index].prop == 'isVip'
-                            || dropCol[index].prop == 'isUpload'
-                            " >
+              <div v-else-if="dropCol[index].prop == 'isLock'
+                || dropCol[index].prop == 'isVip'
+                || dropCol[index].prop == 'isUpload'
+                ">
                 {{ scope.row[dropCol[index].prop] == "Y" ? "是" : "否" }}
               </div>
-              <div v-else-if="dropCol[index].prop == 'customerOrgParentName'" >
+              <div v-else-if="dropCol[index].prop == 'customerOrgParentName'">
                 {{ scope.row.customerOrgParentName
-                    ? scope.row.customerOrgParentName
-                    : scope.row.customerOrgName }}
+                  ? scope.row.customerOrgParentName
+                  : scope.row.customerOrgName }}
               </div>
-              <div v-else-if="dropCol[index].prop == 'sexId'" >
+              <div v-else-if="dropCol[index].prop == 'sexId'">
                 {{ dddw(dict.sex, "id", scope.row[dropCol[index].prop], "displayName") }}
               </div>
-              <div v-else-if="dropCol[index].prop == 'groupPack'" >
-                <div  v-if=" scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
-                  {{ dddw(dict.medicalPackage,"id",scope.row.medicalPackageId,"displayName")}}
+              <div v-else-if="dropCol[index].prop == 'groupPack'">
+                <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
+                  v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+                  {{ dddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
                 </div>
               </div>
-              <div v-else-if="dropCol[index].prop == 'nationId'" >
+              <div v-else-if="dropCol[index].prop == 'nationId'">
                 {{ dddw(dict.nation, "id", scope.row[dropCol[index].prop], "displayName") }}
               </div>
-              <div v-else-if ="dropCol[index].prop == 'birthDate' 
-                            || dropCol[index].prop == 'creationTime'" >
-                {{ scope.row[dropCol[index].prop] ? moment(scope.row[dropCol[index].prop]).format('yyyy-MM-DD'):'' }}
+              <div v-else-if="dropCol[index].prop == 'birthDate'
+                || dropCol[index].prop == 'creationTime'">
+                {{ scope.row[dropCol[index].prop] ? moment(scope.row[dropCol[index].prop]).format('yyyy-MM-DD') : '' }}
               </div>
-              <div v-else-if="dropCol[index].prop == 'maritalStatusId'" >
+              <div v-else-if="dropCol[index].prop == 'maritalStatusId'">
                 {{ dddw(dict.maritalStatus, "id", scope.row[dropCol[index].prop], "displayName") }}
               </div>
-              <div v-else-if="dropCol[index].prop == 'medicalTypeId'" >
+              <div v-else-if="dropCol[index].prop == 'medicalTypeId'">
                 {{ dddw(dict.medicalType, "id", scope.row[dropCol[index].prop], "displayName") }}
               </div>
-              <div v-else-if="dropCol[index].prop == 'personnelTypeId'" >
+              <div v-else-if="dropCol[index].prop == 'personnelTypeId'">
                 {{ dddw(dict.personnelType, "id", scope.row[dropCol[index].prop], "displayName") }}
               </div>
               <div v-else>
                 {{ scope.row[dropCol[index].prop] }}
               </div>
-            </template>        
-          </el-table-column>  
+            </template>
+          </el-table-column>
           <!--
           "sexHormoneTermId": "00000000-0000-0000-0000-000000000000",
           "interposeMeasure": null,
@@ -113,10 +95,10 @@
           "id": "3a0c196d-a6d0-37fe-5c32-4806bdc4530f"
           -->
         </el-table>
-        <div style="display: flex;justify-content:space-between;">            
+        <div style="display: flex;justify-content:space-between;">
           <div></div>
           <div>
-            <span style="font-size:12px;">共：{{loadOpts.totalCount}} 条记录，当前显示：{{patientRegister.prList.length}} 条。</span>
+            <span style="font-size:12px;">共：{{ loadOpts.totalCount }} 条记录，当前显示：{{ patientRegister.prList.length }} 条。</span>
           </div>
         </div>
       </div>
@@ -129,23 +111,17 @@
       </el-tabs>
     </div>
     <div style="margin-left: 10px;">
-      <div v-show="checkPagePriv(pagePriv.privs,'人员登记')" class="listBtn">
-        <el-button type="success" class="commonbutton" @click="btnAdd">人员登记</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '人员登记')" class="listBtn">
+        <el-button type="success" class="commonbutton" @click="btnAdd">人员登记</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'批量正式登记')" class="listBtn">
-        <el-button type="success" class="commonbutton" @click="btnAddBatch">批量正式登记</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '批量正式登记')" class="listBtn">
+        <el-button type="success" class="commonbutton" @click="btnAddBatch">批量正式登记</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'编辑')" class="listBtn">
-        <el-button type="primary" class="commonbutton" @click="btnEdit"
-          >编辑</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '编辑')" class="listBtn">
+        <el-button type="primary" class="commonbutton" @click="btnEdit">编辑</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'删除')" class="listBtn">
-        <el-button type="danger" class="commonbutton" @click="btnDel"
-          >删除</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '删除')" class="listBtn">
+        <el-button type="danger" class="commonbutton" @click="btnDel">删除</el-button>
       </div>
       <!--
       <div class="listBtn">
@@ -161,39 +137,20 @@
         <el-button type="" class="btnClass commonbutton">健康档案</el-button>
       </div>
       -->
-      <div v-show="checkPagePriv(pagePriv.privs,'批量调整分组')" class="listBtn">
-        <el-button type="" class="commonbutton" @click="btnGroupBatch"
-          >批量调整分组</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '批量调整分组')" class="listBtn">
+        <el-button type="" class="commonbutton" @click="btnGroupBatch">批量调整分组</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'批量调整项目')" class="listBtn">
-        <el-button type="" class="commonbutton" @click="btnAsbBatch"
-          >批量调整项目</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '批量调整项目')" class="listBtn">
+        <el-button type="" class="commonbutton" @click="btnAsbBatch">批量调整项目</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'指引单打印')" class="listBtn">
-        <el-button
-          type=""
-          class="commonbutton"
-          @click="guidePrint('0001', false)"
-          >指引单打印</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '指引单打印')" class="listBtn">
+        <el-button type="" class="commonbutton" @click="guidePrint('0001', false)">指引单打印</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'指引单预览')" class="listBtn">
-        <el-button
-          type=""
-          class="commonbutton"
-          @click="guidePrint('0001', true)"
-          >指引单预览</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '指引单预览')" class="listBtn">
+        <el-button type="" class="commonbutton" @click="guidePrint('0001', true)">指引单预览</el-button>
       </div>
-      <div v-show="checkPagePriv(pagePriv.privs,'人员信息导出')" class="listBtn">
-        <el-button
-          type=""
-          class="commonbutton"
-          @click="btnExport('info')"
-          >人员信息导出</el-button
-        >
+      <div v-show="checkPagePriv(pagePriv.privs, '人员信息导出')" class="listBtn">
+        <el-button type="" class="commonbutton" @click="btnExport('info')">人员信息导出</el-button>
       </div>
       <!--
       <div class="listBtn">
@@ -203,81 +160,41 @@
     </div>
 
     <!-- 体检人员登记 :title="patientRegister.patientRegisterRd.id ? '体检人员--编辑' : '体检人员--新增'" -->
-    <el-dialog
-      :title="dataTransOpts.tableS.patient_register.id ? '体检人员--编辑' : '体检人员--新增'"      
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      fullscreen @close="closeDialogPR"
-    > 
+    <el-dialog :title="dataTransOpts.tableS.patient_register.id ? '体检人员--编辑' : '体检人员--新增'" :visible.sync="dialogVisible"
+      :close-on-click-modal="false" fullscreen @close="closeDialogPR">
       <!-- :formInitData="patientRegister.patientRegisterRd" -->
-      <PatientRegisterEdit      
-        :isDoctor="'0'"  
-        :patientRegisterId = "patientRegister.patientRegisterRd.id"
-        :editTimes="editTimes"
-        :refreshRegister="refreshRegister"
-      />
+      <PatientRegisterEdit :isDoctor="'0'" :patientRegisterId="patientRegister.patientRegisterRd.id"
+        :editTimes="editTimes" :refreshRegister="refreshRegister" />
     </el-dialog>
 
     <!-- 拍照 -->
-    <el-dialog
-      title="拍照"
-      :visible.sync="patientRegister.cameraVisble"
-      width="400"
-      height="800"
-      :show-close="false"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="800" :show-close="false"
+      :append-to-body="true" :close-on-click-modal="false">
       <Camera :id="patientRegister.patientRegisterId" />
     </el-dialog>
 
     <!-- 指引单 -->
-    <el-dialog
-      title="指引单"
-      :visible.sync="dialogGuide"
-      width="400"
-      height="800"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="指引单" :visible.sync="dialogGuide" width="400" height="800" :append-to-body="true"
+      :close-on-click-modal="false">
       <div>{{ guideMsg }}</div>
     </el-dialog>
 
     <!-- 批量调整分组 -->
-    <el-dialog
-      title="批量调整分组"
-      :visible.sync="dialogWin.PatientRegisterEditGroupBatch"
-      width="600px"
-      height="800px"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="批量调整分组" :visible.sync="dialogWin.PatientRegisterEditGroupBatch" width="600px" height="800px"
+      :append-to-body="true" :close-on-click-modal="false">
       <PatientRegisterEditGroupBatch :multipleSelection="multipleSelection" />
-      
+
     </el-dialog>
 
     <!-- 批量调整项目 -->
-    <el-dialog
-      title="批量调整项目"
-      :visible.sync="dialogWin.PatientRegisterEditItemBatch"
-      width="610px"
-      height="800px"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-    >
-      <PatientRegisterEditItemBatch :multipleSelection="multipleSelection" />     
+    <el-dialog title="批量调整项目" :visible.sync="dialogWin.PatientRegisterEditItemBatch" width="610px" height="800px"
+      :append-to-body="true" :close-on-click-modal="false">
+      <PatientRegisterEditItemBatch :multipleSelection="multipleSelection" />
     </el-dialog>
 
     <!-- 通用进度条 -->
-    <el-dialog
-      title="数据处理中……"
-      :visible.sync="elProgress.display"
-      width="600px"
-      height="400"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-    >
+    <el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="600px" height="400" :show-close="false"
+      :close-on-click-modal="false" :append-to-body="true">
       <ElProgressOCX />
     </el-dialog>
   </div>
@@ -291,7 +208,7 @@ import FileSaver from 'file-saver';
 import html2canvas from 'html2canvas';
 
 import {
-  getPagePriv,checkPagePriv, 
+  getPagePriv, checkPagePriv,
   dddw,
   objCopy,
   arrayReduce,
@@ -305,7 +222,7 @@ import PatientRegisterAsbItem from "../../components/patientRegister/patientRegi
 
 import ElProgressOCX from "../../components/report/ElProgressOCX.vue";
 import PatientRegisterEditGroupBatch from "./PatientRegisterEditGroupBatch.vue";
-import PatientRegisterEditItemBatch  from "./PatientRegisterEditItemBatch.vue";
+import PatientRegisterEditItemBatch from "./PatientRegisterEditItemBatch.vue";
 
 export default {
   components: {
@@ -318,11 +235,11 @@ export default {
   },
   data() {
     return {
-      pagePriv:{
-        routeUrlorPageName:'patientRegister', //当前页面归属路由或归属页面权限名称
-        privs:[] // 页面权限
+      pagePriv: {
+        routeUrlorPageName: 'patientRegister', //当前页面归属路由或归属页面权限名称
+        privs: [] // 页面权限
       },
-      peisid:null,
+      peisid: null,
       startPoint: -1, // 多选起点 -1 表示选择
       endPoint: -1, // 多选终点 -1 表示未选择
 
@@ -342,48 +259,48 @@ export default {
       headerCols: [],
       //拖动列
       dropCol: [
-        { label: "序号",prop: "sn",minWidth: 40,align:"center"},
-        { label: "体检进度",prop: "completeFlag",minWidth: 80,align:"center"},
-        { label: "打印", prop: "guidePrintTimes", minWidth: 55,align:"center" },
-        { label: "锁住", prop: "isLock", minWidth: 55, align:"center"},
-        { label: "单位", prop: "customerOrgParentName", minWidth: 180, align:"center"},
-        { label: "部门", prop: "customerOrgName", minWidth: 120, align:"center"},
-        { label: "姓名", prop: "patientName", minWidth: 80, align:"center"},
-        { label: "性别", prop: "sexId", minWidth: 55, align:"center"},
-        { label: "年龄", prop: "age", minWidth: 55, align:"center"},
-        { label: "条码号", prop: "patientRegisterNo", minWidth: 150, align:"center"},
-        { label: "档案号", prop: "patientNo", minWidth: 100, align:"center"},
-        { label: "体检次数", prop: "medicalTimes", minWidth: 80, align:"center"},
-        { label: "分组/套餐", prop: "groupPack", minWidth: 150, align:"center"},
-        { label: "民族", prop: "nationId", minWidth: 55, align:"center"},
-        { label: "身份证", prop: "idNo", minWidth: 150, align:"center"},
-        { label: "出生日期", prop: "birthDate", minWidth: 80, align:"center"},
-        { label: "邮箱", prop: "email", minWidth: 150, align:"center"},
-        { label: "手机", prop: "mobileTelephone", minWidth: 100, align:"center"},
-        { label: "电话", prop: "telephone", minWidth: 100, align:"center"},
-        { label: "地址", prop: "address", minWidth: 300, align:""},
-        { label: "体检卡号", prop: "medicalCardNo", minWidth: 80, align:"center"},
-        { label: "工卡号", prop: "jobCardNo", minWidth: 80, align:"center"},
-        { label: "婚姻状况", prop: "maritalStatusId", minWidth: 80, align:"center"},
-        { label: "体检类别", prop: "medicalTypeId", minWidth: 80, align:"center"},
-        { label: "人员类别", prop: "personnelTypeId", minWidth: 80, align:"center"},
-        { label: "职务", prop: "jobPost", minWidth: 80, align:"center"},
-        { label: "职称", prop: "jobTitle", minWidth: 80, align:"center"},
-        { label: "介绍人", prop: "salesman", minWidth: 80, align:"center"},
-        { label: "是否VIP", prop: "isVip", minWidth: 80, align:"center"},
-        { label: "登记人", prop: "creatorName", minWidth: 80, align:"center"},
-        { label: "登记日期", prop: "creationTime", minWidth: 80, align:"center"},
-        { label: "是否上传", prop: "isUpload", minWidth: 80, align:"center"},
-      ],  
-
-      dom:null,   //用于滚动加载数据
-      lazyLoading:false,  //是否懒加载中
-      loadOpts:{
-        totalCount:0,        
-        skipCount:0,
-        maxResultCount:100,
+        { label: "序号", prop: "sn", minWidth: 40, align: "center" },
+        { label: "体检进度", prop: "completeFlag", minWidth: 80, align: "center" },
+        { label: "打印", prop: "guidePrintTimes", minWidth: 55, align: "center" },
+        { label: "锁住", prop: "isLock", minWidth: 55, align: "center" },
+        { label: "单位", prop: "customerOrgParentName", minWidth: 180, align: "center" },
+        { label: "部门", prop: "customerOrgName", minWidth: 120, align: "center" },
+        { label: "姓名", prop: "patientName", minWidth: 80, align: "center" },
+        { label: "性别", prop: "sexId", minWidth: 55, align: "center" },
+        { label: "年龄", prop: "age", minWidth: 55, align: "center" },
+        { label: "条码号", prop: "patientRegisterNo", minWidth: 150, align: "center" },
+        { label: "档案号", prop: "patientNo", minWidth: 100, align: "center" },
+        { label: "体检次数", prop: "medicalTimes", minWidth: 80, align: "center" },
+        { label: "分组/套餐", prop: "groupPack", minWidth: 150, align: "center" },
+        { label: "民族", prop: "nationId", minWidth: 55, align: "center" },
+        { label: "身份证", prop: "idNo", minWidth: 150, align: "center" },
+        { label: "出生日期", prop: "birthDate", minWidth: 80, align: "center" },
+        { label: "邮箱", prop: "email", minWidth: 150, align: "center" },
+        { label: "手机", prop: "mobileTelephone", minWidth: 100, align: "center" },
+        { label: "电话", prop: "telephone", minWidth: 100, align: "center" },
+        { label: "地址", prop: "address", minWidth: 300, align: "" },
+        { label: "体检卡号", prop: "medicalCardNo", minWidth: 80, align: "center" },
+        { label: "工卡号", prop: "jobCardNo", minWidth: 80, align: "center" },
+        { label: "婚姻状况", prop: "maritalStatusId", minWidth: 80, align: "center" },
+        { label: "体检类别", prop: "medicalTypeId", minWidth: 80, align: "center" },
+        { label: "人员类别", prop: "personnelTypeId", minWidth: 80, align: "center" },
+        { label: "职务", prop: "jobPost", minWidth: 80, align: "center" },
+        { label: "职称", prop: "jobTitle", minWidth: 80, align: "center" },
+        { label: "介绍人", prop: "salesman", minWidth: 80, align: "center" },
+        { label: "是否VIP", prop: "isVip", minWidth: 80, align: "center" },
+        { label: "登记人", prop: "creatorName", minWidth: 80, align: "center" },
+        { label: "登记日期", prop: "creationTime", minWidth: 80, align: "center" },
+        { label: "是否上传", prop: "isUpload", minWidth: 80, align: "center" },
+      ],
+
+      dom: null,   //用于滚动加载数据
+      lazyLoading: false,  //是否懒加载中
+      loadOpts: {
+        totalCount: 0,
+        skipCount: 0,
+        maxResultCount: 100,
       },
-      loadOptsInit:{},
+      loadOptsInit: {},
 
     };
   },
@@ -391,16 +308,16 @@ export default {
   created() {
     //获取用户当前页面的权限
     let userPriv = window.sessionStorage.getItem('userPriv')
-    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+    if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
 
     this.headerCols = deepCopy(this.dropCol)
-    this.loadOptsInit = Object.assign({},this.loadOpts)
+    this.loadOptsInit = Object.assign({}, this.loadOpts)
   },
 
   //挂载完成
   mounted() {
     this.quickAsb = this.dict.asbItemAll;
-    
+
     this.peisid = window.sessionStorage.getItem('peisid');
 
     // 初始化可以拖动的列
@@ -423,7 +340,7 @@ export default {
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
-    moment,dddw,deepCopy,checkPagePriv,
+    moment, dddw, deepCopy, checkPagePriv,
 
     // 扩展定义表格行样式
     handleRowClassName({ row, rowIndex }) {
@@ -464,8 +381,8 @@ export default {
 
       //选中（取消勾选）start -------------------------
       this.multipleSelection = []
-      this.patientRegister.prList.forEach(e =>{
-        if(e.choosed){
+      this.patientRegister.prList.forEach(e => {
+        if (e.choosed) {
           this.multipleSelection.push(deepCopy(e))
         }
       })
@@ -493,11 +410,11 @@ export default {
               return this.$peisAPI.printPre(JSON.stringify(toOutShell));
             }
           })
-          .then(res =>{
-            console.log('this.$peisAPI.printPre',res)
-            if(JSON.parse(res).code < 0){
+          .then(res => {
+            console.log('this.$peisAPI.printPre', res)
+            if (JSON.parse(res).code < 0) {
               this.$message.warning(JSON.parse(res).message);
-            }            
+            }
           })
           .catch((err) => {
             this.$message.warning(err);
@@ -507,18 +424,18 @@ export default {
 
         this.elProgress.display = true;
         this.elProgress.percentage = 0;
-        let resPrintData,resPeisAPI,resPrintTimes;
+        let resPrintData, resPeisAPI, resPrintTimes;
 
-        for(let i=0;i<this.multipleSelection.length;i++){
+        for (let i = 0; i < this.multipleSelection.length; i++) {
           try {
             resPrintData = await postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.multipleSelection[i].id}`)
-            if(resPrintData.code == -1) continue
+            if (resPrintData.code == -1) continue
             toOutShell.ReportTable = resPrintData.data
             resPeisAPI = await this.$peisAPI.print(JSON.stringify(toOutShell));
             if (JSON.parse(resPeisAPI).code < 0) continue
-            resPrintTimes = postapi("api/app/patientregister/updatepatientregisterguideprinttimesmany",[this.multipleSelection[i].id]);
-            if(resPrintTimes.code == -1) continue
-            lfind = arrayExistObj(this.patientRegister.prList,"id",this.multipleSelection[i].id);
+            resPrintTimes = postapi("api/app/patientregister/updatepatientregisterguideprinttimesmany", [this.multipleSelection[i].id]);
+            if (resPrintTimes.code == -1) continue
+            lfind = arrayExistObj(this.patientRegister.prList, "id", this.multipleSelection[i].id);
             if (lfind > -1) {
               if (this.patientRegister.prList[lfind].guidePrintTimes) {
                 this.patientRegister.prList[lfind].guidePrintTimes =
@@ -555,31 +472,31 @@ export default {
       }
       this.multipleSelection = JSON.parse(JSON.stringify(rows));
     },
-    
+
     //设置新增/编辑的form数据
-    setForm(formData){
+    setForm(formData) {
       this.patientRegister.patientRegisterRd = deepCopy(formData)
-      if(!this.patientRegister.patientRegisterRd.id){
+      if (!this.patientRegister.patientRegisterRd.id) {
         this.patientRegister.patientRegisterRd.customerOrgId = this.patientRegister.query.customerOrgId
       }
     },
 
     //点击体检次数行
-    rowClick(row) {      
+    rowClick(row) {
       //console.log("this.patientRegister.prList",this.window,this.patientRegister.prList);
 
       // 按住了shift键
       if (this.window.shift) {
         //清除所有选择
-        this.patientRegister.prList.forEach((e,index) => {
+        this.patientRegister.prList.forEach((e, index) => {
           e.choosed = false;
           e.index = index;
         });
 
         if (this.startPoint == -1) {
           this.patientRegister.prList[row.index].choosed = true;
-          this.startPoint = row.index;          
-        }else{
+          this.startPoint = row.index;
+        } else {
           if (this.startPoint > row.index) {
             for (let i = row.index; i <= this.startPoint; i++) {
               this.patientRegister.prList[i].choosed = true;
@@ -590,20 +507,20 @@ export default {
             }
           }
         }
-      }else if (this.window.ctrl) {  // 按住了ctrl 键
+      } else if (this.window.ctrl) {  // 按住了ctrl 键
         this.patientRegister.prList[row.index].choosed = true;
-        if (this.startPoint == -1){
+        if (this.startPoint == -1) {
           this.startPoint = row.index;
-        }                
-      }else{
+        }
+      } else {
         // 未按住了ctrl 、shift 键
         //清除所有选择
         console.log("清除所有选择");
-        this.patientRegister.prList.forEach((e,index) => {
+        this.patientRegister.prList.forEach((e, index) => {
           e.choosed = false;
           e.index = index;
         });
-        console.log(this.patientRegister.prList,row.index);       
+        console.log(this.patientRegister.prList, row.index);
         console.log(this.patientRegister.prList[row.index].choosed);
 
         this.patientRegister.prList[row.index].choosed = true;
@@ -611,16 +528,16 @@ export default {
       }
 
       //选中了多个点编辑时，排序最前的作为当前选中的
-      console.log('row.index <= this.startPoint',row.index,this.startPoint)
+      console.log('row.index <= this.startPoint', row.index, this.startPoint)
       let lfind = -1
-      for(let i=0;i<this.patientRegister.prList.length;i++){
-        if(this.patientRegister.prList[i].choosed){
+      for (let i = 0; i < this.patientRegister.prList.length; i++) {
+        if (this.patientRegister.prList[i].choosed) {
           lfind = i
           break
         }
       }
 
-      if(lfind > -1){
+      if (lfind > -1) {
         // 弹出编辑框，只有在编辑框显示时，才去触发获取数据
         this.dataTransOpts.tableS.patient_register.id = this.patientRegister.prList[lfind].id
         // this.getCustomerOrgGroup(this.patientRegister.prList[lfind].customerOrgParentId);
@@ -643,12 +560,12 @@ export default {
     },
 
     //体检次数 相关操作
-    btnAdd() {  
-      if(!this.peisid || this.peisid == 'null'){
+    btnAdd() {
+      if (!this.peisid || this.peisid == 'null') {
         this.$message.warning("该用户未选归属体检中心，不能执行此操作！");
         return
       }
-      
+
       let customerOrgId = this.patientRegister.query.customerOrgId;
       if (!customerOrgId) {
         this.$message.warning("请选择单位或个人");
@@ -676,17 +593,17 @@ export default {
 
 
     //刷新或添加列表数据
-    refreshRegister(patientRegister){
-      console.log('编辑/新增的 form :',patientRegister)
+    refreshRegister(patientRegister) {
+      console.log('编辑/新增的 form :', patientRegister)
     },
 
     //批量正式登记
-    btnAddBatch(){
+    btnAddBatch() {
       let patientRegisterIds = []
       //取消勾选，换成选择的方式  start
       this.multipleSelection = [];
       this.patientRegister.prList.forEach((e) => {
-        if (e.choosed && e.completeFlag == '0'){
+        if (e.choosed && e.completeFlag == '0') {
           this.multipleSelection.push(e);
           patientRegisterIds.push(e.id)
         }
@@ -699,25 +616,25 @@ export default {
       }
       let completeFlag = '1'
       let body = { completeFlag, patientRegisterIds }
-      postapi('/api/app/patientregister/updatepatientregistercompleteflagormedicalstartdate',body)
-      .then(res =>{
-        if(res.code != -1){
-          console.log('操作成功！')
-          patientRegisterIds.forEach(e => {
-            let lfind = arrayExistObj(this.patientRegister.prList,'id',e)
-            if(lfind > -1) this.patientRegister.prList[lfind].completeFlag = completeFlag
-          });
-        }
-      })
-      .catch(err =>{
-        this.$message.error(`操作失败 ${err}`);
-      });
+      postapi('/api/app/patientregister/updatepatientregistercompleteflagormedicalstartdate', body)
+        .then(res => {
+          if (res.code != -1) {
+            console.log('操作成功！')
+            patientRegisterIds.forEach(e => {
+              let lfind = arrayExistObj(this.patientRegister.prList, 'id', e)
+              if (lfind > -1) this.patientRegister.prList[lfind].completeFlag = completeFlag
+            });
+          }
+        })
+        .catch(err => {
+          this.$message.error(`操作失败 ${err}`);
+        });
     },
 
     // 单个编辑
     btnEdit() {
       // if (!this.patientRegister.patientRegisterRd.id) {
-      if (!this.dataTransOpts.tableS.patient_register.id ) {
+      if (!this.dataTransOpts.tableS.patient_register.id) {
         this.$message.warning("请选择要操作的记录");
         return;
       }
@@ -730,25 +647,25 @@ export default {
     },
 
     //新增或编辑后选中记录
-    async closeDialogPR(){
+    async closeDialogPR() {
       // 如果 dataTransOpts.tableS.patient_register.id 为空(未增加)，则不做处理
-      if(!this.dataTransOpts.tableS.patient_register.id) return
+      if (!this.dataTransOpts.tableS.patient_register.id) return
 
       // 刷新列表（并选中当前新增或编辑的行记录）
-      this.patientRegister.prList.forEach(e =>{
+      this.patientRegister.prList.forEach(e => {
         e.choosed = false
       })
       let res = await postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${this.dataTransOpts.tableS.patient_register.id}`)
-      if(res.code != 1) return
+      if (res.code != 1) return
 
       this.patientRegister.prList.forEach(e => {
         e.choosed = false
       });
-      let lfind = arrayExistObj(this.patientRegister.prList,'id',this.dataTransOpts.tableS.patient_register.id)
-      if(lfind > -1){
-        objCopy(res.data,this.patientRegister.prList[lfind])
+      let lfind = arrayExistObj(this.patientRegister.prList, 'id', this.dataTransOpts.tableS.patient_register.id)
+      if (lfind > -1) {
+        objCopy(res.data, this.patientRegister.prList[lfind])
         this.patientRegister.prList[lfind].choosed = true
-      }else{           
+      } else {
         lfind = this.patientRegister.prList.length
         this.patientRegister.prList.push(res.data)
         this.patientRegister.prList[lfind].index = lfind
@@ -756,7 +673,7 @@ export default {
       }
 
       // 刷新 register_asbitem 表记录
-      if(lfind > -1){
+      if (lfind > -1) {
         this.dataTransOpts.refresh.register_asbitem.M++
         // setTimeout(() => { 
         //   this.$refs['info'].setCurrentRow(currentRow)
@@ -768,7 +685,7 @@ export default {
         //   this.dict.asbItem = [...this.dict.asbItemAll];
         //   this.getPatientRegisterAbs(currentRow.id);          
         // }, 100)        
-      } 
+      }
     },
 
     //拍照
@@ -786,8 +703,8 @@ export default {
 
       //选中（取消勾选）start -------------------------
       this.multipleSelection = []
-      this.patientRegister.prList.forEach(e =>{
-        if(e.choosed){
+      this.patientRegister.prList.forEach(e => {
+        if (e.choosed) {
           this.multipleSelection.push(deepCopy(e))
         }
       })
@@ -815,12 +732,12 @@ export default {
           });
         })
         .then((res) => {
-          if(res.code != -1){
+          if (res.code != -1) {
             console.log("操作成功");
-            arrayReduce(this.patientRegister.prList,this.multipleSelection,'id=id')
+            arrayReduce(this.patientRegister.prList, this.multipleSelection, 'id=id')
             this.setForm(this.patientRegister.patientRegisterRdInit)
             this.getPatientRegisterAbs();
-          }          
+          }
         })
         .catch((err) => {
           if (err == "cancel") {
@@ -828,33 +745,33 @@ export default {
           }
         });
     },
-    
+
 
     //查询
     async Query() {
-      this.loadOpts = Object.assign(this.loadOpts,this.loadOptsInit)
+      this.loadOpts = Object.assign(this.loadOpts, this.loadOptsInit)
       await this.getPrList()
     },
 
     //数据量多时，滚动加载
-    async load(){
+    async load() {
       this.loadOpts.skipCount++
-      await this.getPrList()      
+      await this.getPrList()
     },
 
     // 获取列表数据
-    async getPrList(){
-      
-      if(this.loadOpts.skipCount != 0 && this.loadOpts.skipCount*this.loadOpts.maxResultCount >= this.loadOpts.totalCount) return
-      console.log('getPrList',this.loadOpts)
+    async getPrList() {
+
+      if (this.loadOpts.skipCount != 0 && this.loadOpts.skipCount * this.loadOpts.maxResultCount >= this.loadOpts.totalCount) return
+      console.log('getPrList', this.loadOpts)
 
       let body = {
-        skipCount:this.loadOpts.skipCount,
-        maxResultCount:this.loadOpts.maxResultCount
+        skipCount: this.loadOpts.skipCount,
+        maxResultCount: this.loadOpts.maxResultCount
       };
 
       console.log(`this.patientRegister.query`, this.patientRegister.query);
-      if (this.patientRegister.query.customerOrgFlag) {        
+      if (this.patientRegister.query.customerOrgFlag) {
         // if (this.patientRegister.query.CustomerOrgParentId) {
         //   body.customerOrgId = this.patientRegister.query.CustomerOrgParentId;
         // } else {
@@ -862,9 +779,9 @@ export default {
         //     body.customerOrgId = this.patientRegister.query.customerOrgId;
         // }
         if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId;
-        if(this.patientRegister.query.customerOrgId 
-            && this.patientRegister.query.customerOrgId != this.dict.personOrgId 
-            && this.patientRegister.query.customerOrgRegister.id){
+        if (this.patientRegister.query.customerOrgId
+          && this.patientRegister.query.customerOrgId != this.dict.personOrgId
+          && this.patientRegister.query.customerOrgRegister.id) {
           body.customerOrgRegisterId = this.patientRegister.query.customerOrgRegister.id
         }
 
@@ -910,7 +827,7 @@ export default {
           patientRegisterNo: this.patientRegister.query.patientRegisterNo,
         };
 
-      console.log("/api/app/patientregister/getlistinfilter", body);      
+      console.log("/api/app/patientregister/getlistinfilter", body);
       const loading = this.$loading({
         lock: true,
         text: "Loading",
@@ -919,44 +836,44 @@ export default {
       });
 
       let res = await postapi("/api/app/patientregister/getlistinfilter", body)
-      if(res.code != -1){
+      if (res.code != -1) {
         // 刷新最大记录数
         this.loadOpts.totalCount = res.data.totalCount
         let curLoad = res.data.items
         let oldCount = 0
 
-        if(body.skipCount == 0){  //查询
-          this.patientRegister.prList = [];          
-        }else{
+        if (body.skipCount == 0) {  //查询
+          this.patientRegister.prList = [];
+        } else {
           // 懒加载 ,原数据集不用清空
-          oldCount = this.patientRegister.prList.length          
+          oldCount = this.patientRegister.prList.length
         }
-        curLoad.forEach((e,index) =>{
-          this.patientRegister.prList.push(Object.assign({index:Number(oldCount)+Number(index),choosed:false},e))
+        curLoad.forEach((e, index) => {
+          this.patientRegister.prList.push(Object.assign({ index: Number(oldCount) + Number(index), choosed: false }, e))
         })
 
         //如果 有选中 记录，则刷新其对应的组合项目
-        if(this.dataTransOpts.tableS.patient_register.id){
+        if (this.dataTransOpts.tableS.patient_register.id) {
           this.dataTransOpts.refresh.register_asbitem.M++
         }
       }
-      loading.close(); 
+      loading.close();
     },
 
     //滚动加载数据 
-    scrollFull(){
+    scrollFull() {
       this.dom = this.$refs['info'].bodyWrapper
-      console.log('this.dom',this.dom)
+      console.log('this.dom', this.dom)
 
-      this.dom.addEventListener('scroll',async () => {
+      this.dom.addEventListener('scroll', async () => {
         // console.log('scrollTop',this.dom.scrollTop,'clientHeight',this.dom.clientHeight,'scrollHeight',this.dom.scrollHeight);
-        if(this.dom.scrollTop + this.dom.clientHeight + 20 > this.dom.scrollHeight && !this.lazyLoading){
+        if (this.dom.scrollTop + this.dom.clientHeight + 20 > this.dom.scrollHeight && !this.lazyLoading) {
           // 获取到的不是全部数据 当滚动到底部 
-          console.log('scrollTop',this.dom.scrollTop,'clientHeight',this.dom.clientHeight,'scrollHeight',this.dom.scrollHeight);
-          if((Number(this.loadOpts.skipCount) + 1)*Number(this.loadOpts.maxResultCount) >= Number(this.loadOpts.totalCount)){
+          console.log('scrollTop', this.dom.scrollTop, 'clientHeight', this.dom.clientHeight, 'scrollHeight', this.dom.scrollHeight);
+          if ((Number(this.loadOpts.skipCount) + 1) * Number(this.loadOpts.maxResultCount) >= Number(this.loadOpts.totalCount)) {
             this.lazyLoading = false
-          }else{
-            this.lazyLoading = true            
+          } else {
+            this.lazyLoading = true
             await this.load()
             this.lazyLoading = false
             // this.dom.scrollTop = this.dom.scrollTop - 100
@@ -964,7 +881,7 @@ export default {
         }
       })
     },
-    
+
 
     //右击菜单
     onCellRightClick(row, column) {
@@ -978,35 +895,35 @@ export default {
       let row = { ...this.rClickRow };
       let items = [] //菜单项
 
-      if(checkPagePriv(this.pagePriv.privs,'发送检验申请')) 
+      if (checkPagePriv(this.pagePriv.privs, '发送检验申请'))
         items.push({
           label: "发送检验申请",
           onClick: () => {
             this.lisRequest(row.id);
           },
         })
-      if(checkPagePriv(this.pagePriv.privs,'预览检验条码')) 
+      if (checkPagePriv(this.pagePriv.privs, '预览检验条码'))
         items.push({
           label: "预览检验条码",
           onClick: () => {
             this.lisPrint(row.id, "0002", true);
           },
         })
-      if(checkPagePriv(this.pagePriv.privs,'打印检验条码')) 
+      if (checkPagePriv(this.pagePriv.privs, '打印检验条码'))
         items.push({
           label: "打印检验条码",
           onClick: () => {
             this.lisPrint(row.id, "0002", false);
           },
         })
-      if(checkPagePriv(this.pagePriv.privs,'预览Pacs条码')) 
+      if (checkPagePriv(this.pagePriv.privs, '预览Pacs条码'))
         items.push({
           label: "预览Pacs条码",
           onClick: () => {
             this.pacsPrint(row.id, "0004", true);
           },
         })
-      if(checkPagePriv(this.pagePriv.privs,'打印Pacs条码')) 
+      if (checkPagePriv(this.pagePriv.privs, '打印Pacs条码'))
         items.push({
           label: "打印Pacs条码",
           onClick: () => {
@@ -1050,7 +967,7 @@ export default {
       this.dialogWin.PatientRegisterEditGroupBatch = true;
 
     },
-    
+
     //批量更新项目
     btnAsbBatch() {
       let customerOrgId = this.patientRegister.query.customerOrgId;
@@ -1065,15 +982,15 @@ export default {
       });
       //取消勾选，换成选择的方式  end
 
-      if(this.multipleSelection.length < 1){
+      if (this.multipleSelection.length < 1) {
         this.$message.warning("请选择要操作的记录")
         return
       }
 
       this.dialogWin.PatientRegisterEditItemBatch = true;
-      
+
     },
-  
+
     //检验申请
     async lisRequest(prId) {
       let isPrintLisRequest = false;
@@ -1146,7 +1063,7 @@ export default {
         postapi(
           `/api/app/printreport/getlisrequestreport?PatientRegisterId=${prId}`
         )
-          .then((res) => {        
+          .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = { lisRequest: res.data };
               console.log(
@@ -1302,17 +1219,17 @@ export default {
     },
 
     //通用导出
-    btnExport(elId){
+    btnExport(elId) {
       // 获取HTML元素（表格）
       // let table = document.getElementById(elId); //.cloneNode(true)
       this.$nextTick(() => {
         let refsTable = this.$refs[elId]  //.cloneNode(true) true
         let table = document.getElementById(elId)
-        console.log('table,refsTable',table,refsTable)
-        
+        console.log('table,refsTable', table, refsTable)
+
         let tableData = table.innerHTML
         let fileName = moment(new Date()).format('yyyyMMDDHHmmss')
-        let blob = new Blob([tableData],{type:"text/plain;charset=utf-8"});
+        let blob = new Blob([tableData], { type: "text/plain;charset=utf-8" });
 
         FileSaver.saveAs(blob, fileName + '.xls');
 
@@ -1321,10 +1238,10 @@ export default {
         // let cloneTable = table.cloneNode(true) //[elId]
 
         html2canvas(table).then(canvas => {
-          
+
           // 创建一个a元素用于下载
           const link = document.createElement('a');
-          link.href = canvas.toDataURL('image/jpeg');        
+          link.href = canvas.toDataURL('image/jpeg');
           link.download = fileName + '.jpg';
           document.body.appendChild(link);
           link.click();
@@ -1345,13 +1262,13 @@ export default {
 
   //监听事件
   watch: {
-    "patientRegister.query.customerOrgId":{
+    "patientRegister.query.customerOrgId": {
       // immediate: true, // 立即执行
       // deep: true, // 深度监听复杂类型内变化
-      handler(newVal,oldVal){        
+      handler(newVal, oldVal) {
         //console.log('watch:patientRegister.query.customerOrgId:',newVal,oldVal)
         // 单位变化时，清除当前列表信息
-        if(newVal && newVal != oldVal){
+        if (newVal && newVal != oldVal) {
           this.patientRegister.prList = []
           this.dataTransOpts.tableM.register_asbitem = []
         }
@@ -1394,5 +1311,4 @@ export default {
 .btnClass {
   width: 100px;
 }
-
 </style>
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue
index 8a59858..51f6489 100644
--- a/src/components/patientRegister/customerOrgTreeAll.vue
+++ b/src/components/patientRegister/customerOrgTreeAll.vue
@@ -1,12 +1,12 @@
-<template> 
+<template>
   <div>
     <div style="margin:2px 2px 2px 2px;">
-      <el-input  placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
+      <el-input placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
     </div>
-    <div :style="'overflow: scroll;height:' +(window.pageHeight < 600 ? 430 : window.pageHeight - 170) + 'px;'">
-      <el-tree :data="patientRegister.customerOrgTreeAll" :props="customerOrg.treeprops" 
-        node-key="id" :filter-node-method="filterNode"        
-        @node-click="treeclick" highlight-current ref="customerOrgTree">
+    <div>
+      <el-tree :style="'overflow: scroll;height:' + (window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;'"
+        :data="patientRegister.customerOrgTreeAll" :props="customerOrg.treeprops" node-key="id"
+        :filter-node-method="filterNode" @node-click="treeclick" highlight-current ref="customerOrgTree">
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <div>
             <span class="treeicons">
@@ -14,11 +14,10 @@
                 class="el-icon-document-remove"
                 v-if="data.parentId == null"
               ></i> -->
-              <img style="width:20px;height:20px;vertical-align: sub;" src="@/assets/images/order.png" v-if="data.parentId == null"/>
+              <img style="width:20px;height:20px;vertical-align: sub;" src="@/assets/images/order.png"
+                v-if="data.parentId == null" />
             </span>
-            <span
-              :class="data.parentId == null ? 'maxtitle' : 'mintitle'"
-              >{{ node.label }}
+            <span :class="data.parentId == null ? 'maxtitle' : 'mintitle'">{{ node.label }}
             </span>
           </div>
         </span>
@@ -34,15 +33,15 @@ export default {
   components: {},
   data() {
     return {
-      filterText:'',
+      filterText: '',
     };
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
   computed: {
-    ...mapState(["window","dict", "customerOrg", "patientRegister"]),
+    ...mapState(["window", "dict", "customerOrg", "patientRegister"]),
   },
   //创建组件后
-  created() {},
+  created() { },
 
   //挂载组件完成
   mounted() {
@@ -53,9 +52,9 @@ export default {
   methods: {
     //获取体检单位列表树信息
     getCustomerOrgTree() {
-      getapi("/api/app/customerorg/getbycodeall").then((res) => { 
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
         // console.log("res.data", res.data);
-        if(res.code != -1) this.patientRegister.customerOrgTreeAll = res.data;
+        if (res.code != -1) this.patientRegister.customerOrgTreeAll = res.data;
         //tcdate(this.patientRegister.customerOrgTreeAll)
       });
     },
@@ -92,7 +91,7 @@ export default {
     },
   },
   watch: {
-    "filterText"(newVal,oldVal){
+    "filterText"(newVal, oldVal) {
       this.$refs['customerOrgTree'].filter(newVal);
     }
   },
@@ -100,6 +99,7 @@ export default {
 </script>
 <style scoped>
 @import "../../assets/css/global_tree.css";
+
 .treeicons {
   font-size: 20px;
   margin-right: 5px;
diff --git a/src/components/patientRegister/patientRegisterAsbItem.vue b/src/components/patientRegister/patientRegisterAsbItem.vue
index b3a97ec..c8ccd97 100644
--- a/src/components/patientRegister/patientRegisterAsbItem.vue
+++ b/src/components/patientRegister/patientRegisterAsbItem.vue
@@ -1,57 +1,55 @@
 <template>
   <div>
-    <div style="display: flex">
-      <el-table :data="dataTransOpts.tableM.register_asbitem" border 
-        :height="window.pageHeight < 600 ? 113 : Math.floor((window.pageHeight - 261) / 3)" size="small"
-        highlight-current-row :summary-method="getSummaries" show-summary
-        ref="patientRegister.patientRegisterAbs">
-        <el-table-column label="序号" width="50" align="center">
-          <template slot-scope="scope">
-            <div><i v-if="scope.row.groupPackageId" class="el-icon-star-on" style="font-size: 16px;color: purple;"></i>{{ scope.$index + 1 }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="asbitemName" label="已选组合项目" width="120" />
-        <el-table-column prop="standardPrice" label="标准价" align="center" />
-        <el-table-column prop="discount" label="折扣" align="center" />
-        <el-table-column prop="amount" label="数量" width="50" align="center" />
-        <el-table-column prop="chargePrice" label="价格" align="center" />
-        <el-table-column prop="payTypeFlag" label="支付方式" align="center" >
-          <template slot-scope="scope">
-            <div>{{ dddw(dict.payType, "id", scope.row.payTypeFlag, "displayName") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isCharge" label="收费" min-width="50" align="center">
-          <template slot-scope="scope">
-            <el-checkbox :value="scope.row.isCharge == 'Y'" align="center" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="checkCompleteFlag" label="状态" min-width="50" align="center" >
-          <template slot-scope="scope">
-            <div>
-              {{
-                dddw(
-                  dict.checkCompleteFlag,
-                  "id",
-                  scope.row.checkCompleteFlag,
-                  "displayName"
-                )
-              }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isLock" label="锁" min-width="50" align="center" >
-          <template slot-scope="scope">
-            <el-checkbox :value="scope.row.isLock == 'Y'" align="center" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="creatorName" label="登记人" min-width="70" align="center" />
-        <el-table-column prop="creationTime" label="登记日期" min-width="90" align="center" >
-          <template slot-scope="scope">
-            <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
+    <el-table :data="dataTransOpts.tableM.register_asbitem" border 
+      :height="window.pageHeight < 600 ? 124 : Math.floor((window.pageHeight - 228) / 3)" size="small"
+      highlight-current-row :summary-method="getSummaries" show-summary
+      ref="patientRegister.patientRegisterAbs">
+      <el-table-column label="序号" width="50" align="center">
+        <template slot-scope="scope">
+          <div><i v-if="scope.row.groupPackageId" class="el-icon-star-on" style="font-size: 16px;color: purple;"></i>{{ scope.$index + 1 }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="asbitemName" label="已选组合项目" width="120" />
+      <el-table-column prop="standardPrice" label="标准价" align="center" />
+      <el-table-column prop="discount" label="折扣" align="center" />
+      <el-table-column prop="amount" label="数量" width="50" align="center" />
+      <el-table-column prop="chargePrice" label="价格" align="center" />
+      <el-table-column prop="payTypeFlag" label="支付方式" align="center" >
+        <template slot-scope="scope">
+          <div>{{ dddw(dict.payType, "id", scope.row.payTypeFlag, "displayName") }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="isCharge" label="收费" min-width="50" align="center">
+        <template slot-scope="scope">
+          <el-checkbox :value="scope.row.isCharge == 'Y'" align="center" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkCompleteFlag" label="状态" min-width="50" align="center" >
+        <template slot-scope="scope">
+          <div>
+            {{
+              dddw(
+                dict.checkCompleteFlag,
+                "id",
+                scope.row.checkCompleteFlag,
+                "displayName"
+              )
+            }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="isLock" label="锁" min-width="50" align="center" >
+        <template slot-scope="scope">
+          <el-checkbox :value="scope.row.isLock == 'Y'" align="center" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="creatorName" label="登记人" min-width="70" align="center" />
+      <el-table-column prop="creationTime" label="登记日期" min-width="90" align="center" >
+        <template slot-scope="scope">
+          <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
 </template>
 <script>
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index b76bd7f..84b5c81 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -2,7 +2,7 @@
 
   <div style="display: flex;">
 
-    <div :style="'margin-left: 5px;display: flex; flex-wrap: wrap; height:100px;width:' + (window.pageWidth - (orgEnable=='Y' ? 0:200) - 110 - 30) + 'px;'">
+    <div :style="'margin-left: 5px;display: flex; flex-wrap: wrap; height:100px;width:' + (window.pageWidth - (orgEnable=='Y' ? 0:200) - 110 - 10) + 'px;'">
       <div class="query">
         <span class="spanClass">登记日期：</span>
         <el-date-picker v-model="patientRegister.query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"/>
diff --git a/src/views/customerOrg/patientRegister.vue b/src/views/customerOrg/patientRegister.vue
index 5fd31ef..95b116a 100644
--- a/src/views/customerOrg/patientRegister.vue
+++ b/src/views/customerOrg/patientRegister.vue
@@ -1,30 +1,15 @@
 <template>
   <div>
-    <el-card>
-      <div slot="header">
-        体检人员登记
-      </div>
+    <div>
+      <div class="contenttitle">
+        体检登记 /<span class="contenttitleBold">体检人员登记</span>
+      </div>  
       <div style="display: flex;">
         <!-- 单位树组件 -->
-        <div
-          :style="
-            'border: 0px solid #888;width:200px; height:' +
-            (window.pageHeight < 600 ? 470 : window.pageHeight - 130) +
-            'px;'
-          "
-        >
+        <div>
           <CustomerOrgTreeAll />
         </div>
-        <div
-          :style="
-            'display:block;width:' +
-            (window.pageWidth - 200 - 30) +
-            'px;height:' +
-            (window.pageHeight < 600 ? 470 : window.pageHeight - 130) +
-            'px;' +
-            (window.pageHeight < 600 ? 'overflow-y: scroll;' : '')
-          "
-        >
+        <div style="margin-left: 5px;">
           <!-- 查询条件  -->
           <PatientRegisterQuery />
 
@@ -32,7 +17,7 @@
           <PatientRegisterList />
         </div>
       </div>
-    </el-card>
+    </div>
   </div>
 </template>
 <script>
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 822c659..7a5f6a4 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -1,23 +1,23 @@
 <template>
   <div>
-    <el-card style="display: block; ">
-      <div slot="header" style="height:24px;"> 
-        <div style="display: flex;justify-content:space-between;">          
-          <div>体检医生诊台 </div>
-          <div>
-            <el-image
-              style="margin-top:-5px; margin-right:115px; width: 112px; height: 120px;"
-              :src="peoplePhoto"
-              >
-              <div slot="placeholder" class="image-slot">
-                加载中<span class="dot">...</span>
-              </div>
-            </el-image>
-          </div>       
-        </div> 
+    <div>
+      <div style="display: flex;justify-content:space-between;"> 
+        <div class="contenttitle">
+          体检登记 /<span class="contenttitleBold">体检人员登记</span>
+        </div>  
+        <div style="position: absolute;top:50px;right:10px;z-index: 2000;">
+          <el-image
+            style="margin-right:115px; width: 112px; height: 120px;"
+            :src="peoplePhoto"
+            >
+            <div slot="placeholder" class="image-slot">
+              加载中<span class="dot">...</span>
+            </div>
+          </el-image>
+        </div>
       </div>
       <div style="display: flex;">
-        <div :style="'width:' + (window.pageWidth - 110 - 45) + 'px;'">
+        <div :style="`width:${window.pageWidth - 120}px;`">
           <div style="display: flex;justify-content:space-between;z-index:-1;" >
             <div>
               <PatientRegisterBase />
@@ -40,21 +40,21 @@
                 <RegisterCheckList />
               </el-tab-pane>
               <el-tab-pane label="叫号" name="call">
-                <div :style="`height:${window.pageHeight < 600 ? 340:window.pageHeight-260}px;`">叫号</div>
+                <div :style="`height:${window.pageHeight < 600 ? 400:window.pageHeight-200}px;`">叫号</div>
               </el-tab-pane>
             </el-tabs>
 
-            <div>              
-              <div :style="'margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'" >
+            <div :style="'width:' + (window.pageWidth - 200 - 110 - 15) + 'px;'" >              
+              <div :style="'margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 15 - 2) + 'px;'" >
                 <CheckItemList :isCheckPicture="isCheckPicture" :registerCheckId="dataTransOpts.tableS.register_check.id"/>
               </div>
               <div v-if="isCheckPicture" class="demo-image__preview" :style="'margin-top: 2px;margin-left: 2px;height:110px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">
                 <CheckPicture />
               </div>
-              <div :style="'margin-top: 2px;margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">
+              <div :style="'margin-top: 2px;margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 15 - 2) + 'px;'">
                 <CheckSumSug :registerCheckId="dataTransOpts.tableS.register_check.id" :isCheckPicture="isCheckPicture" :optGrant="optGrant" :addSummary="addSummary" :btnMakeDiagnosis="btnMakeDiagnosis" :save="save" :audit="audit" :unAudit="unAudit" :btnLineUp="btnLineUp"/>
               </div>
-              <div :style="'margin-top: 2px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">
+              <div :style="'margin-top: 2px;width:' + (window.pageWidth - 200 - 110 - 15 - 2) + 'px;'">
                 <RegisterCheckEdit :registerCheckId="dataTransOpts.tableS.register_check.id"/>
               </div>
             </div>
@@ -64,7 +64,7 @@
           <ButtonList :optGrant="optGrant" :addSummary="addSummary" :btnMakeDiagnosis="btnMakeDiagnosis" :save="save" :audit="audit" :unAudit="unAudit"/>
         </div>
       </div>
-    </el-card>    
+    </div>    
   </div>
 </template>
 <script>