diff --git a/src/views/fee-settings/cardRegister.vue b/src/views/fee-settings/cardRegister.vue
index 0527234..387b8c5 100644
--- a/src/views/fee-settings/cardRegister.vue
+++ b/src/views/fee-settings/cardRegister.vue
@@ -8,7 +8,8 @@
             <span class="contenttitleBold">会员卡管理</span>
           </div>
         </div>
-        <div style="
+        <div
+          style="
             background-color: #fff;
             padding: 15px;
             border-radius: 8px;
@@ -17,20 +18,52 @@
             margin-bottom: 10px;
             height: 80px;
             margin-top: 7px;
-          ">
+          "
+        >
           <div class="query">
-            <el-select v-model="query.dateType" placeholder="请选择" filterable size="small" style="width: 80px">
+            <el-select
+              v-model="query.dateType"
+              placeholder="请选择"
+              filterable
+              size="small"
+              style="width: 80px"
+            >
               <el-option label="登记日期" value="createDate" />
               <el-option label="有效日期" value="expiryDate" />
             </el-select>
-            <el-date-picker v-model="query.startDate" style="width:90px;" value-format="yyyy-MM-dd" type="date" placeholder="起始日期" size="small" />
+            <el-date-picker
+              v-model="query.startDate"
+              style="width: 90px"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="起始日期"
+              size="small"
+            />
             <span>--</span>
-            <el-date-picker v-model="query.endDate" style="width:90px;" value-format="yyyy-MM-dd" type="date" placeholder="截止日期" size="small" />
+            <el-date-picker
+              v-model="query.endDate"
+              style="width: 90px"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="截止日期"
+              size="small"
+            />
           </div>
           <div class="query">
             <span class="spanClass">卡类别</span>
-            <el-select v-model="query.cardTypeId" placeholder="请选择" clearable size="small" style="width:70px;">
-              <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
+            <el-select
+              v-model="query.cardTypeId"
+              placeholder="请选择"
+              clearable
+              size="small"
+              style="width: 70px"
+            >
+              <el-option
+                v-for="item in dict.cardType"
+                :key="item.id"
+                :label="item.displayName"
+                :value="item.id"
+              />
             </el-select>
           </div>
           <div class="query">
@@ -41,39 +74,81 @@
                 <el-radio :label="0">停用</el-radio>
               </el-radio-group>
               -->
-            <el-select v-model="query.isActive" placeholder="请选择" style="width:60px;" clearable size="small">
+            <el-select
+              v-model="query.isActive"
+              placeholder="请选择"
+              style="width: 60px"
+              clearable
+              size="small"
+            >
               <el-option label="启用" value="Y" />
               <el-option label="停用" value="N" />
             </el-select>
           </div>
           <div class="query">
             <span class="spanClass">卡号</span>
-            <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 100px" />
+            <el-input
+              placeholder="卡号"
+              v-model="query.cardNo"
+              size="small"
+              clearable
+              style="width: 100px"
+            />
           </div>
           <div class="query">
             <span class="spanClass">卡主姓名</span>
-            <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 70px" />
+            <el-input
+              placeholder="卡主姓名"
+              v-model="query.customerName"
+              size="small"
+              clearable
+              style="width: 70px"
+            />
           </div>
           <div class="query">
             <span class="spanClass">身份证号</span>
-            <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 160px" />
+            <el-input
+              placeholder="身份证号"
+              v-model="query.idNo"
+              size="small"
+              clearable
+              style="width: 160px"
+            />
           </div>
           <div class="query">
             <span class="spanClass">电话</span>
-            <el-input placeholder="手机号/电话" v-model="query.mobileTelephone" size="small" clearable
-              style="width: 120px" />
+            <el-input
+              placeholder="手机号/电话"
+              v-model="query.mobileTelephone"
+              size="small"
+              clearable
+              style="width: 120px"
+            />
           </div>
         </div>
-        <div style="
+        <div
+          style="
             background-color: #fff;
             padding: 15px;
             border-radius: 8px;
             margin-bottom: 10px;
-          ">
-          <el-table :data="dataList" ref="info" id="info" width="100%" :height="window.pageHeight < 600
-            ? 210
-            : Math.floor((window.pageHeight - 340) / 2)
-            " row-key="id" highlight-current-row @selection-change="handleSelectionChange" @row-click="rowClick">
+          "
+        >
+          <el-table
+            :data="dataList"
+            ref="info"
+            id="info"
+            width="100%"
+            :height="
+              window.pageHeight < 600
+                ? 210
+                : Math.floor((window.pageHeight - 340) / 2)
+            "
+            row-key="id"
+            highlight-current-row
+            @selection-change="handleSelectionChange"
+            @row-click="rowClick"
+          >
             <el-table-column prop="cardTypeId" label="卡类别" width="70">
               <template slot-scope="scope">
                 <div>
@@ -101,7 +176,11 @@
             <el-table-column prop="customerName" label="卡主姓名" width="80" />
             <el-table-column prop="idNo" label="卡主身份证号" width="200" />
             <el-table-column prop="telephone" label="卡主电话" width="150" />
-            <el-table-column prop="mobileTelephone" label="卡主手机号" width="150" />
+            <el-table-column
+              prop="mobileTelephone"
+              label="卡主手机号"
+              width="150"
+            />
             <el-table-column prop="isActive" label="启用" width="80">
               <template slot-scope="scope">
                 <div>{{ scope.row.isActive == "N" ? "否" : "是" }}</div>
