From 9ba4344d5014dfe069dbd5c9a0e311ad1f70c568 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 28 Mar 2024 21:58:29 +0800
Subject: [PATCH] seo

---
 src/components/patientRegister/LisRequest.vue |   6 +-
 .../patientRegister/MergeAsbitem.vue          |   8 +-
 .../patientRegister/PatientRegisterEdit.vue   | 591 +++++++++---------
 .../PatientRegisterEditItemBatch.vue          | 166 ++---
 .../patientRegister/PatientRegisterItem.vue   |   2 +-
 .../patientRegister/PatientRegisterList.vue   | 444 ++++++-------
 .../patientRegisterAsbItem.vue                |  62 +-
 src/store/index.js                            |   3 +-
 8 files changed, 614 insertions(+), 668 deletions(-)

diff --git a/src/components/patientRegister/LisRequest.vue b/src/components/patientRegister/LisRequest.vue
index 48d4b21..92b861c 100644
--- a/src/components/patientRegister/LisRequest.vue
+++ b/src/components/patientRegister/LisRequest.vue
@@ -25,13 +25,13 @@
     <!-- 按钮区域 -->
     <div style="display: flex; margin-top: 30px; margin-left: 280px">
       <div style="margin-left: 10px">
-        <el-button type="primary" @click="submit" style="width:80px;">确定</el-button>
+        <el-button class="commonbutton" type="primary" @click="submit" style="width:80px;">确定</el-button>
       </div>
       <div style="margin-left: 10px">
-        <el-button type="success" @click="lisPrint('0002', false)" style="width:80px;">条码打印</el-button>
+        <el-button class="commonbutton" type="success" @click="lisPrint('0002', false)" style="width:80px;">条码打印</el-button>
       </div>
       <div style="margin-left: 10px">
-        <el-button type="danger" @click="patientRegister.lisRequestVisble = false" style="width:80px;">关闭</el-button>
+        <el-button class="commonbutton" type="danger" @click="patientRegister.lisRequestVisble = false" style="width:80px;">关闭</el-button>
       </div>
     </div>
   </div>
diff --git a/src/components/patientRegister/MergeAsbitem.vue b/src/components/patientRegister/MergeAsbitem.vue
index 89c35e1..6dab029 100644
--- a/src/components/patientRegister/MergeAsbitem.vue
+++ b/src/components/patientRegister/MergeAsbitem.vue
@@ -11,7 +11,7 @@
       <el-table :data="tableData" border style="width: 100%" row-key="id" height="300" highlight-current-row size="small"
         @selection-change="handleSelectionChange" :span-method="spanMethod" ref="tableData"
         :row-style="{ height: '30px' }">
-        <el-table-column type="selection" :selectable="selectable" />
+        <el-table-column type="selection" :selectable="selectable" align="center" />
         <el-table-column label="项目类别" width="120" prop="itemTypeName" />
         <el-table-column label="组合项目" width="140" prop="asbitemName" />
         <!-- isItemResultMerger  项目是否可以合并 -->
@@ -31,13 +31,13 @@
     <!-- 按钮区域 -->
     <div style="display: flex; margin-top: 30px; margin-left: 280px">
       <div style="margin-left: 10px">
-        <el-button type="primary" @click="mergeSubmit" style="width:80px;">合并项目</el-button>
+        <el-button class="commonbutton" type="primary" @click="mergeSubmit" style="width:80px;">合并项目</el-button>
       </div>
       <div style="margin-left: 10px">
-        <el-button type="info" @click="unMergeSubmit" style="width:80px;">取消合并</el-button>
+        <el-button class="commonbutton" type="info" @click="unMergeSubmit" style="width:80px;">取消合并</el-button>
       </div>
       <div style="margin-left: 10px">
-        <el-button type="danger" @click="patientRegister.mergeAsbitemVisble = false" style="width:80px;">关闭</el-button>
+        <el-button class="commonbutton" type="danger" @click="patientRegister.mergeAsbitemVisble = false" style="width:80px;">关闭</el-button>
       </div>
     </div>
   </div>
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index dcb2b32..75cc301 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -1,10 +1,11 @@
 <template>
   <div>
+    <!--组件主体-->
     <div style="display: flex">
-      <div :style="'width:' + (window.pageWidth - 110 - 20) + 'px;'">        
+      <div :style="'width:' + (window.pageWidth - 110 - 20) + 'px;'">
         <!--查询条件-->
-        <div v-show="checkPagePriv(pagePriv.privs,'查找')" style="position: absolute;top:28px;left:180px;">
-          <PatientRegisterEditQuery/>
+        <div v-show="checkPagePriv(pagePriv.privs, '查找')" style="position: absolute;top:28px;left:180px;">
+          <PatientRegisterEditQuery />
         </div>
         <div>
           <el-form ref="form" :model="form" label-width="80px" :rules="rules" size="medium">
@@ -12,9 +13,10 @@
               <el-col :span="5">
                 <el-form-item label="单位名称" prop="customerOrgId">
                   <el-cascader v-model="form.customerOrgId" :options="patientRegister.customerOrgTreeAll"
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" filterable popper-class="example" 
-                    :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }" 
-                    :disabled="(form.completeFlag == '3' || isDoctor != '1') ? true:false" size="small">
+                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" filterable
+                    popper-class="example"
+                    :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
+                    :disabled="(form.completeFlag == '3' || isDoctor != '1') ? true : false" size="small">
                   </el-cascader>
                 </el-form-item>
               </el-col>
@@ -48,7 +50,8 @@
             <el-row>
               <el-col :span="5">
                 <el-form-item label="姓名" prop="patientName">
-                  <el-input id="patientName" v-model="form.patientName" @change="Query(form.patientName)" size="small" autocomplete="off"></el-input>
+                  <el-input id="patientName" v-model="form.patientName" @change="Query(form.patientName)" size="small"
+                    autocomplete="off"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="5">
@@ -62,9 +65,9 @@
                   <input type="date" v-model="form.birthDate" size="small" 
                     :style="'border-radius: 4px;border: 1px solid #DCDFE6;height: 32px;line-height: 32px;padding-left: 2px;width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'"/>
                   -->
-                  <el-date-picker v-model="form.birthDate" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="出生日期"
-                    :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'" @change="changeBirthDate"
-                    prefix-icon="" size="small"/>                  
+                  <el-date-picker v-model="form.birthDate" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                    placeholder="出生日期" :style="'width:' + Math.floor((window.pageWidth - 510) / 4.8) + 'px;'"
+                    @change="changeBirthDate" prefix-icon="" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -133,7 +136,8 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="性激素期" prop="sexHormoneTermId">
-                  <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable size="small" :disabled="isComplete">
+                  <el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable size="small"
+                    :disabled="isComplete">
                     <el-option v-for="item in dict.sexHormoneTerm" :key="item.id" :label="item.displayName"
                       :value="item.id">
                     </el-option>
@@ -202,7 +206,8 @@
               </el-col>
               <el-col :span="5">
                 <el-form-item label="单位体检次数" prop="isVip" label-width="110px">
-                  <el-select :class="form.customerOrgId == dict.personOrgId ? '':'enterToTab'" v-model="form.customerOrgRegisterId" placeholder="次数" size="small"
+                  <el-select :class="form.customerOrgId == dict.personOrgId ? '' : 'enterToTab'"
+                    v-model="form.customerOrgRegisterId" placeholder="次数" size="small"
                     :disabled="form.customerOrgId == dict.personOrgId"
                     :style="'width:' + Math.floor((window.pageWidth - 654) / 4.8) + 'px;'" @change="changeMedicalTimes"
                     value-key="id">
@@ -284,7 +289,8 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="状态" prop="completeFlag" label-width="50px">
-                  <el-select v-model="form.completeFlag" placeholder="请选择" :disabled="(form.completeFlag == '2' || form.completeFlag == '3') ? true:false" size="small">
+                  <el-select v-model="form.completeFlag" placeholder="请选择"
+                    :disabled="(form.completeFlag == '2' || form.completeFlag == '3') ? true : false" size="small">
                     <div v-if="form.completeFlag == '2' || form.completeFlag == '3'">
                       <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName"
                         :value="item.id">
@@ -299,14 +305,14 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="6">                
+              <el-col :span="6">
                 <el-form-item label="创建人员">
                   <el-input v-model="form.creatorName" disabled size="small"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="创建时间">
-                  <el-input :value="form.creationTime 
+                  <el-input :value="form.creationTime
                     ? moment(form.creationTime).format('yyyy-MM-DD')
                     : ''
                     " disabled size="small"></el-input>
@@ -337,135 +343,140 @@
         </div>
         <!--人员登记组合项目明细 register_asbitem-->
         <div>
-          <PatientRegisterItem :prForm="form" :prAsbOpraOpts="prAsbOpraOpts" :triggerHeadSave="triggerHeadSave" :refreshFormId="refreshFormId"/>
+          <PatientRegisterItem :prForm="form" :prAsbOpraOpts="prAsbOpraOpts" :triggerHeadSave="triggerHeadSave"
+            :refreshFormId="refreshFormId" />
         </div>
       </div>
-      <div style="margin-left: 10px;">        
-        <div v-show="checkPagePriv(pagePriv.privs,'拍照')">
+      <div style="margin-left: 10px;">
+        <div v-show="checkPagePriv(pagePriv.privs, '拍照')">
           <el-button type="primary" class="commonbutton" @click="photoGrah" icon="el-icon-camera">拍照</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'读身份证')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '读身份证')" class="btn">
           <el-button @click="peopleIcCard" class="commonbutton">读身份证</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'复制新增')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '复制新增')" class="btn">
           <el-button type="primary" class="commonbutton" @click="rdCopy">复制新增</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'保存')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '保存')" class="btn">
           <el-button type="success" class="commonbutton" @click="btnSubmit('form', true)">保存</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'检验单申请')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '检验单申请')" class="btn">
           <el-button type="primary" class="commonbutton" @click="lisRequest">检验单申请</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'条码打印')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '条码打印')" class="btn">
           <el-button type="primary" class="commonbutton" @click="lisPrint('0002', false)">条码打印</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'条码补打')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '条码补打')" class="btn">
           <el-button type="danger" class="commonbutton" @click="reLisRequest">条码补打</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'指引单打印')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '指引单打印')" class="btn">
           <el-button type="primary" class="commonbutton" @click="guidePrint('0001', false)">指引单打印</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'指引单预览')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '指引单预览')" class="btn">
           <el-button type="primary" class="commonbutton" @click="guidePrint('0001', true)">指引单预览</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'手动合并项目')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '手动合并项目')" class="btn">
           <el-button type="danger" class="commonbutton" @click="reMergeAsbitem">手动合并项目</el-button>
         </div>
 
