diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 3055af5..cc76bdc 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1,139 +1,92 @@
 <template>
   <div style="display: flex">
-    <div :style="'margin-left:5px;width:' + (window.pageWidth - 200 - 120 - 85) + 'px;'"
-      @contextmenu.prevent="onContextmenu">
-      <el-table :data="patientRegister.prList" border
-        :height="window.pageHeight < 600 ? 172 : Math.floor((window.pageHeight - 342) * 2 / 3)" highlight-current-row
-        @row-click="rowClick" size="small" @selection-change="handleSelectionChange" @cell-contextmenu="onCellRightClick"
-        ref="info" :row-class-name="handleRowClassName" >
+    <div
+      :style="
+        'margin-left:5px;width:' + (window.pageWidth - 200 - 120 - 85) + 'px;'
+      "
+      @contextmenu.prevent="onContextmenu"
+    >
+      <el-table
+        :data="patientRegister.prList"
+        border
+        :height="
+          window.pageHeight < 600
+            ? 172
+            : Math.floor(((window.pageHeight - 342) * 2) / 3)
+        "
+        highlight-current-row
+        @row-click="rowClick"
+        size="small"
+        @selection-change="handleSelectionChange"
+        @cell-contextmenu="onCellRightClick"
+        ref="info"
+        :row-class-name="handleRowClassName"
+      >
         <!-- 取消勾选，改为选中
         <el-table-column type="selection" width="40"/>
-        -->
+        
         <el-table-column type="index" label="序号" width="50" align="center" />
+        -->
         <el-table-column
-          v-for="(item, index) in headerCols"
-          align="center"
+          v-for="(item, index) in headerCols"          
           show-overflow-tooltip
           :key="`col_${index}`"
           :label="item.label"
-          :width="item.minWidth"
+          :min-width="dropCol[index].minWidth"
+          :align="dropCol[index].align"
         >
           <template slot-scope="scope">