@@ -116,8 +195,16 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="lastModifierName" label="修改人员" width="100" />
-            <el-table-column prop="lastModificationTime" label="修改日期" width="150">
+            <el-table-column
+              prop="lastModifierName"
+              label="修改人员"
+              width="100"
+            />
+            <el-table-column
+              prop="lastModificationTime"
+              label="修改日期"
+              width="150"
+            >
               <template slot-scope="scope">
                 <div v-if="scope.row.lastModificationTime">
                   {{
@@ -130,18 +217,29 @@
           <div style="display: flex; justify-content: space-between">
             <div></div>
             <div>
-              <span style="font-size: 12px">共：{{ loadOpts.totalCount }} 条记录，当前显示：{{
-                dataList.length
-              }}
-                条。</span>
+              <span style="font-size: 12px"
+                >共：{{ loadOpts.totalCount }} 条记录，当前显示：{{
+                  dataList.length
+                }}
+                条。</span
+              >
             </div>
           </div>
         </div>
         <div style="background-color: #fff; padding: 15px; border-radius: 8px">
-          <el-table :data="cardBillList" width="100%" :height="window.pageHeight < 600
-            ? 210
-            : Math.floor((window.pageHeight - 300) / 2)
-            " row-key="id" highlight-current-row ref="cardBillList" @selection-change="handleSelectionChange">
+          <el-table
+            :data="cardBillList"
+            width="100%"
+            :height="
+              window.pageHeight < 600
+                ? 210
+                : Math.floor((window.pageHeight - 300) / 2)
+            "
+            row-key="id"
+            highlight-current-row
+            ref="cardBillList"
+            @selection-change="handleSelectionChange"
+          >
             <el-table-column prop="payModeId" label="支付方式">
               <template slot-scope="scope">
                 <div>
@@ -170,7 +268,11 @@
               </template>
             </el-table-column>
             <el-table-column prop="lastModifierName" label="修改人员" />
-            <el-table-column prop="lastModificationTime" label="修改日期" width="150">
+            <el-table-column
+              prop="lastModificationTime"
+              label="修改日期"
+              width="150"
+            >
               <template slot-scope="scope">
                 <div v-if="scope.row.lastModificationTime">
                   {{
@@ -182,16 +284,18 @@
           </el-table>
         </div>
       </div>
-      <div style="
+      <div
+        style="
           margin-left: 10px;
           margin-top: 50px;
           position: absolute;
           top: 0;
           right: 0;
-        ">
+        "
+      >
         <div>
-            <el-button class="commonbutton" @click="btnQuery">查询</el-button>
-          </div>
+          <el-button class="commonbutton" @click="btnQuery">查询</el-button>
+        </div>
         <div style="margin-top: 10px">
           <el-button class="commonbutton" @click="add">新增</el-button>
         </div>
@@ -215,25 +319,60 @@
         </div>
         <div style="margin-top: 10px">
           <a :underline="false" href="/files/单位体检人员名单导入模板.xlsx">
-            <el-button class="commonbutton" style="font-size: 12px;">导入建卡模板</el-button>
+            <el-button class="commonbutton" style="font-size: 12px"
+              >导入建卡模板</el-button
+            >
           </a>
         </div>
         <div style="margin-top: 10px">
-          <el-button class="commonbutton" @click="btnImportCard">导入建卡</el-button>
+          <el-button class="commonbutton" @click="btnImportCard"
+            >导入建卡</el-button
+          >
+        </div>
+        <div style="margin-top: 10px">
+          <download-excel
+            :fields="jsonFields"
+            :fetch="btnExport"
+            type="xls"
+            :name="tableName"
+          >
+            <el-button class="commonbutton">导出excel</el-button>
+          </download-excel>
         </div>
       </div>
     </div>
 
     <!--弹窗-->
     <div>
-      <el-dialog :title="form.id ? '编辑' : '新增'" :visible.sync="dialogVisible" width="820px" :close-on-click-modal="false">
-        <el-form ref="form" :model="form" label-width="100px" :rules="rules" size="small">
+      <el-dialog
+        :title="form.id ? '编辑' : '新增'"
+        :visible.sync="dialogVisible"
+        width="820px"
+        :close-on-click-modal="false"
+      >
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="100px"
+          :rules="rules"
+          size="small"
+        >
           <el-row>
             <el-col :span="8">
               <el-form-item label="卡类别" prop="cardTypeId">
-                <el-select v-model="form.cardTypeId" placeholder="请选择" filterable @change="category"
-                  :disabled="form.id ? true : false">
-                  <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
+                <el-select
+                  v-model="form.cardTypeId"
+                  placeholder="请选择"
+                  filterable
+                  @change="category"
+                  :disabled="form.id ? true : false"
+                >
+                  <el-option
+                    v-for="item in dict.cardType"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -251,8 +390,13 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="有效期限" prop="expiryDate">
-                <el-date-picker v-model="form.expiryDate" type="date" placeholder="有效期限" size="small"
-                  :style="'width: ' + Math.floor((820 - 340) / 3) + 'px'" />
+                <el-date-picker
+                  v-model="form.expiryDate"
+                  type="date"
+                  placeholder="有效期限"
+                  size="small"
+                  :style="'width: ' + Math.floor((820 - 340) / 3) + 'px'"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -287,8 +431,18 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="体检中心" prop="medicalCenterId">
-                <el-select v-model="form.medicalCenterId" placeholder="请选择" filterable :disabled="peisid ? true : false">
-                  <el-option v-for="item in dict.organization" :key="item.id" :label="item.displayName" :value="item.id">
+                <el-select
+                  v-model="form.medicalCenterId"
+                  placeholder="请选择"
+                  filterable
+                  :disabled="peisid ? true : false"
+                >
+                  <el-option
+                    v-for="item in dict.organization"
+                    :key="item.id"
+                    :label="item.displayName"
+                    :value="item.id"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -308,10 +462,14 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="创建时间" label-width="80px">
-                <el-input :value="form.creationTime
-                  ? moment(form.creationTime).format('yyyy-MM-DD')
-                  : ''
-                  " disabled></el-input>
+                <el-input
+                  :value="
+                    form.creationTime
+                      ? moment(form.creationTime).format('yyyy-MM-DD')
+                      : ''
+                  "
+                  disabled
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -321,21 +479,43 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="修改时间" label-width="80px">
-                <el-input :value="form.lastModificationTime
-                  ? moment(form.lastModificationTime).format('yyyy-MM-DD')
-                  : ''
-                  " disabled></el-input>
+                <el-input
+                  :value="
+                    form.lastModificationTime
+                      ? moment(form.lastModificationTime).format('yyyy-MM-DD')
+                      : ''
+                  "
+                  disabled
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false" class="difference">取消</el-button>
-          <el-button type="primary" @click="onSubmit('form')" class="commonbutton">确定</el-button>
+          <el-button @click="dialogVisible = false" class="difference"
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            @click="onSubmit('form')"
+            class="commonbutton"
+            >确定</el-button
+          >
         </div>
       </el-dialog>
-      <el-dialog title="会员卡充值" :visible.sync="dialogOrder" width="400px" :close-on-click-modal="false">
-        <el-form ref="order" :model="order" label-width="100px" :rules="orderRules" size="small">
+      <el-dialog
+        title="会员卡充值"
+        :visible.sync="dialogOrder"
+        width="400px"
+        :close-on-click-modal="false"
+      >
+        <el-form
+          ref="order"
+          :model="order"
+          label-width="100px"
+          :rules="orderRules"
+          size="small"
+        >
           <el-col :span="24">
             <el-form-item label="会员卡号" prop="cardRegisterId">
               <el-input v-model="order.cardNo" disabled style="width: 200px" />
@@ -343,127 +523,274 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="充值方式" prop="payModeId">
-              <el-select v-model="order.payModeId" placeholder="请选择" filterable :disabled="order.id ? true : false"
-                style="width: 200px">
-                <el-option v-for="item in dict.payMode" :key="item.id" :label="item.displayName" :value="item.id" />
+              <el-select
+                v-model="order.payModeId"
+                placeholder="请选择"
+                filterable
+                :disabled="order.id ? true : false"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="item in dict.payMode"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="充值金额" prop="billMoney">
-              <el-input type="number" v-model="order.billMoney" :disabled="order.id ? true : false"
-                style="width: 200px" />
+              <el-input
+                type="number"
+                v-model="order.billMoney"
+                :disabled="order.id ? true : false"
+                style="width: 200px"
+              />
             </el-form-item>
           </el-col>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogOrder = false" class="difference">取消</el-button>
-          <el-button type="primary" @click="orderSubmit('order')" class="commonbutton">确定</el-button>
+          <el-button @click="dialogOrder = false" class="difference"
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            @click="orderSubmit('order')"
+            class="commonbutton"
+            >确定</el-button
+          >
         </div>
       </el-dialog>
-      <el-dialog title="会员卡退费" :visible.sync="refundOrder" width="400px" :close-on-click-modal="false">
-        <el-form ref="refundorder" :model="refundorder" label-width="100px" :rules="refundRules" size="small">
+      <el-dialog
+        title="会员卡退费"
+        :visible.sync="refundOrder"
+        width="400px"
+        :close-on-click-modal="false"
+      >
+        <el-form
+          ref="refundorder"
+          :model="refundorder"
+          label-width="100px"
+          :rules="refundRules"
+          size="small"
+        >
           <el-col :span="24">
             <el-form-item label="会员卡号" prop="cardRegisterId">
-              <el-input v-model="refundorder.cardNo" disabled style="width: 200px" />
+              <el-input
+                v-model="refundorder.cardNo"
+                disabled
+                style="width: 200px"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="退费方式" prop="payModeId">
-              <el-select v-model="refundorder.payModeId" placeholder="请选择" filterable
-                :disabled="refundorder.id ? true : false" style="width: 200px">
-                <el-option v-for="item in dict.payMode" :key="item.id" :label="item.displayName" :value="item.id" />
+              <el-select
+                v-model="refundorder.payModeId"
+                placeholder="请选择"
+                filterable
+                :disabled="refundorder.id ? true : false"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="item in dict.payMode"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="退费金额" prop="billMoney">
-              <el-input type="number" v-model="refundorder.billMoney" :disabled="refundorder.id ? true : false"
-                style="width: 200px" />
+              <el-input
+                type="number"
+                v-model="refundorder.billMoney"
+                :disabled="refundorder.id ? true : false"
+                style="width: 200px"
+              />
             </el-form-item>
           </el-col>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="refundOrder = false" class="difference">取消</el-button>
-          <el-button type="primary" @click="orderSubmit('refundorder')" class="commonbutton">确定</el-button>
+          <el-button @click="refundOrder = false" class="difference"
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            @click="orderSubmit('refundorder')"
+            class="commonbutton"
+            >确定</el-button
+          >
         </div>
       </el-dialog>
 
-      <el-dialog title="导入EXCEL注意事项" :visible.sync="dialogGroup.fileReadme" width="700px" :show-close="false"
-        :append-to-body="true" :close-on-click-modal="false">
-        <div style="height:400px;padding: 0 20px; ">
+      <el-dialog
+        title="导入EXCEL注意事项"
+        :visible.sync="dialogGroup.fileReadme"
+        width="700px"
+        :show-close="false"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
+        <div style="height: 400px; padding: 0 20px">
           <br />导入Excel时，Excel的格式必须符合一定规范，该格式的模板文件可通过下载模板获取。
           <br />注意事项如下:
           <br />
-          <div style="margin-left: 25px;">1、卡号、卡主不能为空，其余数据可根据实际情况选择是否填写。
+          <div style="margin-left: 25px">
+            1、卡号、卡主不能为空，其余数据可根据实际情况选择是否填写。
             <br />2、卡类别与本软件系统中的名称完全一致。
-            <br />3、折扣率填写错误（未填、0、负数或非有数字）时，则默认为 100 
+            <br />3、折扣率填写错误（未填、0、负数或非有数字）时，则默认为 100
             <br />4、Excel中标题列不能有单元格合并。
           </div>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button class="commonbutton" type="primary" @click="seq--">上一步</el-button>
-          <el-button class="commonbutton" type="primary" @click="seq++">下一步</el-button>
+          <el-button class="commonbutton" type="primary" @click="seq--"
+            >上一步</el-button
+          >
+          <el-button class="commonbutton" type="primary" @click="seq++"
+            >下一步</el-button
+          >
           <el-button class="commonbutton" @click="seq = -1">关闭</el-button>
         </span>
       </el-dialog>
 
-      <el-dialog title="选择文件" :visible.sync="dialogGroup.fileChoose" width="700px" :show-close="false"
-        :append-to-body="true" :close-on-click-modal="false">
-        <div style="height:400px;padding: 0 50px; ">
+      <el-dialog
+        title="选择文件"
+        :visible.sync="dialogGroup.fileChoose"
+        width="700px"
+        :show-close="false"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+      >
+        <div style="height: 400px; padding: 0 50px">
           <!-- webkitdirectory 选择文件属性， multiple 多选属性-->
-          <div><input id="fileNames" type="file" accept=".xlsx,.xls" @change="changeFileChoose" @focus="fileGetFocus" />
+          <div>
+            <input
+              id="fileNames"
+              type="file"
+              accept=".xlsx,.xls"
+              @change="changeFileChoose"
+              @focus="fileGetFocus"
+            />
           </div>
-          <div style="margin: 5px 70px;width:240px;">
-            <el-table :data="sheetNames" border ref="sheetNames" height="300" row-click="chooseSheetName"
-              highlight-current-row size="small">
-              <el-table-column prop="sheetName" label="Excel表单名" min-width="200" align="center" />
+          <div style="margin: 5px 70px; width: 240px">
+            <el-table
+              :data="sheetNames"
+              border
+              ref="sheetNames"
+              height="300"
+              row-click="chooseSheetName"
+              highlight-current-row
+              size="small"
+            >
+              <el-table-column
+                prop="sheetName"
+                label="Excel表单名"
+                min-width="200"
+                align="center"
+              />
             </el-table>
           </div>
-          <div style="display: flex;flex-wrap: wrap;">
-            <span style="margin-top: 6px;">标题行： 第</span>
-            <el-input type="number" v-model="readDataOpts.titleRow" size="small" style="width:60px;margin: 0 5px;" />
-            <span style="margin-top: 6px;">行</span>
+          <div style="display: flex; flex-wrap: wrap">
+            <span style="margin-top: 6px">标题行： 第</span>
+            <el-input
+              type="number"
+              v-model="readDataOpts.titleRow"
+              size="small"
+              style="width: 60px; margin: 0 5px"
+            />
+            <span style="margin-top: 6px">行</span>
           </div>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button class="commonbutton" type="primary" @click="seq--">上一步</el-button>
-          <el-button class="commonbutton" type="primary" @click="seq++">下一步</el-button>
+          <el-button class="commonbutton" type="primary" @click="seq--"
+            >上一步</el-button
+          >
+          <el-button class="commonbutton" type="primary" @click="seq++"
+            >下一步</el-button
+          >
           <el-button class="commonbutton" @click="seq = -1">关闭</el-button>
         </span>
       </el-dialog>
 
-      <el-dialog title="选择待导入的卡信息" :visible.sync="dialogGroup.fileDataOpr" width="700px" :show-close="false"
-        :close-on-click-modal="false"> <!--:append-to-body="true" -->
-        <div style="height:400px;">
-          <div style="margin-top: -10px;">
-            1、在标题列右击鼠标可设置列名，即：标题列有 √ 的，才参与数据导入；<br>            
-            3、按住 Ctr1 或 Shift 键可进行多选。<br>
+      <el-dialog
+        title="选择待导入的卡信息"
+        :visible.sync="dialogGroup.fileDataOpr"
+        width="700px"
+        :show-close="false"
+        :close-on-click-modal="false"
+      >
+        <!--:append-to-body="true" -->
+        <div style="height: 400px">
+          <div style="margin-top: -10px">
+            1、在标题列右击鼠标可设置列名，即：标题列有 √
+            的，才参与数据导入；<br />
+            3、按住 Ctr1 或 Shift 键可进行多选。<br />
           </div>
-          <div style="margin: 5px 0px 0px;" @contextmenu.prevent=""> <!-- -->
-            <el-table :data="excelData" border ref="excelData" @header-contextmenu="headerContextmenu" height="340"
-              @row-click="chooseDataImport" row-key="id" highlight-current-row size="small"
-              :row-class-name="handleRowClassName">
-              <el-table-column type="index" align="center" label="序号" min-width="40" />
+          <div style="margin: 5px 0px 0px" @contextmenu.prevent="">
+            <!-- -->
+            <el-table
+              :data="excelData"
+              border
+              ref="excelData"
+              @header-contextmenu="headerContextmenu"
+              height="340"
+              @row-click="chooseDataImport"
+              row-key="id"
+              highlight-current-row
+              size="small"
+              :row-class-name="handleRowClassName"
+            >
+              <el-table-column
+                type="index"
+                align="center"
+                label="序号"
+                min-width="40"
+              />
               <!-- 
             <el-table-column prop="choosed" align="center" label="选中" min-width="40"/>
             -->
-              <el-table-column v-for="(item, index) in excelCols" :key="`col_${index}`" :prop="item.dispLabel"
-                align="center" :label="(item.val ? '√ ' : '') + (item.dataLabel || item.dispLabel)"
-                :min-width="100 + index" />
-
+              <el-table-column
+                v-for="(item, index) in excelCols"
+                :key="`col_${index}`"
+                :prop="item.dispLabel"
+                align="center"
+                :label="
+                  (item.val ? '√ ' : '') + (item.dataLabel || item.dispLabel)
+                "
+                :min-width="100 + index"
+              />
             </el-table>
           </div>
         </div>
         <span slot="footer" class="dialog-footer">
-          <div style="display: flex;justify-content: space-between;">
-            <div style="display: flex;">
-              <el-button class="commonbutton" type="primary" @click="btnChoose('excelData', 'all')">全选</el-button>
-              <el-button class="commonbutton" type="primary" @click="btnChoose('excelData')">取消全选</el-button>
+          <div style="display: flex; justify-content: space-between">
+            <div style="display: flex">
+              <el-button
+                class="commonbutton"
+                type="primary"
+                @click="btnChoose('excelData', 'all')"
+                >全选</el-button
+              >
+              <el-button
+                class="commonbutton"
+                type="primary"
+                @click="btnChoose('excelData')"
+                >取消全选</el-button
+              >
             </div>
-            <div style="display: flex;">
-              <el-button class="commonbutton" type="primary" @click="seq--">上一步</el-button>
-              <el-button class="commonbutton" type="primary" @click="btnImportCardOK">确定导入</el-button>
+            <div style="display: flex">
+              <el-button class="commonbutton" type="primary" @click="seq--"
+                >上一步</el-button
+              >
+              <el-button
+                class="commonbutton"
+                type="primary"
+                @click="btnImportCardOK"
+                >确定导入</el-button
+              >
               <el-button class="commonbutton" @click="seq = -1">关闭</el-button>
             </div>
           </div>
@@ -507,7 +834,7 @@ export default {
         maxResultCount: 1000,
       },
       loadOptsInit: {},
-      lazyLoading: false,  //是否懒加载中
+      lazyLoading: false, //是否懒加载中
 
       dataList: [], //列表数据
       cardBillList: [], //卡记账数据
@@ -557,10 +884,10 @@ export default {
         ],
         expiryDate: [
           { required: true, message: "请填写卡有效期", trigger: "blur" },
-        ],              
+        ],
         customerName: [
           { required: true, message: "请填写卡主姓名", trigger: "blur" },
-        ], 
+        ],
         /*        
         idNo: [
           { required: true, message: "请填写卡主身份证", trigger: "blur" },
@@ -600,56 +927,69 @@ export default {
         ],
       },
 
-      dom:null,
+      dom: null,
 
       curChoosedRow: {}, //当前选择的行数据
       curChoosedId: "", //当前选择的行ID
 
-
       // 批量导入
       dialogGroup: {
-        mode: true,  //选模式 10 开始 文件导入，20开始 从数据库中导入
-        fileReadme: false,   //导入EXCEL注意事项
-        fileChoose: false,   //选择文件
-        fileDataOpr: false,  //文件数据分析操作
-        fileDataOpts: false, //文件数据导入前参数设定   
+        mode: true, //选模式 10 开始 文件导入，20开始 从数据库中导入
+        fileReadme: false, //导入EXCEL注意事项
+        fileChoose: false, //选择文件
+        fileDataOpr: false, //文件数据分析操作
+        fileDataOpts: false, //文件数据导入前参数设定
 
         query: false, //单位查询条件
         oldMansChoose: false, //选择历史数据导入
-        oldMansOpts: false,   //历史数据导入前参数设定 
+        oldMansOpts: false, //历史数据导入前参数设定
       },
-      oldSeq: -2,       //旧的步骤（辅助区分上一步，下一步）
-      seq: 0,          //当前显示窗口
-      mode: '10',      //模式 10 开始 文件导入，20开始 从数据库中导入 ，30 开始职业病
-      excelCols: [{ dispLabel: '', val: '', dataLabel: '' }],    //excel数据列名 {dispLabel:'',val:'',dataLabel:''}
+      oldSeq: -2, //旧的步骤（辅助区分上一步，下一步）
+      seq: 0, //当前显示窗口
+      mode: "10", //模式 10 开始 文件导入，20开始 从数据库中导入 ，30 开始职业病
+      excelCols: [{ dispLabel: "", val: "", dataLabel: "" }], //excel数据列名 {dispLabel:'',val:'',dataLabel:''}
       importCols: [], //实际导入的列（即有设置与 dataCols 匹配的列）
-      excelData: [],   //excel表格数据 
-      choosedData: [],  // 选中的待导入的数据
+      excelData: [], //excel表格数据
+      choosedData: [], // 选中的待导入的数据
 
       dataCols: [
-        { dispLabel: '不设置', val: '' },
-        { dispLabel: '卡类别', val: 'cardTypeId' },
-        { dispLabel: '会员卡号', val: 'cardNo' },
-        { dispLabel: '折扣率', val: 'discount' },
-        { dispLabel: '初始余额', val: 'cardBalance' },
-        { dispLabel: '性别', val: 'expiryDate' },
-        { dispLabel: '年龄', val: 'age' },
-        { dispLabel: '有效期限', val: 'birthDate' },
-        { dispLabel: '卡主姓名', val: 'customerName' },
-        { dispLabel: '卡主身份证号', val: 'idNo' },
-        { dispLabel: '卡主电话', val: 'telephone' },
-        { dispLabel: '卡主手机号', val: 'mobileTelephone' },
-        { dispLabel: '备注', val: 'remark' },
+        { dispLabel: "不设置", val: "" },
+        { dispLabel: "卡类别", val: "cardTypeId" },
+        { dispLabel: "会员卡号", val: "cardNo" },
+        { dispLabel: "折扣率", val: "discount" },
+        { dispLabel: "初始余额", val: "cardBalance" },
+        { dispLabel: "性别", val: "expiryDate" },
+        { dispLabel: "年龄", val: "age" },
+        { dispLabel: "有效期限", val: "birthDate" },
+        { dispLabel: "卡主姓名", val: "customerName" },
+        { dispLabel: "卡主身份证号", val: "idNo" },
+        { dispLabel: "卡主电话", val: "telephone" },
+        { dispLabel: "卡主手机号", val: "mobileTelephone" },
+        { dispLabel: "备注", val: "remark" },
         //{ dispLabel: '支付方式', val: 'payTypeFlag' },
       ],
 
       workBook: null, //EXCEL 工作薄
       sheetNames: [], //EXCEL 工作薄中的表单 {sheetName:}
       readDataOpts: {
-        file: '',      //选中的文件名 
-        sheetNameChoosed: '',   //当前选中的表格
-        titleRow: 1,   //标题行        
+        file: "", //选中的文件名
+        sheetNameChoosed: "", //当前选中的表格
+        titleRow: 1, //标题行
       },
+      jsonFields: {
+        卡类别: "cardTypeId",
+        会员卡号: "cardNo",
+        折扣率: "discount",
+        卡余额: "cardBalance",
+        有效期限: "expiryDate",
+        卡主姓名: "customerName",
+        卡主身份证号: "idNo",
+        卡主电话: "telephone",
+        卡主手机号: "customerMobile",
+        启用: "isActive",
+        备注: "remark",
+      },
+      tableName:""
     };
   },
 
@@ -670,8 +1010,8 @@ export default {
     this.dictInit();
     // this.btnQuery();
     this.$nextTick(() => {
-      this.scrollFull()
-    })
+      this.scrollFull();
+    });
   },
   computed: {
     ...mapState(["window", "dict"]),
@@ -706,7 +1046,25 @@ export default {
         }
       });
     },
-
+    btnExport(elId) {
+      let tableDatas = deepCopy(this.dataList);
+      tableDatas.forEach((e, index) => {
+        if (e.cardTypeId)
+          e.cardTypeId = dddw(
+            this.dict.cardType,
+            "id",
+            e.cardTypeId,
+            "displayName"
+          );
+        if (e.expiryDate)
+          e.expiryDate = moment(e.expiryDate).format("yyyy-MM-DD");
+        if (e.isActive)
+          e.isActive = e.isActive == "N" ? "否" : "是";
+      });
+      this.tableName =
+        "会员卡列表" + moment(new Date()).format("yyyyMMDDHHmmss") + ".xls";
+      return tableDatas;
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
@@ -751,13 +1109,14 @@ export default {
         return;
       }
 
-      getapi(`/api/app/cardregister/get?id=${this.curChoosedRow.id}`)
-        .then(res => {
+      getapi(`/api/app/cardregister/get?id=${this.curChoosedRow.id}`).then(
+        (res) => {
           if (res.code > -1) {
-            this.form = res.data
+            this.form = res.data;
             this.dialogVisible = true;
           }
-        })
+        }
+      );
 
       // this.form = { ...this.curChoosedRow }
       // this.dialogVisible = true;
@@ -978,7 +1337,7 @@ export default {
               this.$message.error("数据不合法，起始日期不能大于截止日期！");
               return;
             }
-            body.dateType = this.query.dateType == 'expiryDate' ? '2' : '1'
+            body.dateType = this.query.dateType == "expiryDate" ? "2" : "1";
             body.startDate = moment(this.query.startDate).format("yyyy-MM-DD");
             body.endDate = moment(this.query.endDate).format("yyyy-MM-DD");
 
@@ -992,87 +1351,95 @@ export default {
           }
           break;
       }
-      return body
+      return body;
     },
 
     //查询
     btnQuery() {
-      let body = this.getQueryBody()
-
-      body.maxResultCount = this.loadOpts?.maxResultCount || 1000
-      body.skipCount = 0
+      let body = this.getQueryBody();
 
+      body.maxResultCount = this.loadOpts?.maxResultCount || 1000;
+      body.skipCount = 0;
 
       postapi("/api/app/cardregister/getcardregisterlist", body).then((res) => {
         if (res?.code > -1) {
           this.dataList = res.data?.items;
-          this.loadOpts.totalCount = res.data?.totalCount||0
-          if(res.data?.items?.length > 0) this.loadOpts.skipCount = 1
+          this.loadOpts.totalCount = res.data?.totalCount || 0;
+          if (res.data?.items?.length > 0) this.loadOpts.skipCount = 1;
         }
       });
     },
 
     //滚动加载数据
-    //滚动加载数据 
+    //滚动加载数据
     scrollFull() {
-      this.dom = this.$refs['info'].bodyWrapper
+      this.dom = this.$refs["info"].bodyWrapper;
       //console.log('obj', obj)
 
-      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) {
-          // 获取到的不是全部数据 当滚动到底部 
-         // console.log('scrollTop', this.dom.scrollTop, 'clientHeight', this.dom.clientHeight, 'scrollHeight', this.dom.scrollHeight);
-          if (Number(this.loadOpts.skipCount) * (this.loadOpts?.maxResultCount || 1000) >= Number(this.loadOpts.totalCount)) {
-            this.lazyLoading = false
+        if (
+          this.dom.scrollTop + this.dom.clientHeight + 20 >
+            this.dom.scrollHeight &&
+          !this.lazyLoading
+        ) {
+          // 获取到的不是全部数据 当滚动到底部
+          // console.log('scrollTop', this.dom.scrollTop, 'clientHeight', this.dom.clientHeight, 'scrollHeight', this.dom.scrollHeight);
+          if (
+            Number(this.loadOpts.skipCount) *
+              (this.loadOpts?.maxResultCount || 1000) >=
+            Number(this.loadOpts.totalCount)
+          ) {
+            this.lazyLoading = false;
             //this.$message.warning({showClose:true,message:'没有更多的数据可拉取！'})
           } else {
-            this.lazyLoading = true
-            this.loadQuery()
+            this.lazyLoading = true;
+            this.loadQuery();
             // this.dom.scrollTop = this.dom.scrollTop - 100
           }
         }
-      })
+      });
     },
 
     loadQuery() {
-      let body = this.getQueryBody()
-      
-      body.maxResultCount = this.loadOpts?.maxResultCount || 1000
-      body.skipCount = Number(this.loadOpts.skipCount)
+      let body = this.getQueryBody();
+
+      body.maxResultCount = this.loadOpts?.maxResultCount || 1000;
+      body.skipCount = Number(this.loadOpts.skipCount);
 
       postapi("/api/app/cardregister/getcardregisterlist", body).then((res) => {
         if (res?.code > -1) {
-          console.log('this.dataList = this.dataList.concat(res?.data?.items||[]);',this.dataList,res?.data?.items)
-          this.dataList = [].concat(this.dataList,res?.data?.items||[]);
-          this.loadOpts.totalCount = res.data.totalCount
-          this.loadOpts.skipCount = Number(this.loadOpts.skipCount||0) + 1
-          this.lazyLoading = false
+          console.log(
+            "this.dataList = this.dataList.concat(res?.data?.items||[]);",
+            this.dataList,
+            res?.data?.items
+          );
+          this.dataList = [].concat(this.dataList, res?.data?.items || []);
+          this.loadOpts.totalCount = res.data.totalCount;
+          this.loadOpts.skipCount = Number(this.loadOpts.skipCount || 0) + 1;
+          this.lazyLoading = false;
         }
       });
-
     },
 
     // 导入建卡按钮
-    btnImportCard(){
-      this.$message.warning({showClose:true,message:'调试中，敬请期待……'})
+    btnImportCard() {
+      this.$message.warning({ showClose: true, message: "调试中，敬请期待……" });
     },
 
     // 导入建卡 -- 确定导入
-    btnImportCardOK(){
-
-    },
+    btnImportCardOK() {},
 
     //导入完后，导入状态显示
     importRowClassName({ row, rowIndex }) {
-      if (row.importState == '导入失败') {
+      if (row.importState == "导入失败") {
         return "danger";
       } else {
         return "";
       }
     },
 
-    //多选 颜色标记 
+    //多选 颜色标记
     handleRowClassName({ row, rowIndex }) {
       if (row.choosed) {
         return "current-row";
@@ -1083,8 +1450,8 @@ export default {
 
     //清除所选文件
     fileGetFocus(e) {
-      console.log('fileGetFocus(e)', e)
-      e.value = '' //未起作用的 
+      console.log("fileGetFocus(e)", e);
+      e.value = ""; //未起作用的
       // e.target.files = []
     },
 
@@ -1096,10 +1463,10 @@ export default {
       // 调用导入Excel文件的方法
       // File {name: 'vulkan-1.dll',
       // console.log('file',file,file.type)
-      let fileName = this.readDataOpts.file.name.split('.')
-      let fileNameExt = fileName[fileName.length - 1].toLowerCase()
-      if (fileNameExt != 'xls' && fileNameExt != 'xlsx') {
-        this.$message.warning("你选的文件可能不是标准的Excel文件！")
+      let fileName = this.readDataOpts.file.name.split(".");
+      let fileNameExt = fileName[fileName.length - 1].toLowerCase();
+      if (fileNameExt != "xls" && fileNameExt != "xlsx") {
+        this.$message.warning("你选的文件可能不是标准的Excel文件！");
       }
       this.readFile(this.readDataOpts.file);
     },
@@ -1115,19 +1482,19 @@ export default {
         // let typedArray = new Uint8Array(data);
         // var workBook = read(typedArray,{type:'array'})
         // this.workBook = read(data,{type:'binary',cellDates:true})  //日期将转成 标准 日期格式，显示会 undefined
-        this.workBook = read(data, { type: 'binary' })
+        this.workBook = read(data, { type: "binary" });
         // var workBook = readFile(file); //后端读法
 
-        this.sheetNames = []
-        this.workBook.SheetNames.forEach(e => {
-          this.sheetNames.push({ sheetName: e })
-        })
+        this.sheetNames = [];
+        this.workBook.SheetNames.forEach((e) => {
+          this.sheetNames.push({ sheetName: e });
+        });
 
         this.$nextTick(() => {
-          this.$refs['sheetNames'].setCurrentRow(this.sheetNames[0]);
-          this.chooseSheetName(this.sheetNames[0])
-        })
-      }
+          this.$refs["sheetNames"].setCurrentRow(this.sheetNames[0]);
+          this.chooseSheetName(this.sheetNames[0]);
+        });
+      };
 
       // 错误处理
       reader.onerror = function (event) {
@@ -1135,66 +1502,72 @@ export default {
         console.error("File could not be read!" + event.target.error);
       };
 
-
       reader.readAsBinaryString(file);
     },
 
     //选择要导入的Excel表单名
     chooseSheetName(row) {
-      this.readDataOpts.sheetNameChoosed = row.sheetName
+      this.readDataOpts.sheetNameChoosed = row.sheetName;
     },
 
     //读取数据
     readData() {
-      let ret = 1
-      if (!this.readDataOpts.file || !this.workBook || !this.readDataOpts.sheetNameChoosed) {
-        this.$message.warning("请选择文件及要导入的表格")
-        return 0
+      let ret = 1;
+      if (
+        !this.readDataOpts.file ||
+        !this.workBook ||
+        !this.readDataOpts.sheetNameChoosed
+      ) {
+        this.$message.warning("请选择文件及要导入的表格");
+        return 0;
       }
 
       if (this.readDataOpts.titleRow <= 0) {
-        this.$message.warning("标题行不能小于1")
-        return 0
+        this.$message.warning("标题行不能小于1");
+        return 0;
       }
 
-
       let worksheet = this.workBook.Sheets[this.readDataOpts.sheetNameChoosed];
 
       //分析标题信息
       let head = utils.sheet_to_json(worksheet, { header: 1 });
 
-      this.excelCols = []
-      head[this.readDataOpts.titleRow - 1].forEach(e => {
-        let lfind = arrayExistObj(this.dataCols, 'dispTitle', e), val = '', dataLabel = '';
+      this.excelCols = [];
+      head[this.readDataOpts.titleRow - 1].forEach((e) => {
+        let lfind = arrayExistObj(this.dataCols, "dispTitle", e),
+          val = "",
+          dataLabel = "";
         if (lfind > -1) {
-          val = this.dataCols[lfind].val
-          dataLabel = this.dataCols[lfind].dataLabel
+          val = this.dataCols[lfind].val;
+          dataLabel = this.dataCols[lfind].dataLabel;
         }
         this.excelCols.push({
           dispLabel: e,
           val,
-          dataLabel
-        })
-      })
+          dataLabel,
+        });
+      });
       //console.log('head,',head,this.excelCols)
 
-      this.excelData = utils.sheet_to_json(worksheet, { raw: false, range: this.readDataOpts.titleRow - 1 }); //raw:false,range:1 从第1行开始读取
+      this.excelData = utils.sheet_to_json(worksheet, {
+        raw: false,
+        range: this.readDataOpts.titleRow - 1,
+      }); //raw:false,range:1 从第1行开始读取
       this.excelData.forEach((e, index) => {
         e.choosed = false;
         e.index = index;
-        e.id = 'excelData' + index;
-
+        e.id = "excelData" + index;
       });
       //console.log('this.excelCols',this.excelCols)
       // console.log('sheet_to_json excelData',this.excelData)
 
       // 导入后，批量分析Excel列 与 数据字段 的匹配关系
-      this.parseExcelData()
+      this.parseExcelData();
 
-      return ret
+      return ret;
     },
 
-    //选择要导入的数据 
+    //选择要导入的数据
     chooseDataImport(row) {
       // console.log("this.excelData",this.excelData);
 
@@ -1220,7 +1593,8 @@ export default {
             }
           }
         }
-      } else if (this.window.ctrl) {  // 按住了ctrl 键
+      } else if (this.window.ctrl) {
+        // 按住了ctrl 键
         this.excelData[row.index].choosed = true;
         if (this.startPoint == -1) {
           this.startPoint = row.index;
@@ -1233,7 +1607,7 @@ export default {
           e.choosed = false;
           e.index = index;
         });
-        // console.log(this.excelData,row.index);       
+        // console.log(this.excelData,row.index);
         // console.log(this.excelData[row.index].choosed);
 
         this.excelData[row.index].choosed = true;
@@ -1243,36 +1617,35 @@ export default {
 
     // 全选（取消全选）
     btnChoose(refName, type) {
-      let choosed = false
-      if (type && type == 'all') {
-        choosed = true
+      let choosed = false;
+      if (type && type == "all") {
+        choosed = true;
       }
-      this[refName].forEach(e => {
-        e.choosed = choosed
+      this[refName].forEach((e) => {
+        e.choosed = choosed;
         if (choosed) {
-          this.$refs[refName].setCurrentRow(e)
+          this.$refs[refName].setCurrentRow(e);
         }
-      })
+      });
 
       if (!choosed) {
-        this.$refs[refName].setCurrentRow()
+        this.$refs[refName].setCurrentRow();
       }
-
     },
 
     //右击标题
     headerContextmenu(column, event) {
-      let chooseCol = column.minWidth - 100
-      let items = [] //菜单
+      let chooseCol = column.minWidth - 100;
+      let items = []; //菜单
 
-      this.dataCols.forEach(e => {
+      this.dataCols.forEach((e) => {
         items.push({
           label: e.dispLabel,
           onClick: () => {
-            this.setColumn(chooseCol, e)
+            this.setColumn(chooseCol, e);
           },
-        })
-      })
+        });
+      });
 
       //右击显示的菜单
       this.$contextmenu({
@@ -1281,9 +1654,9 @@ export default {
         //x: event.clientX,
         //y: event.clientY,
         customClass: "custom-class",
-        zIndex: 30000,  //够大再能在最上面显示
+        zIndex: 30000, //够大再能在最上面显示
         minWidth: 80,
-        height: 20
+        height: 20,
       });
 
       return false;
@@ -1294,128 +1667,152 @@ export default {
       // console.log('oldColNum,newColObj',oldColNum,newColObj)
       //如果数据字段已设置过，则将之前设置的先清空
       if (newColObj.dispLabel != "不设置") {
-        let lfind = arrayExistObj(this.excelCols, 'dataLabel', newColObj.dispLabel)
+        let lfind = arrayExistObj(
+          this.excelCols,
+          "dataLabel",
+          newColObj.dispLabel
+        );
         if (lfind > -1) {
-          this.excelCols[lfind].dataLabel = ''
-          this.excelCols[lfind].val = ''
+          this.excelCols[lfind].dataLabel = "";
+          this.excelCols[lfind].val = "";
         }
       }
 
-      this.excelCols[oldColNum].dataLabel = newColObj.dispLabel
-      this.excelCols[oldColNum].val = newColObj.val
+      this.excelCols[oldColNum].dataLabel = newColObj.dispLabel;
+      this.excelCols[oldColNum].val = newColObj.val;
       // console.log('newColObj.val',newColObj.val)
-      let tempDate = ''
-      if (newColObj.val == 'birthDate') {
-        this.excelData.forEach(e => {
-          tempDate = e[this.excelCols[oldColNum].dispLabel]
+      let tempDate = "";
+      if (newColObj.val == "birthDate") {
+        this.excelData.forEach((e) => {
+          tempDate = e[this.excelCols[oldColNum].dispLabel];
           // console.log('birthDate',tempDate)
-          e[this.excelCols[oldColNum].dispLabel] = tempDate ? moment(new Date(tempDate)).format('yyyy-MM-DD') : ''
-        })
+          e[this.excelCols[oldColNum].dispLabel] = tempDate
+            ? moment(new Date(tempDate)).format("yyyy-MM-DD")
+            : "";
+        });
       }
     },
 
     // 选择EXCEL文件后，批量分析Excel列 与 数据字段 的匹配关系
     parseExcelData() {
-      let lfind = -1
+      let lfind = -1;
       this.excelCols.forEach((e, i) => {
-        lfind = arrayExistObj(this.dataCols, 'dispLabel', e.dispLabel)
-        if (lfind > -1) this.setColumn(i, this.dataCols[lfind])
+        lfind = arrayExistObj(this.dataCols, "dispLabel", e.dispLabel);
+        if (lfind > -1) this.setColumn(i, this.dataCols[lfind]);
       });
     },
 
     // 确定导入数据库
     btnImport() {
       if (!this.customerOrgIds || this.customerOrgIds.length == 0) {
-        this.$message.warning("请选择单位")
-        return
+        this.$message.warning("请选择单位");
+        return;
       }
       if (!this.customerOrgRegister || !this.customerOrgRegister.id) {
-        this.$message.warning("请选择单位体检次数")
-        return
+        this.$message.warning("请选择单位体检次数");
+        return;
       }
 
-
       this.elProgress.display = true;
       this.elProgress.percentage = 0;
 
-      this.importCols = []
-      this.excelCols.forEach(e => {
+      this.importCols = [];
+      this.excelCols.forEach((e) => {
         if (e.val) {
-          this.importCols.push(e)
+          this.importCols.push(e);
         }
-      })
-      this.tableData = []  // 记录导入后结果状态
-      this.choosedData = []  //选中待导入的数据
-      this.excelData.forEach(e => {
-        if (e.choosed) this.choosedData.push(e)
+      });
+      this.tableData = []; // 记录导入后结果状态
+      this.choosedData = []; //选中待导入的数据
+      this.excelData.forEach((e) => {
+        if (e.choosed) this.choosedData.push(e);
       });
 
       //导入进行中
-      this.importing(this.dataImportOpts.startRow, this.dataImportOpts.nameType)
+      this.importing(
+        this.dataImportOpts.startRow,
+        this.dataImportOpts.nameType
+      );
       // 开始导入时，清除选择的 文件
-      document.getElementById('fileNames').value = '';
-
+      document.getElementById("fileNames").value = "";
     },
 
     //导入进行时
     // startRow : 从第几行开始导入，同名判断交互时，续接导入
     // startRowNameType : 续接导入的第1行，执行 同名判断模式， 3.不提示，按新人导入(前端不用管)
     async importing(startRow, startRowNameType) {
-      let body = {}
+      let body = {};
       for (let i = startRow; i < this.choosedData.length; i++) {
         this.elProgress.percentage = Math.floor(
           ((i + 1) * 100) / this.choosedData.length
         );
 
-
         // 将Excel的数据转换成接口的数据
-        body = this.excelDataToApiBody(this.choosedData[i])
-        if (i == startRow) body.nameType = startRowNameType
-        console.log(`this.choosedData[${i}],startRowNameType,body`)
+        body = this.excelDataToApiBody(this.choosedData[i]);
+        if (i == startRow) body.nameType = startRowNameType;
+        console.log(`this.choosedData[${i}],startRowNameType,body`);
 
         try {
           // 同一人判断
           if (this.choosedSameMan.patientNo) {
             // 上一次循环已经判断是否同一人，此次循环不需再判断了
-            if (this.choosedSameMan.patientNo == '$newPatient$') {
-              body.nameType = '3'
+            if (this.choosedSameMan.patientNo == "$newPatient$") {
+              body.nameType = "3";
             } else {
-              body.patientNo = this.choosedSameMan.patientNo
+              body.patientNo = this.choosedSameMan.patientNo;
             }
-          } else if (startRowNameType != '3') {
-            let result = await this.isSamePatient(startRowNameType, body)
+          } else if (startRowNameType != "3") {
+            let result = await this.isSamePatient(startRowNameType, body);
             if (result.isContinue) {
               if (result.err) {
-                this.tableData.push(Object.assign({ importState: '导入失败', importDes: result.err }, this.choosedData[i]))
-                continue
+                this.tableData.push(
+                  Object.assign(
+                    { importState: "导入失败", importDes: result.err },
+                    this.choosedData[i]
+                  )
+                );
+                continue;
               }
             } else {
-              this.dataImportOpts.startRow = i
+              this.dataImportOpts.startRow = i;
               break; // 跳出循环，重新从 i 开执行 this.importing
             }
           }
 
-          // 旧接口：/api/app/patientregister/createpatientregisterexcel                                 
-          let res = await postapi('/api/app/patientregister/CreatePatientRegisterFromExcel', body)
-          this.choosedSameMan = {}  // 清除选择同一人员的记录
+          // 旧接口：/api/app/patientregister/createpatientregisterexcel
+          let res = await postapi(
+            "/api/app/patientregister/CreatePatientRegisterFromExcel",
+            body
+          );
+          this.choosedSameMan = {}; // 清除选择同一人员的记录
           if (res.code >= 0) {
-            this.tableData.push(Object.assign({ importState: '导入成功' }, this.choosedData[i]))
+            this.tableData.push(
+              Object.assign({ importState: "导入成功" }, this.choosedData[i])
+            );
           } else {
-            this.tableData.push(Object.assign({ importState: '导入失败', importDes: res.message }, this.choosedData[i]))
+            this.tableData.push(
+              Object.assign(
+                { importState: "导入失败", importDes: res.message },
+                this.choosedData[i]
+              )
+            );
           }
         } catch (error) {
-          this.tableData.push(Object.assign({ importState: '导入失败', importDes: `${error}` }, this.choosedData[i]))
+          this.tableData.push(
+            Object.assign(
+              { importState: "导入失败", importDes: `${error}` },
+              this.choosedData[i]
+            )
+          );
         }
 
-
         // 结束导入
         if (i == this.choosedData.length - 1) {
           this.elProgress.display = false;
-          this.seq = -1
+          this.seq = -1;
         }
       }
     },
-
   },
 
   //监听事件
@@ -1439,12 +1836,10 @@ export default {
 @import "../../assets/css/global_input.css";
 @import "../../assets/css/global_font.css";
 
-
 ::v-deep .el-icon-date:before {
   content: "";
 }
 
-
 .box {
   display: flex;
   flex-direction: column;