From 46060db3735760e6ed22cfa03ac1811965a93753 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 16 Dec 2025 21:43:57 +0800
Subject: [PATCH] seo

---
 .../doctorCheck/PatientRegisterBase.vue       | 28 ++++++++++++++--
 src/views/fee-settings/cardRegister.vue       | 32 +++++++++----------
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue
index 03d1700..b08dde2 100644
--- a/src/components/doctorCheck/PatientRegisterBase.vue
+++ b/src/components/doctorCheck/PatientRegisterBase.vue
@@ -23,7 +23,9 @@
         <el-input placeholder="检验条码" v-model="prBase.lisNo" size="small" style="width: 120px;" clearable />
       </div>
       <div>
-        <span class="query">身份证</span>
+
+        <el-button type="primary" style="margin-left: 5px;margin-top: 3px; height: 22px;padding: 2px 2px;" @click="readIdCard">读身份证</el-button>
+
         <el-input placeholder="身份证号" v-model="prBase.idNo" size="small" style="width: 150px;" clearable />
       </div>
       <div>
@@ -110,7 +112,7 @@
 import moment from "moment";
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, deepCopy, objCopy, opjCopy } from '../../utlis/proFunc'
+import { dddw, deepCopy, objCopy, opjCopy,parsIcCardtoLocal } from '../../utlis/proFunc'
 import PatientRegisterForChoose from "../../components/patientRegister/PatientRegisterForChoose.vue";
 
 export default {
@@ -208,6 +210,28 @@ export default {
       this.patientRegister.photo = rd.photo || ''
     },
 
+    //读身份证
+    readIdCard() {
+      if (!this.$peisAPI) {
+        this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
+        return
+      }
+      this.$peisAPI.peopleIcCard().then(res => {
+        console.log('peopleIcCard', res)
+        let lres = JSON.parse(res)
+        if (lres.code > -1) {
+          let idNos = parsIcCardtoLocal(lres.data, this.dict.sex, this.dict.nation)
+          this.prBase.idNo = idNos.IDCode
+          this.onQueryByOnlyNo('idNo')
+        } else {
+          this.$message.error({ showClose: true, message: lres.message })
+        }
+      })
+        .catch(err => {
+          this.$message.error({ showClose: true, message: `读取身份证失败，原因：${err}` })
+        })
+    },
+
 
     // 根据pacs条码查询
     onQueryByPacsNo(checkRequestNo) {
diff --git a/src/views/fee-settings/cardRegister.vue b/src/views/fee-settings/cardRegister.vue
index 64b7794..3ccf3a3 100644
--- a/src/views/fee-settings/cardRegister.vue
+++ b/src/views/fee-settings/cardRegister.vue
@@ -141,7 +141,7 @@
           <el-table :data="cardBillList" width="100%" :height="window.pageHeight < 600
             ? 210
             : Math.floor((window.pageHeight - 300) / 2)
-            " row-key="id" highlight-current-row ref="dataList" @selection-change="handleSelectionChange">
+            " row-key="id" highlight-current-row ref="cardBillList" @selection-change="handleSelectionChange">
             <el-table-column prop="payModeId" label="支付方式">
               <template slot-scope="scope">
                 <div>
@@ -997,15 +997,15 @@ export default {
     btnQuery() {
       let body = this.getQueryBody()
 
-      body.maxResultCount = this.loadOptsInit?.maxResultCount || 0
-      body.skipCount = this.loadOptsInit?.skipCount || 0
+      body.maxResultCount = this.loadOpts?.maxResultCount || 1000
+      body.skipCount = 0
+
 
-      this.loadOptsInit = Object.assign({}, this.loadOpts);
       postapi("/api/app/cardregister/getcardregisterlist", body).then((res) => {
-        if (res.code > -1) {
-          this.dataList = res.data.items;
-          this.loadOpts.totalCount = res.data.totalCount
-          //this.loadOpts.skipCount = 0
+        if (res?.code > -1) {
+          this.dataList = res.data?.items;
+          this.loadOpts.totalCount = res.data?.totalCount||0
+          if(res.data?.items?.length > 0) this.loadOpts.skipCount = 1
         }
       });
     },
@@ -1021,9 +1021,9 @@ export default {
         if (this.dom.scrollTop + this.dom.clientHeight + 20 > this.dom.scrollHeight && !this.lazyLoading) {
           // 获取到的不是全部数据 当滚动到底部 
          // console.log('scrollTop', this.dom.scrollTop, 'clientHeight', this.dom.clientHeight, 'scrollHeight', this.dom.scrollHeight);
-          if (Number(this.loadOpts.skipCount) * Number(this.loadOpts.maxResultCount) >= Number(this.loadOpts.totalCount)) {
+          if (Number(this.loadOpts.skipCount) * (this.loadOpts?.maxResultCount || 1000) >= Number(this.loadOpts.totalCount)) {
             this.lazyLoading = false
-            this.$message.warning({showClose:true,message:'没有更多的数据可拉取！'})
+            //this.$message.warning({showClose:true,message:'没有更多的数据可拉取！'})
           } else {
             this.lazyLoading = true
             this.loadQuery()
@@ -1035,18 +1035,16 @@ export default {
 
     loadQuery() {
       let body = this.getQueryBody()
-      if (Number(this.loadOpts.skipCount) * Number(this.loadOpts.maxResultCount || 100) >= Number(this.loadOpts.totalCount)) {
-        this.$message.warning({ showClose: true, message: '没有更多的数据可拉取' })
-        return
-      }
+      
       body.maxResultCount = this.loadOpts?.maxResultCount || 1000
-      body.skipCount = this.loadOpts.skipCount
+      body.skipCount = Number(this.loadOpts.skipCount)
 
       postapi("/api/app/cardregister/getcardregisterlist", body).then((res) => {
         if (res?.code > -1) {
-          this.dataList = this.dataList.concat(res?.data?.items||[]);
+          console.log('this.dataList = this.dataList.concat(res?.data?.items||[]);',this.dataList,res?.data?.items)
+          this.dataList = [].concat(this.dataList,res?.data?.items||[]);
           this.loadOpts.totalCount = res.data.totalCount
-          this.loadOpts.skipCount++
+          this.loadOpts.skipCount = Number(this.loadOpts.skipCount||0) + 1
           this.lazyLoading = false
         }
       });