-            <span v-if="dropCol[index].prop == 'completeFlag'" style="color: blue">
-              {{ scope.row[dropCol[index].prop] }}
-            </span>
-            <span v-else>
-              {{ scope.row[dropCol[index].prop] }}
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="completeFlag" label="体检进度" align="center">
-          <template slot-scope="scope">
-            <div>{{ ldddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="guidePrintTimes" label="打印" width="50" align="center">
-          <template slot-scope="scope">
-            <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0" style="font-size: 24px;color: green;"></i>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isLock" label="锁住" width="50" align="center">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="customerOrgParentName" label="单位" width="180">
-          <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="customerOrgName" label="部门" width="180">
-          <template slot-scope="scope">
-            <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="patientName" label="姓名"  width="80" align="center"/>
-        <el-table-column prop="sexId" label="性别" width="50" align="center">
-          <template slot-scope="scope">
-            <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="age" label="年龄"  width="50" align="center"/>
-        <el-table-column prop="patientRegisterNo" label="条码号" width="150"  align="center"/>
-        <el-table-column prop="patientNo" label="档案号" align="center"/>
-        <el-table-column prop="medicalTimes" label="体检次数"  width="80" align="center"></el-table-column>
-        <el-table-column label="分组/套餐" width="150" align="center">
-          <template slot-scope="scope">
-            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
-              {{ ldddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+            <div v-if="dropCol[index].prop == 'completeFlag'" >
+              {{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}
             </div>
-            <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
-              {{ ldddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+            <div v-else-if="dropCol[index].prop == 'guidePrintTimes'" >
+              <i class="el-icon-printer"
+                v-if="scope.row.guidePrintTimes > 0"
+                style="font-size: 24px; color: green" />
             </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="nationId" label="民族"  width="50" align="center">
-          <template slot-scope="scope">
-            <div>
-              {{ ldddw(dict.nation, "nationId", scope.row.nationId, "displayName") }}
+            <div v-else-if ="dropCol[index].prop == 'isLock'
+                          || dropCol[index].prop == 'isVip'
+                          || dropCol[index].prop == 'isUpload'
+                          " >
+              {{ scope.row[dropCol[index].prop] == "Y" ? "是" : "否" }}
             </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="idNo" label="身份证" width="150" align="center"/>
-        <el-table-column prop="birthDate" label="出生日期" width="80" align="center">
-          <template slot-scope="scope">
-            <div v-if="scope.row.birthDate">
-              {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
+            <div v-else-if="dropCol[index].prop == 'customerOrgParentName'" >
+              {{ scope.row.customerOrgParentName
+                  ? scope.row.customerOrgParentName
+                  : scope.row.customerOrgName }}
             </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="email" label="邮箱" width="180" />
-        <el-table-column prop="mobileTelephone" label="手机" width="100"  align="center"/>
-        <el-table-column prop="telephone" label="电话" width="100" />
-        <el-table-column prop="address" label="地址" width="300" />
-        <el-table-column prop="medicalCardNo" label="体检卡号" />
-        <el-table-column prop="jobCardNo" label="工卡号" />
-        <el-table-column prop="maritalStatusId" label="婚姻状况"  width="80" align="center">
-          <template slot-scope="scope">
-            <div>
-              {{ ldddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
+            <div v-else-if="dropCol[index].prop == 'sexId'" >
+              {{ dddw(dict.sex, "id", scope.row[dropCol[index].prop], "displayName") }}
             </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="medicalTypeId" label="体检类别">
-          <template slot-scope="scope">
-            <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
-              {{ ldddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
+            <div v-else-if="dropCol[index].prop == 'groupPack'" >
+              <div  v-if=" scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+                {{ dddw(dict.medicalPackage,"id",scope.row.medicalPackageId,"displayName")}}
+              </div>
+              <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+                {{ dddw( dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName" ) }}
+              </div>
             </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="personnelTypeId" label="人员类别">
-          <template slot-scope="scope">
-            <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
-              {{ ldddw(dict.personnelType, "id", scope.row.personnelTypeId, "displayName") }}
+            <div v-else-if="dropCol[index].prop == 'nationId'" >
+              {{ dddw(dict.nation, "id", scope.row[dropCol[index].prop], "displayName") }}
+            </div>
+            <div v-else-if ="dropCol[index].prop == 'birthDate' 
+                          || dropCol[index].prop == 'creationTime'" >
+              {{ scope.row[dropCol[index].prop] ? moment(scope.row[dropCol[index].prop]).format('yyyy-MM-DD'):'' }}
+            </div>
+            <div v-else-if="dropCol[index].prop == 'maritalStatusId'" >
+              {{ dddw(dict.maritalStatus, "id", scope.row[dropCol[index].prop], "displayName") }}
+            </div>
+            <div v-else-if="dropCol[index].prop == 'medicalTypeId'" >
+              {{ dddw(dict.medicalType, "id", scope.row[dropCol[index].prop], "displayName") }}
+            </div>
+            <div v-else-if="dropCol[index].prop == 'personnelTypeId'" >
+              {{ dddw(dict.personnelType, "id", scope.row[dropCol[index].prop], "displayName") }}
+            </div>
+            <div v-else>
+              {{ scope.row[dropCol[index].prop] }}
             </div>
           </template>
-        </el-table-column>
-        <el-table-column prop="jobPost" label="职务" />
-        <el-table-column prop="jobTitle" label="职称" />
-        <el-table-column prop="salesman" label="介绍人" />
-        <el-table-column prop="isVip" label="是否VIP"  width="80" align="center">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="creatorName" label="登记人"  align="center"/>
-        <el-table-column prop="creationTime" label="登记日期" width="90" align="center">
-          <template slot-scope="scope">
-            <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isUpload" label="是否上传"  width="80" align="center">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-
+        </el-table-column>  
         <!--
         "sexHormoneTermId": "00000000-0000-0000-0000-000000000000",
         "interposeMeasure": null,
@@ -169,18 +122,30 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div style="margin-left: 10px;width:110px;">
+    <div style="margin-left: 10px; width: 110px">
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="add">人员登记</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="add"
+          >人员登记</el-button
+        >
       </div>
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="edit">编辑</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="edit"
+          >编辑</el-button
+        >
       </div>
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="del">删除</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="del"
+          >删除</el-button
+        >
       </div>
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="openCamera" icon="el-icon-camera">拍照</el-button>
+        <el-button
+          type=""
+          class="btnClass commonbutton"
+          @click="openCamera"
+          icon="el-icon-camera"
+          >拍照</el-button
+        >
       </div>
       <!--
       <div class="listBtn">
@@ -188,16 +153,30 @@
       </div>
       -->
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="btnGroupBatch">调整分组</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="btnGroupBatch"
+          >调整分组</el-button
+        >
       </div>
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="asbBatch">调整项目</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="asbBatch"
+          >调整项目</el-button
+        >
       </div>
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="guidePrint('0001', false)">指引单打印</el-button>
+        <el-button
+          type=""
+          class="btnClass commonbutton"
+          @click="guidePrint('0001', false)"
+          >指引单打印</el-button
+        >
       </div>
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="guidePrint('0001', true)">指引单预览</el-button>
+        <el-button
+          type=""
+          class="btnClass commonbutton"
+          @click="guidePrint('0001', true)"
+          >指引单预览</el-button
+        >
       </div>
       <!--
       <div class="listBtn">
@@ -207,44 +186,89 @@
     </div>
 
     <!-- 体检人员登记 -->
-    <el-dialog :title="patientRegister.patientRegisterId ? '体检人员--编辑' : '体检人员--新增'" :visible.sync="dialogVisible"
-      :close-on-click-modal="false" fullscreen>
-      <PatientRegisterEdit :formInitData="formInitData" :editTimes="editTimes" />
+    <el-dialog
+      :title="
+        patientRegister.patientRegisterId ? '体检人员--编辑' : '体检人员--新增'
+      "
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      fullscreen
+    >
+      <PatientRegisterEdit
+        :formInitData="formInitData"
+        :editTimes="editTimes"
+      />
     </el-dialog>
 
     <!-- 拍照 -->
-    <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="800" :show-close="false"
-      :append-to-body="true" :close-on-click-modal="false">
+    <el-dialog
+      title="拍照"
+      :visible.sync="patientRegister.cameraVisble"
+      width="400"
+      height="800"
+      :show-close="false"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+    >
       <Camera :id="patientRegister.patientRegisterId" />
     </el-dialog>
 
     <!-- 指引单 -->
-    <el-dialog title="指引单" :visible.sync="dialogGuide" width="400" height="800" :append-to-body="true"
-      :close-on-click-modal="false">
+    <el-dialog
+      title="指引单"
+      :visible.sync="dialogGuide"
+      width="400"
+      height="800"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+    >
       <div>{{ guideMsg }}</div>
     </el-dialog>
 
     <!-- 批量调整分组 -->
-    <el-dialog title="批量调整分组" :visible.sync="dialogGroup" width="600px" height="800" :append-to-body="true"
-      :close-on-click-modal="false">
+    <el-dialog
+      title="批量调整分组"
+      :visible.sync="dialogGroup"
+      width="600px"
+      height="800"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+    >
       <div>
         <div>
           批量调整分组只针对单位体检有效，个人体检将忽略此操作；不能调整已收费或已检的项目及已总检的体检人员。
         </div>
         <div>
           <br /><span>分组</span>
-          <el-select v-model="groupBatch.customerOrgGroupId" placeholder="请选择" filterable size="small">
-            <el-option v-for="item in patientRegister.customerOrgGroup" :key="item.id" :label="item.displayName"
-              :value="item.id" />
+          <el-select
+            v-model="groupBatch.customerOrgGroupId"
+            placeholder="请选择"
+            filterable
+            size="small"
+          >
+            <el-option
+              v-for="item in patientRegister.customerOrgGroup"
+              :key="item.id"
+              :label="item.displayName"
+              :value="item.id"
+            />
           </el-select>
         </div>
         <div>
-          <br /><el-radio v-model="groupBatch.payTypeFlag" label="0">个人支付</el-radio>
-          <br /><el-radio v-model="groupBatch.payTypeFlag" label="1">单位支付</el-radio>
-          <br /><el-radio v-model="groupBatch.payTypeFlag" label="2">免费</el-radio>
+          <br /><el-radio v-model="groupBatch.payTypeFlag" label="0"
+            >个人支付</el-radio
+          >
+          <br /><el-radio v-model="groupBatch.payTypeFlag" label="1"
+            >单位支付</el-radio
+          >
+          <br /><el-radio v-model="groupBatch.payTypeFlag" label="2"
+            >免费</el-radio
+          >
         </div>
         <div>
-          <br /><el-checkbox v-model="groupBatch.isReserveAddAsbitem">保留加做项目（包括不属于原分组的、没有设置分组的）</el-checkbox>
+          <br /><el-checkbox v-model="groupBatch.isReserveAddAsbitem"
+            >保留加做项目（包括不属于原分组的、没有设置分组的）</el-checkbox
+          >
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -254,70 +278,150 @@
     </el-dialog>
 
     <!-- 批量调整项目 -->
-    <el-dialog title="批量调整项目" :visible.sync="dialogAsbitem" width="600px" height="800" :append-to-body="true"
-      :close-on-click-modal="false">
+    <el-dialog
+      title="批量调整项目"
+      :visible.sync="dialogAsbitem"
+      width="600px"
+      height="800"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+    >
       <div>
         <div>
           批量调整分组只针对单位体检有效，个人体检将忽略此操作；不能调整已收费或已检的项目及已总检的体检人员。
         </div>
         <div>
-          <br /><el-radio v-model="asbitemBatch.operate" label="add">增加项目</el-radio>
-          <el-radio v-model="asbitemBatch.operate" label="del">删除项目</el-radio>
+          <br /><el-radio v-model="asbitemBatch.operate" label="add"
+            >增加项目</el-radio
+          >
+          <el-radio v-model="asbitemBatch.operate" label="del"
+            >删除项目</el-radio
+          >
         </div>
         <div>
-          <br /><el-checkbox v-model="asbitemBatch.isDeleteGroup"
-            :disabled="asbitemBatch.operate == 'add' ? true : false">如果删除项目属于分组则删除体检记录信息的分组设置</el-checkbox>
+          <br /><el-checkbox
+            v-model="asbitemBatch.isDeleteGroup"
+            :disabled="asbitemBatch.operate == 'add' ? true : false"
+            >如果删除项目属于分组则删除体检记录信息的分组设置</el-checkbox
+          >
         </div>
         <div>
           <br /><span>直接录入</span>
-          <el-select v-model="asbitemBatch.asbItemId" placeholder="快速选择组合项目" size="small" filterable clearable remote
-            :remote-method="remoteMethod" @change="quickChoosedAsb" default-first-option
-            style="width:150px;text-align: left;padding-right: 15px;">
-            <el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
+          <el-select
+            v-model="asbitemBatch.asbItemId"
+            placeholder="快速选择组合项目"
+            size="small"
+            filterable
+            clearable
+            remote
+            :remote-method="remoteMethod"
+            @change="quickChoosedAsb"
+            default-first-option
+            style="width: 150px; text-align: left; padding-right: 15px"
+          >
+            <el-option
+              v-for="item in quickAsb"
+              :key="item.id"
+              :value="item.id"
+              :label="item.displayName"
+            />
           </el-select>
         </div>
-        <div style="display: flex;margin-top: 2px;">
-          <div style="width:480px;">
-            <el-table :data="asbitemBatch.asbitemsTemp" height="240" width="100%" show-summary @row-dblclick="removeAbs"
-              size="small" @row-click="rowClickaAbitemCurr" border>
-              <el-table-column label="组合项目" width="150" prop="asbitemName" />
+        <div style="display: flex; margin-top: 2px">
+          <div style="width: 480px">
+            <el-table
+              :data="asbitemBatch.asbitemsTemp"
+              height="240"
+              width="100%"
+              show-summary
+              @row-dblclick="removeAbs"
+              size="small"
+              @row-click="rowClickaAbitemCurr"
+              border
+            >
+              <el-table-column
+                label="组合项目"
+                width="150"
+                prop="asbitemName"
+              />
               <el-table-column label="数量" prop="amount" width="60">
                 <template slot-scope="scope">
-                  <el-input type="number" v-model="scope.row.amount" size="small"
-                    :disabled="asbitemBatch.operate == 'del' ? true : false" />
+                  <el-input
+                    type="number"
+                    v-model="scope.row.amount"
+                    size="small"
+                    :disabled="asbitemBatch.operate == 'del' ? true : false"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="实收价格" prop="chargePrice" width="90">
                 <template slot-scope="scope">
-                  <el-input type="number" v-model="scope.row.chargePrice" size="small"
-                    :disabled="asbitemBatch.operate == 'del' ? true : false" />
+                  <el-input
+                    type="number"
+                    v-model="scope.row.chargePrice"
+                    size="small"
+                    :disabled="asbitemBatch.operate == 'del' ? true : false"
+                  />
                 </template>
               </el-table-column>
               <el-table-column label="支付方式" prop="payTypeFlag" width="120">
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.payTypeFlag" size="small"
-                    :disabled="asbitemBatch.operate == 'del' ? true : false">
-                    <el-option v-for="item in dict.payType" :key="item.id" :label="item.displayName" :value="item.id" />
+                  <el-select
+                    v-model="scope.row.payTypeFlag"
+                    size="small"
+                    :disabled="asbitemBatch.operate == 'del' ? true : false"
+                  >
+                    <el-option
+                      v-for="item in dict.payType"
+                      :key="item.id"
+                      :label="item.displayName"
+                      :value="item.id"
+                    />
                   </el-select>
                 </template>
               </el-table-column>
             </el-table>
           </div>
-          <div style="display: block; width: 110px; margin-left: 10px;">
-            <div style="margin-top: 5px;">
-              <el-button type="danger" @click="asbitemDel(1)" style="width: 100px;">删除</el-button>
+          <div style="display: block; width: 110px; margin-left: 10px">
+            <div style="margin-top: 5px">
+              <el-button
+                type="danger"
+                @click="asbitemDel(1)"
+                style="width: 100px"
+                >删除</el-button
+              >
             </div>
-            <div style="margin-top: 5px;">
-              <el-button type="danger" @click="asbitemDel(0)" style="width: 100px;">删除全部</el-button>
+            <div style="margin-top: 5px">
+              <el-button
+                type="danger"
+                @click="asbitemDel(0)"
+                style="width: 100px"
+                >删除全部</el-button
+              >
             </div>
-            <div style="margin-top: 5px;">
-              <el-button type="primary" @click="changePayTypeFlag('0')" style="width: 100px;">全个人支付</el-button>
+            <div style="margin-top: 5px">
+              <el-button
+                type="primary"
+                @click="changePayTypeFlag('0')"
+                style="width: 100px"
+                >全个人支付</el-button
+              >
             </div>
-            <div style="margin-top: 5px;">
-              <el-button type="primary" @click="changePayTypeFlag('1')" style="width: 100px;">全单位支付</el-button>
+            <div style="margin-top: 5px">
+              <el-button
+                type="primary"
+                @click="changePayTypeFlag('1')"
+                style="width: 100px"
+                >全单位支付</el-button
+              >
             </div>
-            <div style="margin-top: 5px;">
-              <el-button type="primary" @click="changePayTypeFlag('2')" style="width: 100px;">全赠送</el-button>
+            <div style="margin-top: 5px">
+              <el-button
+                type="primary"
+                @click="changePayTypeFlag('2')"
+                style="width: 100px"
+                >全赠送</el-button
+              >
             </div>
           </div>
         </div>
@@ -329,27 +433,37 @@
     </el-dialog>
 
     <!-- 通用进度条 -->
-    <el-dialog title="数据处理中……" :visible.sync="elProgress.display" width="600px" height="400"
-      :show-close="false" :close-on-click-modal="false" :append-to-body="true">
+    <el-dialog
+      title="数据处理中……"
+      :visible.sync="elProgress.display"
+      width="600px"
+      height="400"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+    >
       <ElProgressOCX />
     </el-dialog>
-
   </div>
 </template>
 <script>
-
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import Sortable from "sortablejs"
+import Sortable from "sortablejs";
 
-import { dddw, objCopy, arrayReduce, arrayExistObj, deepCopy } from "@/utlis/proFunc";
+import {
+  dddw,
+  objCopy,
+  arrayReduce,
+  arrayExistObj,
+  deepCopy,
+} from "@/utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import Camera from "../../components/patientRegister/Camera.vue";
 import PatientRegisterAsbItem from "../../components/patientRegister/patientRegisterAsbItem.vue";
 
-
 import ElProgressOCX from "../../components/report/ElProgressOCX.vue";
 
 export default {
@@ -361,137 +475,138 @@ export default {
   },
   data() {
     return {
-      startPoint: -1,// 多选起点 -1 表示选择
-      endPoint: -1,// 多选终点 -1 表示选择
-
+      startPoint: -1, // 多选起点 -1 表示选择
+      endPoint: -1, // 多选终点 -1 表示选择
 
       multipleSelection: [], //选中的数据列表
       dialogVisible: false,
       dialogCamera: false,
       dialogGuide: false,
-      guideMsg: 'guideMsg',
+      guideMsg: "guideMsg",
       tabChoosed: "1",
-      formInitData: {},      //体检登记初始表单数据
+      formInitData: {}, //体检登记初始表单数据
       editTimes: 0,
 
-      rClickRow: null,       //右击的行
-      rClickColumn: null,    //右击的列（预留）
+      rClickRow: null, //右击的行
+      rClickColumn: null, //右击的列（预留）
 
       dialogGroup: false,
       groupBatch: {
         patientRegisterId: null,
         customerOrgGroupId: null,
-        payTypeFlag: "1",   //0：个人付费，1：单位付费 2：免费
+        payTypeFlag: "1", //0：个人付费，1：单位付费 2：免费
         isReserveAddAsbitem: true, //是否保留加做项目
       },
 
       dialogAsbitem: false,
       asbitemBatch: {
-        operate: 'add',
+        operate: "add",
         isDeleteGroup: false,
-        asbItemId: '',
+        asbItemId: "",
         asbitemsTemp: [], //删除或增加项目临时用
-        asbitemCurr: {},   //当前选中要删除的项目(批量调整)
+        asbitemCurr: {}, //当前选中要删除的项目(批量调整)
       },
-      quickAsb: [],        //可供快速选择的组合项目      
+      quickAsb: [], //可供快速选择的组合项目
 
       //动态列
-      headerCols:[
-        {
-          label: "体检进度",
-          prop: "completeFlag",
-          minWidth: 100,
-        },
-        {
-          label: "打印",
-          prop: "guidePrintTimes",
-          minWidth: 60,
-        },
-        {
-          label: "锁住",
-          prop: "isLock",
-          minWidth: 60,
-        },
-      ],
+      headerCols: [],
 
       //拖动列
-      dropCol:[
-        {
-          label: "体检进度",
-          prop: "completeFlag",
-          minWidth: 100,
-        },
-        {
-          label: "打印",
-          prop: "guidePrintTimes",
-          minWidth: 60,
-        },
-        {
-          label: "锁住",
-          prop: "isLock",
-          minWidth: 60,
-        },
-      ],
+      dropCol: [
+        { label: "体检进度",prop: "completeFlag",minWidth: 80,align:"center"},
+        { label: "打印", prop: "guidePrintTimes", minWidth: 50,align:"center" },
+        { label: "锁住", prop: "isLock", minWidth: 50, align:"center"},
+        { label: "单位", prop: "customerOrgParentName", minWidth: 180, align:"center"},
+        { label: "部门", prop: "customerOrgName", minWidth: 120, align:"center"},
+        { label: "姓名", prop: "patientName", minWidth: 80, align:"center"},
+        { label: "性别", prop: "sexId", minWidth: 50, align:"center"},
+        { label: "年龄", prop: "age", minWidth: 50, align:"center"},
+        { label: "条码号", prop: "patientRegisterNo", minWidth: 150, align:"center"},
+        { label: "档案号", prop: "patientNo", minWidth: 100, align:"center"},
+        { label: "体检次数", prop: "medicalTimes", minWidth: 80, align:"center"},
+        { label: "分组/套餐", prop: "groupPack", minWidth: 150, align:"center"},
+        { label: "民族", prop: "nationId", minWidth: 50, align:"center"},
+        { label: "身份证", prop: "idNo", minWidth: 150, align:"center"},
+        { label: "出生日期", prop: "birthDate", minWidth: 80, align:"center"},
+        { label: "邮箱", prop: "email", minWidth: 150, align:"center"},
+        { label: "手机", prop: "mobileTelephone", minWidth: 100, align:"center"},
+        { label: "电话", prop: "telephone", minWidth: 100, align:"center"},
+        { label: "地址", prop: "address", minWidth: 300, align:""},
+        { label: "体检卡号", prop: "medicalCardNo", minWidth: 80, align:"center"},
+        { label: "工卡号", prop: "jobCardNo", minWidth: 80, align:"center"},
+        { label: "婚姻状况", prop: "maritalStatusId", minWidth: 80, align:"center"},
+        { label: "体检类别", prop: "medicalTypeId", minWidth: 80, align:"center"},
+        { label: "人员类别", prop: "personnelTypeId", minWidth: 80, align:"center"},
+        { label: "职务", prop: "jobPost", minWidth: 80, align:"center"},
+        { label: "职称", prop: "jobTitle", minWidth: 80, align:"center"},
+        { label: "介绍人", prop: "salesman", minWidth: 80, align:"center"},
+        { label: "是否VIP", prop: "isVip", minWidth: 80, align:"center"},
+        { label: "登记人", prop: "creatorName", minWidth: 80, align:"center"},
+        { label: "登记日期", prop: "creationTime", minWidth: 80, align:"center"},
+        { label: "是否上传", prop: "isUpload", minWidth: 80, align:"center"},
+      ],      
     };
   },
 
-
-
-
   created() {
-    
+    this.headerCols = deepCopy(this.dropCol)
   },
 
   //挂载完成
   mounted() {
-    this.quickAsb = this.dict.asbItemAll; 
-
-    this.dropCol = this.columnDrop(this.dropCol);   
+    this.quickAsb = this.dict.asbItemAll;
+    //初始化可以拖动的列
+    this.dropCol = this.columnDrop(this.dropCol);
   },
   computed: {
-    ...mapState(["window", "dict","elProgress","patientRegister", "customerOrg"]),
+    ...mapState([
+      "window",
+      "dict",
+      "elProgress",
+      "patientRegister",
+      "customerOrg",
+    ]),
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
-
+    moment,dddw,
 
     handleRowClassName({ row, rowIndex }) {
-      // highLightBg 为 'selected'的高亮 
+      // highLightBg 为 'selected'的高亮
       //console.log(rowIndex, row)
       //return row.highLightBg == 'selected' ? 'high-light-bg' : '';
       if (row.choosed) {
-        return 'current-row';
+        return "current-row";
       } else {
-        return '';
+        return "";
       }
-
     },
 
     rowSelected(rows) {
-      rows.forEach(e => {
-        this.$refs['info'].toggleRowSelection(e, true);
-      })
+      rows.forEach((e) => {
+        this.$refs["info"].toggleRowSelection(e, true);
+      });
     },
 
     // 打印指引单(isPreview)
     async guidePrint(ReportCode, isPreview) {
-      if(!this.$peisAPI) {
-        this.$message.info("此功能，需要在壳客户端才可运行！")
-        return       
+      if (!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！");
+        return;
       }
-      let token = localStorage.getItem('token');
-      let user = localStorage.getItem('user');
+      let token = localStorage.getItem("token");
+      let user = localStorage.getItem("user");
       let toOutShell = {
-        ReportCode, token,
-        preViewCanPrint: 'N',
+        ReportCode,
+        token,
+        preViewCanPrint: "N",
         Parameters: [
-          { Name: 'printer', Value: user },
-          { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
+          { Name: "printer", Value: user },
+          { Name: "hisLog", Value: "pic/hisLog.jpg" },
         ],
       };
       let lfind = -1;
 
-
       if (this.multipleSelection.length < 1) {
         this.$message.info("请勾选要打印指引单的人员记录！");
         return;
@@ -501,48 +616,67 @@ export default {
         //
         //this.multipleSelection.forEach((item,index) =>{
 
-        postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.multipleSelection[0].id}`)
+        postapi(
+          `/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${this.multipleSelection[0].id}`
+        )
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = res.data;
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+              console.log(
+                "JSON.stringify(toOutShell)",
+                JSON.stringify(toOutShell)
+              );
               return this.$peisAPI.printPre(JSON.stringify(toOutShell));
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.$message.warning(err);
           });
         // });
       } else {
         this.multipleSelection.forEach((item, index) => {
-          postapi(`/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${item.id}`)
+          postapi(
+            `/api/app/printreport/getpatientregisterguidereport?PatientRegisterId=${item.id}`
+          )
             .then((res) => {
               if (res.code != -1) {
                 toOutShell.ReportTable = res.data;
-                console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+                console.log(
+                  "JSON.stringify(toOutShell)",
+                  JSON.stringify(toOutShell)
+                );
                 return this.$peisAPI.print(JSON.stringify(toOutShell));
               }
             })
-            .then(res => {
-              if (res.toLowerCase() == 'success') {
+            .then((res) => {
+              if (res.toLowerCase() == "success") {
                 //更新打印次数
-                return postapi('api/app/patientregister/updatepatientregisterguideprinttimesmany', [item.id])
+                return postapi(
+                  "api/app/patientregister/updatepatientregisterguideprinttimesmany",
+                  [item.id]
+                );
               }
             })
-            .then(res => {
+            .then((res) => {
               if (res.code != -1) {
-                lfind = arrayExistObj(this.patientRegister.prList, 'id', item.id)
+                lfind = arrayExistObj(
+                  this.patientRegister.prList,
+                  "id",
+                  item.id
+                );
                 if (lfind > -1) {
                   if (this.patientRegister.prList[lfind].guidePrintTimes) {
-                    this.patientRegister.prList[lfind].guidePrintTimes = Number(this.patientRegister.prList[lfind].guidePrintTimes) + 1;
+                    this.patientRegister.prList[lfind].guidePrintTimes =
+                      Number(
+                        this.patientRegister.prList[lfind].guidePrintTimes
+                      ) + 1;
                   } else {
                     this.patientRegister.prList[lfind].guidePrintTimes = 1;
                   }
                 }
-
               }
             })
-            .catch(err => {
+            .catch((err) => {
               this.$message.warning(err);
             });
         });
@@ -553,28 +687,28 @@ export default {
       //this.multipleSelection = rows;
       //console.log('this.multipleSelection',this.multipleSelection)
 
-      rows.forEach(item => {
-        item.highLightBg = 'selected';
+      rows.forEach((item) => {
+        item.highLightBg = "selected";
       });
       // 取消全选
       if (!rows.length) {
-        this.patientRegister.prList.forEach(item => {
-          item.highLightBg = '';
+        this.patientRegister.prList.forEach((item) => {
+          item.highLightBg = "";
         });
       }
       this.multipleSelection = JSON.parse(JSON.stringify(rows));
     },
 
-  
     //获取单位分组 /api/app/customer-org-group/in-customer-org-id/3a0c0444-d7a0-871f-4074-19faf1655caf
     getCustomerOrgGroup(customerOrgld) {
-      getapi(`/api/app/customer-org-group/in-customer-org-id/${customerOrgld}`)
-        .then((res) => {
-          console.log("getCustomerOrgGroup", res.data);
-          if (res.code == 1) {
-            this.patientRegister.customerOrgGroup = res.data;
-          }
-        });
+      getapi(
+        `/api/app/customer-org-group/in-customer-org-id/${customerOrgld}`
+      ).then((res) => {
+        console.log("getCustomerOrgGroup", res.data);
+        if (res.code == 1) {
+          this.patientRegister.customerOrgGroup = res.data;
+        }
+      });
     },
 
     //点击体检次数行
@@ -582,60 +716,63 @@ export default {
       this.patientRegister.photo = ""; //清除照片缓存
 
       this.patientRegister.patientRegisterId = row.id;
-      this.patientRegister.photo = row.photo || '/pic/Photo.jpg';
+      this.patientRegister.photo = row.photo || "/pic/Photo.jpg";
       this.patientRegister.patientRegisterRd = row;
       this.patientRegister.query.customerOrgParentId = row.customerOrgParentId;
-      this.patientRegister.customerOrgGroupChange = 0;   //控制体检列表记录切换时，0 无需触发更换分组操作 
-      this.patientRegister.medicalPackageChange = 0;     //控制体检列表记录切换时，0 无需触发更换套餐操作
+      this.patientRegister.customerOrgGroupChange = 0; //控制体检列表记录切换时，0 无需触发更换分组操作
+      this.patientRegister.medicalPackageChange = 0; //控制体检列表记录切换时，0 无需触发更换套餐操作
       this.getCustomerOrgGroup(row.customerOrgParentId);
-      this.dict.asbItem = [...this.dict.asbItemAll]
+      this.dict.asbItem = [...this.dict.asbItemAll];
       this.getPatientRegisterAbs(row.id);
 
-      
-      console.log('this.patientRegister.prList',this.window, this.patientRegister.prList)
+      console.log(
+        "this.patientRegister.prList",
+        this.window,
+        this.patientRegister.prList
+      );
 
       // 按住了shift键
-      if (this.window.shift) {         
+      if (this.window.shift) {
         //清除所有选择
-        this.patientRegister.prList.forEach(e => {
-          e.choosed = false;  
-          return e
+        this.patientRegister.prList.forEach((e) => {
+          e.choosed = false;
+          return e;
         });
 
-        if (this.startPoint == - 1) {
+        if (this.startPoint == -1) {
           this.patientRegister.prList[row.index].choosed = true;
           this.startPoint = row.index;
-          return
+          return;
         }
 
         if (this.startPoint > row.index) {
           for (let i = row.index; i <= this.startPoint; i++) {
-            this.patientRegister.prList[i].choosed = true
+            this.patientRegister.prList[i].choosed = true;
           }
         } else if (this.startPoint <= row.index) {
           for (let i = this.startPoint; i <= row.index; i++) {
-            this.patientRegister.prList[i].choosed = true
+            this.patientRegister.prList[i].choosed = true;
           }
         }
-        return
+        return;
       }
 
       // 按住了ctrl 键
-      if (this.window.ctrl) {         
+      if (this.window.ctrl) {
         this.patientRegister.prList[row.index].choosed = true;
         this.startPoint = row.index;
-        return        
+        return;
       }
 
       // 未按住了ctrl 、shift 键
       //清除所有选择
-      console.log('清除所有选择')
-      this.patientRegister.prList.forEach(e => {
-        e.choosed = false;  
-        return e
+      console.log("清除所有选择");
+      this.patientRegister.prList.forEach((e) => {
+        e.choosed = false;
+        return e;
       });
       this.patientRegister.prList[row.index].choosed = true;
-      this.startPoint = row.index;      
+      this.startPoint = row.index;
     },
 
     //体检次数 相关操作
@@ -647,12 +784,13 @@ export default {
       }
       //console.log('customerOrgId',customerOrgId)
       this.patientRegister.patientRegisterId = "";
-      this.patientRegister.photo = '/pic/Photo.jpg';
+      this.patientRegister.photo = "/pic/Photo.jpg";
       // this.patientRegister.patientRegisterRdInit.id = "";
       // this.patientRegister.patientRegisterRdInit.customerOrgId = this.patientRegister.query.customerOrgId;
       // this.patientRegister.addTimes++;
       // this.patientRegister.patientRegisterTimes++;
-      this.patientRegister.patientRegisterRdInit.customerOrgId = this.patientRegister.query.customerOrgId;
+      this.patientRegister.patientRegisterRdInit.customerOrgId =
+        this.patientRegister.query.customerOrgId;
       this.formInitData = deepCopy(this.patientRegister.patientRegisterRdInit);
       this.patientRegister.patientRegisterAbs = [];
       this.dialogVisible = true;
@@ -660,13 +798,12 @@ export default {
       this.getPatientRegisterAbs();
     },
 
-
     edit() {
       if (!this.patientRegister.patientRegisterRd.id) {
         alert("请选择要操作的记录");
         return;
       }
-      //this.patientRegister.patientRegisterTimes++; 
+      //this.patientRegister.patientRegisterTimes++;
       this.getPatientRegisterAbs(this.patientRegister.patientRegisterRd.id);
       this.formInitData = { ...this.patientRegister.patientRegisterRd };
       this.dialogVisible = true;
@@ -732,7 +869,9 @@ export default {
       })
         .then(() => {
           //console.log('${this.patientRegister.patientRegisterId}',this.patientRegister.patientRegisterId)
-          return deletapi(`/api/app/patient-register/${this.patientRegister.patientRegisterId}`);
+          return deletapi(
+            `/api/app/patient-register/${this.patientRegister.patientRegisterId}`
+          );
         })
         .then((res) => {
           this.$message.success("删除成功");
@@ -740,7 +879,7 @@ export default {
           this.patientRegister.patientRegisterId = "";
         })
         .catch(() => {
-          this.$message({ type: "info", message: "已取消删除", });
+          this.$message({ type: "info", message: "已取消删除" });
         });
     },
 
@@ -755,51 +894,67 @@ export default {
     //查询
     async Query() {
       this.patientRegister.prList = [];
-      let body = {}
+      let body = {};
 
-      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      console.log(`this.patientRegister.query`, this.patientRegister.query);
       if (this.patientRegister.query.customerOrgFlag) {
         if (this.patientRegister.query.CustomerOrgParentId) {
-          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId;
         } else {
-          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
+          if (this.patientRegister.query.customerOrgId)
+            body.customerOrgId = this.patientRegister.query.customerOrgId;
         }
       }
 
-      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+      if (this.patientRegister.query.sex)
+        body.sexId = this.patientRegister.query.sex;
 
-      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+      if (this.patientRegister.query.patientName)
+        body.patientName = this.patientRegister.query.patientName;
 
-      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+      if (this.patientRegister.query.completeFlag)
+        body.completeFlag = this.patientRegister.query.completeFlag;
 
       //StartDate EndDate
-      if (this.patientRegister.query.startDate && this.patientRegister.query.endDate) {
-        body.startDate = moment(this.patientRegister.query.startDate).format("yyyy-MM-DD")
-        body.endDate = moment(this.patientRegister.query.endDate).format("yyyy-MM-DD")
+      if (
+        this.patientRegister.query.startDate &&
+        this.patientRegister.query.endDate
+      ) {
+        body.startDate = moment(this.patientRegister.query.startDate).format(
+          "yyyy-MM-DD"
+        );
+        body.endDate = moment(this.patientRegister.query.endDate).format(
+          "yyyy-MM-DD"
+        );
         if (body.startDate > body.endDate) {
-          this.$message.warning("起始日期不能大于截止日期，数据校验不通过！")
-          return
+          this.$message.warning("起始日期不能大于截止日期，数据校验不通过！");
+          return;
         }
       }
 
-      if (this.patientRegister.query.phone) body.phone = this.patientRegister.query.phone
+      if (this.patientRegister.query.phone)
+        body.phone = this.patientRegister.query.phone;
 
-      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+      if (this.patientRegister.query.idCardNo)
+        body = { idNo: this.patientRegister.query.idCardNo };
 
-      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+      if (this.patientRegister.query.patientNo)
+        body = { patientNo: this.patientRegister.query.patientNo };
 
-      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+      if (this.patientRegister.query.patientRegisterNo)
+        body = {
+          patientRegisterNo: this.patientRegister.query.patientRegisterNo,
+        };
 
-
-      console.log('/api/app/patientregister/getlistinfilter', body)
+      console.log("/api/app/patientregister/getlistinfilter", body);
 
       const loading = this.$loading({
         lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
       });
-      postapi('/api/app/patientregister/getlistinfilter', body)
+      postapi("/api/app/patientregister/getlistinfilter", body)
         .then((res) => {
           if (res.code != -1) {
             this.patientRegister.prList = res.data.items;
@@ -820,13 +975,13 @@ export default {
       //   this.patientRegister.prList = res.data;
       // } catch (error) {
       //   console.log("query error",error);
-      // }      
+      // }
     },
 
     //右击菜单
     onCellRightClick(row, column) {
-      this.rClickRow = { ...row };       //右击的行记录
-      this.rClickColumn = { ...column };    //右击的列（预留） 
+      this.rClickRow = { ...row }; //右击的行记录
+      this.rClickColumn = { ...column }; //右击的列（预留）
       console.log(row, column.property);
     },
     onContextmenu(event) {
@@ -839,31 +994,31 @@ export default {
             label: "发送检验申请",
             onClick: () => {
               this.lisRequest(row.id);
-            }
+            },
           },
           {
             label: "预览检验条码",
             onClick: () => {
-              this.lisPrint(row.id, '0002', true);
-            }
+              this.lisPrint(row.id, "0002", true);
+            },
           },
           {
             label: "打印检验条码",
             onClick: () => {
-              this.lisPrint(row.id, '0002', false);
-            }
+              this.lisPrint(row.id, "0002", false);
+            },
           },
           {
             label: "预览Pacs条码",
             onClick: () => {
-              this.pacsPrint(row.id, '0004', true);
-            }
+              this.pacsPrint(row.id, "0004", true);
+            },
           },
           {
             label: "打印Pacs条码",
             onClick: () => {
-              this.pacsPrint(row.id, '0004', false);
-            }
+              this.pacsPrint(row.id, "0004", false);
+            },
           },
         ],
         event,
@@ -885,12 +1040,12 @@ export default {
         alert("请选择单位");
         return;
       }
-      //取消勾选，换成选择的方式  start 
-      this.multipleSelection = []
-      this.patientRegister.prList.forEach(e => {
-        if(e.choosed) this.multipleSelection.push(e)
+      //取消勾选，换成选择的方式  start
+      this.multipleSelection = [];
+      this.patientRegister.prList.forEach((e) => {
+        if (e.choosed) this.multipleSelection.push(e);
       });
-      //取消勾选，换成选择的方式  end 
+      //取消勾选，换成选择的方式  end
 
       if (this.multipleSelection.length < 1) {
         this.$message.info("请勾选要操作的人员！");
@@ -905,42 +1060,50 @@ export default {
       let groupBatch = { patientRegisterId: null, ...this.groupBatch };
 
       if (groupBatch.isReserveAddAsbitem) {
-        groupBatch.isReserveAddAsbitem = 'Y';
+        groupBatch.isReserveAddAsbitem = "Y";
       } else {
-        groupBatch.isReserveAddAsbitem = 'N';
+        groupBatch.isReserveAddAsbitem = "N";
       }
-      console.log('groupBatch', groupBatch);
+      console.log("groupBatch", groupBatch);
       if (!groupBatch.customerOrgGroupId) {
         this.$message.warning("请选择分组");
         return;
       }
 
-      this.elProgress.display = true
-      this.elProgress.percentage = 0
+      this.elProgress.display = true;
+      this.elProgress.percentage = 0;
       for (let i = 0; i < this.multipleSelection.length; i++) {
         groupBatch.patientRegisterId = this.multipleSelection[i].id;
         try {
-          await postapi('/api/app/patientregister/updatepatientregistercustomerorggroup', groupBatch);
+          await postapi(
+            "/api/app/patientregister/updatepatientregistercustomerorggroup",
+            groupBatch
+          );
         } catch (error) {
           console.log(error);
         }
-        this.elProgress.percentage = Math.floor((i+1)*100/this.multipleSelection.length)
+        this.elProgress.percentage = Math.floor(
+          ((i + 1) * 100) / this.multipleSelection.length
+        );
       }
       this.$message.success("操作成功！");
       this.dialogGroup = false;
       this.Query();
     },
 
-
     //快速查询项目
     remoteMethod(keyWords) {
-      //console.log('remoteMethod',this.dict.asbItemQuick)  
+      //console.log('remoteMethod',this.dict.asbItemQuick)
       if (keyWords) {
         this.quickAsb = [];
-        this.dict.asbItemQuick.forEach(item => {
-          if (item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
-            || item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
-            || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1) {
+        this.dict.asbItemQuick.forEach((item) => {
+          if (
+            item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) >
+              -1 ||
+            item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) >
+              -1 ||
+            item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
+          ) {
             this.quickAsb.push(item);
           }
         });
@@ -951,10 +1114,10 @@ export default {
 
     //快速选择项目
     quickChoosedAsb(v) {
-      //过滤已选的的组合项目      
-      let lfind = -1
+      //过滤已选的的组合项目
+      let lfind = -1;
       if (v) {
-        lfind = arrayExistObj(this.quickAsb, 'id', v)
+        lfind = arrayExistObj(this.quickAsb, "id", v);
         if (lfind > -1) {
           this.asbitemBatch.asbitemsTemp.push({
             asbitemId: v,
@@ -962,21 +1125,25 @@ export default {
             patientRegisterId: null,
             standardPrice: this.quickAsb[lfind].price,
             chargePrice: this.quickAsb[lfind].price,
-            payTypeFlag: '1',//默认单位支付
-            isCharge: 'N',
+            payTypeFlag: "1", //默认单位支付
+            isCharge: "N",
             amount: 1,
           });
           this.quickAsb.splice(lfind, 1);
-          arrayReduce(this.dict.asbItemQuick, { id: v }, 'id');
+          arrayReduce(this.dict.asbItemQuick, { id: v }, "id");
         }
       }
-      console.log(v, this.asbitemBatch.asbitemsTemp)
+      console.log(v, this.asbitemBatch.asbitemsTemp);
     },
 
     //删除临时显示的组合项目
     removeAbs(row) {
-      let lfind = arrayExistObj(this.asbitemBatch.asbitemsTemp, 'asbitemId', row.asbitemId);
-      if (lfind > - 1) this.asbitemBatch.asbitemsTemp.splice(lfind, 1);
+      let lfind = arrayExistObj(
+        this.asbitemBatch.asbitemsTemp,
+        "asbitemId",
+        row.asbitemId
+      );
+      if (lfind > -1) this.asbitemBatch.asbitemsTemp.splice(lfind, 1);
     },
 
     rowClickaAbitemCurr(row) {
@@ -1003,23 +1170,22 @@ export default {
         alert("请选择单位");
         return;
       }
-      //取消勾选，换成选择的方式  start 
-      this.multipleSelection = []
-      this.patientRegister.prList.forEach(e => {
-        if(e.choosed) this.multipleSelection.push(e)
+      //取消勾选，换成选择的方式  start
+      this.multipleSelection = [];
+      this.patientRegister.prList.forEach((e) => {
+        if (e.choosed) this.multipleSelection.push(e);
       });
-      //取消勾选，换成选择的方式  end 
-
+      //取消勾选，换成选择的方式  end
 
       this.dialogAsbitem = true;
-      //供快速选择的组合项目      
+      //供快速选择的组合项目
       this.dict.asbItemQuick = [...this.dict.asbItemAll];
       this.asbitemBatch.asbitemCurr.asbitemId = null;
       this.asbitemBatch.asbitemsTemp = [];
     },
 
     asbitemDel(type) {
-      //typ==0 为批量删除 
+      //typ==0 为批量删除
       if (Number(type) == 0) {
         this.asbitemBatch.asbitemsTemp = [];
       } else {
@@ -1028,7 +1194,11 @@ export default {
           return;
         }
         //console.log(this.asbitemBatch.asbitemsTemp,this.asbitemBatch.asbitemCurr)
-        let lfind = arrayExistObj(this.asbitemBatch.asbitemsTemp, 'asbitemId', this.asbitemBatch.asbitemCurr.asbitemId);
+        let lfind = arrayExistObj(
+          this.asbitemBatch.asbitemsTemp,
+          "asbitemId",
+          this.asbitemBatch.asbitemCurr.asbitemId
+        );
         if (lfind > -1) {
           this.asbitemBatch.asbitemsTemp.splice(lfind, 1);
           this.asbitemBatch.asbitemCurr.asbitemId = null;
@@ -1039,7 +1209,7 @@ export default {
 
     //批量调整支付方式
     changePayTypeFlag(flag) {
-      this.asbitemBatch.asbitemsTemp.forEach(e => {
+      this.asbitemBatch.asbitemsTemp.forEach((e) => {
         e.payTypeFlag = flag;
         return e;
       });
@@ -1047,15 +1217,16 @@ export default {
 
     //批量调整项目
     async asbitemBatchHandle() {
-      let msg = '', body = {};
+      let msg = "",
+        body = {};
       if (this.asbitemBatch.asbitemsTemp.length == 0) {
         this.$message.warning("没有选择组合项目，不可执行此操作！");
         return;
       }
-      if (this.asbitemBatch.operate == 'add') {
+      if (this.asbitemBatch.operate == "add") {
         this.asbitemBatch.asbitemsTemp.forEach((e, index) => {
           if (!e.amount || !e.chargePrice) {
-            msg = '第 ' + (index + 1) + " 行，未输入数量或价格！";
+            msg = "第 " + (index + 1) + " 行，未输入数量或价格！";
           }
         });
         if (msg) {
@@ -1078,31 +1249,37 @@ export default {
         //     }
         //   ]
         // }
-        let createRegisterAsbitemDtos = deepCopy(this.asbitemBatch.asbitemsTemp);
+        let createRegisterAsbitemDtos = deepCopy(
+          this.asbitemBatch.asbitemsTemp
+        );
 
-        createRegisterAsbitemDtos.forEach(e => {
+        createRegisterAsbitemDtos.forEach((e) => {
           delete e.asbitemName;
           return e;
         });
-        this.elProgress.display = true
-        this.elProgress.percentage = 0
+        this.elProgress.display = true;
+        this.elProgress.percentage = 0;
         for (let i = 0; i < this.multipleSelection.length; i++) {
-          createRegisterAsbitemDtos.forEach(e => {
+          createRegisterAsbitemDtos.forEach((e) => {
             e.patientRegisterId = this.multipleSelection[i].id;
             return e;
           });
           body = {
             organizationUnitId: this.multipleSelection[i].organizationUnitId,
             createRegisterAsbitemDtos,
-          }
+          };
           try {
-            await postapi('/api/app/registerasbitem/createregisterasbitemincustomerorgmany', body);
+            await postapi(
+              "/api/app/registerasbitem/createregisterasbitemincustomerorgmany",
+              body
+            );
           } catch (error) {
-            console.log('批量增加项目错误，原因：', error);
+            console.log("批量增加项目错误，原因：", error);
           }
-          this.elProgress.percentage = Math.floor((i+1)*100/this.multipleSelection.length)
+          this.elProgress.percentage = Math.floor(
+            ((i + 1) * 100) / this.multipleSelection.length
+          );
         }
-
       } else {
         // {
         //   isDeleteGroup: 'N',
@@ -1111,27 +1288,31 @@ export default {
         // }
         let asbitemIds = [];
         if (this.asbitemBatch.isDeleteGroup) {
-          body.isDeleteGroup = 'Y';
+          body.isDeleteGroup = "Y";
         } else {
-          body.isDeleteGroup = 'N';
+          body.isDeleteGroup = "N";
         }
-        this.elProgress.display = true
-        this.elProgress.percentage = 0
+        this.elProgress.display = true;
+        this.elProgress.percentage = 0;
         for (let i = 0; i < this.multipleSelection.length; i++) {
-
-          this.asbitemBatch.asbitemsTemp.forEach(e => {
+          this.asbitemBatch.asbitemsTemp.forEach((e) => {
             asbitemIds.push(e.asbitemId);
           });
 
           body.patientRegisterId = this.multipleSelection[i].id;
-          body.asbitemIds = asbitemIds
+          body.asbitemIds = asbitemIds;
 
           try {
-            await postapi('/api/app/registerasbitem/deleteregisterasbitemincustomerorgmany', body);
+            await postapi(
+              "/api/app/registerasbitem/deleteregisterasbitemincustomerorgmany",
+              body
+            );
           } catch (error) {
-            console.log('批量删除项目错误，原因：', error);
+            console.log("批量删除项目错误，原因：", error);
           }
-          this.elProgress.percentage = Math.floor((i+1)*100/this.multipleSelection.length)
+          this.elProgress.percentage = Math.floor(
+            ((i + 1) * 100) / this.multipleSelection.length
+          );
         }
       }
 
@@ -1142,16 +1323,21 @@ export default {
 
     //检验申请
     async lisRequest(prId) {
-      let isPrintLisRequest = false
-      let res = null
+      let isPrintLisRequest = false;
+      let res = null;
       if (prId.length < 1) {
         this.$message.info("人员信息尚未保存，不可执行此操作！");
         return;
       }
 
       try {
-        res = await postapi(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${prId}`);
-        console.log(`/api/app/lisrequest/setlisrequest?PatientRegisterId=${prId}`, res)
+        res = await postapi(
+          `/api/app/lisrequest/setlisrequest?PatientRegisterId=${prId}`
+        );
+        console.log(
+          `/api/app/lisrequest/setlisrequest?PatientRegisterId=${prId}`,
+          res
+        );
       } catch (error) {
         return;
       }
@@ -1161,7 +1347,7 @@ export default {
       }
 
       //重复申请，重打
-      if (res.code == -1 && res.message.indexOf('已申请') > -1) {
+      if (res.code == -1 && res.message.indexOf("已申请") > -1) {
         isPrintLisRequest = true;
       }
 
@@ -1180,129 +1366,151 @@ export default {
         return;
       }
       //打印检验申请单
-      this.lisPrint(prId, '0003', false);
+      this.lisPrint(prId, "0003", false);
     },
 
     //检验条码打印
     lisPrint(prId, ReportCode, isPreview) {
-      if(!this.$peisAPI) {
-        this.$message.info("此功能，需要在壳客户端才可运行！")
-        return       
+      if (!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！");
+        return;
       }
-      let token = localStorage.getItem('token');
-      let user = localStorage.getItem('user');
+      let token = localStorage.getItem("token");
+      let user = localStorage.getItem("user");
       let toOutShell = {
-        ReportCode, token,
-        preViewCanPrint: 'N',
+        ReportCode,
+        token,
+        preViewCanPrint: "N",
         Parameters: [
-          { Name: 'printer', Value: user },
-          { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
+          { Name: "printer", Value: user },
+          { Name: "hisLog", Value: "pic/hisLog.jpg" },
         ],
       };
 
-
       if (isPreview) {
         //http://140.143.162.39:9529/api/app/printreport/getlisrequestreport?PatientRegisterId=3a0d2e90-da68-3746-6775-bf17e5f9b295
         //this.multipleSelection.forEach((item,index) =>{
-        postapi(`/api/app/printreport/getlisrequestreport?PatientRegisterId=${prId}`)
+        postapi(
+          `/api/app/printreport/getlisrequestreport?PatientRegisterId=${prId}`
+        )
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = { lisRequest: res.data };
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+              console.log(
+                "JSON.stringify(toOutShell)",
+                JSON.stringify(toOutShell)
+              );
               return this.$peisAPI.printPre(JSON.stringify(toOutShell));
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.$message.warning(err);
           });
         // });
       } else {
-
-        postapi(`/api/app/printreport/getlisrequestreport?PatientRegisterId=${prId}`)
+        postapi(
+          `/api/app/printreport/getlisrequestreport?PatientRegisterId=${prId}`
+        )
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = { lisRequest: res.data };
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+              console.log(
+                "JSON.stringify(toOutShell)",
+                JSON.stringify(toOutShell)
+              );
               return this.$peisAPI.print(JSON.stringify(toOutShell));
             }
           })
-          .then(res => {
-            console.log('res', res);
-            if (res && res.toLowerCase() == 'success') {
+          .then((res) => {
+            console.log("res", res);
+            if (res && res.toLowerCase() == "success") {
               //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
               // {
               //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
               //   "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
               //   "lisRequestId": "3fa85f64-5717-4562-b3fc-2c963f66afa6"
               // }
-              return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: prId })
+              return postapi("/api/app/lisrequest/updatelisrequestisprint", {
+                operateType: 1,
+                patientRegisterId: prId,
+              });
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.$message.warning(err);
           });
-
       }
     },
 
     //pacs条码打印
     pacsPrint(prId, ReportCode, isPreview) {
-      if(!this.$peisAPI) {
-        this.$message.info("此功能，需要在壳客户端才可运行！")
-        return       
+      if (!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！");
+        return;
       }
-      let token = localStorage.getItem('token');
-      let user = localStorage.getItem('user');
+      let token = localStorage.getItem("token");
+      let user = localStorage.getItem("user");
       let toOutShell = {
-        ReportCode, token,
-        preViewCanPrint: 'Y',
+        ReportCode,
+        token,
+        preViewCanPrint: "Y",
         Parameters: [
-          { Name: 'printer', Value: user },
-          { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
+          { Name: "printer", Value: user },
+          { Name: "hisLog", Value: "pic/hisLog.jpg" },
         ],
       };
 
-
       if (isPreview) {
         //http://140.143.162.39:9529/api/app/printreport/getpacsnoreport?PatientRegisterId=3a0c990e-5756-2dc0-19d5-69a617fe4048
         //this.multipleSelection.forEach((item,index) =>{
-        postapi(`/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`)
+        postapi(
+          `/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`
+        )
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = { lisRequest: res.data };
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+              console.log(
+                "JSON.stringify(toOutShell)",
+                JSON.stringify(toOutShell)
+              );
               return this.$peisAPI.printPre(JSON.stringify(toOutShell));
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.$message.warning(err);
           });
         // });
       } else {
-
-        postapi(`/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`)
+        postapi(
+          `/api/app/printreport/getpacsnoreport?PatientRegisterId=${prId}`
+        )
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = { lisRequest: res.data };
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+              console.log(
+                "JSON.stringify(toOutShell)",
+                JSON.stringify(toOutShell)
+              );
               return this.$peisAPI.print(JSON.stringify(toOutShell));
             }
           })
-          .then(res => {
-            if (res.toLowerCase() == 'success') {
+          .then((res) => {
+            if (res.toLowerCase() == "success") {
               //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
               // {
               //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
               //   "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
               //   "lisRequestId": "3fa85f64-5717-4562-b3fc-2c963f66afa6"
               // }
-              return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: prId })
+              return postapi("/api/app/lisrequest/updatelisrequestisprint", {
+                operateType: 1,
+                patientRegisterId: prId,
+              });
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.$message.warning(err);
           });
-
       }
     },
 
@@ -1312,18 +1520,33 @@ export default {
       Sortable.create(wrapperTr, {
         animation: 180,
         delay: 0,
+        // 元素被选中
+        onChoose: function (/**Event*/ evt) {
+          //console.log('onChoose',evt,evt.oldIndex)
+          evt.oldIndex; // element index within parent
+        },
+
+        // 元素未被选中的时候（从选中到未选中）
+        onUnchoose: function (/**Event*/ evt) {
+          // same properties as onEnd
+        },
+
+        // 开始拖拽的时候
+        onStart: function (/**Event*/ evt) {
+          //console.log('onStart',evt,evt.oldIndex)
+          evt.oldIndex; // element index within parent
+        },
         onEnd: (evt) => {
-          const oldItem = dropCol[evt.oldIndex - 1];
-          dropCol.splice(evt.oldIndex - 1, 1);
-          dropCol.splice(evt.newIndex - 1, 0, oldItem);
+          const oldItem = dropCol[evt.oldIndex];  // dropCol[evt.oldIndex - 1]; 
+          if (oldItem) {
+            dropCol.splice(evt.oldIndex, 1);
+            dropCol.splice(evt.newIndex, 0, oldItem);
+          }
+          //console.log(this.headerCols, oldItem, dropCol);
         },
       });
       return dropCol;
     },
-
-    
-
-
   },
 
   //监听事件