From 3dd5573c802cb8935c6f9824d25709e42e4068f1 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Mon, 18 Mar 2024 23:29:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E6=97=B6=E5=80=99=E6=98=8E=E7=BB=86=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E4=B8=8B=E6=BB=91=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/jeecg/JEditableTable.vue | 8 ++++----
 jshERP-web/src/views/bill/mixins/BillModalMixin.js | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue
index ca554f17..caa18887 100644
--- a/jshERP-web/src/components/jeecg/JEditableTable.vue
+++ b/jshERP-web/src/components/jeecg/JEditableTable.vue
@@ -90,12 +90,12 @@
 
             <!-- 动态生成tr -->
             <template v-for="(row,rowIndex) in rows">
-              <!-- tr 只加载可见的和预加载的总共十条数据 -->
+              <!-- tr 如果超出200条，则只加载可见的和预加载的总共十条数据 -->
               <div
-                v-if="
+                v-if="rows.length<=200 ||
+                (rows.length>200 &&
                 rowIndex >= parseInt(`${(scrollTop-rowHeight) / rowHeight}`) &&
-                  (parseInt(`${scrollTop / rowHeight}`) + 9) > rowIndex
-              "
+                  (parseInt(`${scrollTop / rowHeight}`) + 9) > rowIndex)"
                 :id="`${caseId}tbody-tr-${rowIndex}`"
                 :data-idx="rowIndex"
                 class="tr"
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 8b99f308..7237d46b 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -797,6 +797,7 @@ export const BillModalMixin = {
     },
     //扫码之后回车
     scanPressEnter() {
+      let that = this
       if(this.scanBarCode) {
         this.getAllTable().then(tables => {
           return getListData(this.form, tables)
@@ -910,6 +911,10 @@ export const BillModalMixin = {
               //置空扫码的内容
               this.scanBarCode = ''
               this.$refs.scanBarCode.focus()
+              //自动下滑到最后一行
+              setTimeout(function(){
+                that.$refs.materialDataTable.resetScrollTop((newDetailArr.length+1)*that.$refs.materialDataTable.rowHeight)
+              },1000)
             }
           })
         })