diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 4d12477..00fca52 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -2,40 +2,75 @@
   <div>
     <!--组件主体-->
     <div style="display: flex">
-      <div :style="'width:' + (window.pageWidth - 200 - 145) + 'px;'" @contextmenu.prevent="onContextmenu">
+      <div
+        :style="'width:' + (window.pageWidth - 200 - 145) + 'px;'"
+        @contextmenu.prevent="onContextmenu"
+      >
         <div>
-          <u-table :data="tableData" border :height="window.pageHeight < 600
-            ? 248
-            : Math.floor(((window.pageHeight - 250) * 2) / 3)
-            " highlight-current-row @row-click="rowClick" @row-dblclick="dblClick" size="small" row-key="id"
-            @selection-change="handleSelectionChange" @row-contextmenu="onCellRightClick" ref="info" id="info"
-            :row-class-name="handleRowClassName" use-virtual :row-height="25" @table-body-scroll="scrollFull"
-            big-data-checkbox :data-changes-scroll-top="false" :summary-method="getSummaries" show-summary>
-            <u-table-column type="selection" width="40" align="center"></u-table-column>
-            <u-table-column v-for="(item, index) in dragCol" :key="index" :type="dragCol[index].type"
-              :min-width="dragCol[index].minWidth" :align="dragCol[index].align" :label="item.label"
-              :prop="dragCol[index].prop" :sortable="dragCol[index].type || dragCol[index].prop == 'sn'
-                ? false
-                : true
-                ">
+          <u-table
+            :data="tableData"
+            border
+            :height="
+              window.pageHeight < 600
+                ? 248
+                : Math.floor(((window.pageHeight - 250) * 2) / 3)
+            "
+            highlight-current-row
+            @row-click="rowClick"
+            @row-dblclick="dblClick"
+            size="small"
+            row-key="id"
+            @selection-change="handleSelectionChange"
+            @row-contextmenu="onCellRightClick"
+            ref="info"
+            id="info"
+            :row-class-name="handleRowClassName"
+            use-virtual
+            :row-height="25"
+            @table-body-scroll="scrollFull"
+            big-data-checkbox
+            :data-changes-scroll-top="false"
+          >
+            <u-table-column
+              type="selection"
+              width="40"
+              align="center"
+            ></u-table-column>
+            <u-table-column
+              v-for="(item, index) in dragCol"
+              :key="index"
+              :type="dragCol[index].type"
+              :min-width="dragCol[index].minWidth"
+              :align="dragCol[index].align"
+              :label="item.label"
+              :prop="dragCol[index].prop"
+              :sortable="
+                dragCol[index].type || dragCol[index].prop == 'sn'
+                  ? false
+                  : true
+              "
+            >
               <template slot-scope="scope" v-if="!dragCol[index].type">
                 <div v-if="!dragCol[index].type">
                   <div v-if="dragCol[index].prop == 'sn'">
                     {{ scope.$index + 1 }}
                   </div>
