From 97da9150abedace264665c6ee48f2d970de2c3ce Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 22 Nov 2024 18:33:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E6=89=AB=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../patientRegister/PatientRegisterList.vue        | 14 ++++++++++----
 .../patientRegister/patientRegisterQuery.vue       |  4 ++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 37596cc..ed30850 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -1058,7 +1058,9 @@ export default {
       // 查询时，清掉明细数据 （滚动时不清）
       this.dataTransOpts.tableS.patient_register.id = ''
       this.tableDataCurrentRow = {} // 清除选择
-      this.tableData = []
+      if(!(this.patientRegister.query.isSeries == 'Y' && this.patientRegister.query.patientRegisterNo)){
+        this.tableData = []
+      }
 
       setTimeout(() => {
         this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新  
@@ -1202,9 +1204,13 @@ export default {
               }
             });
 
-            if (body.skipCount == 0) {  //查询
-              this.tableData = [];
-            }
+            // 不是连续扫码时，需要判断是否分页查询(连续扫码不清原来的数据)
+            console.log('this.patientRegister.query',this.patientRegister.query.isSeries,this.patientRegister.query.patientRegisterNo)
+            if(!(this.patientRegister.query.isSeries == 'Y' && this.patientRegister.query.patientRegisterNo)){
+              if (body.skipCount == 0) {  //查询
+                this.tableData = [];
+              }
+            }            
 
             this.tableData = this.tableData.concat(curLoad)
             // else {
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 7e6c89e..64c756b 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -18,6 +18,10 @@
         <el-date-picker v-model="patientRegister.query.endDate" type="date" placeholder="截止日期" size="small"
           style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
       </div>
+      <div class="query">
+          <span class="spanClass">连续扫码</span>
+          <el-checkbox v-model="patientRegister.query.isSeries" size="small" true-label="Y" false-label="N" />
+        </div>
       <div class="query">
         <span class="spanClass">条码号</span>
         <el-input placeholder="条码号" v-model="patientRegister.query.patientRegisterNo" size="small" clearable