From 664f50a7b5b8a8dbbc48c93b01762250d6ef4d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E8=AF=9D?= <752718920@qq.com>
Date: Thu, 5 May 2022 23:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG=EF=BC=9A=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E9=80=89=E6=8B=A9=E6=A1=86=E9=80=89=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E9=80=89=E8=BF=87=E5=88=99=E4=B8=8D=E8=83=BD=E5=86=8D?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/jeecgbiz/JSelectList.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/JSelectList.vue b/jshERP-web/src/components/jeecgbiz/JSelectList.vue
index 9505daf3..086e1e84 100644
--- a/jshERP-web/src/components/jeecgbiz/JSelectList.vue
+++ b/jshERP-web/src/components/jeecgbiz/JSelectList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-input-search v-if="kind === 'material'" v-model="names" placeholder="请选择" @search="onSearch"></a-input-search>
+    <a-input-search v-if="kind === 'material'" v-model="names" placeholder="请选择" @pressEnter="onPressEnter" @search="onSearch"></a-input-search>
     <a-input-search v-if="kind === 'batch'||kind === 'sn'" v-model="names" placeholder="请选择" readOnly @search="onSearch"></a-input-search>
     <j-select-material-modal v-if="kind === 'material'" ref="selectModal" :modal-width="modalWidth" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
     <j-select-batch-modal v-if="kind === 'batch'" ref="selectModal" :modal-width="modalWidth" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
@@ -70,7 +70,7 @@
       initComp(name) {
         this.names = name
       },
-      onSearch() {
+      onPressEnter() {
         if(this.kind === 'material') {
           let param = {
             barCode: this.names,
@@ -84,6 +84,7 @@
                 //如果条码可以查到商品，则直接加载，不用弹窗再选择
                 this.$emit("change", this.names)
               } else {
+                //匹配不到进行弹窗
                 this.$refs.selectModal.showModal(this.names)
               }
             }
@@ -92,6 +93,14 @@
           this.$refs.selectModal.showModal()
         }
       },
+      onSearch() {
+        if(this.kind === 'material') {
+          //直接进行弹窗
+          this.$refs.selectModal.showModal(this.names)
+        } else {
+          this.$refs.selectModal.showModal()
+        }
+      },
       selectOK(rows, idstr) {
         console.log("选中id", idstr)
         if (!rows) {