-                  <div v-else-if="dragCol[index].prop == 'completeFlag'" :style="`color: ${setPrStatusColor(
-                    scope.row.isAudit,
-                    scope.row.completeFlag
-                  )}`">
+                  <div
+                    v-else-if="dragCol[index].prop == 'completeFlag'"
+                    :style="`color: ${setPrStatusColor(
+                      scope.row.isAudit,
+                      scope.row.completeFlag
+                    )}`"
+                  >
                     {{
                       scope.row.isAudit == "Y"
                         ? "已审核"
                         : dddw(
-                          dict.completeFlag,
-                          "id",
-                          scope.row.completeFlag,
-                          "displayName"
-                        )
+                            dict.completeFlag,
+                            "id",
+                            scope.row.completeFlag,
+                            "displayName"
+                          )
                     }}
                   </div>
                   <div v-else-if="dragCol[index].prop == 'qztlType'">
@@ -49,29 +84,42 @@
                     }}
                   </div>
                   <div v-else-if="dragCol[index].prop == 'guidePrintTimes'">
-                    <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0"
-                      style="font-size: 20px; color: green" />
+                    <i
+                      class="el-icon-printer"
+                      v-if="scope.row.guidePrintTimes > 0"
+                      style="font-size: 20px; color: green"
+                    />
                   </div>
                   <div v-else-if="dragCol[index].prop == 'isLock'">
-                    <i class="el-icon-lock" v-if="scope.row.isLock == 'Y'" style="font-size: 20px; color: red" />
+                    <i
+                      class="el-icon-lock"
+                      v-if="scope.row.isLock == 'Y'"
+                      style="font-size: 20px; color: red"
+                    />
                   </div>
-                  <div v-else-if="
-                    dragCol[index].prop == 'isVip' ||
-                    dragCol[index].prop == 'isUpload' ||
-                    dragCol[index].prop == 'qztlIsMain' ||
-                    dragCol[index].prop == 'qztlIsCy' ||
-                    dragCol[index].prop == 'qztlIsCw' ||
-                    dragCol[index].prop == 'qztlIsGt' ||
-                    dragCol[index].prop == 'qztlIsWh' ||
-                    dragCol[index].prop == 'qztlIsFj'
-                  ">
-                    <el-checkbox :value="scope.row[dragCol[index].prop] == 'Y'" />
+                  <div
+                    v-else-if="
+                      dragCol[index].prop == 'isVip' ||
+                      dragCol[index].prop == 'isUpload' ||
+                      dragCol[index].prop == 'qztlIsMain' ||
+                      dragCol[index].prop == 'qztlIsCy' ||
+                      dragCol[index].prop == 'qztlIsCw' ||
+                      dragCol[index].prop == 'qztlIsGt' ||
+                      dragCol[index].prop == 'qztlIsWh' ||
+                      dragCol[index].prop == 'qztlIsFj'
+                    "
+                  >
+                    <el-checkbox
+                      :value="scope.row[dragCol[index].prop] == 'Y'"
+                    />
                     <!--
                     {{ scope.row[dragCol[index].prop] == "Y" ? "是" : "否" }}
                       -->
                   </div>
 
-                  <div v-else-if="dragCol[index].prop == 'customerOrgParentName'">
+                  <div
+                    v-else-if="dragCol[index].prop == 'customerOrgParentName'"
+                  >
                     {{
                       scope.row.customerOrgParentName
                         ? scope.row.customerOrgParentName
@@ -89,10 +137,12 @@
                     }}
                   </div>
                   <div v-else-if="dragCol[index].prop == 'groupPack'">
-                    <div v-if="
-                      scope.row.medicalPackageId !== dict.personOrgId &&
-                      scope.row.customerOrgId === dict.personOrgId
-                    ">
+                    <div
+                      v-if="
+                        scope.row.medicalPackageId !== dict.personOrgId &&
+                        scope.row.customerOrgId === dict.personOrgId
+                      "
+                    >
                       {{ scope.row.medicalPackageName }}
                     </div>
                     <div v-else>
@@ -115,8 +165,8 @@
                     {{
                       scope.row[dragCol[index].prop]
                         ? moment(scope.row[dragCol[index].prop]).format(
-                          "yyyy-MM-DD"
-                        )
+                            "yyyy-MM-DD"
+                          )
                         : ""
                     }}
                   </div>
@@ -160,7 +210,7 @@
                   <div v-else-if="dragCol[index].prop == 'customerOrgName'">
                     {{
                       scope.row[dragCol[index].prop] ==
-                        scope.row["customerOrgParentName"]
+                      scope.row["customerOrgParentName"]
                         ? ""
                         : scope.row[dragCol[index].prop]
                     }}
@@ -202,10 +252,12 @@
           <div style="display: flex; justify-content: space-between">
             <div></div>
             <div>
-              <span style="font-size: 12px">共：{{ loadOpts.totalCount }} 条记录，当前显示：{{
-                tableData.length
-              }}
-                条。</span>
+              <span style="font-size: 12px"
+                >共：{{ loadOpts.totalCount }} 条记录，当前显示：{{
+                  tableData.length
+                }}
+                条。</span
+              >
             </div>
           </div>
         </div>
@@ -218,23 +270,53 @@
         </el-tabs>
       </div>
       <div style="margin-left: 10px">
-        <div v-show="checkPagePriv(pagePriv.privs, '导入青藏数据')" class="listBtn">
-          <el-button type="success" class="commonbutton" @click="btnImportOrgData">导入青藏数据</el-button>
+        <div
+          v-show="checkPagePriv(pagePriv.privs, '导入青藏数据')"
+          class="listBtn"
+        >
+          <el-button
+            type="success"
+            class="commonbutton"
+            @click="btnImportOrgData"
+            >导入青藏数据</el-button
+          >
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '人员登记')" class="listBtn">
-          <el-button type="success" class="commonbutton" @click="btnAdd">人员登记</el-button>
+          <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('1')">批量正式登记</el-button>
+        <div
+          v-show="checkPagePriv(pagePriv.privs, '批量正式登记')"
+          class="listBtn"
+        >
+          <el-button
+            type="success"
+            class="commonbutton"
+            @click="btnAddBatch('1')"
+            >批量正式登记</el-button
+          >
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '批量转预登记')" class="listBtn">
-          <el-button type="success" class="commonbutton" @click="btnAddBatch('0')">批量转预登记</el-button>
+        <div
+          v-show="checkPagePriv(pagePriv.privs, '批量转预登记')"
+          class="listBtn"
+        >
+          <el-button
+            type="success"
+            class="commonbutton"
+            @click="btnAddBatch('0')"
+            >批量转预登记</el-button
+          >
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '编辑')" class="listBtn">
-          <el-button type="primary" class="commonbutton" @click="btnEdit">编辑</el-button>
+          <el-button type="primary" class="commonbutton" @click="btnEdit"
+            >编辑</el-button
+          >
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '删除')" class="listBtn">
-          <el-button type="danger" class="deleteButton" @click="btnDel">删除</el-button>
+          <el-button type="danger" class="deleteButton" @click="btnDel"
+            >删除</el-button
+          >
         </div>
         <!--
       <div class="listBtn">
@@ -250,37 +332,91 @@
         <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="printPromise()" style="font-size: 12px">人员检验检查条码</el-button>
+        <div
+          v-show="checkPagePriv(pagePriv.privs, '人员检验检查条码')"
+          class="listBtn"
+        >
+          <el-button
+            type=""
+            class="commonbutton"
+            @click="printPromise()"
+            style="font-size: 12px"
+            >人员检验检查条码</el-button
+          >
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '人员信息导出')" class="listBtn">
-          <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName">
+        <div
+          v-show="checkPagePriv(pagePriv.privs, '人员信息导出')"
+          class="listBtn"
+        >
+          <!-- <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName">
             <el-button type="" style="width:100%">人员信息导出</el-button>
-          </download-excel>
-          <!-- <el-button type="" class="commonbutton" @click="btnExport('info')">人员信息导出</el-button> -->
+          </download-excel> -->
+          <el-button type="" class="commonbutton" @click="btnExport('info')"
+            >人员信息导出</el-button
+          >
         </div>
         <!-- 弃用
         <div class="listBtn">
           <el-button type="" class="commonbutton" @click="btnDragColDesign">设计列排序</el-button>
         </div>
         -->
-        <div v-show="checkPagePriv(pagePriv.privs, '人员检验检查条码')" class="listBtn">
-          <el-button type="" class="commonbutton" @click="printPromise2()" style="font-size: 12px">人员+检查条码</el-button>
+        <div
+          v-show="checkPagePriv(pagePriv.privs, '人员检验检查条码')"
+          class="listBtn"
+        >
+          <el-button
+            type=""
+            class="commonbutton"
+            @click="printPromise2()"
+            style="font-size: 12px"
+            >人员+检查条码</el-button
+          >
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs, '体检表回收')" class="listBtn">
-          <el-button type="" class="commonbutton" @click="btnScanRecover">体检表回收</el-button>
+        <div
+          v-show="checkPagePriv(pagePriv.privs, '体检表回收')"
+          class="listBtn"
+        >
+          <el-button type="" class="commonbutton" @click="btnScanRecover"
+            >体检表回收</el-button
+          >
         </div>
 
         <!-- elProgress.display  dialogWin.LocalConfig
@@ -292,68 +428,126 @@
       <div class="listBtn">
         <el-button type="" class="btnClass commonbutton" @click="rowSelected(tableData)">选中</el-button>
       </div>
-      -->
-      </div>
+      --></div>
     </div>
     <!--组件弹窗-->
     <div>
       <!-- 体检人员登记 :title="patientRegister.patientRegisterRd.id ? '体检人员--编辑' : '体检人员--新增'" -->
-      <el-dialog :title="dataTransOpts.tableS.patient_register.id
-        ? '体检人员--编辑'
-        : '体检人员--新增'
-        " :visible.sync="dialogWin.PatientRegisterEdit" :close-on-click-modal="false" fullscreen
-        @close="close_dialogWin_PatientRegisterEdit">
+      <el-dialog
+        :title="
+          dataTransOpts.tableS.patient_register.id
+            ? '体检人员--编辑'
+            : '体检人员--新增'
+        "
+        :visible.sync="dialogWin.PatientRegisterEdit"
+        :close-on-click-modal="false"
+        fullscreen
+        @close="close_dialogWin_PatientRegisterEdit"
+      >
         <!-- :formInitData="patientRegister.patientRegisterRd" -->
-        <PatientRegisterEdit :isDoctor="'1'" :patientRegisterId="patientRegister.patientRegisterRd.id"
-          :editTimes="editTimes" :refFuncSetData="refFuncSetData" />
+        <PatientRegisterEdit
+          :isDoctor="'1'"
+          :patientRegisterId="patientRegister.patientRegisterRd.id"
+          :editTimes="editTimes"
+          :refFuncSetData="refFuncSetData"
+        />
       </el-dialog>
 
       <!-- 修改信息 -->
-      <el-dialog title="修改人员信息" :visible.sync="upBaseInfo.visble" width="800px" :show-close="false"
-        :append-to-body="true" :close-on-click-modal="false">
+      <el-dialog
+        title="修改人员信息"
+        :visible.sync="upBaseInfo.visble"
+        width="800px"
+        :show-close="false"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
         <div>
           <div style="display: flex; margin-bottom: 20px">
-            <el-form ref="form" :model="upBaseInfo" label-width="80px" size="medium">
+            <el-form
+              ref="form"
+              :model="upBaseInfo"
+              label-width="80px"
+              size="medium"
+            >
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="姓名" prop="patientName">
-                    <el-input id="patientName" v-model="upBaseInfo.patientName" size="small"
-                      autocomplete="off"></el-input>
+                    <el-input
+                      id="patientName"
+                      v-model="upBaseInfo.patientName"
+                      size="small"
+                      autocomplete="off"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="身份证号" prop="idNo">
-                    <el-input v-model="upBaseInfo.idNo" placeholder="身份证号" @change="changeIdNo('N')"
-                      size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.idNo"
+                      placeholder="身份证号"
+                      @change="changeIdNo('N')"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="出生日期" prop="birthDate">
-                    <el-date-picker v-model="upBaseInfo.birthDate" type="date" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" placeholder="出生日期" style="width: 180px;" @change="changeBirthDate"
-                      size="small" />
+                    <el-date-picker
+                      v-model="upBaseInfo.birthDate"
+                      type="date"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      placeholder="出生日期"
+                      style="width: 180px"
+                      @change="changeBirthDate"
+                      size="small"
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="性别" prop="sexId">
-                    <el-select v-model="upBaseInfo.sexId" placeholder="请选择" size="small" filterable>
-                      <el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
+                    <el-select
+                      v-model="upBaseInfo.sexId"
+                      placeholder="请选择"
+                      size="small"
+                      filterable
+                    >
+                      <el-option
+                        v-for="item in dict.sex"
+                        :key="item.id"
+                        :label="item.displayName"
+                        :value="item.id"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="年龄" prop="age">
-                    <el-input v-model="upBaseInfo.age" size="small" @change="changeAge"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.age"
+                      size="small"
+                      @change="changeAge"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="婚姻" prop="maritalStatusId">
-                    <el-select v-model="upBaseInfo.maritalStatusId" placeholder="请选择" size="small" filterable>
-                      <el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName"
-                        :value="item.id">
+                    <el-select
+                      v-model="upBaseInfo.maritalStatusId"
+                      placeholder="请选择"
+                      size="small"
+                      filterable
+                    >
+                      <el-option
+                        v-for="item in dict.maritalStatus"
+                        :key="item.id"
+                        :label="item.displayName"
+                        :value="item.id"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -362,19 +556,35 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="手机号" prop="mobileTelephone">
-                    <el-input v-model="upBaseInfo.mobileTelephone" size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.mobileTelephone"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="电话" prop="telephone">
-                    <el-input v-model="upBaseInfo.telephone" size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.telephone"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="籍贯" prop="birthPlaceId">
-                    <el-select v-model="upBaseInfo.birthPlaceId" placeholder="请选择" filterable clearable size="small">
-                      <el-option v-for="item in dict.birthPlace" :key="item.id" :label="item.displayName"
-                        :value="item.id" />
+                    <el-select
+                      v-model="upBaseInfo.birthPlaceId"
+                      placeholder="请选择"
+                      filterable
+                      clearable
+                      size="small"
+                    >
+                      <el-option
+                        v-for="item in dict.birthPlace"
+                        :key="item.id"
+                        :label="item.displayName"
+                        :value="item.id"
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -382,43 +592,76 @@
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="地址" prop="address">
-                    <el-input v-model="upBaseInfo.address" size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.address"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="邮编" prop="postalCode">
-                    <el-input v-model="upBaseInfo.postalCode" size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.postalCode"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="邮箱" prop="email">
-                    <el-input v-model="upBaseInfo.email" size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.email"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="体检卡号" prop="medicalCardNo">
-                    <el-input v-model="upBaseInfo.medicalCardNo" size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.medicalCardNo"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="性激素期" prop="sexHormoneTermId">
-                    <el-select v-model="upBaseInfo.sexHormoneTermId" placeholder="请选择" filterable clearable
-                      size="small">
-                      <el-option v-for="item in dict.sexHormoneTerm" :key="item.id" :label="item.displayName"
-                        :value="item.id">
+                    <el-select
+                      v-model="upBaseInfo.sexHormoneTermId"
+                      placeholder="请选择"
+                      filterable
+                      clearable
+                      size="small"
+                    >
+                      <el-option
+                        v-for="item in dict.sexHormoneTerm"
+                        :key="item.id"
+                        :label="item.displayName"
+                        :value="item.id"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="民族" prop="nationId">
-                    <el-select v-model="upBaseInfo.nationId" placeholder="请选择" filterable clearable default-first-option
-                      :filter-method="filterMethod" size="small">
-                      <el-option v-for="item in nation" :key="item.id" :label="item.displayName" :value="item.id" />
+                    <el-select
+                      v-model="upBaseInfo.nationId"
+                      placeholder="请选择"
+                      filterable
+                      clearable
+                      default-first-option
+                      :filter-method="filterMethod"
+                      size="small"
+                    >
+                      <el-option
+                        v-for="item in nation"
+                        :key="item.id"
+                        :label="item.displayName"
+                        :value="item.id"
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -426,35 +669,64 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="体检类别" prop="medicalTypeId">
-                    <el-select v-model="upBaseInfo.medicalTypeId" placeholder="请选择" filterable clearable size="small">
-                      <el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
-                        :value="item.id" />
+                    <el-select
+                      v-model="upBaseInfo.medicalTypeId"
+                      placeholder="请选择"
+                      filterable
+                      clearable
+                      size="small"
+                    >
+                      <el-option
+                        v-for="item in dict.medicalType"
+                        :key="item.id"
+                        :label="item.displayName"
+                        :value="item.id"
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="人员类别" prop="personnelTypeId">
-                    <el-select v-model="upBaseInfo.personnelTypeId" placeholder="请选择" filterable clearable size="small">
-                      <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
-                        :value="item.id" />
+                    <el-select
+                      v-model="upBaseInfo.personnelTypeId"
+                      placeholder="请选择"
+                      filterable
+                      clearable
+                      size="small"
+                    >
+                      <el-option
+                        v-for="item in dict.personnelType"
+                        :key="item.id"
+                        :label="item.displayName"
+                        :value="item.id"
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="介绍人" prop="salesman">
-                    <el-input v-model="upBaseInfo.salesman" size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.salesman"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="工卡号" prop="jobCardNo">
-                    <el-input v-model="upBaseInfo.jobCardNo" size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.jobCardNo"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="职务" prop="jobPost">
-                    <el-input v-model="upBaseInfo.jobPost" size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.jobPost"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -471,172 +743,334 @@
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="电话随访" prop="isPhoneFollow">
-                    <el-checkbox v-model="upBaseInfo.isPhoneFollow" true-label="Y" false-label="N" />
+                    <el-checkbox
+                      v-model="upBaseInfo.isPhoneFollow"
+                      true-label="Y"
+                      false-label="N"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="VIP" prop="isVip">
-                    <el-checkbox v-model="upBaseInfo.isVip" true-label="Y" false-label="N" />
+                    <el-checkbox
+                      v-model="upBaseInfo.isVip"
+                      true-label="Y"
+                      false-label="N"
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="隐藏姓名" prop="isNameHide">
-                    <el-checkbox v-model="upBaseInfo.isNameHide" true-label="Y" false-label="N" />
+                    <el-checkbox
+                      v-model="upBaseInfo.isNameHide"
+                      true-label="Y"
+                      false-label="N"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="锁住" prop="isLock">
-                    <el-checkbox v-model="upBaseInfo.isLock" true-label="Y" false-label="N" />
+                    <el-checkbox
+                      v-model="upBaseInfo.isLock"
+                      true-label="Y"
+                      false-label="N"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="体检开始" prop="isMedicalStart">
-                    <el-checkbox v-model="upBaseInfo.isMedicalStart" true-label="Y" false-label="N" />
+                    <el-checkbox
+                      v-model="upBaseInfo.isMedicalStart"
+                      true-label="Y"
+                      false-label="N"
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="备注" prop="remark">
-                    <el-input v-model="upBaseInfo.remark" type="textarea" :rows="1" placeholder="请输入备注"
-                      size="small"></el-input>
+                    <el-input
+                      v-model="upBaseInfo.remark"
+                      type="textarea"
+                      :rows="1"
+                      placeholder="请输入备注"
+                      size="small"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
           </div>
 
-
           <div style="display: flex; justify-content: space-between">
             <div></div>
             <div>
-              <el-button class="commonbutton" @click="btnUpBaseInfo">提交</el-button>
-              <el-button class="commonbutton" @click="close_dialogWin_upBaseInfo">关闭</el-button>
+              <el-button class="commonbutton" @click="btnUpBaseInfo"
+                >提交</el-button
+              >
+              <el-button
+                class="commonbutton"
+                @click="close_dialogWin_upBaseInfo"
+                >关闭</el-button
+              >
             </div>
           </div>
         </div>
       </el-dialog>
 
-      <el-dialog title="修改信息--体检日期" :visible.sync="dialogEditMedicalStartDate" width="400" :show-close="false"
-        :append-to-body="true" :close-on-click-modal="false">
+      <el-dialog
+        title="修改信息--体检日期"
+        :visible.sync="dialogEditMedicalStartDate"
+        width="400"
+        :show-close="false"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
         <div>
           <div style="display: flex; margin-bottom: 20px">
             <span style="padding: 5px 0 0 10px; width: 100px">体检日期</span>
-            <el-date-picker v-model="upBaseInfo.medicalStartDate" type="date" placeholder="体检日期" size="small"
-              value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+            <el-date-picker
+              v-model="upBaseInfo.medicalStartDate"
+              type="date"
+              placeholder="体检日期"
+              size="small"
+              value-format="yyyy-MM-dd"
+              :picker-options="pickerOptions"
+            />
           </div>
           <div style="display: flex; justify-content: space-between">
             <div></div>
             <div>
-              <el-button class="commonbutton" @click="btnEditMedicalStartDate">提交</el-button>
-              <el-button class="commonbutton" @click="dialogEditMedicalStartDate = false">关闭</el-button>
+              <el-button class="commonbutton" @click="btnEditMedicalStartDate"
+                >提交</el-button
+              >
+              <el-button
+                class="commonbutton"
+                @click="dialogEditMedicalStartDate = false"
+                >关闭</el-button
+              >
             </div>
           </div>
         </div>
       </el-dialog>
 
       <!-- 分诊排队 -->
-      <el-dialog title="分诊排队" :visible.sync="dialogWin.queue" width="800px" :append-to-body="true"
-        :close-on-click-modal="false">
+      <el-dialog
+        title="分诊排队"
+        :visible.sync="dialogWin.queue"
+        width="800px"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
         <Queue :refParams="queueParams" />
       </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="dialogWin.ImportOrgData" width="800px" :append-to-body="true"
-        :close-on-click-modal="false">
+      <el-dialog
+        title="导入企业数据"
+        :visible.sync="dialogWin.ImportOrgData"
+        width="800px"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
         <ImportOrgData />
       </el-dialog>
 
       <!-- 列排序 -->
-      <el-dialog title="列排序" :visible.sync="dialogColSort" width="300px" :append-to-body="true"
-        :close-on-click-modal="false">
-        <el-table id="elTable_dragCol" :data="dragColDesign" row-key="prop" border height="600">
+      <el-dialog
+        title="列排序"
+        :visible.sync="dialogColSort"
+        width="300px"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
+        <el-table
+          id="elTable_dragCol"
+          :data="dragColDesign"
+          row-key="prop"
+          border
+          height="600"
+        >
           <el-table-column type="index" label="序号" width="40" align="center">
           </el-table-column>
-          <el-table-column label="列名" prop="label" min-width="120" align="center"></el-table-column>
+          <el-table-column
+            label="列名"
+            prop="label"
+            min-width="120"
+            align="center"
+          ></el-table-column>
         </el-table>
         <span slot="footer" class="dialog-footer">
-          <el-button class="commonbutton" @click="dialogColSort = false">取消</el-button>
-          <el-button class="commonbutton" @click="btnDragColDesignOk">确定</el-button>
+          <el-button class="commonbutton" @click="dialogColSort = false"
+            >取消</el-button
+          >
+          <el-button class="commonbutton" @click="btnDragColDesignOk"
+            >确定</el-button
+          >
         </span>
       </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">
+      <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="dialogWin.PatientRegisterEditDoctorBatch" width="610px"
-        :append-to-body="true" :close-on-click-modal="false">
-        <PatientRegisterEditDoctorBatch :multipleSelection="multipleSelection" :doctorType="doctorType" />
+      <el-dialog
+        title="批量调整检查项目医生"
+        :visible.sync="dialogWin.PatientRegisterEditDoctorBatch"
+        width="610px"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
+        <PatientRegisterEditDoctorBatch
+          :multipleSelection="multipleSelection"
+          :doctorType="doctorType"
+        />
       </el-dialog>
 
       <!-- 批量调整体检类别 -->
-      <el-dialog title="批量调整体检类别" :visible.sync="dialogWin.PatientRegisterEditMedicalTypeBatch" width="610px"
-        :append-to-body="true" :close-on-click-modal="false">
-        <PatientRegisterEditMedicalTypeBatch :multipleSelection="multipleSelection" />
+      <el-dialog
+        title="批量调整体检类别"
+        :visible.sync="dialogWin.PatientRegisterEditMedicalTypeBatch"
+        width="610px"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
+        <PatientRegisterEditMedicalTypeBatch
+          :multipleSelection="multipleSelection"
+        />
       </el-dialog>
 
       <!-- 批量调整人员类别 -->
-      <el-dialog title="批量调整人员类别" :visible.sync="dialogWin.PatientRegisterEditPersonnelTypeBatch" width="610px"
-        :append-to-body="true" :close-on-click-modal="false">
-        <PatientRegisterEditPersonnelTypeBatch :multipleSelection="multipleSelection" />
+      <el-dialog
+        title="批量调整人员类别"
+        :visible.sync="dialogWin.PatientRegisterEditPersonnelTypeBatch"
+        width="610px"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
+        <PatientRegisterEditPersonnelTypeBatch
+          :multipleSelection="multipleSelection"
+        />
       </el-dialog>
 
       <!-- 批量调整备注 -->
-      <el-dialog title="批量调整备注" :visible.sync="dialogWin.PatientRegisterEditRemarkBatch" width="610px"
-        :append-to-body="true" :close-on-click-modal="false">
-        <PatientRegisterEditRemarkBatch :multipleSelection="multipleSelection" />
+      <el-dialog
+        title="批量调整备注"
+        :visible.sync="dialogWin.PatientRegisterEditRemarkBatch"
+        width="610px"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
+        <PatientRegisterEditRemarkBatch
+          :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>
 
       <!--通用本地参数设置-->
-      <el-dialog title="本地参数设置" :visible.sync="dialogWin.LocalConfig" :close-on-click-modal="false"
-        :append-to-body="true" width="800px" height="600px">
+      <el-dialog
+        title="本地参数设置"
+        :visible.sync="dialogWin.LocalConfig"
+        :close-on-click-modal="false"
+        :append-to-body="true"
+        width="800px"
+        height="600px"
+      >
         <LocalConfig />
       </el-dialog>
 
       <!--云胶片二维码-->
-      <el-dialog :visible.sync="qrCode.winDisplay" title="云胶片二维码" width="400px" style="text-align:center">
+      <el-dialog
+        :visible.sync="qrCode.winDisplay"
+        title="云胶片二维码"
+        width="400px"
+        style="text-align: center"
+      >
         <!--<canvas ref="canvas"></canvas>-->
-        <img width="100%" :src="qrCode.personUrl">
-        <div style="font-size: 16px;">{{ qrCode.barcodeNo + ' ' + qrCode.patientName }}</div>
+        <img width="100%" :src="qrCode.personUrl" />
+        <div style="font-size: 16px">
+          {{ qrCode.barcodeNo + " " + qrCode.patientName }}
+        </div>
       </el-dialog>
       <!---->
-      <el-dialog title="扫/输入条码回收体检表（指引单）" :visible.sync="recover.dialog" width="400px" :append-to-body="true"
-        :close-on-click-modal="false">
-        <div style="margin-left: 10px;">
+      <el-dialog
+        title="扫/输入条码回收体检表（指引单）"
+        :visible.sync="recover.dialog"
+        width="400px"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
+        <div style="margin-left: 10px">
           <template>
             <el-radio v-model="recover.recoverType" label="0">条码号</el-radio>
             <el-radio v-model="recover.recoverType" label="1">档案号</el-radio>
           </template>
-          <el-input style="margin: 10px 0;" ref="tmh" v-model="recover.barcode"
-            @keyup.native.enter="signByPatientRegisterNo"></el-input>
+          <el-input
+            style="margin: 10px 0"
+            ref="tmh"
+            v-model="recover.barcode"
+            @keyup.native.enter="signByPatientRegisterNo"
+          ></el-input>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="signByPatientRegisterNo" class="commonbutton">确定</el-button>
-          <el-button @click="recover.dialog = false" class="commonbutton">关闭</el-button>
+          <el-button
+            type="primary"
+            @click="signByPatientRegisterNo"
+            class="commonbutton"
+            >确定</el-button
+          >
+          <el-button @click="recover.dialog = false" class="commonbutton"
+            >关闭</el-button
+          >
         </div>
       </el-dialog>
     </div>
@@ -644,13 +1078,15 @@
 </template>
 <script>
 import moment from "moment";
-import QRCode from 'qrcode'
+import QRCode from "qrcode";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import Sortable from "sortablejs";
 import FileSaver from "file-saver";
+import * as XLSX from "xlsx";
 import html2canvas from "html2canvas";
 import JsonExcel from "vue-json-excel";
+import { exportJsonToExcel } from "../../utlis/Export2Excel";
 
 import {
   getPagePriv,
@@ -659,7 +1095,10 @@ import {
   objCopy,
   arrayReduce,
   arrayExistObj,
-  deepCopy, birthdayToAge, ageToBirthday, parseID,
+  deepCopy,
+  birthdayToAge,
+  ageToBirthday,
+  parseID,
   setPrStatusColor,
 } from "../../utlis/proFunc";
 import { savePeoplePhoto } from "../../utlis/proApi";
@@ -678,7 +1117,7 @@ import PatientRegisterEditRemarkBatch from "./PatientRegisterEditRemarkBatch.vue
 import ImportOrgData from "./ImportOrgData.vue";
 import LocalConfig from "../../components/common/LocalConfig.vue";
 import Queue from "../../components/queue/Queue.vue";
-import { UTable, UTableColumn } from 'umy-ui';
+import { UTable, UTableColumn } from "umy-ui";
 
 export default {
   components: {
@@ -697,7 +1136,7 @@ export default {
     Queue,
     DownloadExcel: JsonExcel,
     UTable,
-    UTableColumn
+    UTableColumn,
   },
   data() {
     return {
@@ -836,10 +1275,30 @@ export default {
         { label: "高铁", prop: "qztlIsGt", minWidth: 50, align: "center" },
         { label: "职害", prop: "qztlIsWh", minWidth: 50, align: "center" },
         { label: "复检", prop: "qztlIsFj", minWidth: 50, align: "center" },
-        { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
-        { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },
-        { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
-        { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
+        {
+          label: "标准金额",
+          prop: "standardAmount",
+          minWidth: 80,
+          align: "center",
+        },
+        {
+          label: "应收金额",
+          prop: "receivableAmount",
+          minWidth: 80,
+          align: "center",
+        },
+        {
+          label: "实收金额",
+          prop: "chargeAmount",
+          minWidth: 80,
+          align: "center",
+        },
+        {
+          label: "支付方式",
+          prop: "chargePayMode",
+          minWidth: 80,
+          align: "center",
+        },
       ],
       dialogColSort: false,
       jsonFields: {},
@@ -860,12 +1319,12 @@ export default {
         patientRegisterId: "",
         medicalStartDate: "", // 体检日期
 
-        registerManType: 'customer', //登记人员类型，客服：customer 医生：doctor 支持在医生诊台处理登记人员
+        registerManType: "customer", //登记人员类型，客服：customer 医生：doctor 支持在医生诊台处理登记人员
         id: "", //id
-        photo: '', //照片
+        photo: "", //照片
         patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
         patientNo: "", //档案号
-        customerOrgId: ["00000000-0000-0000-0000-000000000001"], //单位编号 默认个人 
+        customerOrgId: ["00000000-0000-0000-0000-000000000001"], //单位编号 默认个人
         customerOrgParentId: "00000000-0000-0000-0000-000000000001",
         customerOrgName: "个人体检",
         customerOrgRegisterId: "00000000-0000-0000-0000-000000000001", //默认单位体检次数
@@ -906,27 +1365,27 @@ export default {
         creationTime: "",
         lastModificationTime: "",
         lastModifierId: null,
-        isMaxMedicalTimes: 'N',
+        isMaxMedicalTimes: "N",
         //medicalStartDate: null,
-        hisPatientId: '',  //对接 hisid
+        hisPatientId: "", //对接 hisid
         registerCheckAsbitems: [], //所选组合项目明细
         // 青藏公司 数据
-        qztlType: '0',  // 高原/健康
-        qztlIsCw: 'N',  // 普速
-        qztlIsCy: 'N',  // 从业
-        qztlIsGt: 'N',  // 高铁
-        qztlIsMain: 'N',  // 行车
-        qztlIsWh: 'N',  // 职害
-        qztlIsFj: 'N',  // 复检
-        isQztlImport: 'N',  // 导入
-        uploadQztlFlag: 'N',  // 上传
-        planuserid: '',  // 计划人  
+        qztlType: "0", // 高原/健康
+        qztlIsCw: "N", // 普速
+        qztlIsCy: "N", // 从业
+        qztlIsGt: "N", // 高铁
+        qztlIsMain: "N", // 行车
+        qztlIsWh: "N", // 职害
+        qztlIsFj: "N", // 复检
+        isQztlImport: "N", // 导入
+        uploadQztlFlag: "N", // 上传
+        planuserid: "", // 计划人
 
         // 职业病
-        ocCheckTypeId: null,  //检查类别
-        jobType: '', //工种
+        ocCheckTypeId: null, //检查类别
+        jobType: "", //工种
         poisonIds: [], // 接害因素IDs（主表不保存此项数据）
-        isPatientOccupationalDisease: 'Y', // 是否职业病检查（主表不保存此项数据）
+        isPatientOccupationalDisease: "Y", // 是否职业病检查（主表不保存此项数据）
         appointPatientRegisterId: "",
         thirdBookingId: "",
         occupationalDiseaseNumber: "",
@@ -939,24 +1398,24 @@ export default {
           maxResultCount: 100, //分页时单页记录数
         },
       },
-      tableName: "",  //导出人员列表表名
-      doctorType: "check",  //check:检查 audit：审核
-      merge_lis_pacs_label: "0", //默认0  检验检查条码合并 0：不合并，1：合并      
+      tableName: "", //导出人员列表表名
+      doctorType: "check", //check:检查 audit：审核
+      merge_lis_pacs_label: "0", //默认0  检验检查条码合并 0：不合并，1：合并
       qrCode: {
         winDisplay: false, // 页面显示
-        url: 'https://ccjktj.cn:5081/', //二维码 前辍地址
-        personUrl: '', // 个人云胶片地址
-        barcodeNo: '条码号',
-        patientName: '姓 名'
+        url: "https://ccjktj.cn:5081/", //二维码 前辍地址
+        personUrl: "", // 个人云胶片地址
+        barcodeNo: "条码号",
+        patientName: "姓 名",
       },
 
       // 体检表回收
       recover: {
         dialog: false,
-        recoverType: '0', //回收类型 0-条码号 1-档案号
-        barcode: '', // 条码号或档案号
+        recoverType: "0", //回收类型 0-条码号 1-档案号
+        barcode: "", // 条码号或档案号
         barcodes: [], // 条码号或档案号集合
-        isRecoverGuide: 'Y',  //状态 Y-回收，N-取消回收
+        isRecoverGuide: "Y", //状态 Y-回收，N-取消回收
       },
 
       // 避免单击事件与双击事件冲突
@@ -974,11 +1433,13 @@ export default {
       );
 
     try {
-      let LocalConfig = JSON.parse(window.localStorage.getItem("LocalConfig") || null)
+      let LocalConfig = JSON.parse(
+        window.localStorage.getItem("LocalConfig") || null
+      );
       if (LocalConfig?.normal?.maxResultCount) {
-        this.LocalConfig.normal.maxResultCount = LocalConfig.normal.maxResultCount
+        this.LocalConfig.normal.maxResultCount =
+          LocalConfig.normal.maxResultCount;
       }
-
     } catch (error) {
       console.log('window.localStorage.getItem("LocalConfig")', error);
     }
@@ -990,21 +1451,22 @@ export default {
 
     this.loadOptsInit = Object.assign({}, this.loadOpts);
     // 获取系统参数 -- 合并检验检查条码
-    postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: 'merge_lis_pacs_label' })
-      .then(res => {
-        if (res.code > -1) {
-          this.merge_lis_pacs_label = res.data || "0"
-        }
-      })
+    postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId", {
+      sysParmId: "merge_lis_pacs_label",
+    }).then((res) => {
+      if (res.code > -1) {
+        this.merge_lis_pacs_label = res.data || "0";
+      }
+    });
 
     // 获取系统参数 -- 云胶片二维码网址
-    postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId: 'pacs_cloud_url' })
-      .then(res => {
-        if (res.code > -1) {
-          this.qrCode.url = res.data || "https://ccjktj.cn:5081/"
-        }
-      })
-
+    postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId", {
+      sysParmId: "pacs_cloud_url",
+    }).then((res) => {
+      if (res.code > -1) {
+        this.qrCode.url = res.data || "https://ccjktj.cn:5081/";
+      }
+    });
   },
 
   //挂载完成
@@ -1275,7 +1737,7 @@ export default {
     printGuideLisPacs(row) {
       return new Promise((resolve, reject) => {
         // this.merge_lis_pacs_label == '1' 合并检验检查条码
-        if (this.merge_lis_pacs_label == '1') {
+        if (this.merge_lis_pacs_label == "1") {
           this.lisPrint(row, "0002", false)
             .then((res) => {
               return this.guidePrintPromise("0008", false, row);
@@ -1304,8 +1766,6 @@ export default {
               reject(err);
             });
         }
-
-
       });
     },
 
@@ -1325,7 +1785,6 @@ export default {
       });
     },
 
-
     async printPromise() {
       if (this.multipleSelection.length < 1) {
         this.$message.info({
@@ -1381,7 +1840,6 @@ export default {
       this.elProgress.display = false;
     },
 
-
     handleSelectionChange(rows) {
       //this.multipleSelection = rows;
       //// console.log('this.multipleSelection',this.multipleSelection)
@@ -1462,7 +1920,7 @@ export default {
 
       // if (lfind > -1) {
       // 弹出编辑框，只有在编辑框显示时，才去触发获取数据
-      this.clickTime1 = new Date().getTime()
+      this.clickTime1 = new Date().getTime();
 
       setTimeout(() => {
         if (this.clickTime1 > this.clickTime2) {
@@ -1477,15 +1935,14 @@ export default {
 
     // 双击 调出编辑
     dblClick(row) {
-      this.clickTime2 = new Date().getTime()
-      this.dataTransOpts.tableS.patient_register.id = row.id
-      this.btnEdit()
+      this.clickTime2 = new Date().getTime();
+      this.dataTransOpts.tableS.patient_register.id = row.id;
+      this.btnEdit();
 
       //触发单击事件
       this.dataTransOpts.tableS.patient_register = deepCopy(row);
       this.tableDataCurrentRow = deepCopy(row);
       this.dataTransOpts.refresh.register_check_asbitem.M++; //触发所选组合项目刷新
-
     },
 
     // 导入企业(青藏公司)数据
@@ -1520,7 +1977,7 @@ export default {
       // this.getPatientRegisterAbs();
 
       this.dataTransOpts.tableS.patient_register.id = "";
-      this.dataTransOpts.copyGroup.itemTypeIds = [] //
+      this.dataTransOpts.copyGroup.itemTypeIds = []; //
       this.dialogWin.PatientRegisterEdit = true;
       this.dataTransOpts.plus.clearPatientRegisterQuery++; //触发清空人员登记界面的查询条件
       setTimeout(() => {
@@ -1597,7 +2054,7 @@ export default {
       // 触发数据刷新
       this.dataTransOpts.refresh.patient_register.S++; //触发人员信息刷新(会同时刷新组合项目)
       this.dataTransOpts.plus.clearPatientRegisterQuery++; //触发清空人员登记界面的查询条件
-      this.dataTransOpts.copyGroup.itemTypeIds = [] //
+      this.dataTransOpts.copyGroup.itemTypeIds = []; //
       this.dialogWin.PatientRegisterEdit = true;
     },
 
@@ -1741,7 +2198,7 @@ export default {
       if (
         this.loadOpts.skipCount != 0 &&
         this.loadOpts.skipCount * this.loadOpts.maxResultCount >=
-        this.loadOpts.totalCount
+          this.loadOpts.totalCount
       )
         return;
       // console.log('getPrList', this.loadOpts)
@@ -1775,7 +2232,7 @@ export default {
               this.patientRegister.query.customerOrgGroupIds;
           }
         } catch (error) {
-          console.error(error)
+          console.error(error);
         }
       }
 
@@ -1877,67 +2334,68 @@ export default {
 
       // 带费且合计  /api/app/PatientRegister/GetPatientRegisterWithCharge
       // 不带费且合计 /api/app/patientregister/getlistinfilter
-      postapi("/api/app/PatientRegister/GetPatientRegisterWithCharge", body).then(
-        async (res) => {
-          if (res.code > -1) {
-            // 刷新最大记录数
-            this.loadOpts.totalCount = res.data.totalCount;
-            let curLoad = res.data.items;
-
-            // let oldCount = 0
-            // 处理：
+      postapi(
+        "/api/app/PatientRegister/GetPatientRegisterWithCharge",
+        body
+      ).then(async (res) => {
+        if (res.code > -1) {
+          // 刷新最大记录数
+          this.loadOpts.totalCount = res.data.totalCount;
+          let curLoad = res.data.items;
+
+          // let oldCount = 0
+          // 处理：
+          // 1、分组/套餐 排序混乱的问题
+          // 2、扫身份证查询时，无照片自动更新照片(参数控制)
+          curLoad.forEach((e) => {
             // 1、分组/套餐 排序混乱的问题
-            // 2、扫身份证查询时，无照片自动更新照片(参数控制)
-            curLoad.forEach((e) => {
-              // 1、分组/套餐 排序混乱的问题
-              if (e.customerOrgId == this.dict.personOrgId) {
-                e.groupPack = e.medicalPackageId;
-              } else {
-                e.groupPack = e.customerOrgGroupId;
-              }
+            if (e.customerOrgId == this.dict.personOrgId) {
+              e.groupPack = e.medicalPackageId;
+            } else {
+              e.groupPack = e.customerOrgGroupId;
+            }
 
-              //  2、扫身份证查询时，无照片自动更新照片(参数控制)
-              if (upPhotoParam != "N" && photo) {
-                if (!e.photo) {
-                  savePeoplePhoto(e.id, photo);
-                }
+            //  2、扫身份证查询时，无照片自动更新照片(参数控制)
+            if (upPhotoParam != "N" && photo) {
+              if (!e.photo) {
+                savePeoplePhoto(e.id, photo);
               }
-            });
+            }
+          });
 
-            // 不是连续扫码时，需要判断是否分页查询(连续扫码不清原来的数据)
-            console.log(
-              "this.patientRegister.query",
-              this.patientRegister.query.isSeries,
+          // 不是连续扫码时，需要判断是否分页查询(连续扫码不清原来的数据)
+          console.log(
+            "this.patientRegister.query",
+            this.patientRegister.query.isSeries,
+            this.patientRegister.query.patientRegisterNo
+          );
+          if (
+            !(
+              this.patientRegister.query.isSeries == "Y" &&
               this.patientRegister.query.patientRegisterNo
-            );
-            if (
-              !(
-                this.patientRegister.query.isSeries == "Y" &&
-                this.patientRegister.query.patientRegisterNo
-              )
-            ) {
-              if (body.skipCount == 0) {
-                //查询
-                this.tableData = [];
-              }
+            )
+          ) {
+            if (body.skipCount == 0) {
+              //查询
+              this.tableData = [];
             }
+          }
 
-            this.tableData = this.tableData.concat(curLoad);
-            // else {
-            //   // 懒加载 ,原数据集不用清空
-            //   oldCount = this.tableData.length
-            // }
-            // curLoad.forEach((e, index) => {
-            //   this.tableData.push(Object.assign({ index: Number(oldCount) + Number(index), choosed: false }, e))
-            // })
-
-            //如果 有选中 记录，则刷新其对应的组合项目
-            if (this.dataTransOpts.tableS.patient_register.id) {
-              this.dataTransOpts.refresh.register_check_asbitem.M++;
-            }
+          this.tableData = this.tableData.concat(curLoad);
+          // else {
+          //   // 懒加载 ,原数据集不用清空
+          //   oldCount = this.tableData.length
+          // }
+          // curLoad.forEach((e, index) => {
+          //   this.tableData.push(Object.assign({ index: Number(oldCount) + Number(index), choosed: false }, e))
+          // })
+
+          //如果 有选中 记录，则刷新其对应的组合项目
+          if (this.dataTransOpts.tableS.patient_register.id) {
+            this.dataTransOpts.refresh.register_check_asbitem.M++;
           }
         }
-      );
+      });
     },
 
     //滚动加载数据
@@ -1945,7 +2403,7 @@ export default {
       if (scroll.judgeFlse) {
         if (
           (Number(this.loadOpts.skipCount) + 1) *
-          Number(this.loadOpts.maxResultCount) >=
+            Number(this.loadOpts.maxResultCount) >=
           Number(this.loadOpts.totalCount)
         ) {
           return;
@@ -1978,10 +2436,9 @@ export default {
       this.close_dialogWin_PatientRegisterEdit();
     },
 
-
     btnUpBaseInfo() {
       // let body = {
-      //   patientRegisterId: this.upBaseInfo.patientRegisterId,        
+      //   patientRegisterId: this.upBaseInfo.patientRegisterId,
       // };
       // {
       //   "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
@@ -1996,7 +2453,8 @@ export default {
       // body[this.upBaseInfo.colName] = this.upBaseInfo.value;
 
       // 旧版/api/app/PatientRegister/UpdatePatientRegisterBaseInfoByPatientRegisterId
-      postapi("/api/app/PatientRegister/UpdatePatientRegisterBySumCheck",
+      postapi(
+        "/api/app/PatientRegister/UpdatePatientRegisterBySumCheck",
         this.upBaseInfo
       ).then((res) => {
         if (res.code > -1) {
@@ -2007,35 +2465,38 @@ export default {
 
     //修改出生日期
     changeBirthDate() {
-      this.upBaseInfo.age = birthdayToAge(this.upBaseInfo.birthDate)
+      this.upBaseInfo.age = birthdayToAge(this.upBaseInfo.birthDate);
     },
 
     //修改出生日期
     changeAge() {
-      this.upBaseInfo.birthDate = ageToBirthday(this.upBaseInfo.age)
+      this.upBaseInfo.birthDate = ageToBirthday(this.upBaseInfo.age);
     },
 
     //修改身份证，生成年龄、出生、性别
     // isNameContinue 身份证号查重后是否姓名查重
     changeIdNo(isNameContinue) {
-      if (!this.upBaseInfo.idNo) return
-      let ret = parseID(this.upBaseInfo.idNo)
+      if (!this.upBaseInfo.idNo) return;
+      let ret = parseID(this.upBaseInfo.idNo);
       // console.log('changeIdNo',ret)
       if (ret.age != -1) {
-        this.upBaseInfo.birthDate = new Date(ret.birthday)
-        this.upBaseInfo.age = ret.age
-        this.upBaseInfo.sexId = ret.sex
+        this.upBaseInfo.birthDate = new Date(ret.birthday);
+        this.upBaseInfo.age = ret.age;
+        this.upBaseInfo.sexId = ret.sex;
       }
     },
 
     //快速选择组合项目时，调整可按拼间简码及简称查找
     filterMethod(keyWords) {
-      //// console.log('filterMethod',this.asbItemQuick)  
+      //// console.log('filterMethod',this.asbItemQuick)
       if (keyWords) {
         this.nation = [];
-        this.dict.nation.forEach(item => {
-          if (item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
-            || item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1) {
+        this.dict.nation.forEach((item) => {
+          if (
+            item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) >
+              -1 ||
+            item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+          ) {
             this.nation.push(item);
           }
         });
@@ -2064,7 +2525,7 @@ export default {
       getapi("/api/app/nation/in-filter").then((res) => {
         if (res.code != -1) {
           this.dict.nation = res.data;
-          this.nation = deepCopy(res.data)
+          this.nation = deepCopy(res.data);
         }
       });
 
@@ -2076,9 +2537,10 @@ export default {
       });
 
       this.dataTransOpts.tableS.patient_register.id = row.id;
-      this.dataTransOpts.tableS.patient_register.patientRegisterNo = row.patientRegisterNo
+      this.dataTransOpts.tableS.patient_register.patientRegisterNo =
+        row.patientRegisterNo;
 
-      this.upBaseInfo = Object.assign(this.upBaseInfo, row)
+      this.upBaseInfo = Object.assign(this.upBaseInfo, row);
       this.upBaseInfo.patientRegisterId = row.id;
       this.upBaseInfo.visble = true;
     },
@@ -2152,10 +2614,11 @@ export default {
       //   children: [
       //     { label: "修改姓名", onClick: () => { ; } }
       //   ]
-      // })   
+      // })
       if (checkPagePriv(this.pagePriv.privs, "修改人员信息")) {
         items.push({
-          label: "修改人员信息", onClick: () => {
+          label: "修改人员信息",
+          onClick: () => {
             this.fnUpBaseInfo(row);
           },
         });
@@ -2174,11 +2637,14 @@ export default {
           onClick: () => {
             postapi(`/api/app/patient-register/update-photo`, {
               patientRegisterId: row.id,
-              photo: ''
-            })
-              .then(res => {
-                if (res.code > -1) this.$message.success({ showClose: true, message: '操作成功！' })
-              })
+              photo: "",
+            }).then((res) => {
+              if (res.code > -1)
+                this.$message.success({
+                  showClose: true,
+                  message: "操作成功！",
+                });
+            });
           },
         });
 
@@ -2273,7 +2739,7 @@ export default {
       if (subMenuPrint.length > 0)
         items.push({ label: "打印条码", children: subMenuPrint });
 
-      //  导入结果合集 ============ start 
+      //  导入结果合集 ============ start
       let subMenuImp = [];
       if (
         checkPagePriv(this.pagePriv.privs, "导入检查结果") &&
@@ -2308,10 +2774,10 @@ export default {
       if (subMenuImp.length > 0) {
         items.push({ label: "导入结果", children: subMenuImp });
       }
-      //  导入结果合集 ============ end   
+      //  导入结果合集 ============ end
 
       //  批量操作合集 ============ start
-      let batchMenus = []
+      let batchMenus = [];
       if (
         checkPagePriv(this.pagePriv.privs, "批量更新组合项目明细") &&
         this.multipleSelection.length > 0
@@ -2379,15 +2845,13 @@ export default {
       if (batchMenus.length > 0) {
         items.push({ label: "批量操作", children: batchMenus });
       }
-      //  批量操作合集 ============ end  
+      //  批量操作合集 ============ end
 
-      if (
-        checkPagePriv(this.pagePriv.privs, "查看云胶片二维码")
-      )
+      if (checkPagePriv(this.pagePriv.privs, "查看云胶片二维码"))
         items.push({
           label: "查看云胶片二维码",
           onClick: () => {
-            this.makeQrCode(row)
+            this.makeQrCode(row);
           },
         });
 
@@ -2683,7 +3147,7 @@ export default {
               }
             });
           break;
-        case "diAn":  //迪安数据导入
+        case "diAn": //迪安数据导入
           url = "/api/app/ImportLisResult/ImportDianResultByPatientRegisterId";
           postapi(url, { patientRegisterId: row.id }).then((res) => {
             if (res.code > -1) {
@@ -2692,7 +3156,7 @@ export default {
             }
           });
           break;
-        default:  //常规lis数据导入
+        default: //常规lis数据导入
           postapi(url, { patientRegisterId: row.id }).then((res) => {
             if (res.code > -1) {
               this.$message.success({ showClose: true, message: "导入成功！" });
@@ -2706,15 +3170,18 @@ export default {
     //生成云胶片二维码
     makeQrCode(row) {
       //let canvas = this.$refs.canvas;
-      let url = `${this.qrCode.url}?reportparam=条码号&mrn=条码号`  //`https://ccjktj.cn:5081/?reportparam=条码号&mrn=条码号`
+      let url = `${this.qrCode.url}?reportparam=条码号&mrn=条码号`; //`https://ccjktj.cn:5081/?reportparam=条码号&mrn=条码号`
       if (row?.patientRegisterNo) {
-        url = `${this.qrCode.url}?reportparam=${row.patientRegisterNo}&mrn=${row.patientRegisterNo}`
-        this.qrCode.barcodeNo = row.patientRegisterNo
+        url = `${this.qrCode.url}?reportparam=${row.patientRegisterNo}&mrn=${row.patientRegisterNo}`;
+        this.qrCode.barcodeNo = row.patientRegisterNo;
       }
       if (row?.patientName) {
-        this.qrCode.patientName = row.patientName
+        this.qrCode.patientName = row.patientName;
       }