-        <div v-show="checkPagePriv(pagePriv.privs,'全个人支付')" style="margin-top: 30px;">
+        <div v-show="checkPagePriv(pagePriv.privs, '全个人支付')" style="margin-top: 30px;">
           <el-button type="primary" class="commonbutton" @click="prAsbOpraOpts.payTypeFlag = '0'">全个人支付</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'全单位支付')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '全单位支付')" class="btn">
           <el-button type="primary" class="commonbutton" @click="prAsbOpraOpts.payTypeFlag = '1'">全单位支付</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'全赠送')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '全赠送')" class="btn">
           <el-button type="primary" class="commonbutton" @click="prAsbOpraOpts.payTypeFlag = '2'">全赠送</el-button>
         </div>
-        <div v-show="checkPagePriv(pagePriv.privs,'收费')" class="btn">
+        <div v-show="checkPagePriv(pagePriv.privs, '收费')" class="btn">
           <el-button type="success" class="commonbutton" @click="toCharge(form.patientRegisterNo)">收费</el-button>
         </div>
       </div>
     </div>
 
-    <!-- 人员档案列表 -->
-    <el-dialog title="人员档案列表" :visible.sync="dialogVisible" width="800px" :show-close="false" :close-on-click-modal="false"
-      :append-to-body="true">
-      <el-table :data="patientList" border width="800" height="480" row-key="id" size="small"
-        class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" @row-dblclick="patientDblclick" ref="patientList">
-        <el-table-column type="index" width="30" />
-        <el-table-column prop="patientNo" label="档案号" />
-        <el-table-column prop="lastTime" label="末次体检" width="100">
-          <template slot-scope="scope">
-            <div v-if="scope.row.lastTime">
-              {{ moment(scope.row.lastTime).format("yyyy-MM-DD") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="medicalTimes" label="体检次数" />
-        <el-table-column prop="displayName" label="姓名" />
-        <el-table-column prop="sexId" label="性别">
-          <template slot-scope="scope">
-            <div>
-              {{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="maritalStatusId" label="婚姻">
-          <template slot-scope="scope">
-            <div>
-              {{ dddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="birthDate" label="出生日期" width="100">
-          <template slot-scope="scope">
-            <div v-if="scope.row.birthDate">
-              {{ moment(scope.row.birthDate).format("yyyy-MM-DD") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="nationId" label="民族">
-          <template slot-scope="scope">
-            <div>
-              {{ dddw(dict.nation, "id", scope.row.nationId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="idNo" label="身份证号" />
-        <el-table-column prop="telephone" label="电话" />
-        <el-table-column prop="mobileTelephone" label="手机号" />
-      </el-table>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false" style="width:90px;">取消</el-button>
-        <el-button type="primary" @click="choosePatient" style="width:90px;">确定</el-button>
-      </span>
-    </el-dialog>
-
-    <!-- 拍照（openCamera） 网页模式，已废弃  
+    <!--组件弹窗-->
+    <div>
+      <!-- 人员档案列表 -->
+      <el-dialog title="人员档案列表" :visible.sync="dialogVisible" width="800px" :show-close="false"
+        :close-on-click-modal="false" :append-to-body="true">
+        <el-table :data="patientList" border width="800" height="480" row-key="id" size="small"
+          class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" @row-dblclick="patientDblclick"
+          ref="patientList">
+          <el-table-column type="index" width="30" />
+          <el-table-column prop="patientNo" label="档案号" />
+          <el-table-column prop="lastTime" label="末次体检" width="100">
+            <template slot-scope="scope">
+              <div v-if="scope.row.lastTime">
+                {{ moment(scope.row.lastTime).format("yyyy-MM-DD") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="medicalTimes" label="体检次数" />
+          <el-table-column prop="displayName" label="姓名" />
+          <el-table-column prop="sexId" label="性别">
+            <template slot-scope="scope">
+              <div>
+                {{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="maritalStatusId" label="婚姻">
+            <template slot-scope="scope">
+              <div>
+                {{ dddw(dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="birthDate" label="出生日期" width="100">
+            <template slot-scope="scope">
+              <div v-if="scope.row.birthDate">
+                {{ moment(scope.row.birthDate).format("yyyy-MM-DD") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="nationId" label="民族">
+            <template slot-scope="scope">
+              <div>
+                {{ dddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="idNo" label="身份证号" />
+          <el-table-column prop="telephone" label="电话" />
+          <el-table-column prop="mobileTelephone" label="手机号" />
+        </el-table>
+        <span slot="footer" class="dialog-footer">
+          <el-button class="commonbutton" @click="dialogVisible = false" style="width:90px;">取消</el-button>
+          <el-button class="commonbutton" type="primary" @click="choosePatient" style="width:90px;">确定</el-button>
+        </span>
+      </el-dialog>
+
+      <!-- 拍照（openCamera） 网页模式，已废弃  
     <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="600"
       :close-on-click-modal="false" :append-to-body="true">
       <Camera :id="form.id" />    
     </el-dialog>
     -->
-    <!-- 检验条码补打 -->
-    <el-dialog title="检验条码补打" :visible.sync="patientRegister.lisRequestVisble" width="600px" height="400"
-      :show-close="false" :close-on-click-modal="false" :append-to-body="true">
-      <LisRequest :id="form.id" :brushTimes="brushTimes" />
-    </el-dialog>
-
-    <!-- 手动合并项目 -->
-    <el-dialog title="手动合并项目" :visible.sync="patientRegister.mergeAsbitemVisble" width="600px" height="400"
-      :show-close="false" :close-on-click-modal="false" :append-to-body="true">
-      <MergeAsbitem :id="form.id" :organizationUnitId="form.organizationUnitId" :brushTimes="brushTimes" />
-    </el-dialog>
-
-    <!-- 收费 -->
-    <el-dialog title="" :visible.sync="dialogWin.charge" :close-on-click-modal="false"
-      :append-to-body="true" fullscreen @close="closeDialogCharge">
-      <div style="margin-top: -30px;">
-        <Charge :patientRegisterNo="chargePatientRegisterNo"/>
-      </div>
-    </el-dialog>
+      <!-- 检验条码补打 -->
+      <el-dialog title="检验条码补打" :visible.sync="patientRegister.lisRequestVisble" width="600px" height="400"
+        :show-close="false" :close-on-click-modal="false" :append-to-body="true">
+        <LisRequest :id="form.id" :brushTimes="brushTimes" />
+      </el-dialog>
+
+      <!-- 手动合并项目 -->
+      <el-dialog title="手动合并项目" :visible.sync="patientRegister.mergeAsbitemVisble" width="600px" height="400"
+        :show-close="false" :close-on-click-modal="false" :append-to-body="true">
+        <MergeAsbitem :id="form.id" :organizationUnitId="form.organizationUnitId" :brushTimes="brushTimes" />
+      </el-dialog>
+
+      <!-- 收费 -->
+      <el-dialog title="" :visible.sync="dialogWin.charge" :close-on-click-modal="false" :append-to-body="true" fullscreen
+        @close="closeDialogCharge">
+        <div style="margin-top: -30px;">
+          <Charge :patientRegisterNo="chargePatientRegisterNo" />
+        </div>
+      </el-dialog>
+    </div>
   </div>
 </template>
 <script>
@@ -473,7 +484,11 @@ import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import mm from "../../utlis/mm";
-import { getPagePriv,checkPagePriv, objCopy, setNull, dddw,checkIDCode, parseID, birthdayToAge,ageToBirthday, deepCopy, arrayFilter, arrayReduce,parsIcCardtoLocal, photoParse, savePeoplePhoto, arrayExistObj } from "../../utlis/proFunc";
+import {
+  getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID,
+  birthdayToAge, ageToBirthday, deepCopy, arrayFilter, arrayReduce, parsIcCardtoLocal,
+  photoParse, savePeoplePhoto, arrayExistObj
+} from "../../utlis/proFunc";
 import Camera from "./Camera.vue";
 import PatientRegisterItem from "./PatientRegisterItem.vue";
 import LisRequest from "./LisRequest.vue";
@@ -492,24 +507,24 @@ export default {
     PatientRegisterEditQuery
   },
   // isDoctor: '0:标准人员登记/1:医生诊台登记(可修改单位)' 
-  props: ['isDoctor','patientRegisterId','editTimes','refreshRegister'],
+  props: ['isDoctor', 'patientRegisterId', 'editTimes', 'refreshRegister', 'refFuncSetData'],
   data() {
     return {
-      pagePriv:{
-        routeUrlorPageName:'PatientRegisterEdit', //当前页面归属路由或归属页面权限名称
-        privs:[] // 页面权限
+      pagePriv: {
+        routeUrlorPageName: 'PatientRegisterEdit', //当前页面归属路由或归属页面权限名称
+        privs: [] // 页面权限
       },
 
       apiurl: mm.apiurl,
       brushTimes: 0,
-      
+
       peisid: null,
       peoplePhoto: '',
-      
+
       form: {
-        registerManType:'customer', //登记人员类型，客服：customer 医生：doctor 支持在医生诊台处理登记人员
+        registerManType: 'customer', //登记人员类型，客服：customer 医生：doctor 支持在医生诊台处理登记人员
         id: "", //id
-        photo:'', //照片
+        photo: '', //照片
         patientId: "00000000-0000-0000-0000-000000000000", //档案号ID 选择了档案就传档案号，未选就传00000-0000...
         patientNo: "", //档案号
         customerOrgId: ["00000000-0000-0000-0000-000000000000"], //单位编号 默认个人 
@@ -556,9 +571,9 @@ export default {
         isLockBox: false, //是否锁住
         customerOrgRegisterId: null,
         isMaxMedicalTimes: 'N',
-        medicalStartDate:null
+        medicalStartDate: null
       }, //单位 记录 目前新增与更新是一致
-      formInit:{}, //表单初始化
+      formInit: {}, //表单初始化
       customerOrgRegisterList: [], //单位体检次数列表
       defaultNull: [
         "customerOrgId",
@@ -576,7 +591,7 @@ export default {
       ], //一般uuid字段为空时，需设置为null值
 
       rules: {
-        customerOrgId:[
+        customerOrgId: [
           { required: true, message: "请填写单位", trigger: "blur" },
         ],
         patientName: [
@@ -592,23 +607,23 @@ export default {
       patientChoosed: {}, //查重选中的人员
 
 
-      registerVisible:false,
-      patientRegisters:[],
-      registerChoosed:{},
+      registerVisible: false,
+      patientRegisters: [],
+      registerChoosed: {},
 
       dialogCamera: false, //拍照组件
 
-      chargePatientRegisterNo:'',  //对哪个条码客户收费 
+      chargePatientRegisterNo: '',  //对哪个条码客户收费 
 
       //人员登记，组合项目明细操作相关参数
-      prAsbOpraOpts:{
-        formId:'',      //form.id为空时，明细保存取此formId
-        copyNew:0,      //触发复制新增
-        payTypeFlag:'', //触发调整支付方式
-        prAsbSave:0, //触发组合项目明细保存
-        prAsbQuery:0,//触发组合项目明细查询，比如收费后，刷新收费状态
-        prAsbGroup:0, //触发分组更换
-        prAsbPackage:0, //触发套餐更换
+      prAsbOpraOpts: {
+        formId: '',      //form.id为空时，明细保存取此formId
+        copyNew: 0,      //触发复制新增
+        payTypeFlag: '', //触发调整支付方式
+        prAsbSave: 0, //触发组合项目明细保存
+        prAsbQuery: 0,//触发组合项目明细查询，比如收费后，刷新收费状态
+        prAsbGroup: 0, //触发分组更换
+        prAsbPackage: 0, //触发套餐更换
       },
     };
   },
@@ -616,7 +631,7 @@ export default {
   created() {
     //获取用户当前页面的权限
     let userPriv = window.sessionStorage.getItem('userPriv')
-    if(userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
+    if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
 
     this.formInit = deepCopy(this.form)
     // 初始化字典数据
@@ -630,44 +645,44 @@ export default {
   },
 
   computed: {
-    ...mapState(["window","dialogWin","dataTransOpts","dict", "patientRegister", "customerOrg", "projPriv"]),
+    ...mapState(["window", "dialogWin", "dataTransOpts", "dict", "patientRegister", "customerOrg", "projPriv"]),
 
     //是否总检(已总检则不允许修改套餐与分组)
-    isComplete(){
-      return this.form.completeFlag == '3' ? true:false;
+    isComplete() {
+      return this.form.completeFlag == '3' ? true : false;
     },
 
     // 套餐 disabled 如完成体检亦不允许编辑
-    displayPackage(){      
+    displayPackage() {
       let isPersonOrgId = true
-      if(!this.isComplete){
-        if(!this.form.customerOrgId) return false
-        if(typeof this.form.customerOrgId == 'string'){
-          if(this.form.customerOrgId == this.dict.personOrgId) isPersonOrgId = false
-        }else{
-          if(this.form.customerOrgId[this.form.customerOrgId.length - 1] == this.dict.personOrgId) isPersonOrgId = false
-        }    
-      }          
-      return isPersonOrgId      
+      if (!this.isComplete) {
+        if (!this.form.customerOrgId) return false
+        if (typeof this.form.customerOrgId == 'string') {
+          if (this.form.customerOrgId == this.dict.personOrgId) isPersonOrgId = false
+        } else {
+          if (this.form.customerOrgId[this.form.customerOrgId.length - 1] == this.dict.personOrgId) isPersonOrgId = false
+        }
+      }
+      return isPersonOrgId
     },
 
     // 分组 disabled 如完成体检亦不允许编辑
-    displayGroup(){      
+    displayGroup() {
       let isPersonOrgId = true
-      if(!this.isComplete){
-        if(!this.form.customerOrgId) return isPersonOrgId
-        if(typeof this.form.customerOrgId == 'string'){
-          if(this.form.customerOrgId != this.dict.personOrgId) isPersonOrgId = false
-        }else{
-          if(this.form.customerOrgId[this.form.customerOrgId.length - 1] != this.dict.personOrgId) isPersonOrgId = false
+      if (!this.isComplete) {
+        if (!this.form.customerOrgId) return isPersonOrgId
+        if (typeof this.form.customerOrgId == 'string') {
+          if (this.form.customerOrgId != this.dict.personOrgId) isPersonOrgId = false
+        } else {
+          if (this.form.customerOrgId[this.form.customerOrgId.length - 1] != this.dict.personOrgId) isPersonOrgId = false
         }
-      }        
-      return isPersonOrgId      
+      }
+      return isPersonOrgId
     },
   },
   methods: {
     ...mapActions(['getPatientRegisterAbs']),
-    dddw,moment,checkPagePriv,
+    dddw, moment, checkPagePriv,
 
     //数据初始化
     dictInit() {
@@ -744,7 +759,7 @@ export default {
       });
 
       //套餐
-      postapi("/api/app/medicalpackage/GetBasicList",{}).then((res) => {
+      postapi("/api/app/medicalpackage/GetBasicList", {}).then((res) => {
         if (res.code == 1) {
           this.dict.medicalPackage = res.data;
         }
@@ -773,20 +788,20 @@ export default {
 
       // console.log("dict", this.dict);
     },
-    
-    
+
+
     // 获取登记信息 初始form表单数据
-    async initFormData(patientRegisterId){    
+    async initFormData(patientRegisterId) {
 
       this.peisid = window.sessionStorage.getItem('peisid');
 
       if (!patientRegisterId) { //添加
         objCopy(this.formInit, this.form);
         this.form.organizationUnitId = this.peisid; //体检中收
-        this.form.customerOrgId = this.patientRegister.query.customerOrgId||this.dict.personOrgId //体检单位
+        this.form.customerOrgId = this.patientRegister.query.customerOrgId || this.dict.personOrgId //体检单位
         this.form.customerOrgParentId = await this.getParentCustomerOrgId(this.form.customerOrgId) //体检父单位
 
-      }else{
+      } else {
         // let res = await getapi(`/api/app/patient-register/${patientRegisterId}`)
         let res = await postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${patientRegisterId}`)
         this.form = res.data
@@ -797,31 +812,31 @@ export default {
       // 单位/个人 的分组与套餐处理
       await this.changeCustomerOrgId(this.form.customerOrgId)
       this.dataTransOpts.refresh.register_asbitem.M++ //触发所选组合项目刷新  
-      
+
 
     },
 
     //选择单位
-    async changeCustomerOrgId(v){
+    async changeCustomerOrgId(v) {
       let customerOrgId = ""
-      if(Array.isArray(v) && v.length > 0){
+      if (Array.isArray(v) && v.length > 0) {
         customerOrgId = v[v.length - 1]
-      }else{
+      } else {
         customerOrgId = v
       }
-      let  customerOrgParentId = await this.getParentCustomerOrgId(customerOrgId)
+      let customerOrgParentId = await this.getParentCustomerOrgId(customerOrgId)
 
-      if(customerOrgParentId){
+      if (customerOrgParentId) {
         if (customerOrgParentId != this.dict.personOrgId) this.getCustomerOrgRegisterList(customerOrgParentId)
-          
+
         // 父单位被更改时，需要触发 修改 分组/套餐
-        if(this.form.customerOrgParentId != customerOrgParentId){             
-          if (customerOrgParentId == this.dict.personOrgId) {          
+        if (this.form.customerOrgParentId != customerOrgParentId) {
+          if (customerOrgParentId == this.dict.personOrgId) {
             this.form.customerOrgRegisterId = null
             this.form.customerOrgGroupId = null
             this.form.medicalPackageId = null
-            this.patientRegister.customerOrgGroup = []          
-          }else{
+            this.patientRegister.customerOrgGroup = []
+          } else {
             this.form.customerOrgRegisterId = null
             this.form.customerOrgGroupId = null
             this.form.medicalPackageId = null
@@ -829,69 +844,69 @@ export default {
             // this.getCustomerOrgRegisterList(customerOrgParentId)
           }
 
-          if(this.form.customerOrgParentId == this.dict.personOrgId){
+          if (this.form.customerOrgParentId == this.dict.personOrgId) {
             this.changeMedicalPackageId()
-          }else{
+          } else {
             this.changeCustomerOrgGroupId()
           }
           this.form.customerOrgParentId = customerOrgParentId
-        }        
+        }
       }
     },
 
     // 获取顶级单位ID
-    async getParentCustomerOrgId(customerOrgId){
-      let  customerOrgParentId = null
-      if(!customerOrgId) return customerOrgParentId
-      if(typeof customerOrgId == 'string'){
+    async getParentCustomerOrgId(customerOrgId) {
+      let customerOrgParentId = null
+      if (!customerOrgId) return customerOrgParentId
+      if (typeof customerOrgId == 'string') {
         try {
           let res = await getapi(`/api/app/customer-org/parent/${this.form.customerOrgId}`)
-          if(res.code != -1) customerOrgParentId = res.data
+          if (res.code != -1) customerOrgParentId = res.data
         } catch (error) {
-          console.log('获取顶级单位ID出错：',error)
+          console.log('获取顶级单位ID出错：', error)
         }
-      }else if(customerOrgId.length > 0){
+      } else if (customerOrgId.length > 0) {
         customerOrgParentId = customerOrgId[0]
       }
       return customerOrgParentId
     },
 
     //获取单位体检次数
-    getCustomerOrgRegisterList(customerOrgParentId){
+    getCustomerOrgRegisterList(customerOrgParentId) {
       //获取单位体检次数信息
       getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${customerOrgParentId}`)
-      .then(res =>{
-        if(res.code != - 1){
-          console.log('获取单位体检次数',this.form.customerOrgRegisterId,res.data)
-          if(this.form.customerOrgRegisterId){
-            let lfind = arrayExistObj(res.data,"id",this.form.customerOrgRegisterId)
-            if(lfind == -1) this.form.customerOrgRegisterId = ''
-          }
-          if(!this.form.customerOrgRegisterId){
-            this.customerOrgRegisterList = arrayFilter(res.data, 'isComplete', 'N')  //不显示已完成的体检次数
-            if(this.customerOrgRegisterList.length > 0){
-              this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id              
+        .then(res => {
+          if (res.code != - 1) {
+            console.log('获取单位体检次数', this.form.customerOrgRegisterId, res.data)
+            if (this.form.customerOrgRegisterId) {
+              let lfind = arrayExistObj(res.data, "id", this.form.customerOrgRegisterId)
+              if (lfind == -1) this.form.customerOrgRegisterId = ''
             }
+            if (!this.form.customerOrgRegisterId) {
+              this.customerOrgRegisterList = arrayFilter(res.data, 'isComplete', 'N')  //不显示已完成的体检次数
+              if (this.customerOrgRegisterList.length > 0) {
+                this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id
+              }
+            }
+            if (this.form.customerOrgRegisterId) return getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${this.form.customerOrgRegisterId}`) //获取单位分组
           }
-          if(this.form.customerOrgRegisterId) return getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${this.form.customerOrgRegisterId}`) //获取单位分组
-        }
-      }).then(res =>{
-        if(res && res.code != -1){
-          this.patientRegister.customerOrgGroup = res.data.items;
-        }
-      })     
+        }).then(res => {
+          if (res && res.code != -1) {
+            this.patientRegister.customerOrgGroup = res.data.items;
+          }
+        })
     },
 
     //读取身份证信息
     peopleIcCard() {
-      if(!this.$peisAPI) {
+      if (!this.$peisAPI) {
         this.$message.info("此功能，需要在壳客户端才可运行！")
-        return       
+        return
       }
       this.$peisAPI.peopleIcCard().then(res => {
-        console.log('peopleIcCard',res)
+        console.log('peopleIcCard', res)
         let lres = JSON.parse(res)
-        if (lres.code >= 0) {          
+        if (lres.code >= 0) {
           let idNos = parsIcCardtoLocal(lres.data, this.dict.sex, this.dict.nation)
           this.form.patientName = idNos.Name
           this.form.birthDate = idNos.birthDate
@@ -916,7 +931,7 @@ export default {
     //     let res = await getapi(`/api/app/customer-org/parent/${this.form.customerOrgId}`);
     //     let res1 = await getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${res.data}`);
     //     this.customerOrgRegisterList = arrayFilter(res1.data, 'isComplete', 'N')
-        
+
     //     //要把已完成体检的次数去掉 (查询时不能触发保存)
     //     // if (this.customerOrgRegisterList.length > 0) {
     //     //   this.form.customerOrgRegisterId = this.customerOrgRegisterList[this.customerOrgRegisterList.length - 1].id
@@ -933,7 +948,7 @@ export default {
     changeMedicalTimes() {
 
       this.form.customerOrgGroupId = null
-      this.changeCustomerOrgGroupId()  
+      this.changeCustomerOrgGroupId()
 
       //获取体检次数下的分组
       this.getCustomerOrgGroup(this.form.customerOrgRegisterId)
@@ -989,7 +1004,7 @@ export default {
 
 
       if (this.form.customerOrgId != this.dict.personOrgId) payTypeFlag = '1'  //单位支付
-      
+
       for (let i = 0; i < groupPackageAsb.length; i++) {
         lfind = arrayExistObj(this.patientRegister.patientRegisterAbs, 'asbitemId', groupPackageAsb[i].id)
         if (lfind > - 1) {
@@ -1002,11 +1017,11 @@ export default {
           asbitemName: groupPackageAsb[i].displayName,
           patientRegisterId: this.form.id,
           standardPrice: groupPackageAsb[i].price,
-          chargePrice: typeFlag == 'group' ? groupPackageAsb[i].customerOrgGroupDetailPrice:groupPackageAsb[i].price,
+          chargePrice: typeFlag == 'group' ? groupPackageAsb[i].customerOrgGroupDetailPrice : groupPackageAsb[i].price,
           payTypeFlag,
-          discount: typeFlag == 'group' ? groupPackageAsb[i].discount:100,
+          discount: typeFlag == 'group' ? groupPackageAsb[i].discount : 100,
           isCharge: "N",
-          amount: typeFlag == 'group' ? groupPackageAsb[i].customerOrgGroupDetailAmount:1,
+          amount: typeFlag == 'group' ? groupPackageAsb[i].customerOrgGroupDetailAmount : 1,
           groupPackageId: groupPackageId
         }
         this.patientRegister.patientRegisterAbs.push(pojo)
@@ -1070,11 +1085,11 @@ export default {
 
       //console.log(`/api/app/patient/in-filter?Filter=${param}`)
       let body = {
-        filter:param,
-        maxResultCount:500
+        filter: param,
+        maxResultCount: 500
       }
-      
-      postapi('/api/app/patient/getlistinfilter',body).then((res) => {
+
+      postapi('/api/app/patient/getlistinfilter', body).then((res) => {
         if (res.code != -1) {
           console.log("查重 ", res); //有数据才显示
           if (res.data.items && res.data.items.length > 0) {
@@ -1091,7 +1106,7 @@ export default {
       this.patientChoosed = row;
     },
 
-    patientDblclick(row){
+    patientDblclick(row) {
       this.patientChoosed = row;
       this.choosePatient()
     },
@@ -1131,20 +1146,20 @@ export default {
 
     },
 
-    registerRowClick(row){
+    registerRowClick(row) {
       this.registerChoosed = row;
     },
-    registerRowDblclick(row){
+    registerRowDblclick(row) {
       this.registerChoosed = row;
       this.chooseRegister()
     },
 
-    chooseRegister(){
+    chooseRegister() {
       if (!this.registerChoosed) {
         alert("请选中人员登记信息");
         return;
       }
-       
+
       objCopy(this.registerChoosed, this.form)
       // this.patientRegister.patientRegisterId = this.registerChoosed.id
       // this.patientRegister.photo = this.registerChoosed.photo
@@ -1155,9 +1170,9 @@ export default {
       }, 20);
 
       this.registerVisible = false
-      
+
     },
-  
+
     changeBox(type) {
       //赋值
       if (this.form[type + 'Box']) {
@@ -1198,7 +1213,7 @@ export default {
     },
 
     // 组装基本信息保存的参数体
-    madePrBody(){
+    madePrBody() {
       //赋值
       let body = deepCopy(this.form);
       // console.log('this.form',this.form)
@@ -1209,12 +1224,12 @@ export default {
         } catch (error) {
           // this.form.birthDate != "Invalid date"
           body.birthDate = null
-        }        
-      }else{
+        }
+      } else {
         body.birthDate = null
       }
-      if(body.birthDate == "Invalid date") body.birthDate = null
-      if(isNaN(body.age)) body.age = null
+      if (body.birthDate == "Invalid date") body.birthDate = null
+      if (isNaN(body.age)) body.age = null
       // console.log('body',body)
       // Invalid date
 
@@ -1236,12 +1251,12 @@ export default {
       delete body.photo;
 
       // if(this.form.registerManType == 'customer') delete body.medicalStartDate;
-      if(this.form.id) delete body.medicalStartDate;
+      if (this.form.id) delete body.medicalStartDate;
 
       setNull(body, this.defaultNull);
 
-      if(typeof this.form.customerOrgId == 'object'){
-        if(this.form.customerOrgId.length > 0) body.customerOrgId = this.form.customerOrgId[this.form.customerOrgId.length - 1]
+      if (typeof this.form.customerOrgId == 'object') {
+        if (this.form.customerOrgId.length > 0) body.customerOrgId = this.form.customerOrgId[this.form.customerOrgId.length - 1]
       }
 
       //日期转换 日期控件增加格式
@@ -1256,31 +1271,31 @@ export default {
 
     //提交
     btnSubmit(formName, msgTip) {
-      this.$refs[formName].validate((valid,fields) => {
-        console.log('fields',fields)
-        if(!valid){
+      this.$refs[formName].validate((valid, fields) => {
+        console.log('fields', fields)
+        if (!valid) {
           this.$message.warning(fields[Object.keys(fields)[0]][0].message);
           return false
         }
 
-        if(this.form.customerOrgId != this.dict.personOrgId){
-          if(!this.form.customerOrgRegisterId){
+        if (this.form.customerOrgId != this.dict.personOrgId) {
+          if (!this.form.customerOrgRegisterId) {
             this.$message.warning("请填写单位体检次数！");
             return false
           }
         }
 
-        if(this.form.idNo && checkIDCode(this.form.idNo) == false){
+        if (this.form.idNo && checkIDCode(this.form.idNo) == false) {
           this.$message.warning("身份证号填写不合法！");
           return false
-        }        
-                
-        
+        }
+
+
 
-        if (this.form.id){
+        if (this.form.id) {
           // 更新时，先保存明细，再更新主表
           this.prAsbOpraOpts.prAsbSave++  //触发组合项目保存
-        }else {
+        } else {
           let body = this.madePrBody()
           //id为空则新增
           console.log(`/api/patientregister/createreturninfo`, body);
@@ -1293,16 +1308,16 @@ export default {
                 //触发已选组合项目保存
                 this.prAsbOpraOpts.formId = res.data.id
                 this.dataTransOpts.tableS.patient_register.id = res.data.id
-                let temp = Object.assign({},res.data,{id:''})
-                objCopy(temp,this.form)
+                let temp = Object.assign({}, res.data, { id: '' })
+                objCopy(temp, this.form)
 
                 // 稍作延时，否则 this.prAsbOpraOpts.formId 尚未更新
-                setTimeout(() =>{
+                setTimeout(() => {
                   this.prAsbOpraOpts.prAsbSave++
-                },20)
+                }, 20)
 
                 // 用于刷新登记的列表
-                this.refreshRegister(Object.assign({},res.data))
+                this.refreshRegister(Object.assign({}, res.data))
 
                 //一般读身份证照片时，会出现这种情况
                 if (this.patientRegister.photo && this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(res.data.id, this.patientRegister.photo);
@@ -1310,7 +1325,7 @@ export default {
             }
           );
         }
-        
+
       });
     },
 
@@ -1375,9 +1390,9 @@ export default {
         alert("请先保存人员信息");
         return;
       }
-      if(!this.$peisAPI) {
+      if (!this.$peisAPI) {
         this.$message.info("此功能，需要在壳客户端才可运行！")
-        return       
+        return
       }
       this.$peisAPI.photoGrah()
         .then(res => {
@@ -1424,9 +1439,9 @@ export default {
         this.$message.info("人员信息尚未保存，不可执行此操作！");
         return;
       }
-      if(!this.$peisAPI) {
+      if (!this.$peisAPI) {
         this.$message.info("此功能，需要在壳客户端才可运行！")
-        return       
+        return
       }
 
       let token = window.sessionStorage.getItem('token');
@@ -1448,8 +1463,8 @@ export default {
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = res.data;
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));              
-              return this.$peisAPI.printPre(JSON.stringify(toOutShell));             
+              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+              return this.$peisAPI.printPre(JSON.stringify(toOutShell));
             }
           })
           .catch(err => {
@@ -1462,7 +1477,7 @@ export default {
           .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));
             }
           })
@@ -1541,9 +1556,9 @@ export default {
         this.$message.info("人员信息尚未保存，不可执行此操作！");
         return;
       }
-      if(!this.$peisAPI) {
+      if (!this.$peisAPI) {
         this.$message.info("此功能，需要在壳客户端才可运行！")
-        return       
+        return
       }
 
       let token = window.sessionStorage.getItem('token');
@@ -1620,41 +1635,41 @@ export default {
       this.patientRegister.mergeAsbitemVisble = true;
     },
 
-    async toCharge(patientRegisterNo){
+    async toCharge(patientRegisterNo) {
 
-      if(!patientRegisterNo){
+      if (!patientRegisterNo) {
         this.$message.warning("请先保存人员信息！")
         return
       }
 
       try {
         let res = await proApi.getPrAsb(this.form.id)
-        if(res.code == -1){
+        if (res.code == -1) {
           this.$message.warning(`操作失败，原因：${res.message}`)
-          return 
-        }        
+          return
+        }
       } catch (error) {
         this.$message.warning(`操作失败，原因：${error}`)
-        return 
+        return
       }
 
       this.dialogWin.charge = true
       //多次重复点击时，刷新处理
       this.chargePatientRegisterNo = patientRegisterNo
-      setTimeout(() => { 
+      setTimeout(() => {
         this.dataTransOpts.refresh.charge.S++
       }, 20)
 
     },
 
     //关闭收费窗口时，刷新收费状态信息
-    closeDialogCharge(){      
+    closeDialogCharge() {
       // this.prAsbOpraOpts.prAsbQuery++
       this.dataTransOpts.refresh.register_asbitem.M++
     },
 
     //触发人员信息保存（更新）
-    triggerHeadSave(){
+    triggerHeadSave() {
       //id不为空则编辑 api/patientregister/updatepatientregister
       let body = this.madePrBody()
       // console.log(`/api/patientregister/updatepatientregister?PatientRegisterId=${this.form.id}`, body);
@@ -1665,22 +1680,22 @@ export default {
           if (this.patientRegister.photo && this.patientRegister.photo.indexOf("data:image") > -1) savePeoplePhoto(this.form.id, this.patientRegister.photo);
           objCopy(this.form, this.patientRegister.patientRegisterRd);
 
-          this.refreshRegister(Object.assign({},this.form))
+          this.refreshRegister(Object.assign({}, this.form))
         }
       });
-      
+
     },
 
     // 新增保存基本信息产生新的ID，等明细保存后，再更新表单form.id
-    refreshFormId(){
-      console.log('refreshFormId',this.prAsbOpraOpts.formId)
+    refreshFormId() {
+      console.log('refreshFormId', this.prAsbOpraOpts.formId)
       this.form.id = this.prAsbOpraOpts.formId
       this.prAsbOpraOpts.formId = '' //清空
-                
+
       /**/
       // this.patientRegister.prList.push(res.data);  //列表添加记录
       this.patientRegister.patientRegisterId = this.form.id;
-      objCopy(this.form, this.patientRegister.patientRegisterRd); 
+      objCopy(this.form, this.patientRegister.patientRegisterRd);
 
       //this.patientRegister.query.times++; 不在触发列表查询（换成局部刷新）放在窗口关闭事件中去
       // let curRow = deepCopy(this.patientRegister.patientRegisterRd)
@@ -1694,40 +1709,40 @@ export default {
         let inputs = document.querySelectorAll("form input"); //用数组可以读取多个标签的元素  //.inline-input
         //console.log('inputs',inputs);
         // 为每个输入框添加键盘事件监听器
-        inputs.forEach((input,i) => {
-          
+        inputs.forEach((input, i) => {
+
           input.addEventListener('keydown', (event) => {
-            
+
             // 如果按下的是回车键
             // console.log('data-ismultiline',input.getAttribute('data-ismultiline'));
 
             if (event.keyCode === 13) {
               // 阻止回车键的默认行为（换行）
-              event.preventDefault();   
-              
+              event.preventDefault();
+
               // 跳至下一个输入框
-              for(let j=i+1; j<inputs.length;j++){
-                if(inputs[j].getAttribute('disabled') != "disabled" ){
+              for (let j = i + 1; j < inputs.length; j++) {
+                if (inputs[j].getAttribute('disabled') != "disabled") {
                   inputs[j].focus();
                   break;
                 }
-              }              
-            }            
+              }
+            }
           });
         });
-      
+
       });
-    }, 
+    },
 
   },
 
   //监听事件
-  watch: { 
+  watch: {
     //人员ID未切换换时 也可以强制刷新数据
-    "dataTransOpts.refresh.patient_register.S":{
-      immediate:true,
+    "dataTransOpts.refresh.patient_register.S": {
+      immediate: true,
       handler(newVal, oldVal) {
-        console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);        
+        console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
         this.initFormData(this.dataTransOpts.tableS.patient_register.id)
       }
     },
@@ -1741,7 +1756,7 @@ export default {
     },
 
     //修改单位触发
-    "form.customerOrgId":{
+    "form.customerOrgId": {
       // immediate:true,
       // // deep:true,
       handler(newVal, oldVal) {
@@ -1756,8 +1771,6 @@ export default {
 };
 </script>
 <style scoped>
-
-
 .btn {
   margin-top: 5px;
 }
@@ -1769,7 +1782,7 @@ export default {
 .query {
   margin-left: 10px;
 }
+
 .querySpan {
   margin-right: 2px;
-}
-</style>
+}</style>
diff --git a/src/components/patientRegister/PatientRegisterEditItemBatch.vue b/src/components/patientRegister/PatientRegisterEditItemBatch.vue
index 0041fde..91e06cb 100644
--- a/src/components/patientRegister/PatientRegisterEditItemBatch.vue
+++ b/src/components/patientRegister/PatientRegisterEditItemBatch.vue
@@ -5,90 +5,43 @@
         批量调整分组只针对单位体检有效，个人体检将忽略此操作；不能调整已收费或已检的项目及已总检的体检人员。
       </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" highlight-current-row
-          filterable :filter-method="filterMethod"
-          clearable  @clear="quickAsb = deepCopy(asbItemQuick)"           
-          @change="quickChoosedAsb"
-          default-first-option  ref="quickAsbOCX"
-          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" highlight-current-row filterable
+          :filter-method="filterMethod" clearable @clear="quickAsb = deepCopy(asbItemQuick)" @change="quickChoosedAsb"
+          default-first-option ref="quickAsbOCX" 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"  highlight-current-row
-            @row-click="rowClickaAbitemCurr"
-            border
-          >
-            <el-table-column
-              label="组合项目"
-              width="150"
-              prop="asbitemName"
-            />
+          <el-table :data="asbitemBatch.asbitemsTemp" height="240" width="100%" show-summary @row-dblclick="removeAbs"
+            size="small" highlight-current-row @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>
@@ -96,66 +49,34 @@
         </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
-            >
+            <el-button class="commonbutton" 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
-            >
+            <el-button class="commonbutton" 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
-            >
+            <el-button class="commonbutton" 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
-            >
+            <el-button class="commonbutton" 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
-            >
+            <el-button class="commonbutton" type="primary" @click="changePayTypeFlag('2')" style="width: 100px">全赠送</el-button>
           </div>
         </div>
       </div>
       <div style="display: flex;margin-top: 5px;margin-right: 10px;justify-content:space-between;">
         <div></div>
         <div>
-          <el-button type="primary" @click="asbitemBatchHandle">确 定</el-button>
-          <el-button @click="dialogWin.PatientRegisterEditItemBatch = false">取 消</el-button>
+          <el-button class="commonbutton" type="primary" @click="asbitemBatchHandle">确 定</el-button>
+          <el-button class="commonbutton" @click="dialogWin.PatientRegisterEditItemBatch = false">取 消</el-button>
         </div>
       </div>
     </div>
-   
+
     <!-- 通用进度条 -->
-    <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>
@@ -181,9 +102,9 @@ export default {
   components: {
     ElProgressOCX,
   },
-  props:["multipleSelection"],
+  props: ["multipleSelection"],
   data() {
-    return {  
+    return {
       asbitemBatch: {
         operate: "add",
         isDeleteGroup: false,
@@ -192,7 +113,7 @@ export default {
         asbitemCurr: {}, //当前选中要删除的项目(批量调整)
       },
 
-      asbItemQuick:[], //快速选择未过滤前全部项目
+      asbItemQuick: [], //快速选择未过滤前全部项目
       quickAsb: [], //可供快速选择的组合项目
 
     };
@@ -222,7 +143,7 @@ export default {
 
   },
   methods: {
-    moment,dddw,deepCopy,
+    moment, dddw, deepCopy,
 
     //快速查询项目
     filterMethod(keyWords) {
@@ -232,9 +153,9 @@ export default {
         this.asbItemQuick.forEach((item) => {
           if (
             item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) >
-              -1 ||
+            -1 ||
             item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) >
-              -1 ||
+            -1 ||
             item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
           ) {
             this.quickAsb.push(item);
@@ -267,10 +188,10 @@ export default {
         }
       }
       //console.log(v, this.asbitemBatch.asbitemsTemp);
-      this.$nextTick(() => {        
+      this.$nextTick(() => {
         this.$refs['quickAsbOCX'].blur(); //total  asbItemId
         this.asbItemId = ''
-        this.quickAsb = deepCopy(this.asbItemQuick) 
+        this.quickAsb = deepCopy(this.asbItemQuick)
         this.$refs['quickAsbOCX'].focus(); //total  asbItemId       
       });
 
@@ -352,7 +273,7 @@ export default {
           this.$message.warning(msg);
           return;
         }
-        
+
         let createRegisterAsbitemDtos = deepCopy(
           this.asbitemBatch.asbitemsTemp
         );
@@ -425,13 +346,13 @@ export default {
       // 操作成功后，刷新列表
       this.patientRegister.query.times++
     },
- 
+
     // 初始化字典信息
-    dictInit(){
+    dictInit() {
 
       // 获取在用的组合项目
-      postapi('/api/app/asbitem/GetBasicList',{isFilterActive:'Y'}).then(res =>{
-        if(res.code != -1){          
+      postapi('/api/app/asbitem/GetBasicList', { isFilterActive: 'Y' }).then(res => {
+        if (res.code != -1) {
           this.asbItemQuick = res.data
           this.quickAsb = res.data
         }
@@ -442,10 +363,10 @@ export default {
 
   //监听事件
   watch: {
-    "dataTransOpts.refresh.asbitem.M":{
+    "dataTransOpts.refresh.asbitem.M": {
       immediate: true, // 立即执行
       // deep: true, // 深度监听复杂类型内变化
-      handler(newVal,oldVal){        
+      handler(newVal, oldVal) {
         console.log(`watch: 刷新在用组合项目 newVal: ${newVal} oldVal:${oldVal}`)
         this.dictInit()
       }
@@ -471,5 +392,4 @@ export default {
 .btnClass {
   width: 100px;
 }
-
 </style>
diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue
index 65d5cdc..d80e754 100644
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@@ -96,7 +96,7 @@
           <el-table-column label="已选组合项目" min-width="120" prop="asbitemName" >
             <template slot-scope="scope">
               <div>
-                <el-tooltip class="item" effect="dark" content="套餐/分组中包含的组合项目" placement="top">
+                <el-tooltip class="item" effect="dark" content="标五角星表示属于分组或套餐的项目" placement="top">
                   <i v-if="scope.row.groupPackageId" class="el-icon-star-on" style="font-size: 14px;color: purple;"></i>
                 </el-tooltip>
                 {{ scope.row.asbitemName }}
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index e267260..82a6154 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1,74 +1,77 @@
 <template>
-  <div style="display: flex">
-    <div :style="'width:' + (window.pageWidth - 200-145) + 'px;'" @contextmenu.prevent="onContextmenu">
-      <div>
-        <el-table @body-scrolling="load" :data="patientRegister.prList" border
-          :height="window.pageHeight < 600 ? 248 : Math.floor(((window.pageHeight - 250) * 2) / 3)" highlight-current-row
-          @row-click="rowClick" size="small" row-key="id" @selection-change="handleSelectionChange"
-          @cell-contextmenu="onCellRightClick" ref="info" id="info" :row-class-name="handleRowClassName">
-          <!-- 取消勾选，改为选中
+  <div>
+    <!--组件主体-->
+    <div style="display: flex">
+      <div :style="'width:' + (window.pageWidth - 200 - 145) + 'px;'" @contextmenu.prevent="onContextmenu">
+        <div>
+          <el-table @body-scrolling="load" :data="tableData" border
+            :height="window.pageHeight < 600 ? 248 : Math.floor(((window.pageHeight - 250) * 2) / 3)"
+            highlight-current-row @row-click="rowClick" size="small" row-key="id"
+            @selection-change="handleSelectionChange" @cell-contextmenu="onCellRightClick" ref="info" id="info"
+            :row-class-name="handleRowClassName">
+            <!-- 取消勾选，改为选中
           <el-table-column type="selection" width="40" show-overflow-tooltip/>
           :height="window.pageHeight < 600 ? 202 : Math.floor(((window.pageHeight - 302) * 2) / 3)"
           -->
-          <el-table-column v-for="(item, index) in headerCols" :key="`col_${index}`" :min-width="dropCol[index].minWidth"
-            :align="dropCol[index].align" :label="item.label" :prop="dropCol[index].prop"
-            :sortable="dropCol[index].prop == 'sn' ? false : true">
-            <template slot-scope="scope">
-              <div v-if="dropCol[index].prop == 'sn'">
-                {{ scope.$index + 1 }}
-              </div>
-              <div v-else-if="dropCol[index].prop == 'completeFlag'">
-                {{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}
-              </div>
-              <div v-else-if="dropCol[index].prop == 'guidePrintTimes'">
-                <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0" style="font-size: 20px; color: green" />
-              </div>
-              <div v-else-if="dropCol[index].prop == 'isLock'
-                || dropCol[index].prop == 'isVip'
-                || dropCol[index].prop == 'isUpload'
-                ">
-                {{ scope.row[dropCol[index].prop] == "Y" ? "是" : "否" }}
-              </div>
-              <div v-else-if="dropCol[index].prop == 'customerOrgParentName'">
-                {{ scope.row.customerOrgParentName
-                  ? scope.row.customerOrgParentName
-                  : scope.row.customerOrgName }}
-              </div>
-              <div v-else-if="dropCol[index].prop == 'sexId'">
-                {{ dddw(dict.sex, "id", scope.row[dropCol[index].prop], "displayName") }}
-              </div>
-              <div v-else-if="dropCol[index].prop == 'groupPack'">
-                <div
-                  v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
-                  {{ dddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+            <el-table-column v-for="(item, index) in headerCols" :key="`col_${index}`"
+              :min-width="dropCol[index].minWidth" :align="dropCol[index].align" :label="item.label"
+              :prop="dropCol[index].prop" :sortable="dropCol[index].prop == 'sn' ? false : true">
+              <template slot-scope="scope">
+                <div v-if="dropCol[index].prop == 'sn'">
+                  {{ scope.$index + 1 }}
                 </div>
-                <div
-                  v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
-                  {{ dddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+                <div v-else-if="dropCol[index].prop == 'completeFlag'">
+                  {{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}
                 </div>
-              </div>
-              <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>
-          <!--
+                <div v-else-if="dropCol[index].prop == 'guidePrintTimes'">
+                  <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0" style="font-size: 20px; color: green" />
+                </div>
+                <div v-else-if="dropCol[index].prop == 'isLock'
+                  || dropCol[index].prop == 'isVip'
+                  || dropCol[index].prop == 'isUpload'
+                  ">
+                  {{ scope.row[dropCol[index].prop] == "Y" ? "是" : "否" }}
+                </div>
+                <div v-else-if="dropCol[index].prop == 'customerOrgParentName'">
+                  {{ scope.row.customerOrgParentName
+                    ? scope.row.customerOrgParentName
+                    : scope.row.customerOrgName }}
+                </div>
+                <div v-else-if="dropCol[index].prop == 'sexId'">
+                  {{ dddw(dict.sex, "id", scope.row[dropCol[index].prop], "displayName") }}
+                </div>
+                <div v-else-if="dropCol[index].prop == 'groupPack'">
+                  <div
+                    v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+                    {{ dddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+                  </div>
+                  <div
+                    v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+                    {{ dddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+                  </div>
+                </div>
+                <div v-else-if="dropCol[index].prop == 'nationId'">
+                  {{ 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>
+            <!--
           "sexHormoneTermId": "00000000-0000-0000-0000-000000000000",
           "interposeMeasure": null,
           "medicalConclusionId": "00000000-0000-0000-0000-000000000000",
@@ -94,36 +97,37 @@
           "creatorId": null,
           "id": "3a0c196d-a6d0-37fe-5c32-4806bdc4530f"
           -->
-        </el-table>
-        <div style="display: flex;justify-content:space-between;">
-          <div></div>
-          <div>
-            <span style="font-size:12px;">共：{{ loadOpts.totalCount }} 条记录，当前显示：{{ patientRegister.prList.length }} 条。</span>
+          </el-table>
+          <div style="display: flex;justify-content:space-between;">
+            <div></div>
+            <div>
+              <span style="font-size:12px;">共：{{ loadOpts.totalCount }} 条记录，当前显示：{{ tableData.length }}
+                条。</span>
+            </div>
           </div>
         </div>
+        <!-- 给合项目  基本信息  -->
+        <el-tabs v-model="tabChoosed" style="margin-top: -22px;">
+          <!-- 给合项目 -->
+          <el-tab-pane label="已选组合项目" name="1">
+            <PatientRegisterAsbItem />
+          </el-tab-pane>
+        </el-tabs>
       </div>
-      <!-- 给合项目  基本信息  -->
-      <el-tabs v-model="tabChoosed" style="margin-top: -22px;">
-        <!-- 给合项目 -->
-        <el-tab-pane label="已选组合项目" name="1">
-          <PatientRegisterAsbItem />
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <div style="margin-left: 10px;">
-      <div v-show="checkPagePriv(pagePriv.privs, '人员登记')" class="listBtn">
-        <el-button type="success" class="commonbutton" @click="btnAdd">人员登记</el-button>
-      </div>
-      <div v-show="checkPagePriv(pagePriv.privs, '批量正式登记')" class="listBtn">
-        <el-button type="success" class="commonbutton" @click="btnAddBatch">批量正式登记</el-button>
-      </div>
-      <div v-show="checkPagePriv(pagePriv.privs, '编辑')" class="listBtn">
-        <el-button type="primary" class="commonbutton" @click="btnEdit">编辑</el-button>
-      </div>
-      <div v-show="checkPagePriv(pagePriv.privs, '删除')" class="listBtn">
-        <el-button type="danger" class="commonbutton" @click="btnDel">删除</el-button>
-      </div>
-      <!--
+      <div style="margin-left: 10px;">
+        <div v-show="checkPagePriv(pagePriv.privs, '人员登记')" class="listBtn">
+          <el-button type="success" class="commonbutton" @click="btnAdd">人员登记</el-button>
+        </div>
+        <div v-show="checkPagePriv(pagePriv.privs, '批量正式登记')" class="listBtn">
+          <el-button type="success" class="commonbutton" @click="btnAddBatch">批量正式登记</el-button>
+        </div>
+        <div v-show="checkPagePriv(pagePriv.privs, '编辑')" class="listBtn">
+          <el-button type="primary" class="commonbutton" @click="btnEdit">编辑</el-button>
+        </div>
+        <div v-show="checkPagePriv(pagePriv.privs, '删除')" class="listBtn">
+          <el-button type="danger" class="commonbutton" @click="btnDel">删除</el-button>
+        </div>
+        <!--
       <div class="listBtn">
         <el-button
           type=""
@@ -137,66 +141,65 @@
         <el-button type="" class="btnClass commonbutton">健康档案</el-button>
       </div>
       -->
-      <div v-show="checkPagePriv(pagePriv.privs, '批量调整分组')" class="listBtn">
-        <el-button type="" class="commonbutton" @click="btnGroupBatch">批量调整分组</el-button>
-      </div>
-      <div v-show="checkPagePriv(pagePriv.privs, '批量调整项目')" class="listBtn">
-        <el-button type="" class="commonbutton" @click="btnAsbBatch">批量调整项目</el-button>
-      </div>
-      <div v-show="checkPagePriv(pagePriv.privs, '指引单打印')" class="listBtn">
-        <el-button type="" class="commonbutton" @click="guidePrint('0001', false)">指引单打印</el-button>
-      </div>
-      <div v-show="checkPagePriv(pagePriv.privs, '指引单预览')" class="listBtn">
-        <el-button type="" class="commonbutton" @click="guidePrint('0001', true)">指引单预览</el-button>
-      </div>
-      <div v-show="checkPagePriv(pagePriv.privs, '人员信息导出')" class="listBtn">
-        <el-button type="" class="commonbutton" @click="btnExport('info')">人员信息导出</el-button>
-      </div>
-      <!--
+        <div v-show="checkPagePriv(pagePriv.privs, '批量调整分组')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="btnGroupBatch">批量调整分组</el-button>
+        </div>
+        <div v-show="checkPagePriv(pagePriv.privs, '批量调整项目')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="btnAsbBatch">批量调整项目</el-button>
+        </div>
+        <div v-show="checkPagePriv(pagePriv.privs, '指引单打印')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="guidePrint('0001', false)">指引单打印</el-button>
+        </div>
+        <div v-show="checkPagePriv(pagePriv.privs, '指引单预览')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="guidePrint('0001', true)">指引单预览</el-button>
+        </div>
+        <div v-show="checkPagePriv(pagePriv.privs, '人员信息导出')" class="listBtn">
+          <el-button type="" class="commonbutton" @click="btnExport('info')">人员信息导出</el-button>
+        </div>
+        <!--
       <div class="listBtn">
-        <el-button type="" class="btnClass commonbutton" @click="rowSelected(patientRegister.prList)">选中</el-button>
+        <el-button type="" class="btnClass commonbutton" @click="rowSelected(tableData)">选中</el-button>
       </div>
       -->
+      </div>
+    </div>
+    <!--组件弹窗-->
+    <div>
+      <!-- 体检人员登记 :title="patientRegister.patientRegisterRd.id ? '体检人员--编辑' : '体检人员--新增'" -->
+      <el-dialog :title="dataTransOpts.tableS.patient_register.id ? '体检人员--编辑' : '体检人员--新增'"
+        :visible.sync="dialogWin.PatientRegisterEdit" :close-on-click-modal="false" fullscreen
+        @close="close_dialogWin_PatientRegisterEdit">
+        <!-- :formInitData="patientRegister.patientRegisterRd" -->
+        <PatientRegisterEdit :isDoctor="'0'" :patientRegisterId="patientRegister.patientRegisterRd.id"
+          :editTimes="editTimes" :refreshRegister="refreshRegister" :refFuncSetData="refFuncSetData"/>
+      </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">
+        <Camera :id="patientRegister.patientRegisterId" />
+      </el-dialog>
+
+
+      <!-- 批量调整分组 -->
+      <el-dialog title="批量调整分组" :visible.sync="dialogWin.PatientRegisterEditGroupBatch" width="600px" height="800px"
+        :append-to-body="true" :close-on-click-modal="false">
+        <PatientRegisterEditGroupBatch :multipleSelection="multipleSelection" />
+
+      </el-dialog>
+
+      <!-- 批量调整项目 -->
+      <el-dialog title="批量调整项目" :visible.sync="dialogWin.PatientRegisterEditItemBatch" width="610px" height="800px"
+        :append-to-body="true" :close-on-click-modal="false">
+        <PatientRegisterEditItemBatch :multipleSelection="multipleSelection" />
+      </el-dialog>
+
+      <!-- 通用进度条 -->
+      <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>
-
-    <!-- 体检人员登记 :title="patientRegister.patientRegisterRd.id ? '体检人员--编辑' : '体检人员--新增'" -->
-    <el-dialog :title="dataTransOpts.tableS.patient_register.id ? '体检人员--编辑' : '体检人员--新增'" :visible.sync="dialogVisible"
-      :close-on-click-modal="false" fullscreen @close="closeDialogPR">
-      <!-- :formInitData="patientRegister.patientRegisterRd" -->
-      <PatientRegisterEdit :isDoctor="'0'" :patientRegisterId="patientRegister.patientRegisterRd.id"
-        :editTimes="editTimes" :refreshRegister="refreshRegister" />
-    </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">
-      <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">
-      <div>{{ guideMsg }}</div>
-    </el-dialog>
-
-    <!-- 批量调整分组 -->
-    <el-dialog title="批量调整分组" :visible.sync="dialogWin.PatientRegisterEditGroupBatch" width="600px" height="800px"
-      :append-to-body="true" :close-on-click-modal="false">
-      <PatientRegisterEditGroupBatch :multipleSelection="multipleSelection" />
-
-    </el-dialog>
-
-    <!-- 批量调整项目 -->
-    <el-dialog title="批量调整项目" :visible.sync="dialogWin.PatientRegisterEditItemBatch" width="610px" height="800px"
-      :append-to-body="true" :close-on-click-modal="false">
-      <PatientRegisterEditItemBatch :multipleSelection="multipleSelection" />
-    </el-dialog>
-
-    <!-- 通用进度条 -->
-    <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>
@@ -243,11 +246,12 @@ export default {
       startPoint: -1, // 多选起点 -1 表示选择
       endPoint: -1, // 多选终点 -1 表示未选择
 
+      tableData: [], //表格数据
+      tableDataCurrentRow: {}, // 当前被选中的行
+
       multipleSelection: [], //选中的数据列表
-      dialogVisible: false,
+
       dialogCamera: false,
-      dialogGuide: false,
-      guideMsg: "guideMsg",
       tabChoosed: "1",
       formInitData: {}, //体检登记初始表单数据
       editTimes: 0,
@@ -309,7 +313,7 @@ export default {
     //获取用户当前页面的权限
     let userPriv = window.sessionStorage.getItem('userPriv')
     if (userPriv) this.pagePriv.privs = deepCopy(getPagePriv(this.pagePriv.routeUrlorPageName))
-    
+
     this.loadOptsInit = Object.assign({}, this.loadOpts)
   },
 
@@ -354,12 +358,17 @@ export default {
       }
     },
 
+    // 行选择
     rowSelected(rows) {
       rows.forEach((e) => {
         this.$refs["info"].toggleRowSelection(e, true);
       });
     },
 
+    refFuncSetData(item, v) {
+      setData(this, item, v)
+    },
+
     // 打印指引单(isPreview)
     async guidePrint(ReportCode, isPreview) {
       if (!this.$peisAPI) {
@@ -381,7 +390,7 @@ export default {
 
       //选中（取消勾选）start -------------------------
       this.multipleSelection = []
-      this.patientRegister.prList.forEach(e => {
+      this.tableData.forEach(e => {
         if (e.choosed) {
           this.multipleSelection.push(deepCopy(e))
         }
@@ -435,15 +444,15 @@ export default {
             if (JSON.parse(resPeisAPI).code < 0) continue
             resPrintTimes = postapi("api/app/patientregister/updatepatientregisterguideprinttimesmany", [this.multipleSelection[i].id]);
             if (resPrintTimes.code == -1) continue
-            lfind = arrayExistObj(this.patientRegister.prList, "id", this.multipleSelection[i].id);
+            lfind = arrayExistObj(this.tableData, "id", this.multipleSelection[i].id);
             if (lfind > -1) {
-              if (this.patientRegister.prList[lfind].guidePrintTimes) {
-                this.patientRegister.prList[lfind].guidePrintTimes =
+              if (this.tableData[lfind].guidePrintTimes) {
+                this.tableData[lfind].guidePrintTimes =
                   Number(
-                    this.patientRegister.prList[lfind].guidePrintTimes
+                    this.tableData[lfind].guidePrintTimes
                   ) + 1;
               } else {
-                this.patientRegister.prList[lfind].guidePrintTimes = 1;
+                this.tableData[lfind].guidePrintTimes = 1;
               }
             }
           } catch (error) {
@@ -466,7 +475,7 @@ export default {
       });
       // 取消全选
       if (!rows.length) {
-        this.patientRegister.prList.forEach((item) => {
+        this.tableData.forEach((item) => {
           item.highLightBg = "";
         });
       }
@@ -483,32 +492,32 @@ export default {
 
     //点击体检次数行
     rowClick(row) {
-      //console.log("this.patientRegister.prList",this.window,this.patientRegister.prList);
+      //console.log("this.tableData",this.window,this.tableData);
 
       // 按住了shift键
       if (this.window.shift) {
         //清除所有选择
-        this.patientRegister.prList.forEach((e, index) => {
+        this.tableData.forEach((e, index) => {
           e.choosed = false;
           e.index = index;
         });
 
         if (this.startPoint == -1) {
-          this.patientRegister.prList[row.index].choosed = true;
+          this.tableData[row.index].choosed = true;
           this.startPoint = row.index;
         } else {
           if (this.startPoint > row.index) {
             for (let i = row.index; i <= this.startPoint; i++) {
-              this.patientRegister.prList[i].choosed = true;
+              this.tableData[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.tableData[i].choosed = true;
             }
           }
         }
       } else if (this.window.ctrl) {  // 按住了ctrl 键
-        this.patientRegister.prList[row.index].choosed = true;
+        this.tableData[row.index].choosed = true;
         if (this.startPoint == -1) {
           this.startPoint = row.index;
         }
@@ -516,22 +525,22 @@ export default {
         // 未按住了ctrl 、shift 键
         //清除所有选择
         console.log("清除所有选择");
-        this.patientRegister.prList.forEach((e, index) => {
+        this.tableData.forEach((e, index) => {
           e.choosed = false;
           e.index = index;
         });
-        console.log(this.patientRegister.prList, row.index);
-        console.log(this.patientRegister.prList[row.index].choosed);
+        console.log(this.tableData, row.index);
+        console.log(this.tableData[row.index].choosed);
 
-        this.patientRegister.prList[row.index].choosed = true;
+        this.tableData[row.index].choosed = true;
         this.startPoint = row.index;
       }
 
       //选中了多个点编辑时，排序最前的作为当前选中的
       console.log('row.index <= this.startPoint', row.index, this.startPoint)
       let lfind = -1
-      for (let i = 0; i < this.patientRegister.prList.length; i++) {
-        if (this.patientRegister.prList[i].choosed) {
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (this.tableData[i].choosed) {
           lfind = i
           break
         }
@@ -539,21 +548,22 @@ export default {
 
       if (lfind > -1) {
         // 弹出编辑框，只有在编辑框显示时，才去触发获取数据
-        this.dataTransOpts.tableS.patient_register.id = this.patientRegister.prList[lfind].id
-        // this.getCustomerOrgGroup(this.patientRegister.prList[lfind].customerOrgParentId);
+        this.dataTransOpts.tableS.patient_register.id = this.tableData[lfind].id
+        this.tableDataCurrentRow = deepCopy(this.tableData[lfind])
+        // this.getCustomerOrgGroup(this.tableData[lfind].customerOrgParentId);
         setTimeout(() => {
           this.dataTransOpts.refresh.register_asbitem.M++ //触发所选组合项目刷新  
-        }, 20);
+        }, 10);
 
         // 旧的方式
-        // if(this.patientRegister.patientRegisterRd.id != this.patientRegister.prList[lfind].id){
-        //   this.setForm(this.patientRegister.prList[lfind])
-        //   // this.patientRegister.query.customerOrgParentId = this.patientRegister.prList[lfind].customerOrgParentId;
+        // if(this.patientRegister.patientRegisterRd.id != this.tableData[lfind].id){
+        //   this.setForm(this.tableData[lfind])
+        //   // this.patientRegister.query.customerOrgParentId = this.tableData[lfind].customerOrgParentId;
         //   this.patientRegister.customerOrgGroupChange = 0; //控制体检列表记录切换时，0 无需触发更换分组操作
         //   this.patientRegister.medicalPackageChange = 0; //控制体检列表记录切换时，0 无需触发更换套餐操作
-        //   // this.getCustomerOrgGroup(this.patientRegister.prList[lfind].customerOrgParentId);
+        //   // this.getCustomerOrgGroup(this.tableData[lfind].customerOrgParentId);
         //   this.dict.asbItem = [...this.dict.asbItemAll];
-        //   this.getPatientRegisterAbs(this.patientRegister.prList[lfind].id);
+        //   this.getPatientRegisterAbs(this.tableData[lfind].id);
         // }
       }
 
@@ -576,12 +586,12 @@ export default {
       // this.setForm(this.patientRegister.patientRegisterRdInit)      
       // this.patientRegister.patientRegisterAbs = [];
       // this.patientRegister.patientRegisterRd.id = ''
-      // this.dialogVisible = true;
+      // this.dialogWin.PatientRegisterEdit = true;
       // this.editTimes++; //触发表单窗口，数据更新
       // this.getPatientRegisterAbs();
 
       this.dataTransOpts.tableS.patient_register.id = ''
-      this.dialogVisible = true;
+      this.dialogWin.PatientRegisterEdit = true;
       setTimeout(() => {
         // 触发数据刷新
         this.dataTransOpts.refresh.patient_register.S++  //触发人员信息刷新
@@ -602,7 +612,7 @@ export default {
       let patientRegisterIds = []
       //取消勾选，换成选择的方式  start
       this.multipleSelection = [];
-      this.patientRegister.prList.forEach((e) => {
+      this.tableData.forEach((e) => {
         if (e.choosed && e.completeFlag == '0') {
           this.multipleSelection.push(e);
           patientRegisterIds.push(e.id)
@@ -621,8 +631,8 @@ export default {
           if (res.code != -1) {
             console.log('操作成功！')
             patientRegisterIds.forEach(e => {
-              let lfind = arrayExistObj(this.patientRegister.prList, 'id', e)
-              if (lfind > -1) this.patientRegister.prList[lfind].completeFlag = completeFlag
+              let lfind = arrayExistObj(this.tableData, 'id', e)
+              if (lfind > -1) this.tableData[lfind].completeFlag = completeFlag
             });
           }
         })
@@ -638,8 +648,8 @@ export default {
         this.$message.warning("请选择要操作的记录");
         return;
       }
-      //console.log(this.patientRegister.patientRegisterRd,this.patientRegister.prList)
-      this.dialogVisible = true;
+      //console.log(this.patientRegister.patientRegisterRd,this.tableData)
+      this.dialogWin.PatientRegisterEdit = true;
       // 触发数据刷新
       this.dataTransOpts.refresh.patient_register.S++  //触发人员信息刷新(会同时刷新组合项目)
       this.dataTransOpts.plus.clearPatientRegisterQuery++ //触发清空人员登记界面的查询条件
@@ -647,29 +657,29 @@ export default {
     },
 
     //新增或编辑后选中记录
-    async closeDialogPR() {
+    async close_dialogWin_PatientRegisterEdit() {
       // 如果 dataTransOpts.tableS.patient_register.id 为空(未增加)，则不做处理
-      if (!this.dataTransOpts.tableS.patient_register.id) return
-
-      // 刷新列表（并选中当前新增或编辑的行记录）
-      this.patientRegister.prList.forEach(e => {
-        e.choosed = false
-      })
-      let res = await postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${this.dataTransOpts.tableS.patient_register.id}`)
-      if (res.code != 1) return
-
-      this.patientRegister.prList.forEach(e => {
-        e.choosed = false
-      });
-      let lfind = arrayExistObj(this.patientRegister.prList, 'id', this.dataTransOpts.tableS.patient_register.id)
-      if (lfind > -1) {
-        objCopy(res.data, this.patientRegister.prList[lfind])
-        this.patientRegister.prList[lfind].choosed = true
+      let id = this.dataTransOpts.tableS.patient_register.id
+      if (!id){
+        id = this.tableDataCurrentRow.id
+      }
+      if(!id) return
+      this.dataTransOpts.tableS.patient_register.id = id
+      
+      // let res = await postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${this.dataTransOpts.tableS.patient_register.id}`)
+      // if (res.code != 1) return
+
+      // this.tableData.forEach(e => {
+      //   e.choosed = false
+      // });      
+      let lfind = arrayExistObj(this.tableData, 'id', this.dataTransOpts.tableS.patient_register.id)
+      if (lfind > -1) { 
+        objCopy(this.tableDataCurrentRow,this.tableData[lfind])       
       } else {
-        lfind = this.patientRegister.prList.length
-        this.patientRegister.prList.push(res.data)
-        this.patientRegister.prList[lfind].index = lfind
-        this.patientRegister.prList[lfind].choosed = true
+        lfind = this.tableData.length
+        this.tableDataCurrentRow.index = lfind
+        this.tableDataCurrentRow.choosed = true
+        this.tableData.push(this.tableDataCurrentRow) 
       }
 
       // 刷新 register_asbitem 表记录
@@ -678,10 +688,10 @@ export default {
         // setTimeout(() => { 
         //   this.$refs['info'].setCurrentRow(currentRow)
         //   this.setForm(currentRow)
-        //   // this.patientRegister.query.customerOrgParentId = this.patientRegister.prList[lfind].customerOrgParentId;
+        //   // this.patientRegister.query.customerOrgParentId = this.tableData[lfind].customerOrgParentId;
         //   this.patientRegister.customerOrgGroupChange = 0; //控制体检列表记录切换时，0 无需触发更换分组操作
         //   this.patientRegister.medicalPackageChange = 0; //控制体检列表记录切换时，0 无需触发更换套餐操作
-        //   // this.getCustomerOrgGroup(this.patientRegister.prList[lfind].customerOrgParentId);
+        //   // this.getCustomerOrgGroup(this.tableData[lfind].customerOrgParentId);
         //   this.dict.asbItem = [...this.dict.asbItemAll];
         //   this.getPatientRegisterAbs(currentRow.id);          
         // }, 100)        
@@ -703,7 +713,7 @@ export default {
 
       //选中（取消勾选）start -------------------------
       this.multipleSelection = []
-      this.patientRegister.prList.forEach(e => {
+      this.tableData.forEach(e => {
         if (e.choosed) {
           this.multipleSelection.push(deepCopy(e))
         }
@@ -734,7 +744,7 @@ export default {
         .then((res) => {
           if (res.code != -1) {
             console.log("操作成功");
-            arrayReduce(this.patientRegister.prList, this.multipleSelection, 'id=id')
+            arrayReduce(this.tableData, this.multipleSelection, 'id=id')
             this.setForm(this.patientRegister.patientRegisterRdInit)
             this.getPatientRegisterAbs();
           }
@@ -843,13 +853,13 @@ export default {
         let oldCount = 0
 
         if (body.skipCount == 0) {  //查询
-          this.patientRegister.prList = [];
+          this.tableData = [];
         } else {
           // 懒加载 ,原数据集不用清空
-          oldCount = this.patientRegister.prList.length
+          oldCount = this.tableData.length
         }
         curLoad.forEach((e, index) => {
-          this.patientRegister.prList.push(Object.assign({ index: Number(oldCount) + Number(index), choosed: false }, e))
+          this.tableData.push(Object.assign({ index: Number(oldCount) + Number(index), choosed: false }, e))
         })
 
         //如果 有选中 记录，则刷新其对应的组合项目
@@ -954,7 +964,7 @@ export default {
       }
       //取消勾选，换成选择的方式  start
       this.multipleSelection = [];
-      this.patientRegister.prList.forEach((e) => {
+      this.tableData.forEach((e) => {
         if (e.choosed) this.multipleSelection.push(e);
       });
       //取消勾选，换成选择的方式  end
@@ -977,7 +987,7 @@ export default {
       }
       //取消勾选，换成选择的方式  start
       this.multipleSelection = [];
-      this.patientRegister.prList.forEach((e) => {
+      this.tableData.forEach((e) => {
         if (e.choosed) this.multipleSelection.push(e);
       });
       //取消勾选，换成选择的方式  end
@@ -1269,7 +1279,7 @@ export default {
         //console.log('watch:patientRegister.query.customerOrgId:',newVal,oldVal)
         // 单位变化时，清除当前列表信息
         if (newVal && newVal != oldVal) {
-          this.patientRegister.prList = []
+          this.tableData = []
           this.dataTransOpts.tableM.register_asbitem = []
         }
       }
diff --git a/src/components/patientRegister/patientRegisterAsbItem.vue b/src/components/patientRegister/patientRegisterAsbItem.vue
index 29595c3..4174ceb 100644
--- a/src/components/patientRegister/patientRegisterAsbItem.vue
+++ b/src/components/patientRegister/patientRegisterAsbItem.vue
@@ -1,12 +1,16 @@
 <template>
   <div>
-    <el-table :data="dataTransOpts.tableM.register_asbitem" border 
+    <el-table :data="dataTransOpts.tableM.register_asbitem" border
       :height="window.pageHeight < 600 ? 124 : Math.floor((window.pageHeight - 228) / 3)" size="small"
-      highlight-current-row :summary-method="getSummaries" show-summary
-      ref="patientRegister.patientRegisterAbs">
+      highlight-current-row :summary-method="getSummaries" show-summary ref="patientRegister.patientRegisterAbs">
       <el-table-column label="序号" width="50" align="center">
         <template slot-scope="scope">
-          <div><i v-if="scope.row.groupPackageId" class="el-icon-star-on" style="font-size: 16px;color: purple;"></i>{{ scope.$index + 1 }}</div>
+          <div>
+            <el-tooltip class="item" effect="dark" content="标五角星表示属于分组或套餐的项目" placement="left">
+              <i v-if="scope.row.groupPackageId" class="el-icon-star-on" style="font-size: 16px;color: purple;" />
+            </el-tooltip>
+            {{ scope.$index + 1 }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column prop="asbitemName" label="已选组合项目" width="120" />
@@ -14,7 +18,7 @@
       <el-table-column prop="discount" label="折扣" align="center" />
       <el-table-column prop="amount" label="数量" width="50" align="center" />
       <el-table-column prop="chargePrice" label="价格" align="center" />
-      <el-table-column prop="payTypeFlag" label="支付方式" align="center" >
+      <el-table-column prop="payTypeFlag" label="支付方式" align="center">
         <template slot-scope="scope">
           <div>{{ dddw(dict.payType, "id", scope.row.payTypeFlag, "displayName") }}</div>
         </template>
@@ -24,7 +28,7 @@
           <el-checkbox :value="scope.row.isCharge == 'Y'" align="center" />
         </template>
       </el-table-column>
-      <el-table-column prop="checkCompleteFlag" label="状态" min-width="50" align="center" >
+      <el-table-column prop="checkCompleteFlag" label="状态" min-width="50" align="center">
         <template slot-scope="scope">
           <div>
             {{
@@ -38,13 +42,13 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="isLock" label="锁" min-width="50" align="center" >
+      <el-table-column prop="isLock" label="锁" min-width="50" align="center">
         <template slot-scope="scope">
           <el-checkbox :value="scope.row.isLock == 'Y'" align="center" />
         </template>
       </el-table-column>
       <el-table-column prop="creatorName" label="登记人" min-width="70" align="center" />
-      <el-table-column prop="creationTime" label="登记日期" min-width="90" align="center" >
+      <el-table-column prop="creationTime" label="登记日期" min-width="90" align="center">
         <template slot-scope="scope">
           <div>{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
         </template>
@@ -64,11 +68,11 @@ export default {
     return {};
   },
 
-  created() { 
-    
+  created() {
+
   },
 
-  updated(){
+  updated() {
     this.$nextTick(() => {
       this.$refs['patientRegister.patientRegisterAbs'].doLayout()
     })
@@ -81,25 +85,23 @@ export default {
     ...mapState(["window", "dataTransOpts", "dict", "patientRegister"]),
   },
   methods: {
-    dddw,moment,    
+    dddw, moment,
 
     // 刷新登记的项目
-    retrieveRegister_asbitem(id){
-      if(!id){
-        this.dataTransOpts.tableM.register_asbitem = []
-        return
-      }
+    retrieveRegister_asbitem(id) {
+      this.dataTransOpts.tableM.register_asbitem = []
+      if (!id) return
       getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`)
-      .then(res => {
-        console.log(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, res)
-        if (res.code != -1) {          
-          res.data.forEach(e => {
-            e.standTotal = e.amount * e.standardPrice
-            e.total = e.amount * e.chargePrice
-          });
-          this.dataTransOpts.tableM.register_asbitem = res.data
-        }
-      })
+        .then(res => {
+          console.log(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, res)
+          if (res.code != -1) {
+            res.data.forEach(e => {
+              e.standTotal = e.amount * e.standardPrice
+              e.total = e.amount * e.chargePrice
+            });
+            this.dataTransOpts.tableM.register_asbitem = res.data
+          }
+        })
 
     },
 
@@ -154,12 +156,12 @@ export default {
   },
 
   //监听事件
-  watch: {    
+  watch: {
     //人员ID未切换换时 也可以强制刷新数据
-    "dataTransOpts.refresh.register_asbitem.M":{
+    "dataTransOpts.refresh.register_asbitem.M": {
       // immediate:true,
       handler(newVal, oldVal) {
-        console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);        
+        console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
         this.retrieveRegister_asbitem(this.dataTransOpts.tableS.patient_register.id)
       }
     },
diff --git a/src/store/index.js b/src/store/index.js
index 4f2fdc7..36ca7a3 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -357,7 +357,8 @@ export default new Vuex.Store({
                 sum_diagnosis: [], // 总检诊断
             },
             plus: {
-                clearPatientRegisterQuery: 0,
+                clearPatientRegisterQuery: 0,   //清空人员登记界面查询条件
+                PatientRegisterEditItemBatch:0,  //刷新批量调整项目窗口
             }
 
         },