diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index a9b8bee..3619a44 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -2,40 +2,74 @@
   <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" size="small" row-key="id"
-            @selection-change="handleSelectionChange" @row-contextmenu="onCellRightClick" ref="info" id="info"
-            :row-class-name="handleRowClassName" use-virtual :row-height="30" @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
-                ">
+          <u-table
+            :data="tableData"
+            border
+            :height="
+              window.pageHeight < 600
+                ? 248
+                : Math.floor(((window.pageHeight - 250) * 2) / 3)
+            "
+            highlight-current-row
+            @row-click="rowClick"
+            size="small"
+            row-key="id"
+            @selection-change="handleSelectionChange"
+            @row-contextmenu="onCellRightClick"
+            ref="info"
+            id="info"
+            :row-class-name="handleRowClassName"
+            use-virtual
+            :row-height="30"
+            @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,26 +83,37 @@
                     }}
                   </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'
-                  ">
+                  <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'
+                    "
+                  >
                     {{ 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
@@ -86,10 +131,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
+                      "
+                    >
                       {{
                         dddw(
                           dict.medicalPackage,
@@ -99,10 +146,12 @@
                         )
                       }}
                     </div>
-                    <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
+                      "
+                    >
                       {{
                         dddw(
                           dict.customerOrgGroupAll,
@@ -127,8 +176,8 @@
                     {{
                       scope.row[dragCol[index].prop]
                         ? moment(scope.row[dragCol[index].prop]).format(
-                          "yyyy-MM-DD"
-                        )
+                            "yyyy-MM-DD"
+                          )
                         : ""
                     }}
                   </div>
@@ -168,7 +217,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]
                     }}
@@ -210,10 +259,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>
@@ -226,23 +277,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">
@@ -258,29 +339,74 @@
         <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> -->
         </div>
         <div class="listBtn">
-          <el-button type="" class="commonbutton" @click="btnDragColDesign">设计列排序</el-button>
+          <el-button type="" class="commonbutton" @click="btnDragColDesign"
+            >设计列排序</el-button
+          >
         </div>
         <!-- elProgress.display  dialogWin.LocalConfig
         <div class="listBtn"> 
@@ -291,25 +417,40 @@
       <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="`修改信息--${upBaseInfo.label}`" :visible.sync="upBaseInfo.visble" width="400" :show-close="false"
-        :append-to-body="true" :close-on-click-modal="false">
+      <el-dialog
+        :title="`修改信息--${upBaseInfo.label}`"
+        :visible.sync="upBaseInfo.visble"
+        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">{{
@@ -320,90 +461,183 @@
           <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" />
+      <el-dialog
+        title="批量调整检查项目医生"
+        :visible.sync="dialogWin.PatientRegisterEditDoctorBatch"
+        width="610px"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
+        <PatientRegisterEditDoctorBatch
+          :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>
     </div>
@@ -441,7 +675,7 @@ import PatientRegisterEditDoctorBatch from "./PatientRegisterEditDoctorBatch.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';
 export default {
   components: {
     PatientRegisterEdit,
@@ -455,6 +689,8 @@ export default {
     ImportOrgData,
     Queue,
     DownloadExcel: JsonExcel,
+    UTable,
+    UTableColumn
   },
   data() {
     return {
@@ -620,7 +856,7 @@ export default {
         },
       },
       LocalConfigInit: {},
-      tableName: ""//导出人员列表表名
+      tableName:""//导出人员列表表名
     };
   },
 
@@ -1300,7 +1536,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)
@@ -1463,17 +1699,8 @@ export default {
                 this.tableData = [];
               }
             }
-            if (curLoad.length > 0) {
-              if (this.patientRegister.query.isSeries == "Y") {
-                // 已存在原来的数据中，则不再加载
-                let lfind = arrayExistObj(this.tableData, 'id', curLoad[0].id)
-                if (lfind == -1) this.tableData = this.tableData.concat(curLoad)
-
-              } else {
-                this.tableData = this.tableData.concat(curLoad);
-              }
-            }
 
+            this.tableData = this.tableData.concat(curLoad);
             // else {
             //   // 懒加载 ,原数据集不用清空
             //   oldCount = this.tableData.length
@@ -1496,7 +1723,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;
@@ -2121,7 +2348,8 @@ export default {
         this.jsonFields[e.label] = e.prop;
       });
       let tableDatas=deepCopy(this.tableData)
-      tableDatas.forEach(e=>{
+      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)e.guidePrintTimes=e.guidePrintTimes > 0?'打印':''
         if(e.isLock)e.isLock=e.isLock=='Y'?'锁住':''
@@ -2131,23 +2359,23 @@ export default {
         }else if(e.medicalPackageId !== this.dict.personOrgId &&e.customerOrgId !== this.dict.personOrgId){
           e.groupPack=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.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" ? "是" : "否"
+        if(e.nationId)e.nationId=dddw(this.dict.nation,"id",e.nationId,"displayName")
+        if(e.idNo)e.idNo=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'
+      this.tableName='人员登记列表'+moment(new Date()).format('yyyyMMDDHHmmss')+'.xls'
       return tableDatas;
       // const columns = this.$refs.info.getColumns(); // 获取列信息
       // const data = this.$refs.info.getData(); // 获取数据
diff --git a/src/main.js b/src/main.js
index e6af2c6..27f0171 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,20 +3,17 @@ import App from "./App.vue";
 import router from "./router";
 import store from "./store";
 import ElementUI from "element-ui";
-import "element-ui/lib/theme-chalk/index.css";
 import axios from "axios";
 import JsonExcel from "vue-json-excel"; //vue全局导入导出excel
 import Print from "vue-print-nb";
 import Meta from 'vue-meta'
 import Contextmenu from 'vue-contextmenujs' //'vue-contextmenu'
 import "./assets/css/global_font.css";
-import UmyUi from 'umy-ui'
-//import 'umy-ui/lib/theme-chalk/index.css'; // 引入样式
-
+import 'umy-ui/lib/theme-chalk/index.css'; // 引入样式
+import "element-ui/lib/theme-chalk/index.css";
 
 
 
-Vue.use(UmyUi);
 Vue.use(Contextmenu);
 Vue.use(Meta);
 Vue.use(ElementUI);