-      this.qrCode.patientName = this.qrCode.patientName.substring(0, 1) + '*' + this.qrCode.patientName.substring(2)
+      this.qrCode.patientName =
+        this.qrCode.patientName.substring(0, 1) +
+        "*" +
+        this.qrCode.patientName.substring(2);
 
       // canvas 方式不可取，有延时
       // this.$nextTick(() => {
@@ -2732,59 +3199,146 @@ export default {
       //     })
       // })
 
-      QRCode.toDataURL(url, { errorCorrectionLevel: 'H' })
-        .then(res => {
-          console.log(res)
-          this.qrCode.personUrl = res
-          this.qrCode.winDisplay = true
+      QRCode.toDataURL(url, { errorCorrectionLevel: "H" })
+        .then((res) => {
+          console.log(res);
+          this.qrCode.personUrl = res;
+          this.qrCode.winDisplay = true;
         })
-        .catch(err => {
-          this.$message.error({ showClose: true, message: err.message })
-          console.error(err)
+        .catch((err) => {
+          this.$message.error({ showClose: true, message: err.message });
+          console.error(err);
         })
         .finally(() => {
-          console.log('url', url)
-        })
-
+          console.log("url", url);
+        });
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => {
+        return filterVal.map((j) => v[j]);
+      });
     },
-
     //通用导出
     btnExport(elId) {
-      this.dragCol.forEach((e) => {
-        this.jsonFields[e.label] = e.prop;
+      require.ensure([], () => {
+        const tHeader = [];
+        const filterVal = [];
+        this.dragCol.forEach((e) => {
+          tHeader.push(e.label);
+          filterVal.push(e.prop);
+        });
+        const list = this.tableData.map((row, index) => {
+          const newRow = { ...row }; // 创建副本，避免修改原数据
+          // 使用对象映射优化数据转换
+          newRow.sn = index + 1;
+          if (newRow.completeFlag)
+            newRow.completeFlag =
+              newRow.isAudit == "Y"
+                ? "已审核"
+                : this.dddw(
+                    this.dict.completeFlag,
+                    "id",
+                    newRow.completeFlag,
+                    "displayName"
+                  );
+          if (newRow.guidePrintTimes?.toString())
+            newRow.guidePrintTimes = newRow.guidePrintTimes > 0 ? "打印" : "";
+          if (newRow.isLock) newRow.isLock = newRow.isLock == "Y" ? "锁住" : "";
+          if (newRow.sexId)
+            newRow.sexId = this.dddw(
+              this.dict.sex,
+              "id",
+              newRow.sexId,
+              "displayName"
+            );
+          if (newRow.patientRegisterNo)
+            newRow.patientRegisterNo = "\u200C" + newRow.patientRegisterNo;
+          if (newRow.patientNo) newRow.patientNo = "\u200C" + newRow.patientNo;
+          if (
+            newRow.medicalPackageId !== this.dict.personOrgId &&
+            newRow.customerOrgId === this.dict.personOrgId
+          ) {
+            newRow.groupPack = newRow.medicalPackageName;
+          } else if (
+            newRow.medicalPackageId !== this.dict.personOrgId &&
+            newRow.customerOrgId !== this.dict.personOrgId
+          ) {
+            newRow.groupPack = newRow.customerOrgGroupName;
+          }
+          if (newRow.idNo) newRow.idNo = "\u200C" + newRow.idNo;
+          if (newRow.birthDate)
+            newRow.birthDate = moment(newRow.birthDate).format("yyyy-MM-DD");
+          if (newRow.medicalTypeId)
+            newRow.medicalTypeId = this.dddw(
+              this.dict.medicalType,
+              "id",
+              newRow.medicalTypeId,
+              "displayName"
+            );
+          if (newRow.isVip) newRow.isVip = newRow.isVip == "Y" ? "是" : "否";
+          if (newRow.isUpload)
+            newRow.isUpload = newRow.isUpload == "Y" ? "是" : "否";
+          if (newRow.qztlType)
+            newRow.qztlType = this.dddw(
+              this.dict.qztlType,
+              "id",
+              newRow.qztlType,
+              "displayName"
+            );
+          if (newRow.qztlIsMain)
+            newRow.qztlIsMain = newRow.qztlIsMain == "Y" ? "是" : "否";
+          if (newRow.qztlIsCy)
+            newRow.qztlIsCy = newRow.qztlIsCy == "Y" ? "是" : "否";
+          if (newRow.qztlIsCw)
+            newRow.qztlIsCw = newRow.qztlIsCw == "Y" ? "是" : "否";
+          if (newRow.qztlIsGt)
+            newRow.qztlIsGt = newRow.qztlIsGt == "Y" ? "是" : "否";
+          if (newRow.qztlIsWh)
+            newRow.qztlIsWh = newRow.qztlIsWh == "Y" ? "是" : "否";
+          if (newRow.qztlIsFj)
+            newRow.qztlIsFj = newRow.qztlIsFj == "Y" ? "是" : "否";
+
+          return newRow;
+        });
+        const data =list.map((v) => filterVal.map((j) => v[j]));
+        exportJsonToExcel(tHeader, data, '人员登记列表' + moment(new Date()).format('yyyyMMDDHHmmss')); //"列表excel"  是下载后的表名 可修改
       });
-      let tableDatas = deepCopy(this.tableData)
-      tableDatas.forEach((e, index) => {
-        if (index) e.sn = index + 1
-        if (e.completeFlag) e.completeFlag = e.isAudit == "Y" ? "已审核" : dddw(this.dict.completeFlag, "id", e.completeFlag, "displayName")
-        if (e.guidePrintTimes.toString()) e.guidePrintTimes = e.guidePrintTimes > 0 ? '打印' : ''
-        if (e.isLock) e.isLock = e.isLock == 'Y' ? '锁住' : ''
-        if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
-        if (e.patientRegisterNo) e.patientRegisterNo = '\u200C' + e.patientRegisterNo
-        if (e.patientNo) e.patientNo = '\u200C' + e.patientNo
-        if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
-          e.groupPack = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
-        } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
-          e.groupPack = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
-        }
-        //if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName")
-        if (e.idNo) e.idNo = '\u200C' + e.idNo
-        if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD")
-        //if (e.maritalStatusId) e.maritalStatusId = dddw(this.dict.maritalStatus, "id", e.maritalStatusId, "displayName")
-        if (e.medicalTypeId) e.medicalTypeId = dddw(this.dict.medicalType, "id", e.medicalTypeId, "displayName")
-        //if (e.personnelTypeId) e.personnelTypeId = dddw(this.dict.personnelType, "id", e.personnelTypeId, "displayName")
-        if (e.isVip) e.isVip = e.isVip == "Y" ? "是" : "否"
-        if (e.isUpload) e.isUpload = e.isUpload == "Y" ? "是" : "否"
-        if (e.qztlType) e.qztlType = dddw(this.dict.qztlType, "id", e.qztlType, "displayName")
-        if (e.qztlIsMain) e.qztlIsMain = e.qztlIsMain == "Y" ? "是" : "否"
-        if (e.qztlIsCy) e.qztlIsCy = e.qztlIsCy == "Y" ? "是" : "否"
-        if (e.qztlIsCw) e.qztlIsCw = e.qztlIsCw == "Y" ? "是" : "否"
-        if (e.qztlIsGt) e.qztlIsGt = e.qztlIsGt == "Y" ? "是" : "否"
-        if (e.qztlIsWh) e.qztlIsWh = e.qztlIsWh == "Y" ? "是" : "否"
-        if (e.qztlIsFj) e.qztlIsFj = e.qztlIsFj == "Y" ? "是" : "否"
-      })
-      this.tableName = '人员登记列表' + moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
-      return tableDatas;
+
+      // this.dragCol.forEach((e) => {
+      //   this.jsonFields[e.label] = e.prop;
+      // });
+      // let tableDatas = deepCopy(this.tableData)
+      // tableDatas.forEach((e, index) => {
+      //   if (index) e.sn = index + 1
+      //   if (e.completeFlag) e.completeFlag = e.isAudit == "Y" ? "已审核" : dddw(this.dict.completeFlag, "id", e.completeFlag, "displayName")
+      //   if (e.guidePrintTimes.toString()) e.guidePrintTimes = e.guidePrintTimes > 0 ? '打印' : ''
+      //   if (e.isLock) e.isLock = e.isLock == 'Y' ? '锁住' : ''
+      //   if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
+      //   if (e.patientRegisterNo) e.patientRegisterNo = '\u200C' + e.patientRegisterNo
+      //   if (e.patientNo) e.patientNo = '\u200C' + e.patientNo
+      //   if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
+      //     e.groupPack = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
+      //   } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
+      //     e.groupPack = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
+      //   }
+      //   //if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName")
+      //   if (e.idNo) e.idNo = '\u200C' + e.idNo
+      //   if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD")
+      //   //if (e.maritalStatusId) e.maritalStatusId = dddw(this.dict.maritalStatus, "id", e.maritalStatusId, "displayName")
+      //   if (e.medicalTypeId) e.medicalTypeId = dddw(this.dict.medicalType, "id", e.medicalTypeId, "displayName")
+      //   //if (e.personnelTypeId) e.personnelTypeId = dddw(this.dict.personnelType, "id", e.personnelTypeId, "displayName")
+      //   if (e.isVip) e.isVip = e.isVip == "Y" ? "是" : "否"
+      //   if (e.isUpload) e.isUpload = e.isUpload == "Y" ? "是" : "否"
+      //   if (e.qztlType) e.qztlType = dddw(this.dict.qztlType, "id", e.qztlType, "displayName")
+      //   if (e.qztlIsMain) e.qztlIsMain = e.qztlIsMain == "Y" ? "是" : "否"
+      //   if (e.qztlIsCy) e.qztlIsCy = e.qztlIsCy == "Y" ? "是" : "否"
+      //   if (e.qztlIsCw) e.qztlIsCw = e.qztlIsCw == "Y" ? "是" : "否"
+      //   if (e.qztlIsGt) e.qztlIsGt = e.qztlIsGt == "Y" ? "是" : "否"
+      //   if (e.qztlIsWh) e.qztlIsWh = e.qztlIsWh == "Y" ? "是" : "否"
+      //   if (e.qztlIsFj) e.qztlIsFj = e.qztlIsFj == "Y" ? "是" : "否"
+      // })
+      // this.tableName = '人员登记列表' + moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
+      // return tableDatas;
       // const columns = this.$refs.info.getColumns(); // 获取列信息
       // const data = this.$refs.info.getData(); // 获取数据
       // console.log(columns)
@@ -2835,16 +3389,15 @@ export default {
 
     // 点击扫码回收体检表按钮
     btnScanRecover() {
-      this.patientRegisterNo = ''
-      this.recover.dialog = true
+      this.patientRegisterNo = "";
+      this.recover.dialog = true;
       this.$nextTick(() => {
-        this.$refs['tmh'].focus(); //打开光标定位到条码栏里 
+        this.$refs["tmh"].focus(); //打开光标定位到条码栏里
       });
     },
 
     //按条码号查个人数据
     signByPatientRegisterNo() {
-
       // let patientRegisterNos = [this.patientRegisterNo]
       // let body = {
       //   patientRegisterNos
@@ -2857,19 +3410,17 @@ export default {
       //       this.$message.success({ showClose: true, message: '操作成功！' })
       //     }
       //   });
-      this.recover.barcodes = [this.recover.barcode]
-      postapi('/api/app/PatientRegister/BatchRecoverGuide', this.recover)
-        .then((res) => {
+      this.recover.barcodes = [this.recover.barcode];
+      postapi("/api/app/PatientRegister/BatchRecoverGuide", this.recover).then(
+        (res) => {
           if (res.code > -1) {
-            this.recover.barcode = ''
-            this.$message.success({ showClose: true, message: '操作成功！' })
+            this.recover.barcode = "";
+            this.$message.success({ showClose: true, message: "操作成功！" });
           }
-        });
-
+        }
+      );
     },
 
-
-
     btnDragColDesign() {
       this.dragColDesign = deepCopy(this.dragCol);
       this.dialogColSort = true;
@@ -2901,7 +3452,7 @@ export default {
 
     //合计
     getSummaries(param) {
-      console.log('getSummaries param', param)
+      console.log("getSummaries param", param);
       // if(!param){
       //   param = {
       //     columns:[{}, {}, {}, {}, {}, {}, {property: 'asbitemMoney'},{property: 'customerOrgGroupDetailMoney'}],
@@ -2910,28 +3461,28 @@ export default {
       // }
 
       const { columns, data } = param;
-      const sumCol = [2, 3, 4, 7, 8]  //需合计的列
+      const sumCol = [2, 3, 4, 7, 8]; //需合计的列
       const sums = [];
       columns.forEach((column, index) => {
         //console.log('column, index,data',column, index,data)
         //显示合计列
         if (index === 1) {
-          sums[index] = '合计';
+          sums[index] = "合计";
           return;
         }
 
         //不合计的列
         if (sumCol.indexOf(index) == -1) {
-          sums[index] = '';
+          sums[index] = "";
           return;
         }
 
-        sums[index] = 0
-        data.forEach(e => {
-          if (!isNaN(e[column.property])) sums[index] += Number(e[column.property])// * e['amount']
-        })
-        sums[index] = sums[index].toFixed(2) //+ ' 元';
-
+        sums[index] = 0;
+        data.forEach((e) => {
+          if (!isNaN(e[column.property]))
+            sums[index] += Number(e[column.property]); // * e['amount']
+        });
+        sums[index] = sums[index].toFixed(2); //+ ' 元';
       });
       return sums;
     },
diff --git a/src/components/patientRegister/patientRegisterRecoverListQuery.vue b/src/components/patientRegister/patientRegisterRecoverListQuery.vue
index 891faa1..42014b2 100644
--- a/src/components/patientRegister/patientRegisterRecoverListQuery.vue
+++ b/src/components/patientRegister/patientRegisterRecoverListQuery.vue
@@ -3,22 +3,40 @@
     <div class="contenttitle">
       体检查询 /<span class="contenttitleBold">回收表格查询</span>
     </div>
-    
+
     <!--查询条件-->
-    <div style="display: flex;">
+    <div style="display: flex">
       <div class="query">
-
-        <el-select v-model="patientRegister.query.dateType" placeholder="请选择" style="width: 80px" size="small">
+        <el-select
+          v-model="patientRegister.query.dateType"
+          placeholder="请选择"
+          style="width: 80px"
+          size="small"
+        >
           <el-option label="登记日期" :value="'1'" />
           <el-option label="体检日期" :value="'2'" />
           <el-option label="登记或体检" :value="'3'" />
         </el-select>
         <!-- dateType  1 登记，2 体检，3 体检或登记-->
-        <el-date-picker v-model="patientRegister.query.startDate" type="date" placeholder="起始日期" size="small"
-          style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+        <el-date-picker
+          v-model="patientRegister.query.startDate"
+          type="date"
+          placeholder="起始日期"
+          size="small"
+          style="width: 90px"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+        />
         <span class="spanClass">至</span>
-        <el-date-picker v-model="patientRegister.query.endDate" type="date" placeholder="截止日期" size="small"
-          style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+        <el-date-picker
+          v-model="patientRegister.query.endDate"
+          type="date"
+          placeholder="截止日期"
+          size="small"
+          style="width: 90px"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+        />
       </div>
       <!--
       <div class="query">
@@ -116,15 +134,33 @@
     -->
       <div class="query">
         <span class="spanClass">人员类别</span>
-        <el-select v-model="patientRegister.query.personnelTypeIds" placeholder="请选择" clearable filterable
-          style="width: 170px" size="small" multiple collapse-tags>
-          <el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName" :value="item.id" />
+        <el-select
+          v-model="patientRegister.query.personnelTypeIds"
+          placeholder="请选择"
+          clearable
+          filterable
+          style="width: 170px"
+          size="small"
+          multiple
+          collapse-tags
+        >
+          <el-option
+            v-for="item in dict.personnelType"
+            :key="item.id"
+            :label="item.displayName"
+            :value="item.id"
+          />
         </el-select>
       </div>
       <div class="query">
         <span class="spanClass">表回收</span>
-        <el-select v-model="patientRegister.query.isRecoverGuide" placeholder="请选择" clearable style="width: 80px"
-          size="small">
+        <el-select
+          v-model="patientRegister.query.isRecoverGuide"
+          placeholder="请选择"
+          clearable
+          style="width: 80px"
+          size="small"
+        >
           <el-option label="未回收" value="N" />
           <el-option label="已回收" value="Y" />
         </el-select>
@@ -133,53 +169,114 @@
         <el-button class="commonbutton" @click="btnQuery">查询</el-button>
       </div>
       <div class="query">
-        <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName">
+        <!-- <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName">
             <el-button type="" style="width:100%">导出excel</el-button>
-          </download-excel>
+          </download-excel> -->
+        <el-button type="" class="commonbutton" @click="btnExport"
+          >导出excel</el-button
+        >
       </div>
     </div>
     <div :style="'margin-top: 10px;width:' + (window.pageWidth - 15) + 'px;'">
-      <el-table :data="tableData" width="100%" border :height="window.pageHeight < 600 ? 405 : window.pageHeight - 165"
-        row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
-        @row-click="rowClick">
+      <el-table
+        :data="tableData"
+        width="100%"
+        border
+        :height="window.pageHeight < 600 ? 405 : window.pageHeight - 165"
+        row-key="id"
+        size="small"
+        highlight-current-row
+        ref="dataList"
+        @selection-change="handleSelectionChange"
+        @row-click="rowClick"
+      >
         <el-table-column type="index" width="40" label="序号" align="center" />
-        <el-table-column prop="isRecoverGuide" label="回收" align="center" width="50" sortable>
+        <el-table-column
+          prop="isRecoverGuide"
+          label="回收"
+          align="center"
+          width="50"
+          sortable
+        >
           <template slot-scope="scope">
             <el-checkbox :value="scope.row.isRecoverGuide == 'Y'" />
           </template>
         </el-table-column>
         <el-table-column prop="completeFlag" label="体检进度" sortable>
           <template slot-scope="scope">
-            <div>{{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
+            <div>
+              {{
+                dddw(
+                  dict.completeFlag,
+                  "id",
+                  scope.row.completeFlag,
+                  "displayName"
+                )
+              }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="isLock" label="锁住" width="50">
           <template slot-scope="scope">
-            <i class="el-icon-lock" v-if="scope.row.isLock == 'Y'" style="font-size: 20px; color: red" />
+            <i
+              class="el-icon-lock"
+              v-if="scope.row.isLock == 'Y'"
+              style="font-size: 20px; color: red"
+            />
           </template>
         </el-table-column>
-        <el-table-column prop="customerOrgParentName" label="单位" width="180" sortable>
+        <el-table-column
+          prop="customerOrgParentName"
+          label="单位"
+          width="180"
+          sortable
+        >
           <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}
+            <div>
+              {{
+                scope.row.customerOrgParentName
+                  ? scope.row.customerOrgParentName
+                  : scope.row.customerOrgName
+              }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="customerOrgName" label="部门" width="180" sortable>
+        <el-table-column
+          prop="customerOrgName"
+          label="部门"
+          width="180"
+          sortable
+        >
           <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName == scope.row.customerOrgName ? "" : scope.row.customerOrgName }}
+            <div>
+              {{
+                scope.row.customerOrgParentName == scope.row.customerOrgName
+                  ? ""
+                  : scope.row.customerOrgName
+              }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="patientName" label="姓名" sortable/>
+        <el-table-column prop="patientName" label="姓名" sortable />
         <el-table-column prop="sexName" label="性别" sortable>
         </el-table-column>
         <el-table-column prop="age" label="年龄" />
-        <el-table-column prop="patientRegisterNo" label="条码号" width="150" sortable/>
-        <el-table-column prop="patientNo" label="档案号" sortable/>
+        <el-table-column
+          prop="patientRegisterNo"
+          label="条码号"
+          width="150"
+          sortable
+        />
+        <el-table-column prop="patientNo" label="档案号" sortable />
         <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">
+            <div
+              v-if="
+                scope.row.medicalPackageId !== dict.personOrgId &&
+                scope.row.customerOrgId === dict.personOrgId
+              "
+            >
               {{ scope.row.medicalPackageName }}
             </div>
             <div v-else>
@@ -187,8 +284,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="nationName" label="民族">
-        </el-table-column>
+        <el-table-column prop="nationName" label="民族"> </el-table-column>
         <el-table-column prop="idNo" label="身份证" width="150" />
         <el-table-column prop="birthDate" label="出生日期" width="100">
           <template slot-scope="scope">
@@ -228,41 +324,44 @@
             <el-checkbox :value="scope.row.isUpload == 'Y'" />
           </template>
         </el-table-column>
-
       </el-table>
       <div style="display: flex; justify-content: space-between">
         <div></div>
         <div>
-          <span style="font-size: 12px">共：{{ loadOpts.totalCount }} 条记录，当前显示：{{
-            tableData.length
-          }}
-            条。</span>
+          <span style="font-size: 12px"
+            >共：{{ loadOpts.totalCount }} 条记录，当前显示：{{
+              tableData.length
+            }}
+            条。</span
+          >
         </div>
       </div>
     </div>
-
-
   </div>
 </template>
 <script>
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, objCopy, arrayReduce, arrayExistObj,deepCopy  } from "@/utlis/proFunc";
+import {
+  dddw,
+  objCopy,
+  arrayReduce,
+  arrayExistObj,
+  deepCopy,
+} from "@/utlis/proFunc";
 import { savePeoplePhoto } from "../../utlis/proApi";
+import { exportJsonToExcel } from "../../utlis/Export2Excel";
 
 export default {
-  components: {
-    
-  },
+  components: {},
   data() {
     return {
       tableData: [], //列表数据
       multipleSelection: [], //选中的数据列表
-      tableDataCurrentRow: {},  // 单行选中的行 
+      tableDataCurrentRow: {}, // 单行选中的行
 
-
-      patientRegisterNo: '',
+      patientRegisterNo: "",
 
       LocalConfig: {
         normal: {
@@ -278,7 +377,8 @@ export default {
       lazyLoading: false,
       dom: null,
       jsonFields: {
-        回收:"isRecoverGuide",
+        序号: "sn",
+        回收: "isRecoverGuide",
         体检进度: "completeFlag",
         锁住: "isLock",
         单位: "customerOrgParentName",
@@ -303,24 +403,26 @@ export default {
         体检类别: "medicalTypeName",
         人员类别: "personnelTypeName",
         职务: "jobPost",
-        职称: "jobTitle", 
+        职称: "jobTitle",
         介绍人: "salesman",
         VIP: "isVip",
         登记人: "creatorName",
         登记日期: "creationTime",
-        上传: "isUpload"
+        上传: "isUpload",
       },
-      tableName:""
+      tableName: "",
     };
   },
 
   created() {
     try {
-      let LocalConfig = JSON.parse(window.localStorage.getItem("LocalConfig") || null)
+      let LocalConfig = JSON.parse(
+        window.localStorage.getItem("LocalConfig") || null
+      );
       if (LocalConfig?.normal?.maxResultCount) {
-        this.LocalConfig.normal.maxResultCount = LocalConfig.normal.maxResultCount
+        this.LocalConfig.normal.maxResultCount =
+          LocalConfig.normal.maxResultCount;
       }
-
     } catch (error) {
       console.log('window.localStorage.getItem("LocalConfig")', error);
     }
@@ -334,24 +436,31 @@ export default {
   },
 
   //挂载完成
-  mounted() {    
+  mounted() {
     let ldate = new Date();
     this.patientRegister.query.startDate = ldate;
     this.patientRegister.query.endDate = ldate;
-    this.patientRegister.query.dateType = '2'
+    this.patientRegister.query.dateType = "2";
 
-    this.dictInit()
+    this.dictInit();
 
     this.$nextTick(() => {
-      this.scrollFull()
-    })
+      this.scrollFull();
+    });
   },
   computed: {
-    ...mapState(["pickerOptions", "window", "dict", "patientRegister", "customerOrg"]),
+    ...mapState([
+      "pickerOptions",
+      "window",
+      "dict",
+      "patientRegister",
+      "customerOrg",
+    ]),
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
-    dddw, moment,
+    dddw,
+    moment,
 
     dictInit() {
       //体检类别
@@ -380,35 +489,33 @@ export default {
     },
 
     rowClick(row) {
-      this.tableDataCurrentRow = row
+      this.tableDataCurrentRow = row;
     },
 
-
-
-
     //按条码号查个人数据
     signByPatientRegisterNo() {
-      let patientRegisterNos = [this.patientRegisterNo]
+      let patientRegisterNos = [this.patientRegisterNo];
       let body = {
-        patientRegisterNos
-      }
+        patientRegisterNos,
+      };
       //console.log(`/api/app/patientregister/getpatientregisterorpatient`, body)
-      postapi('/api/app/PatientRegister/BatchRecoverGuideByPatientRegisterNo', body)
-        .then((res) => {
-          if (res.code > -1) {
-            this.patientRegisterNo = ''
-            this.$message.success({ showClose: true, message: '操作成功！' })
-          }
-        });
+      postapi(
+        "/api/app/PatientRegister/BatchRecoverGuideByPatientRegisterNo",
+        body
+      ).then((res) => {
+        if (res.code > -1) {
+          this.patientRegisterNo = "";
+          this.$message.success({ showClose: true, message: "操作成功！" });
+        }
+      });
     },
 
-    
     //查询
     btnQuery() {
-      this.Query()
+      this.Query();
     },
     async Query() {
-      // 查询时，清掉明细数据 （滚动时不清）      
+      // 查询时，清掉明细数据 （滚动时不清）
       this.tableDataCurrentRow = {}; // 清除选择
       if (
         !(
@@ -419,7 +526,6 @@ export default {
         this.tableData = [];
       }
 
-
       this.loadOpts = Object.assign(this.loadOpts, this.loadOptsInit);
       await this.getPrList();
     },
@@ -428,7 +534,7 @@ export default {
     async load() {
       this.loadOpts.skipCount++;
       await this.getPrList();
-      this.lazyLoading = false
+      this.lazyLoading = false;
     },
 
     // 获取列表数据
@@ -436,7 +542,7 @@ export default {
       if (
         this.loadOpts.skipCount != 0 &&
         this.loadOpts.skipCount * this.loadOpts.maxResultCount >=
-        this.loadOpts.totalCount
+          this.loadOpts.totalCount
       )
         return;
       // console.log('getPrList', this.loadOpts)
@@ -470,7 +576,7 @@ export default {
               this.patientRegister.query.customerOrgGroupIds;
           }
         } catch (error) {
-          console.error(error)
+          console.error(error);
         }
       }
 
@@ -623,48 +729,103 @@ export default {
             // curLoad.forEach((e, index) => {
             //   this.tableData.push(Object.assign({ index: Number(oldCount) + Number(index), choosed: false }, e))
             // })
-
           }
         }
       );
     },
 
-
-    //滚动加载数据 
+    //滚动加载数据
     scrollFull() {
-      this.dom = this.$refs['dataList'].bodyWrapper
-      console.log('obj', this.dom)
+      this.dom = this.$refs["dataList"].bodyWrapper;
+      console.log("obj", 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', obj.scrollTop, 'clientHeight', obj.clientHeight, 'scrollHeight', obj.scrollHeight);
-          if (Number(this.loadOpts.skipCount) * Number(this.loadOpts.maxResultCount) >= Number(this.loadOpts.totalCount)) {
-            this.lazyLoading = false
+          if (
+            Number(this.loadOpts.skipCount) *
+              Number(this.loadOpts.maxResultCount) >=
+            Number(this.loadOpts.totalCount)
+          ) {
+            this.lazyLoading = false;
           } else {
-            this.lazyLoading = true
-            this.load()
+            this.lazyLoading = true;
+            this.load();
             // this.dom.scrollTop = this.dom.scrollTop - 100
           }
         }
-      })
+      });
     },
     btnExport(elId) {
-      let tableDatas = deepCopy(this.tableData)
-      tableDatas.forEach((e, index) => {
-        if(e.completeFlag) e.completeFlag = this.dddw(this.dict.completeFlag, "id", e.completeFlag, "displayName")
-        if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
-        if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
-          e.groupPack = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
-        } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
-          e.groupPack = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
-        }
-        if (e.idNo) e.idNo = e.idNo + '&'
-        if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD")
-      })
-      this.tableName = '体检表回收' + moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
-      return tableDatas;
+      require.ensure([], () => {
+        const tHeader = [];
+        const filterVal = [];
+        this.jsonFields &&
+          Object.keys(this.jsonFields).forEach((key) => {
+            tHeader.push(key);
+            filterVal.push(this.jsonFields[key]);
+          });
+        const list = this.tableData.map((row, index) => {
+          const newRow = { ...row }; // 创建副本，避免修改原数据
+          // 使用对象映射优化数据转换
+          newRow.sn = index + 1;
+          if (newRow.completeFlag)
+            newRow.completeFlag = this.dddw(
+              this.dict.completeFlag,
+              "id",
+              newRow.completeFlag,
+              "displayName"
+            );
+          if (newRow.sexId)
+            newRow.sexId = dddw(this.dict.sex, "id", newRow.sexId, "displayName");
+          if (
+            newRow.medicalPackageId !== this.dict.personOrgId &&
+            newRow.customerOrgId === this.dict.personOrgId
+          ) {
+            newRow.groupPack = newRow.medicalPackageName; // dddw(this.dict.medicalPackage, "id", newRow.medicalPackageId, "displayName")
+          } else if (
+            newRow.medicalPackageId !== this.dict.personOrgId &&
+            newRow.customerOrgId !== this.dict.personOrgId
+          ) {
+            newRow.groupPack = newRow.customerOrgGroupName; // dddw(this.dict.customerOrgGroupAll, "id", newRow.customerOrgGroupId, "displayName")
+          }
+          if (newRow.idNo) newRow.idNo = "\u200C"+newRow.idNo;
+          if (newRow.patientRegisterNo)
+            newRow.patientRegisterNo = "\u200C" + newRow.patientRegisterNo;
+          if (newRow.patientNo) newRow.patientNo = "\u200C" + newRow.patientNo;
+          if (newRow.birthDate)
+            newRow.birthDate = moment(newRow.birthDate).format("yyyy-MM-DD");
+
+          return newRow;
+        });
+        const data = list.map((v) => filterVal.map((j) => v[j]));
+        exportJsonToExcel(
+          tHeader,
+          data,
+          "体检表回收" + moment(new Date()).format("yyyyMMDDHHmmss")
+        ); //"列表excel"  是下载后的表名 可修改
+      });
+
+      // let tableDatas = deepCopy(this.tableData)
+      // tableDatas.forEach((e, index) => {
+      //   if(e.completeFlag) e.completeFlag = this.dddw(this.dict.completeFlag, "id", e.completeFlag, "displayName")
+      //   if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
+      //   if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
+      //     e.groupPack = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
+      //   } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
+      //     e.groupPack = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
+      //   }
+      //   if (e.idNo) e.idNo = e.idNo + '&'
+      //   if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD")
+      // })
+      // this.tableName = '体检表回收' + moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
+      // return tableDatas;
     },
   },
 
@@ -677,17 +838,16 @@ export default {
         this.Query();
       }
     },
-
   },
 };
 </script>
 <style scoped>
-@import '../../assets/css/global_button.css';
-@import '../../assets/css/global_dialog.css';
-@import '../../assets/css/global_form.css';
-@import '../../assets/css/global_input.css';
-@import '../../assets/css/global_table.css';
-@import '../../assets/css/global.css';
+@import "../../assets/css/global_button.css";
+@import "../../assets/css/global_dialog.css";
+@import "../../assets/css/global_form.css";
+@import "../../assets/css/global_input.css";
+@import "../../assets/css/global_table.css";
+@import "../../assets/css/global.css";
 
 .btnClass {
   width: 100px;
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index 218eba3..e714498 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -1,104 +1,176 @@
 <template>
+  <div>
     <div>
-        <div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="btnQuery">查询</el-button>
-            </div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="btnImportResult('pacs')">导入检查结果</el-button>
-            </div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="btnImportResult('lis')">导入检验结果</el-button>
-            </div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="btnReport(true)">预览报告</el-button>
-            </div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="btnReport(false)">打印报告</el-button>
-            </div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="btnReportExport(false)">导出 pdf 报告</el-button>
-            </div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="btnGetReport('Y')">领取报告</el-button>
-            </div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="btnUpReport">上传Web</el-button>
-            </div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="btnCheckHistory">历次结果</el-button>
-            </div>
-            <div class="listBtn">
-                <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="xlsName">
+      <div class="listBtn">
+        <el-button type="primary" class="commonbutton" @click="btnQuery"
+          >查询</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <el-button
+          type="primary"
+          class="commonbutton"
+          @click="btnImportResult('pacs')"
+          >导入检查结果</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <el-button
+          type="primary"
+          class="commonbutton"
+          @click="btnImportResult('lis')"
+          >导入检验结果</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="commonbutton" @click="btnReport(true)"
+          >预览报告</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="commonbutton" @click="btnReport(false)"
+          >打印报告</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <el-button
+          type="primary"
+          class="commonbutton"
+          @click="btnReportExport(false)"
+          >导出 pdf 报告</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <el-button
+          type="primary"
+          class="commonbutton"
+          @click="btnGetReport('Y')"
+          >领取报告</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="commonbutton" @click="btnUpReport"
+          >上传Web</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="commonbutton" @click="btnCheckHistory"
+          >历次结果</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <!-- <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="xlsName">
                     <el-button type="" class="commonbutton" style="width:100%">人员信息导出</el-button>
-                </download-excel>
-            </div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="exportZip">导出Zip</el-button>
-            </div>
-            <div class="listBtn">
-                <el-button type="primary" class="commonbutton" @click="exportJpg">导出Jpg</el-button>
+                </download-excel> -->
+        <el-button type="" class="commonbutton" @click="btnExport"
+          >人员信息导出</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="commonbutton" @click="exportZip"
+          >导出Zip</el-button
+        >
+      </div>
+      <div class="listBtn">
+        <el-button type="primary" class="commonbutton" @click="exportJpg"
+          >导出Jpg</el-button
+        >
+      </div>
+    </div>
+    <div>
+      <!-- 通用进度条 -->
+      <el-dialog
+        title="数据处理中……"
+        :visible.sync="elProgress.display"
+        width="640px"
+        :show-close="false"
+        :close-on-click-modal="false"
+        :append-to-body="true"
+      >
+        <ElProgressOCX />
+      </el-dialog>
+
+      <el-dialog
+        title="报告领取"
+        :visible.sync="dialogGetReport"
+        width="350px"
+        :show-close="false"
+        :close-on-click-modal="false"
+        :append-to-body="true"
+      >
+        <div>
+          <div class="query" style="display: flex; margin: 0 0 30px 10px">
+            <span class="spanClass">领取人</span>
+            <el-input
+              placeholder="领取人"
+              v-model="receiveReport.reportReceiveName"
+              size="small"
+              clearable
+              style="width: 120px"
+            />
+          </div>
+          <div style="display: flex; justify-content: space-between">
+            <div></div>
+            <div style="display: flex">
+              <div>
+                <el-button
+                  type="primary"
+                  class="commonbutton"
+                  @click="btnGetReportOk"
+                  >确定</el-button
+                >
+              </div>
+              <div style="margin-left: 10px">
+                <el-button
+                  type="primary"
+                  class="commonbutton"
+                  @click="dialogGetReport = false"
+                  >取消</el-button
+                >
+              </div>
             </div>
+          </div>
         </div>
+      </el-dialog>
+
+      <el-dialog
+        title="历次结果"
+        :visible.sync="dialogVisibleCheckHistory"
+        :close-on-click-modal="false"
+        width="900px"
+      >
         <div>
-            <!-- 通用进度条 -->
-            <el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="640px" :show-close="false"
-                :close-on-click-modal="false" :append-to-body="true">
-                <ElProgressOCX />
-            </el-dialog>
-
-            <el-dialog title="报告领取" :visible.sync="dialogGetReport" width="350px" :show-close="false"
-                :close-on-click-modal="false" :append-to-body="true">
-                <div>
-
-                    <div class="query" style="display: flex;margin: 0 0 30px 10px;">
-                        <span class="spanClass">领取人</span>
-                        <el-input placeholder="领取人" v-model="receiveReport.reportReceiveName" size="small" clearable
-                            style="width: 120px" />
-                    </div>
-                    <div style="display: flex;justify-content: space-between;">
-                        <div></div>
-                        <div style="display: flex;">
-                            <div>
-                                <el-button type="primary" class="commonbutton" @click="btnGetReportOk">确定</el-button>
-                            </div>
-                            <div style="margin-left: 10px;">
-                                <el-button type="primary" class="commonbutton"
-                                    @click="dialogGetReport = false">取消</el-button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </el-dialog>
-
-            <el-dialog title="历次结果" :visible.sync="dialogVisibleCheckHistory" :close-on-click-modal="false"
-                width="900px">
-                <div>
-                    <el-tabs v-model="tabChoosed">
-                        <!---->
-                        <el-tab-pane label="明细结果" name="2">
-                            <CheckDetails :patientRegisterId="dataTransOpts.tableS.patient_register.id"
-                                :refParams="{ place: 'doctor' }" />
-                        </el-tab-pane>
-                        <el-tab-pane label="本次图文报告" name="4">
-                            <ImageTextReport :refParams="{ place: 'doctor' }" />
-                        </el-tab-pane>
-                        <!-- <el-tab-pane label="项目对比" name="4">
+          <el-tabs v-model="tabChoosed">
+            <!---->
+            <el-tab-pane label="明细结果" name="2">
+              <CheckDetails
+                :patientRegisterId="dataTransOpts.tableS.patient_register.id"
+                :refParams="{ place: 'doctor' }"
+              />
+            </el-tab-pane>
+            <el-tab-pane label="本次图文报告" name="4">
+              <ImageTextReport :refParams="{ place: 'doctor' }" />
+            </el-tab-pane>
+            <!-- <el-tab-pane label="项目对比" name="4">
                         <SumItemsType :patientId="doctorCheck.prBase.patientId" />
                     </el-tab-pane> -->
-                        <el-tab-pane label="横向对比" name="5">
-                            <SumItems :patientId="dataTransOpts.tableS.patient_register.id"
-                                :refParams="{ place: 'doctor' }" />
-                        </el-tab-pane>
-                        <el-tab-pane label="历次综述" name="6">
-                            <SumHistory :patientId="dataTransOpts.tableS.patient_register.id"
-                                :refParams="{ place: 'doctor' }" />
-                        </el-tab-pane>
-                    </el-tabs>
-                </div>
-            </el-dialog>
+            <el-tab-pane label="横向对比" name="5">
+              <SumItems
+                :patientId="dataTransOpts.tableS.patient_register.id"
+                :refParams="{ place: 'doctor' }"
+              />
+            </el-tab-pane>
+            <el-tab-pane label="历次综述" name="6">
+              <SumHistory
+                :patientId="dataTransOpts.tableS.patient_register.id"
+                :refParams="{ place: 'doctor' }"
+              />
+            </el-tab-pane>
+          </el-tabs>
         </div>
+      </el-dialog>
     </div>
+  </div>
 </template>
 <script>
 import moment from "moment";
@@ -111,714 +183,1041 @@ import CheckDetails from "../../components/sumDoctorCheck/CheckDetails.vue";
 import SumItemsType from "../../components/sumDoctorCheck/SumItemsType.vue";
 import SumItems from "../../components/sumDoctorCheck/SumItems.vue";
 import SumHistory from "../../components/sumDoctorCheck/SumHistory.vue";
-import OccDisease from "../../components/occDisease/OccDisease.vue"
+import OccDisease from "../../components/occDisease/OccDisease.vue";
 import ImageTextReport from "../../components/occDisease/ImageTextReport.vue";
+import { exportJsonToExcel } from "../../utlis/Export2Excel";
 
 export default {
-    components: {
-        //PatientRegisterList,
-        ElProgressOCX,
-        CheckDetails,
-        SumItemsType,
-        SumItems,
-        SumHistory,
-        OccDisease,
-        ImageTextReport
-    },
-    data() {
-        return {
-            dialogGetReport: false,
-            dialogVisibleCheckHistory: false,
-            tabChoosed: '2',
-            receiveReport: {
-                patientRegisterIds: [
-                ],
-                isReceiveReport: "Y",
-                reportReceiveName: "" //// 报告领取人
-            },
-            jsonFields: {},
-            xlsName: '',
-
-            dragCol: [
-                { label: "序号", prop: "sn", minWidth: 40, align: "center" },
-                { label: "打印", prop: "isReportPrint", minWidth: 60, align: "center" },
-                { label: "领取", prop: "isReceiveReport", minWidth: 60, align: "center" },
-                { label: "体检进度", prop: "completeFlag", minWidth: 90, align: "center" },
-                { label: "体检日期", prop: "medicalStartDate", minWidth: 100, align: "center" },
-                { label: "单位名称", prop: "org", minWidth: 180, align: "left", showTooltip: true },
-                { label: "部门名称", prop: "dept", minWidth: 150, align: "left", showTooltip: true },
-                { label: "姓名", prop: "patientName", minWidth: 60, align: "center" },
-                { label: "性别", prop: "sexName", minWidth: 60, align: "center" },
-                { label: "年龄", prop: "age", minWidth: 60, align: "center" },
-                { label: "民族", prop: "nationName", minWidth: 70, align: "center" },
-                { label: "身份证号", prop: "idNo", minWidth: 160, align: "center" },
-                { label: "条码号", prop: "patientRegisterNo", minWidth: 110, align: "center" },
-                { label: "档案号", prop: "patientNo", minWidth: 80, align: "center" },
-                { label: "次数", prop: "medicalTimes", minWidth: 60, align: "center" },
-                { label: "备注", prop: "remark", minWidth: 150, align: "left" },
-                { label: "分组/套餐", prop: "groupPack", minWidth: 150, align: "center" },
-                { label: "手机", prop: "mobileTelephone", minWidth: 130, align: "center" },
-                { label: "电话", prop: "telephone", minWidth: 130, align: "center" },
-                { label: "出生日期", prop: "birthDate", minWidth: 90, align: "center" },
-                { label: "婚姻", prop: "maritalStatusName", minWidth: 70, align: "center" },
-                { label: "地址", prop: "address", minWidth: 400, align: "left", showTooltip: true },
-                { label: "体检卡号", prop: "medicalCardNo", minWidth: 90, align: "center" },
-                { label: "工卡号", prop: "jobCardNo", minWidth: 90, align: "center" },
-                { label: "体检类别", prop: "medicalTypeName", minWidth: 100, align: "center" },
-                { label: "人员类别", prop: "personnelTypeName", minWidth: 100, align: "center" },
-                { label: "职务", prop: "jobPost", minWidth: 70, align: "center" },
-                { label: "职称", prop: "jobTitle", minWidth: 70, align: "center" },
-                { label: "介绍人", prop: "salesman", minWidth: 80, align: "center" },
-                { label: "VIP", prop: "isVip", minWidth: 80, align: "center" },
-                { label: "总检医生", prop: "summaryDoctorName", minWidth: 90, align: "center" },
-                { label: "总检日期", prop: "summaryDate", minWidth: 140, align: "center" },
-                { label: "审核医生", prop: "auditDoctorName", minWidth: 90, align: "center" },
-                { label: "审核日期", prop: "auditDate", minWidth: 140, align: "center" },
-                { label: "登记人", prop: "registerName", minWidth: 80, align: "center" },
-                { label: "登记时间", prop: "registerDate", minWidth: 140, align: "center" },
-                { label: "打印人", prop: "reportPrintName", minWidth: 70, align: "center" },
-                { label: "领取人", prop: "reportReceiveName", minWidth: 70, align: "center" },
-                { label: "领取时间", prop: "reportReceiveDate", minWidth: 140, align: "center" },
-                { label: "锁住", prop: "isLock", minWidth: 60, align: "center" },
-                { label: "预约备单", prop: "isUploadAppoint", minWidth: 90, align: "center" },
-                { label: "上传", prop: "isUpload", minWidth: 60, align: "center" },
-                // { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
-                // { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },        
-                // { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
-                // { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
-            ],
-        };
-    },
-
-    created() { },
-
-    //挂载完成
-    mounted() {
-        this.dataTransOpts.tableS.patient_register.id = ''
-        // this.getPatientRegister(this.dataTransOpts.tableS.patient_register.patientRegisterNo)
-    },
-
-    computed: {
-        ...mapState(["dict", "elProgress", "dataTransOpts", "patientRegister", "doctorCheck", "sumDoctorCheck", "report"]),
-    },
-
-    methods: {
-        dddw,
-        btnQuery() {
-            this.patientRegister.query.times++
+  components: {
+    //PatientRegisterList,
+    ElProgressOCX,
+    CheckDetails,
+    SumItemsType,
+    SumItems,
+    SumHistory,
+    OccDisease,
+    ImageTextReport,
+  },
+  data() {
+    return {
+      dialogGetReport: false,
+      dialogVisibleCheckHistory: false,
+      tabChoosed: "2",
+      receiveReport: {
+        patientRegisterIds: [],
+        isReceiveReport: "Y",
+        reportReceiveName: "", //// 报告领取人
+      },
+      jsonFields: {},
+      xlsName: "",
+
+      dragCol: [
+        { label: "序号", prop: "sn", minWidth: 40, align: "center" },
+        { label: "打印", prop: "isReportPrint", minWidth: 60, align: "center" },
+        {
+          label: "领取",
+          prop: "isReceiveReport",
+          minWidth: 60,
+          align: "center",
         },
-        exportJpg() {
-            if (!this.$peisAPI) {
-                this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
-                return
-            }
-
-            if (!(this.dataTransOpts.tableM.patient_register && this.dataTransOpts.tableM.patient_register.length > 0)) {
-                this.$message.warning({ showClose: true, message: "请勾选择记录！" })
-                return
-            }
-            this.$peisAPI.openDirectoryDialog()
-                .then(res => {
-                    let lres = JSON.parse(res)
-                    if (lres.code > -1 && lres.data) {
-                        this.report2Jpg(JSON.parse(lres.data).directory)
-                    }
-                    console.log('lres', lres)
-                })
-                .catch(err => {
-                    this.$message.error(err)
-                })
+        {
+          label: "体检进度",
+          prop: "completeFlag",
+          minWidth: 90,
+          align: "center",
         },
-        async report2Jpg(path) {
-            this.elProgress.display = true;
-            this.elProgress.percentage = 0;
-
-            let token = window.sessionStorage.getItem('token');
-            let toOutShell = {
-                localPath: path,
-                token,
-                patientRegisterId: ""
-            };
-
-            for (let i = 0; i < this.dataTransOpts.tableM.patient_register.length; i++) {
-
-                let e = this.dataTransOpts.tableM.patient_register[i];
-                this.elProgress.percentage = Math.floor(((i + 1) * 100) / this.dataTransOpts.tableM.patient_register.length);
-
-                // 导出pdf
-                try {
-                    toOutShell.patientRegisterId = e.patientRegisterId
-                    let jsonToOutShell = JSON.stringify(toOutShell)
-                    console.log('toOutShell', jsonToOutShell)
-                    let res = await this.$peisAPI.exportDcmjpg(jsonToOutShell)
-                    if (JSON.parse(res).code < 0) {
-                        console.log('this.$peisAPI.exportDcmjpg err', res)
-                    }
-                } catch (error) {
-                    console.log('error', error)
-                    this.$message.warning({ showClose: true, message: error });
-                }
-            }
-            this.elProgress.display = false;
+        {
+          label: "体检日期",
+          prop: "medicalStartDate",
+          minWidth: 100,
+          align: "center",
         },
-
-        // 历次结果
-        btnCheckHistory() {
-            if (!this.dataTransOpts.tableS.patient_register.id) return;
-            this.dialogVisibleCheckHistory = true;
-            this.dataTransOpts.refresh.sumDoctor.M++    //刷新历次明细
-            this.dataTransOpts.plus.OccDisease++    //刷新图文报告
+        {
+          label: "单位名称",
+          prop: "org",
+          minWidth: 180,
+          align: "left",
+          showTooltip: true,
         },
-
-        exportZip() {
-            if (!this.$peisAPI) {
-                this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
-                return
-            }
-
-            if (!(this.dataTransOpts.tableM.patient_register && this.dataTransOpts.tableM.patient_register.length > 0)) {
-                this.$message.warning({ showClose: true, message: "请勾选择记录！" })
-                return
-            }
-            this.$peisAPI.openDirectoryDialog()
-                .then(res => {
-                    let lres = JSON.parse(res)
-                    if (lres.code > -1 && lres.data) {
-                        this.report2Zip(JSON.parse(lres.data).directory)
-                    }
-                    console.log('lres', lres)
-                })
-                .catch(err => {
-                    this.$message.error(err)
-                })
+        {
+          label: "部门名称",
+          prop: "dept",
+          minWidth: 150,
+          align: "left",
+          showTooltip: true,
         },
-        async report2Zip(path) {
-            this.elProgress.display = true;
-            this.elProgress.percentage = 0;
-
-            let token = window.sessionStorage.getItem('token');
-            let toOutShell = {
-                localPath: path,
-                token,
-                patientRegisterId: ""
-            };
-
-            for (let i = 0; i < this.dataTransOpts.tableM.patient_register.length; i++) {
-
-                let e = this.dataTransOpts.tableM.patient_register[i];
-                this.elProgress.percentage = Math.floor(((i + 1) * 100) / this.dataTransOpts.tableM.patient_register.length);
-
-                // 导出pdf
-                try {
-                    toOutShell.patientRegisterId = e.patientRegisterId
-                    let jsonToOutShell = JSON.stringify(toOutShell)
-                    console.log('toOutShell', jsonToOutShell)
-                    let res = await this.$peisAPI.exportDcmZip(jsonToOutShell)
-                    if (JSON.parse(res).code < 0) {
-                        console.log('this.$peisAPI.exportDcmZip err', res)
-                    }
-                } catch (error) {
-                    console.log('error', error)
-                    this.$message.warning({ showClose: true, message: error });
-                }
-            }
-            this.elProgress.display = false;
+        { label: "姓名", prop: "patientName", minWidth: 60, align: "center" },
+        { label: "性别", prop: "sexName", minWidth: 60, align: "center" },
+        { label: "年龄", prop: "age", minWidth: 60, align: "center" },
+        { label: "民族", prop: "nationName", minWidth: 70, align: "center" },
+        { label: "身份证号", prop: "idNo", minWidth: 160, align: "center" },
+        {
+          label: "条码号",
+          prop: "patientRegisterNo",
+          minWidth: 110,
+          align: "center",
         },
-
-        // 导入结果
-        btnImportResult(checkType) {
-            if (!this.dataTransOpts.tableS.patient_register.id) {
-                this.$message.warning({ showClose: true, message: "请先选择记录！" })
-                return
-            }
-
-            let patientRegisterId = this.dataTransOpts.tableS.patient_register.id
-            let url = '/api/app/ImportLisResult/ImportResultByPatientRegisterId'
-            switch (checkType) {
-                case 'pacs':
-                    url = '/api/app/ImportPacsResult/ImportResultByPatientRegisterId'
-                    postapi(url, { patientRegisterId })
-                        .then(res => {
-                            if (res.code > -1) {
-                                return postapi('/api/app/ImportElectrocardiogramResult/ImportElectrocardiogramResultByPatientRegisterId', { patientRegisterId })
-                            }
-                        })
-                        .then(res => {
-                            if (res && res.code > -1) {
-                                this.$message.success({ showClose: true, message: '导入成功！' })
-                            }
-                        })
-                    break;
-                default:
-                    postapi(url, { patientRegisterId }).then(res => {
-                        if (res.code > -1) {
-                            this.$message.success({ showClose: true, message: '导入成功！' })
-                        }
-                    })
-                    break;
-            }
-
-
+        { label: "档案号", prop: "patientNo", minWidth: 80, align: "center" },
+        { label: "次数", prop: "medicalTimes", minWidth: 60, align: "center" },
+        { label: "备注", prop: "remark", minWidth: 150, align: "left" },
+        {
+          label: "分组/套餐",
+          prop: "groupPack",
+          minWidth: 150,
+          align: "center",
         },
-
-        //领取体检报告（提交）
-        btnGetReportOk() {
-            postapi('/api/app/PatientRegister/BatchUpdatePatientRegisterReportReceive', this.receiveReport)
-                .then(res => {
-                    if (res.code > -1) {
-                        this.$message.success({ showClose: true, message: '操作成功！' })
-                        let reportReceiveDate = moment(new Date()).format('yyyy-MM-DD HH:mm:ss')
-                        let lfind = -1
-                        this.receiveReport.patientRegisterIds.forEach(patientRegisterId => {
-                            lfind = arrayExistObj(this.patientRegister.prList, 'patientRegisterId', patientRegisterId)
-                            if (lfind > -1) {
-                                this.patientRegister.prList[lfind].isReceiveReport = this.receiveReport.isReceiveReport
-                                this.patientRegister.prList[lfind].reportReceiveName = this.receiveReport.reportReceiveName
-                                this.patientRegister.prList[lfind].reportReceiveDate = reportReceiveDate
-                            }
-                        });
-                        this.dialogGetReport = false
-                    }
-                })
+        {
+          label: "手机",
+          prop: "mobileTelephone",
+          minWidth: 130,
+          align: "center",
         },
-
-        //领取体检报告(按钮)
-        btnGetReport(isReceiveReport) {
-            //console.log('this.dataTransOpts.tableS.patient_register.id',this.dataTransOpts.tableS.patient_register.id,this.dataTransOpts.tableM.patient_register)
-            let rd = []
-            if (this.dataTransOpts.tableM.patient_register && this.dataTransOpts.tableM.patient_register.length > 0) {
-                rd = rd.concat(this.dataTransOpts.tableM.patient_register)
-            }
-            if (rd.length == 0) {
-                if (this.dataTransOpts.tableS.patient_register.id) rd.push({ patientRegisterId: this.dataTransOpts.tableS.patient_register.id })
-            }
-            if (rd.length == 0) {
-                this.$message.warning({ showClose: true, message: "请先勾选或选择记录（有勾选人员时，仅操作勾选的记录）！" })
-                return
-            }
-            let lfind = arrayExistObj(this.patientRegister.prList, 'patientRegisterId', rd[0].patientRegisterId)
-            if (lfind > -1) {
-                this.receiveReport.reportReceiveName = this.patientRegister.prList[lfind].patientName
-            }
-
-            this.receiveReport.patientRegisterIds = []
-            this.receiveReport.isReceiveReport = isReceiveReport
-            rd.forEach(e => {
-                this.receiveReport.patientRegisterIds.push(e.patientRegisterId)
-            });
-            //
-            // {
-            //     "patientRegisterIds": [
-            //         "3fa85f64-5717-4562-b3fc-2c963f66afa6"
-            //     ],
-            //     "isReceiveReport": "string",
-            //     "reportReceiveName": "string"
-            // }
-
-            this.dialogGetReport = true
+        { label: "电话", prop: "telephone", minWidth: 130, align: "center" },
+        { label: "出生日期", prop: "birthDate", minWidth: 90, align: "center" },
+        {
+          label: "婚姻",
+          prop: "maritalStatusName",
+          minWidth: 70,
+          align: "center",
         },
-
-        //上传报告
-        async btnUpReport() {
-            if (!this.$peisAPI) {
-                this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
-                return
-            }
-
-            if (this.dataTransOpts.tableM.patient_register && this.dataTransOpts.tableM.patient_register.length > 0) {
-                this.elProgress.display = true;
-                this.elProgress.percentage = 0;
-
-                let ReportCode = '0005';
-                let token = window.sessionStorage.getItem('token');
-                let user = window.sessionStorage.getItem('user');
-                let toOutShell = {
-                    ReportCode, token,
-                    isBuildImage: 'N',
-                    IsUploadPdf: 'N',
-                    preViewCanPrint: 'Y',
-                    BusinessCode: '',
-                    Parameters: [
-                        { Name: 'printer', Value: user },
-                        { Name: 'LTS', Value: 'Y' }, //Y、N   N只看不能打印
-                        { Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" },    //报告首页主图
-                        { Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" },  //报告页眉图片
-                        { Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" },  //报告页脚图片
-                        { Name: "orgSign", Value: "pic/orgSign.png" },       // 体检章 
-                        { Name: 'picExtOne', Value: 'pic/hisLog.jpg' },      // 院徽
-                        { Name: 'picExtTwo', Value: 'pic/orgSignCom.png' },  // 单位公章
-                        { Name: 'resultSign', Value: 'pic/resultSign.png' }, // 结果章，如：职业病（本次体检未发现职业性异常）
-                        { Name: 'picExtThree', Value: 'pic/peisQrCode.jpg' },  // 公众号二维码
-                        { Name: 'picExtFour', Value: 'pic/peisQrCodeMini.jpg' },  // 小程序二维码
-                    ],
-                    IsHealthReport: 'Y'
-                };
-
-                for (let i = 0; i < this.dataTransOpts.tableM.patient_register.length; i++) {
-
-                    let e = this.dataTransOpts.tableM.patient_register[i];
-                    this.elProgress.percentage = Math.floor(((i + 1) * 100) / this.dataTransOpts.tableM.patient_register.length);
-
-                    // 调上传接口
-                    try {
-                        if (e.completeFlag == '3') {
-                            toOutShell.BusinessCode = e.patientRegisterId
-                            toOutShell.customerOrgName = e.customerOrgName || ''  // 增加单位名称参数
-                            toOutShell.departmentName = e.departmentName || ''
-                            let jsonToOutShell = JSON.stringify(toOutShell)
-                            console.log('toOutShell', jsonToOutShell)
-                            let res = await this.$peisAPI.upLoadReportPdf(jsonToOutShell)
-                            if (JSON.parse(res).code < 0) {
-                                this.$message.error({ showClose: true, message: res.message });
-                                console.log('$peisAPI.upLoadReportPdf err', res)
-                            } else {
-                                // 上传成功 ，更新上传传状态
-                                e.isUpload = 'Y'
-                                // console.log('btnUpReport success', JSON.parse(res))
-                            }
-                        } else {
-                            let patientRegisterId = e.patientRegisterId
-                            let res2 = await postapi('/api/app/TransToWebPeis/TransPatientRegisterByPatientRegisterId', { patientRegisterId })
-                            if (res2.code == -1) {
-                                console.log('TransToWebPeis err', res2)
-                            } else {
-                                // 上传成功 ，更新备单状态
-                                e.isUploadAppoint = 'Y'
-                            }
-                        }
-
-                    } catch (error) {
-                        console.log('error', error)
-                        this.$message.warning({ showClose: true, message: error });
-                    }
-                }
-                this.elProgress.display = false;
-
-            } else {
-                this.$message.warning({ showClose: true, message: "请勾选择记录！" })
-                return
-            }
+        {
+          label: "地址",
+          prop: "address",
+          minWidth: 400,
+          align: "left",
+          showTooltip: true,
+        },
+        {
+          label: "体检卡号",
+          prop: "medicalCardNo",
+          minWidth: 90,
+          align: "center",
+        },
+        { label: "工卡号", prop: "jobCardNo", minWidth: 90, align: "center" },
+        {
+          label: "体检类别",
+          prop: "medicalTypeName",
+          minWidth: 100,
+          align: "center",
+        },
+        {
+          label: "人员类别",
+          prop: "personnelTypeName",
+          minWidth: 100,
+          align: "center",
         },
+        { label: "职务", prop: "jobPost", minWidth: 70, align: "center" },
+        { label: "职称", prop: "jobTitle", minWidth: 70, align: "center" },
+        { label: "介绍人", prop: "salesman", minWidth: 80, align: "center" },
+        { label: "VIP", prop: "isVip", minWidth: 80, align: "center" },
+        {
+          label: "总检医生",
+          prop: "summaryDoctorName",
+          minWidth: 90,
+          align: "center",
+        },
+        {
+          label: "总检日期",
+          prop: "summaryDate",
+          minWidth: 140,
+          align: "center",
+        },
+        {
+          label: "审核医生",
+          prop: "auditDoctorName",
+          minWidth: 90,
+          align: "center",
+        },
+        {
+          label: "审核日期",
+          prop: "auditDate",
+          minWidth: 140,
+          align: "center",
+        },
+        {
+          label: "登记人",
+          prop: "registerName",
+          minWidth: 80,
+          align: "center",
+        },
+        {
+          label: "登记时间",
+          prop: "registerDate",
+          minWidth: 140,
+          align: "center",
+        },
+        {
+          label: "打印人",
+          prop: "reportPrintName",
+          minWidth: 70,
+          align: "center",
+        },
+        {
+          label: "领取人",
+          prop: "reportReceiveName",
+          minWidth: 70,
+          align: "center",
+        },
+        {
+          label: "领取时间",
+          prop: "reportReceiveDate",
+          minWidth: 140,
+          align: "center",
+        },
+        { label: "锁住", prop: "isLock", minWidth: 60, align: "center" },
+        {
+          label: "预约备单",
+          prop: "isUploadAppoint",
+          minWidth: 90,
+          align: "center",
+        },
+        { label: "上传", prop: "isUpload", minWidth: 60, align: "center" },
+        // { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
+        // { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },
+        // { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
+        // { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
+      ],
+    };
+  },
+
+  created() {},
+
+  //挂载完成
+  mounted() {
+    this.dataTransOpts.tableS.patient_register.id = "";
+    // this.getPatientRegister(this.dataTransOpts.tableS.patient_register.patientRegisterNo)
+  },
+
+  computed: {
+    ...mapState([
+      "dict",
+      "elProgress",
+      "dataTransOpts",
+      "patientRegister",
+      "doctorCheck",
+      "sumDoctorCheck",
+      "report",
+    ]),
+  },
+
+  methods: {
+    dddw,
+    btnQuery() {
+      this.patientRegister.query.times++;
+    },
+    exportJpg() {
+      if (!this.$peisAPI) {
+        this.$message.info({
+          showClose: true,
+          message: "此功能，需要在壳客户端才可运行！",
+        });
+        return;
+      }
+
+      if (
+        !(
+          this.dataTransOpts.tableM.patient_register &&
+          this.dataTransOpts.tableM.patient_register.length > 0
+        )
+      ) {
+        this.$message.warning({ showClose: true, message: "请勾选择记录！" });
+        return;
+      }
+      this.$peisAPI
+        .openDirectoryDialog()
+        .then((res) => {
+          let lres = JSON.parse(res);
+          if (lres.code > -1 && lres.data) {
+            this.report2Jpg(JSON.parse(lres.data).directory);
+          }
+          console.log("lres", lres);
+        })
+        .catch((err) => {
+          this.$message.error(err);
+        });
+    },
+    async report2Jpg(path) {
+      this.elProgress.display = true;
+      this.elProgress.percentage = 0;
+
+      let token = window.sessionStorage.getItem("token");
+      let toOutShell = {
+        localPath: path,
+        token,
+        patientRegisterId: "",
+      };
+
+      for (
+        let i = 0;
+        i < this.dataTransOpts.tableM.patient_register.length;
+        i++
+      ) {
+        let e = this.dataTransOpts.tableM.patient_register[i];
+        this.elProgress.percentage = Math.floor(
+          ((i + 1) * 100) / this.dataTransOpts.tableM.patient_register.length
+        );
+
+        // 导出pdf
+        try {
+          toOutShell.patientRegisterId = e.patientRegisterId;
+          let jsonToOutShell = JSON.stringify(toOutShell);
+          console.log("toOutShell", jsonToOutShell);
+          let res = await this.$peisAPI.exportDcmjpg(jsonToOutShell);
+          if (JSON.parse(res).code < 0) {
+            console.log("this.$peisAPI.exportDcmjpg err", res);
+          }
+        } catch (error) {
+          console.log("error", error);
+          this.$message.warning({ showClose: true, message: error });
+        }
+      }
+      this.elProgress.display = false;
+    },
 
+    // 历次结果
+    btnCheckHistory() {
+      if (!this.dataTransOpts.tableS.patient_register.id) return;
+      this.dialogVisibleCheckHistory = true;
+      this.dataTransOpts.refresh.sumDoctor.M++; //刷新历次明细
+      this.dataTransOpts.plus.OccDisease++; //刷新图文报告
+    },
 
+    exportZip() {
+      if (!this.$peisAPI) {
+        this.$message.info({
+          showClose: true,
+          message: "此功能，需要在壳客户端才可运行！",
+        });
+        return;
+      }
+
+      if (
+        !(
+          this.dataTransOpts.tableM.patient_register &&
+          this.dataTransOpts.tableM.patient_register.length > 0
+        )
+      ) {
+        this.$message.warning({ showClose: true, message: "请勾选择记录！" });
+        return;
+      }
+      this.$peisAPI
+        .openDirectoryDialog()
+        .then((res) => {
+          let lres = JSON.parse(res);
+          if (lres.code > -1 && lres.data) {
+            this.report2Zip(JSON.parse(lres.data).directory);
+          }
+          console.log("lres", lres);
+        })
+        .catch((err) => {
+          this.$message.error(err);
+        });
+    },
+    async report2Zip(path) {
+      this.elProgress.display = true;
+      this.elProgress.percentage = 0;
+
+      let token = window.sessionStorage.getItem("token");
+      let toOutShell = {
+        localPath: path,
+        token,
+        patientRegisterId: "",
+      };
+
+      for (
+        let i = 0;
+        i < this.dataTransOpts.tableM.patient_register.length;
+        i++
+      ) {
+        let e = this.dataTransOpts.tableM.patient_register[i];
+        this.elProgress.percentage = Math.floor(
+          ((i + 1) * 100) / this.dataTransOpts.tableM.patient_register.length
+        );
+
+        // 导出pdf
+        try {
+          toOutShell.patientRegisterId = e.patientRegisterId;
+          let jsonToOutShell = JSON.stringify(toOutShell);
+          console.log("toOutShell", jsonToOutShell);
+          let res = await this.$peisAPI.exportDcmZip(jsonToOutShell);
+          if (JSON.parse(res).code < 0) {
+            console.log("this.$peisAPI.exportDcmZip err", res);
+          }
+        } catch (error) {
+          console.log("error", error);
+          this.$message.warning({ showClose: true, message: error });
+        }
+      }
+      this.elProgress.display = false;
+    },
 
-        //体检报告打印（预览）
-        async btnReport(isPreview) {
-            if (!this.$peisAPI) {
-                this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
-                return
+    // 导入结果
+    btnImportResult(checkType) {
+      if (!this.dataTransOpts.tableS.patient_register.id) {
+        this.$message.warning({ showClose: true, message: "请先选择记录！" });
+        return;
+      }
+
+      let patientRegisterId = this.dataTransOpts.tableS.patient_register.id;
+      let url = "/api/app/ImportLisResult/ImportResultByPatientRegisterId";
+      switch (checkType) {
+        case "pacs":
+          url = "/api/app/ImportPacsResult/ImportResultByPatientRegisterId";
+          postapi(url, { patientRegisterId })
+            .then((res) => {
+              if (res.code > -1) {
+                return postapi(
+                  "/api/app/ImportElectrocardiogramResult/ImportElectrocardiogramResultByPatientRegisterId",
+                  { patientRegisterId }
+                );
+              }
+            })
+            .then((res) => {
+              if (res && res.code > -1) {
+                this.$message.success({
+                  showClose: true,
+                  message: "导入成功！",
+                });
+              }
+            });
+          break;
+        default:
+          postapi(url, { patientRegisterId }).then((res) => {
+            if (res.code > -1) {
+              this.$message.success({ showClose: true, message: "导入成功！" });
             }
+          });
+          break;
+      }
+    },
 
-            ///3a0c990e-5756-2dc0-19d5-69a617fe4048 isPatientOccupationalDisease patientRegisterId  completeFlag  isAudit
-            let rds = this.getChoosedRds()
-            if (rds.length == 0) return
-
-
-            let ReportCode = '0005';
-            if (rds[0].isPatientOccupationalDisease == 'Y') ReportCode = '0006'
-
-            let token = window.sessionStorage.getItem('token');
-            let user = window.sessionStorage.getItem('user');
-            let toOutShell = {
-                ReportCode, token,
-                isBuildImage: 'N',
-                IsUploadPdf: 'N',
-                preViewCanPrint: 'Y',
-                BusinessCode: rds[0].patientRegisterId,
-                Parameters: [
-                    { Name: 'printer', Value: user },
-                    { Name: 'LTS', Value: 'Y' }, //Y、N   N只看不能打印                    
-                    { Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" },    //报告首页主图
-                    { Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" },  //报告页眉图片
-                    { Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" },  //报告页脚图片
-                    { Name: "orgSign", Value: rds[0].isPatientOccupationalDisease == 'Y' ? "pic/orgSignOcc.png" : "pic/orgSign.png" },       // 体检章 
-                    { Name: 'picExtOne', Value: 'pic/hisLog.jpg' },      // 院徽
-                    { Name: 'picExtTwo', Value: 'pic/orgSignCom.png' },  // 单位公章
-                    { Name: 'resultSign', Value: 'pic/resultSign.png' }, // 结果章，如：职业病（本次体检未发现职业性异常）
-                    { Name: 'picExtThree', Value: 'pic/peisQrCode.jpg' },  // 公众号二维码
-                    { Name: 'picExtFour', Value: 'pic/peisQrCodeMini.jpg' },  // 小程序二维码
-                    { Name: 'picExtFive', Value: 'pic/sumDoctorSign.jpg' },  // 总检签名（部份企业固定才用）
-                    { Name: 'picExtSix', Value: 'pic/auditDoctorSign.jpg' },  // 总检审核签名（部份企业固定才用）
-                ],
-            };
-
-            // 总检审核后才能打印
-            if (rds[0].completeFlag != '3') toOutShell.preViewCanPrint = 'N'
-            if (toOutShell.preViewCanPrint == 'Y' && rds[0].isAudit == 'N') {
-                let sysParmId = "medical_report_print_after_summary_check_is_audit"
-                let sysParam = await postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId })
-                if (sysParam.data.toUpperCase() == 'Y') toOutShell.preViewCanPrint = 'N'
+    //领取体检报告（提交）
+    btnGetReportOk() {
+      postapi(
+        "/api/app/PatientRegister/BatchUpdatePatientRegisterReportReceive",
+        this.receiveReport
+      ).then((res) => {
+        if (res.code > -1) {
+          this.$message.success({ showClose: true, message: "操作成功！" });
+          let reportReceiveDate = moment(new Date()).format(
+            "yyyy-MM-DD HH:mm:ss"
+          );
+          let lfind = -1;
+          this.receiveReport.patientRegisterIds.forEach((patientRegisterId) => {
+            lfind = arrayExistObj(
+              this.patientRegister.prList,
+              "patientRegisterId",
+              patientRegisterId
+            );
+            if (lfind > -1) {
+              this.patientRegister.prList[lfind].isReceiveReport =
+                this.receiveReport.isReceiveReport;
+              this.patientRegister.prList[lfind].reportReceiveName =
+                this.receiveReport.reportReceiveName;
+              this.patientRegister.prList[lfind].reportReceiveDate =
+                reportReceiveDate;
             }
+          });
+          this.dialogGetReport = false;
+        }
+      });
+    },
 
-            // let res = await postapi(`/api/app/printreport/getpeisreport?PatientRegisterId=${this.patientRegister.patientRegisterId}`)
-            // toOutShell.ReportTable = res.data
-            let JSONtoOutShell = JSON.stringify(toOutShell)
-            console.log('$peisAPI.printPre', JSONtoOutShell)
-            if (isPreview) {
-                this.$peisAPI.printPre(JSONtoOutShell)
-                    .then(res => {
-                        if (JSON.parse(res).code < 0) {
-                            this.$message.warning({ showClose: true, message: JSON.parse(res).message });
-                        }
-                    })
-                    .catch((err) => {
-                        console.log('预览体检报告错误', err)
-                        this.$message.warning({ showClose: true, message: `${err}` });
-                    });
-
-            } else {
-                let lfind = -1
-                for (let i = 0; i < rds.length; i++) {
-                    let rd = rds[i];
-
-                    toOutShell.ReportCode = rd.isPatientOccupationalDisease == 'Y' ? '0006' : '0005'
-                    toOutShell.BusinessCode = rd.patientRegisterId
-                    if (rd.completeFlag != '3') toOutShell.preViewCanPrint = 'N'
-                    if (toOutShell.preViewCanPrint == 'Y' && rd.isAudit == 'N') {
-                        let sysParmId = "medical_report_print_after_summary_check_is_audit"
-                        let sysParam = await postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId })
-                        if (sysParam.data.toUpperCase() == 'Y') toOutShell.preViewCanPrint = 'N'
-                    }
-
-                    if (toOutShell.preViewCanPrint == 'N') {
-                        this.$message.warning({ showClose: true, message: '未总检或未审核，不可打印报告' })
-                        continue
-                    }
-                    JSONtoOutShell = JSON.stringify(toOutShell)
-                    try {
-                        let lres = await this.$peisAPI.print(JSONtoOutShell)
-                        if (JSON.parse(lres).code < 0) {
-                            this.$message.warning({ showClose: true, message: JSON.parse(lres).message });
-                        } else {
-                            postapi('/api/app/patientregister/updatepatientregisterreportprinttimesmany', [rd.patientRegisterId])
-                                .then(res => {
-                                    if (res.code > -1) {
-                                        lfind = arrayExistObj(this.patientRegister.prList, 'patientRegisterId', rd.patientRegisterId)
-                                        if (lfind > -1) this.patientRegister.prList[lfind].isReportPrint = 'Y'
-                                    }
-                                })
-                        }
-                    } catch (error) {
-                        this.$message.warning({ showClose: true, message: error });
-                    }
-                }
-            }
+    //领取体检报告(按钮)
+    btnGetReport(isReceiveReport) {
+      //console.log('this.dataTransOpts.tableS.patient_register.id',this.dataTransOpts.tableS.patient_register.id,this.dataTransOpts.tableM.patient_register)
+      let rd = [];
+      if (
+        this.dataTransOpts.tableM.patient_register &&
+        this.dataTransOpts.tableM.patient_register.length > 0
+      ) {
+        rd = rd.concat(this.dataTransOpts.tableM.patient_register);
+      }
+      if (rd.length == 0) {
+        if (this.dataTransOpts.tableS.patient_register.id)
+          rd.push({
+            patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
+          });
+      }
+      if (rd.length == 0) {
+        this.$message.warning({
+          showClose: true,
+          message: "请先勾选或选择记录（有勾选人员时，仅操作勾选的记录）！",
+        });
+        return;
+      }
+      let lfind = arrayExistObj(
+        this.patientRegister.prList,
+        "patientRegisterId",
+        rd[0].patientRegisterId
+      );
+      if (lfind > -1) {
+        this.receiveReport.reportReceiveName =
+          this.patientRegister.prList[lfind].patientName;
+      }
+
+      this.receiveReport.patientRegisterIds = [];
+      this.receiveReport.isReceiveReport = isReceiveReport;
+      rd.forEach((e) => {
+        this.receiveReport.patientRegisterIds.push(e.patientRegisterId);
+      });
+      //
+      // {
+      //     "patientRegisterIds": [
+      //         "3fa85f64-5717-4562-b3fc-2c963f66afa6"
+      //     ],
+      //     "isReceiveReport": "string",
+      //     "reportReceiveName": "string"
+      // }
+
+      this.dialogGetReport = true;
+    },
 
-        },
+    //上传报告
+    async btnUpReport() {
+      if (!this.$peisAPI) {
+        this.$message.info({
+          showClose: true,
+          message: "此功能，需要在壳客户端才可运行！",
+        });
+        return;
+      }
+
+      if (
+        this.dataTransOpts.tableM.patient_register &&
+        this.dataTransOpts.tableM.patient_register.length > 0
+      ) {
+        this.elProgress.display = true;
+        this.elProgress.percentage = 0;
+
+        let ReportCode = "0005";
+        let token = window.sessionStorage.getItem("token");
+        let user = window.sessionStorage.getItem("user");
+        let toOutShell = {
+          ReportCode,
+          token,
+          isBuildImage: "N",
+          IsUploadPdf: "N",
+          preViewCanPrint: "Y",
+          BusinessCode: "",
+          Parameters: [
+            { Name: "printer", Value: user },
+            { Name: "LTS", Value: "Y" }, //Y、N   N只看不能打印
+            { Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" }, //报告首页主图
+            { Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" }, //报告页眉图片
+            { Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" }, //报告页脚图片
+            { Name: "orgSign", Value: "pic/orgSign.png" }, // 体检章
+            { Name: "picExtOne", Value: "pic/hisLog.jpg" }, // 院徽
+            { Name: "picExtTwo", Value: "pic/orgSignCom.png" }, // 单位公章
+            { Name: "resultSign", Value: "pic/resultSign.png" }, // 结果章，如：职业病（本次体检未发现职业性异常）
+            { Name: "picExtThree", Value: "pic/peisQrCode.jpg" }, // 公众号二维码
+            { Name: "picExtFour", Value: "pic/peisQrCodeMini.jpg" }, // 小程序二维码
+          ],
+          IsHealthReport: "Y",
+        };
 
-        // 导出 pdf 报告
-        btnReportExport() {
-            if (!this.$peisAPI) {
-                this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
-                return
+        for (
+          let i = 0;
+          i < this.dataTransOpts.tableM.patient_register.length;
+          i++
+        ) {
+          let e = this.dataTransOpts.tableM.patient_register[i];
+          this.elProgress.percentage = Math.floor(
+            ((i + 1) * 100) / this.dataTransOpts.tableM.patient_register.length
+          );
+
+          // 调上传接口
+          try {
+            if (e.completeFlag == "3") {
+              toOutShell.BusinessCode = e.patientRegisterId;
+              toOutShell.customerOrgName = e.customerOrgName || ""; // 增加单位名称参数
+              toOutShell.departmentName = e.departmentName || "";
+              let jsonToOutShell = JSON.stringify(toOutShell);
+              console.log("toOutShell", jsonToOutShell);
+              let res = await this.$peisAPI.upLoadReportPdf(jsonToOutShell);
+              if (JSON.parse(res).code < 0) {
+                this.$message.error({ showClose: true, message: res.message });
+                console.log("$peisAPI.upLoadReportPdf err", res);
+              } else {
+                // 上传成功 ，更新上传传状态
+                e.isUpload = "Y";
+                // console.log('btnUpReport success', JSON.parse(res))
+              }
+            } else {
+              let patientRegisterId = e.patientRegisterId;
+              let res2 = await postapi(
+                "/api/app/TransToWebPeis/TransPatientRegisterByPatientRegisterId",
+                { patientRegisterId }
+              );
+              if (res2.code == -1) {
+                console.log("TransToWebPeis err", res2);
+              } else {
+                // 上传成功 ，更新备单状态
+                e.isUploadAppoint = "Y";
+              }
             }
+          } catch (error) {
+            console.log("error", error);
+            this.$message.warning({ showClose: true, message: error });
+          }
+        }
+        this.elProgress.display = false;
+      } else {
+        this.$message.warning({ showClose: true, message: "请勾选择记录！" });
+        return;
+      }
+    },
 
-            if (!(this.dataTransOpts.tableM.patient_register && this.dataTransOpts.tableM.patient_register.length > 0)) {
-                this.$message.warning({ showClose: true, message: "请勾选择记录！" })
-                return
+    //体检报告打印（预览）
+    async btnReport(isPreview) {
+      if (!this.$peisAPI) {
+        this.$message.info({
+          showClose: true,
+          message: "此功能，需要在壳客户端才可运行！",
+        });
+        return;
+      }
+
+      ///3a0c990e-5756-2dc0-19d5-69a617fe4048 isPatientOccupationalDisease patientRegisterId  completeFlag  isAudit
+      let rds = this.getChoosedRds();
+      if (rds.length == 0) return;
+
+      let ReportCode = "0005";
+      if (rds[0].isPatientOccupationalDisease == "Y") ReportCode = "0006";
+
+      let token = window.sessionStorage.getItem("token");
+      let user = window.sessionStorage.getItem("user");
+      let toOutShell = {
+        ReportCode,
+        token,
+        isBuildImage: "N",
+        IsUploadPdf: "N",
+        preViewCanPrint: "Y",
+        BusinessCode: rds[0].patientRegisterId,
+        Parameters: [
+          { Name: "printer", Value: user },
+          { Name: "LTS", Value: "Y" }, //Y、N   N只看不能打印
+          { Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" }, //报告首页主图
+          { Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" }, //报告页眉图片
+          { Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" }, //报告页脚图片
+          {
+            Name: "orgSign",
+            Value:
+              rds[0].isPatientOccupationalDisease == "Y"
+                ? "pic/orgSignOcc.png"
+                : "pic/orgSign.png",
+          }, // 体检章
+          { Name: "picExtOne", Value: "pic/hisLog.jpg" }, // 院徽
+          { Name: "picExtTwo", Value: "pic/orgSignCom.png" }, // 单位公章
+          { Name: "resultSign", Value: "pic/resultSign.png" }, // 结果章，如：职业病（本次体检未发现职业性异常）
+          { Name: "picExtThree", Value: "pic/peisQrCode.jpg" }, // 公众号二维码
+          { Name: "picExtFour", Value: "pic/peisQrCodeMini.jpg" }, // 小程序二维码
+          { Name: "picExtFive", Value: "pic/sumDoctorSign.jpg" }, // 总检签名（部份企业固定才用）
+          { Name: "picExtSix", Value: "pic/auditDoctorSign.jpg" }, // 总检审核签名（部份企业固定才用）
+        ],
+      };
+
+      // 总检审核后才能打印
+      if (rds[0].completeFlag != "3") toOutShell.preViewCanPrint = "N";
+      if (toOutShell.preViewCanPrint == "Y" && rds[0].isAudit == "N") {
+        let sysParmId = "medical_report_print_after_summary_check_is_audit";
+        let sysParam = await postapi(
+          "/api/app/SysParmValue/GetSysParmValueBySysParmId",
+          { sysParmId }
+        );
+        if (sysParam.data.toUpperCase() == "Y")
+          toOutShell.preViewCanPrint = "N";
+      }
+
+      // let res = await postapi(`/api/app/printreport/getpeisreport?PatientRegisterId=${this.patientRegister.patientRegisterId}`)
+      // toOutShell.ReportTable = res.data
+      let JSONtoOutShell = JSON.stringify(toOutShell);
+      console.log("$peisAPI.printPre", JSONtoOutShell);
+      if (isPreview) {
+        this.$peisAPI
+          .printPre(JSONtoOutShell)
+          .then((res) => {
+            if (JSON.parse(res).code < 0) {
+              this.$message.warning({
+                showClose: true,
+                message: JSON.parse(res).message,
+              });
             }
-
-            this.$peisAPI.openDirectoryDialog()
-                .then(res => {
-                    let lres = JSON.parse(res)
-                    if (lres.code > -1 && lres.data) {
-                        this.report2pdf(JSON.parse(lres.data).directory)
-                    }
-                    console.log('lres', lres)
-                })
-                .catch(err => {
-                    this.$message.error(err)
-                })
-        },
-
-        async report2pdf(path) {
-            if (this.dataTransOpts.tableM.patient_register.length < 1) return
-            this.elProgress.display = true;
-            this.elProgress.percentage = 0;
-
-            let ReportCode = '0005';
-            if (this.dataTransOpts.tableM.patient_register[0].isPatientOccupationalDisease == 'Y') ReportCode = '0006'
-            let token = window.sessionStorage.getItem('token');
-            let user = window.sessionStorage.getItem('user');
-            let toOutShell = {
-                ReportCode, token,
-                isBuildImage: 'N',
-                IsUploadPdf: 'N',
-                preViewCanPrint: 'Y',
-                BusinessCode: '',
-                Parameters: [
-                    { Name: 'printer', Value: user },
-                    { Name: 'LTS', Value: 'Y' }, //Y、N   N只看不能打印
-                    { Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" },    //报告首页主图
-                    { Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" },  //报告页眉图片
-                    { Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" },  //报告页脚图片
-                    { Name: "orgSign", Value: this.dataTransOpts.tableM.patient_register[0].isPatientOccupationalDisease == 'Y' ? "pic/orgSignOcc.png" : "pic/orgSign.png" },       // 体检章 
-                    { Name: 'picExtOne', Value: 'pic/hisLog.jpg' },      // 院徽
-                    { Name: 'picExtTwo', Value: 'pic/orgSignCom.png' },  // 单位公章
-                    { Name: 'resultSign', Value: 'pic/resultSign.png' }, // 结果章，如：职业病（本次体检未发现职业性异常）
-                    { Name: 'picExtThree', Value: 'pic/peisQrCode.jpg' },  // 公众号二维码
-                    { Name: 'picExtFour', Value: 'pic/peisQrCodeMini.jpg' },  // 小程序二维码
-
-                ],
-                IsHealthReport: 'Y'
-            };
-
-            for (let i = 0; i < this.dataTransOpts.tableM.patient_register.length; i++) {
-
-                let e = this.dataTransOpts.tableM.patient_register[i];
-                this.elProgress.percentage = Math.floor(((i + 1) * 100) / this.dataTransOpts.tableM.patient_register.length);
-
-                // 导出pdf
-                try {
-                    if (e.completeFlag == '3') {
-                        toOutShell.BusinessCode = e.patientRegisterId
-                        toOutShell.ExportDirectory = `${path}\\${e.patientName}_${e.patientRegisterNo}.pdf`
-                        toOutShell.customerOrgName = e.customerOrgName || ''  // 增加单位名称参数
-                        toOutShell.departmentName = e.departmentName || ''
-
-                        let jsonToOutShell = JSON.stringify(toOutShell)
-                        console.log('toOutShell', jsonToOutShell)
-                        let res = await this.$peisAPI.exportToPdfPre(jsonToOutShell)
-                        if (JSON.parse(res).code < 0) {
-                            console.log('this.$peisAPI.exportToPdfPre err', res)
-                        }
-                    }
-
-                } catch (error) {
-                    console.log('error', error)
-                    this.$message.warning({ showClose: true, message: error });
+          })
+          .catch((err) => {
+            console.log("预览体检报告错误", err);
+            this.$message.warning({ showClose: true, message: `${err}` });
+          });
+      } else {
+        let lfind = -1;
+        for (let i = 0; i < rds.length; i++) {
+          let rd = rds[i];
+
+          toOutShell.ReportCode =
+            rd.isPatientOccupationalDisease == "Y" ? "0006" : "0005";
+          toOutShell.BusinessCode = rd.patientRegisterId;
+          if (rd.completeFlag != "3") toOutShell.preViewCanPrint = "N";
+          if (toOutShell.preViewCanPrint == "Y" && rd.isAudit == "N") {
+            let sysParmId = "medical_report_print_after_summary_check_is_audit";
+            let sysParam = await postapi(
+              "/api/app/SysParmValue/GetSysParmValueBySysParmId",
+              { sysParmId }
+            );
+            if (sysParam.data.toUpperCase() == "Y")
+              toOutShell.preViewCanPrint = "N";
+          }
+
+          if (toOutShell.preViewCanPrint == "N") {
+            this.$message.warning({
+              showClose: true,
+              message: "未总检或未审核，不可打印报告",
+            });
+            continue;
+          }
+          JSONtoOutShell = JSON.stringify(toOutShell);
+          try {
+            let lres = await this.$peisAPI.print(JSONtoOutShell);
+            if (JSON.parse(lres).code < 0) {
+              this.$message.warning({
+                showClose: true,
+                message: JSON.parse(lres).message,
+              });
+            } else {
+              postapi(
+                "/api/app/patientregister/updatepatientregisterreportprinttimesmany",
+                [rd.patientRegisterId]
+              ).then((res) => {
+                if (res.code > -1) {
+                  lfind = arrayExistObj(
+                    this.patientRegister.prList,
+                    "patientRegisterId",
+                    rd.patientRegisterId
+                  );
+                  if (lfind > -1)
+                    this.patientRegister.prList[lfind].isReportPrint = "Y";
                 }
+              });
             }
-            this.elProgress.display = false;
-        },
+          } catch (error) {
+            this.$message.warning({ showClose: true, message: error });
+          }
+        }
+      }
+    },
 
-        //按条码号查个人数据
-        getPatientRegister(patientRegisterNo) {
-            if (!patientRegisterNo) return
-            postapi('/api/app/patientregister/GetAlreadyRegisterPatientRegisterByNo', { patientRegisterNo })
-                .then((res) => {
-                    if (res.code > -1) {
-                        this.dataTransOpts.tableS.patient_register = deepCopy(res.data)
-                    }
-                })
-        },
+    // 导出 pdf 报告
+    btnReportExport() {
+      if (!this.$peisAPI) {
+        this.$message.info({
+          showClose: true,
+          message: "此功能，需要在壳客户端才可运行！",
+        });
+        return;
+      }
+
+      if (
+        !(
+          this.dataTransOpts.tableM.patient_register &&
+          this.dataTransOpts.tableM.patient_register.length > 0
+        )
+      ) {
+        this.$message.warning({ showClose: true, message: "请勾选择记录！" });
+        return;
+      }
+
+      this.$peisAPI
+        .openDirectoryDialog()
+        .then((res) => {
+          let lres = JSON.parse(res);
+          if (lres.code > -1 && lres.data) {
+            this.report2pdf(JSON.parse(lres.data).directory);
+          }
+          console.log("lres", lres);
+        })
+        .catch((err) => {
+          this.$message.error(err);
+        });
+    },
 
-        // 通用判断 是否有选中或勾选记录（同时有选中与勾选记录时，以勾选记录为主）
-        getChoosedRds() {
-            let rd = []
-            if (this.dataTransOpts.tableM.patient_register && this.dataTransOpts.tableM.patient_register.length > 0) {
-                rd = rd.concat(this.dataTransOpts.tableM.patient_register)
+    async report2pdf(path) {
+      if (this.dataTransOpts.tableM.patient_register.length < 1) return;
+      this.elProgress.display = true;
+      this.elProgress.percentage = 0;
+
+      let ReportCode = "0005";
+      if (
+        this.dataTransOpts.tableM.patient_register[0]
+          .isPatientOccupationalDisease == "Y"
+      )
+        ReportCode = "0006";
+      let token = window.sessionStorage.getItem("token");
+      let user = window.sessionStorage.getItem("user");
+      let toOutShell = {
+        ReportCode,
+        token,
+        isBuildImage: "N",
+        IsUploadPdf: "N",
+        preViewCanPrint: "Y",
+        BusinessCode: "",
+        Parameters: [
+          { Name: "printer", Value: user },
+          { Name: "LTS", Value: "Y" }, //Y、N   N只看不能打印
+          { Name: "firstPage", Value: "pic/peisReportFirstPage.jpg" }, //报告首页主图
+          { Name: "pageHeader", Value: "pic/peisReportPageHeader.jpg" }, //报告页眉图片
+          { Name: "pageFooter", Value: "pic/peisReportPageFooter.jpg" }, //报告页脚图片
+          {
+            Name: "orgSign",
+            Value:
+              this.dataTransOpts.tableM.patient_register[0]
+                .isPatientOccupationalDisease == "Y"
+                ? "pic/orgSignOcc.png"
+                : "pic/orgSign.png",
+          }, // 体检章
+          { Name: "picExtOne", Value: "pic/hisLog.jpg" }, // 院徽
+          { Name: "picExtTwo", Value: "pic/orgSignCom.png" }, // 单位公章
+          { Name: "resultSign", Value: "pic/resultSign.png" }, // 结果章，如：职业病（本次体检未发现职业性异常）
+          { Name: "picExtThree", Value: "pic/peisQrCode.jpg" }, // 公众号二维码
+          { Name: "picExtFour", Value: "pic/peisQrCodeMini.jpg" }, // 小程序二维码
+        ],
+        IsHealthReport: "Y",
+      };
+
+      for (
+        let i = 0;
+        i < this.dataTransOpts.tableM.patient_register.length;
+        i++
+      ) {
+        let e = this.dataTransOpts.tableM.patient_register[i];
+        this.elProgress.percentage = Math.floor(
+          ((i + 1) * 100) / this.dataTransOpts.tableM.patient_register.length
+        );
+
+        // 导出pdf
+        try {
+          if (e.completeFlag == "3") {
+            toOutShell.BusinessCode = e.patientRegisterId;
+            toOutShell.ExportDirectory = `${path}\\${e.patientName}_${e.patientRegisterNo}.pdf`;
+            toOutShell.customerOrgName = e.customerOrgName || ""; // 增加单位名称参数
+            toOutShell.departmentName = e.departmentName || "";
+
+            let jsonToOutShell = JSON.stringify(toOutShell);
+            console.log("toOutShell", jsonToOutShell);
+            let res = await this.$peisAPI.exportToPdfPre(jsonToOutShell);
+            if (JSON.parse(res).code < 0) {
+              console.log("this.$peisAPI.exportToPdfPre err", res);
             }
-            if (rd.length == 0) {
-                if (this.dataTransOpts.tableS.patient_register.id) {
-                    let lfind = arrayExistObj(this.patientRegister.prList, 'patientRegisterId', this.dataTransOpts.tableS.patient_register.id)
-                    if (lfind > -1) rd.push(this.patientRegister.prList.slice(lfind, Number(lfind) + 1))
-                }
-            }
-            if (rd.length == 0) {
-                this.$message.warning({ showClose: true, message: "请先勾选或选择记录（有勾选人员时，仅操作勾选的记录）！" })
-            }
-            return rd
-        },
-
-        //通用导出
-        btnExport(elId) {
-            this.dragCol.forEach((e) => {
-                switch (e.prop) {
-                    case 'medicalStartDate':  // 避免科学计数或数据转换
-                    case 'birthDate':
-                    case 'summaryDate':
-                    case 'auditDate':
-                    case 'registerDate':
-                    case 'reportReceiveDate':
-                    case 'idNo':
-                    case 'patientRegisterNo':
-                    case 'patientNo':
-                    case 'mobileTelephone':
-                    case 'telephone':
-                        this.jsonFields[e.label] = {
-                            field: e.prop,
-                            callback: value => {
-                                return value ? `\u200C${value}` : '';
-                            }
-                        }
-                        break;
-
-                    default:
-                        this.jsonFields[e.label] = e.prop;
-                        break;
-                }
-
-            });
-
-            let tableDatas = deepCopy(this.patientRegister.prList)
-            tableDatas.forEach((e, index) => {
-                e.sn = index + 1
-                if (e.completeFlag) e.completeFlag = e.isAudit == "Y" ? "已审核" : dddw(this.dict.completeFlag, "id", e.completeFlag, "displayName")
-                e.isReportPrint = e.isReportPrint == 'Y' ? '√' : ''
-                if (e.isLock) e.isLock = e.isLock == 'Y' ? '√' : ''
-                if (e.isVip) e.isVip = e.isVip == 'Y' ? '√' : ''
-                if (e.isUpload) e.isUpload = e.isUpload == 'Y' ? '√' : ''
-                if (e.isUploadAppoint) e.isUploadAppoint = e.isUploadAppoint == 'Y' ? '√' : ''
-                if (e.isReceiveReport) e.isReceiveReport = e.isReceiveReport == 'Y' ? '√' : ''
-
-
-                //if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
-                // if (e.patientRegisterNo) e.patientRegisterNo = " " + e.patientRegisterNo
-                // if (e.patientNo) e.patientNo = " " + e.patientNo
-                // if (e.idNo) e.idNo = " " + e.idNo
-                // if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
-                //     e.packGroup = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
-                // } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
-                //     e.packGroup = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
-                // }
-                //if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName")
-                // if (e.idNo) e.idNo = " " + e.idNo
-                // if (e.mobileTelephone) e.mobileTelephone = " " + e.mobileTelephone
-                // if (e.telephone) e.telephone = " " + e.telephone
-
-                if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD")
-
-
-
-            })
-            this.xlsName = '人员列表' + moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
-            return tableDatas;
+          }
+        } catch (error) {
+          console.log("error", error);
+          this.$message.warning({ showClose: true, message: error });
+        }
+      }
+      this.elProgress.display = false;
+    },
 
-        },
+    //按条码号查个人数据
+    getPatientRegister(patientRegisterNo) {
+      if (!patientRegisterNo) return;
+      postapi(
+        "/api/app/patientregister/GetAlreadyRegisterPatientRegisterByNo",
+        { patientRegisterNo }
+      ).then((res) => {
+        if (res.code > -1) {
+          this.dataTransOpts.tableS.patient_register = deepCopy(res.data);
+        }
+      });
+    },
 
+    // 通用判断 是否有选中或勾选记录（同时有选中与勾选记录时，以勾选记录为主）
+    getChoosedRds() {
+      let rd = [];
+      if (
+        this.dataTransOpts.tableM.patient_register &&
+        this.dataTransOpts.tableM.patient_register.length > 0
+      ) {
+        rd = rd.concat(this.dataTransOpts.tableM.patient_register);
+      }
+      if (rd.length == 0) {
+        if (this.dataTransOpts.tableS.patient_register.id) {
+          let lfind = arrayExistObj(
+            this.patientRegister.prList,
+            "patientRegisterId",
+            this.dataTransOpts.tableS.patient_register.id
+          );
+          if (lfind > -1)
+            rd.push(
+              this.patientRegister.prList.slice(lfind, Number(lfind) + 1)
+            );
+        }
+      }
+      if (rd.length == 0) {
+        this.$message.warning({
+          showClose: true,
+          message: "请先勾选或选择记录（有勾选人员时，仅操作勾选的记录）！",
+        });
+      }
+      return rd;
     },
 
-    //监听事件()
-    watch: {
-        // 强制刷新人员登记信息
-        "dataTransOpts.refresh.patient_register.S": {
-            // immediate:true,
-            handler(newVal, oldVal) {
-                console.log(`watch 组合项目列表 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.patientRegisterNo}`);
-                this.getPatientRegister(this.dataTransOpts.tableS.patient_register.patientRegisterNo)
-                // this.dataTransOpts.refresh.register_check.M++
-            }
-        },
+    //通用导出
+    btnExport(elId) {
+      require.ensure([], () => {
+        const tHeader = [];
+        const filterVal = [];
+        this.dragCol.forEach((e) => {
+          tHeader.push(e.label);
+          filterVal.push(e.prop);
+        });
+        const list = this.patientRegister.prList.map((row, index) => {
+          const newRow = { ...row }; // 创建副本，避免修改原数据
+          // 使用对象映射优化数据转换
+          newRow.sn = index + 1;
+          if (newRow.completeFlag)
+            newRow.completeFlag =
+              newRow.isAudit == "Y"
+                ? "已审核"
+                : dddw(
+                    this.dict.completeFlag,
+                    "id",
+                    newRow.completeFlag,
+                    "displayName"
+                  );
+          newRow.isReportPrint = newRow.isReportPrint == "Y" ? "√" : "";
+          if (newRow.idNo) newRow.idNo = "\u200C"+newRow.idNo;
+          if (newRow.patientRegisterNo)
+            newRow.patientRegisterNo = "\u200C" + newRow.patientRegisterNo;
+          if (newRow.patientNo) newRow.patientNo = "\u200C" + newRow.patientNo;
+          if (newRow.isLock) newRow.isLock = newRow.isLock == "Y" ? "√" : "";
+          if (newRow.isVip) newRow.isVip = newRow.isVip == "Y" ? "√" : "";
+          if (newRow.isUpload)
+            newRow.isUpload = newRow.isUpload == "Y" ? "√" : "";
+          if (newRow.isUploadAppoint)
+            newRow.isUploadAppoint = newRow.isUploadAppoint == "Y" ? "√" : "";
+          if (newRow.isReceiveReport)
+            newRow.isReceiveReport = newRow.isReceiveReport == "Y" ? "√" : "";
+
+          //if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
+          // if (e.patientRegisterNo) e.patientRegisterNo = " " + e.patientRegisterNo
+          // if (e.patientNo) e.patientNo = " " + e.patientNo
+          // if (e.idNo) e.idNo = " " + e.idNo
+          // if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
+          //     e.packGroup = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
+          // } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
+          //     e.packGroup = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
+          // }
+          //if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName")
+          // if (e.idNo) e.idNo = " " + e.idNo
+          // if (e.mobileTelephone) e.mobileTelephone = " " + e.mobileTelephone
+          // if (e.telephone) e.telephone = " " + e.telephone
+
+          if (newRow.birthDate)
+            newRow.birthDate = moment(newRow.birthDate).format("yyyy-MM-DD");
+
+          return newRow;
+        });
+        const data = list.map((v) => filterVal.map((j) => v[j]));
+        exportJsonToExcel(
+          tHeader,
+          data,
+          "人员列表" + moment(new Date()).format("yyyyMMDDHHmmss")
+        ); //"列表excel"  是下载后的表名 可修改
+      });
+
+      // this.dragCol.forEach((e) => {
+      //     switch (e.prop) {
+      //         case 'medicalStartDate':  // 避免科学计数或数据转换
+      //         case 'birthDate':
+      //         case 'summaryDate':
+      //         case 'auditDate':
+      //         case 'registerDate':
+      //         case 'reportReceiveDate':
+      //         case 'idNo':
+      //         case 'patientRegisterNo':
+      //         case 'patientNo':
+      //         case 'mobileTelephone':
+      //         case 'telephone':
+      //             this.jsonFields[e.label] = {
+      //                 field: e.prop,
+      //                 callback: value => {
+      //                     return value ? `\u200C${value}` : '';
+      //                 }
+      //             }
+      //             break;
+
+      //         default:
+      //             this.jsonFields[e.label] = e.prop;
+      //             break;
+      //     }
+
+      // });
+
+      // let tableDatas = deepCopy(this.patientRegister.prList)
+      // tableDatas.forEach((e, index) => {
+      //     e.sn = index + 1
+      //     if (e.completeFlag) e.completeFlag = e.isAudit == "Y" ? "已审核" : dddw(this.dict.completeFlag, "id", e.completeFlag, "displayName")
+      //     e.isReportPrint = e.isReportPrint == 'Y' ? '√' : ''
+      //     if (e.isLock) e.isLock = e.isLock == 'Y' ? '√' : ''
+      //     if (e.isVip) e.isVip = e.isVip == 'Y' ? '√' : ''
+      //     if (e.isUpload) e.isUpload = e.isUpload == 'Y' ? '√' : ''
+      //     if (e.isUploadAppoint) e.isUploadAppoint = e.isUploadAppoint == 'Y' ? '√' : ''
+      //     if (e.isReceiveReport) e.isReceiveReport = e.isReceiveReport == 'Y' ? '√' : ''
+
+      //     //if (e.sexId) e.sexId = dddw(this.dict.sex, "id", e.sexId, "displayName")
+      //     // if (e.patientRegisterNo) e.patientRegisterNo = " " + e.patientRegisterNo
+      //     // if (e.patientNo) e.patientNo = " " + e.patientNo
+      //     // if (e.idNo) e.idNo = " " + e.idNo
+      //     // if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId === this.dict.personOrgId) {
+      //     //     e.packGroup = e.medicalPackageName  // dddw(this.dict.medicalPackage, "id", e.medicalPackageId, "displayName")
+      //     // } else if (e.medicalPackageId !== this.dict.personOrgId && e.customerOrgId !== this.dict.personOrgId) {
+      //     //     e.packGroup = e.customerOrgGroupName // dddw(this.dict.customerOrgGroupAll, "id", e.customerOrgGroupId, "displayName")
+      //     // }
+      //     //if (e.nationId) e.nationId = dddw(this.dict.nation, "id", e.nationId, "displayName")
+      //     // if (e.idNo) e.idNo = " " + e.idNo
+      //     // if (e.mobileTelephone) e.mobileTelephone = " " + e.mobileTelephone
+      //     // if (e.telephone) e.telephone = " " + e.telephone
+
+      //     if (e.birthDate) e.birthDate = moment(e.birthDate).format("yyyy-MM-DD")
+
+      // })
+      // this.xlsName = '人员列表' + moment(new Date()).format('yyyyMMDDHHmmss') + '.xls'
+      // return tableDatas;
+    },
+  },
+
+  //监听事件()
+  watch: {
+    // 强制刷新人员登记信息
+    "dataTransOpts.refresh.patient_register.S": {
+      // immediate:true,
+      handler(newVal, oldVal) {
+        console.log(
+          `watch 组合项目列表 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.patientRegisterNo}`
+        );
+        this.getPatientRegister(
+          this.dataTransOpts.tableS.patient_register.patientRegisterNo
+        );
+        // this.dataTransOpts.refresh.register_check.M++
+      },
     },
+  },
 };
 </script>
 <style scoped>
-@import '../../assets/css/global_button.css';
+@import "../../assets/css/global_button.css";
 
 .listBtn {
-    margin-top: 10px;
-    /*
+  margin-top: 10px;
+  /*
     text-align: center;
     */
 }
 
 .btnClass {
-    width: 100px;
+  width: 100px;
 }
 
 .spanClass {
-    font-size: 14px;
-    padding: 5px 2px 0 0;
+  font-size: 14px;
+  padding: 5px 2px 0 0;
 }
 </style>
\ No newline at end of file
diff --git a/src/utlis/Export2Excel.js b/src/utlis/Export2Excel.js
index 861f545..0805734 100644
--- a/src/utlis/Export2Excel.js
+++ b/src/utlis/Export2Excel.js
@@ -192,4 +192,22 @@ export function exportToExcel(idSelector, fileName, isNew, list, titleNum = 1) {
         }
     }
     return wbout
+}
+export function exportJsonToExcel(th, jsonData, defaultTitle) {
+
+    /* original data */
+    var data = jsonData;
+    data.unshift(th);
+    var ws_name = "SheetJS";
+    var wb = new Workbook()
+    var ws = sheet_from_array_of_arrays(data);
+    console.log(wb,ws)
+
+
+    /* add worksheet to workbook */
+    wb.SheetNames.push(ws_name);
+    wb.Sheets[ws_name] = ws;
+    var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
+    var title = defaultTitle || '列表'
+    saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), title + ".xlsx")
 }
\ No newline at end of file