From f517323f8b3182726a76ccbaf82378d700b1c18e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 27 Oct 2021 00:36:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8D=95=E6=8D=AE=E4=B8=AD=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E9=80=89=E6=8B=A9=E6=A1=86=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8F=AF=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/jeecgbiz/JSelectList.vue   | 32 +++++++++++++++----
 .../jeecgbiz/modal/JSelectMaterialModal.vue   |  3 +-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/JSelectList.vue b/jshERP-web/src/components/jeecgbiz/JSelectList.vue
index 021d6de8..9505daf3 100644
--- a/jshERP-web/src/components/jeecgbiz/JSelectList.vue
+++ b/jshERP-web/src/components/jeecgbiz/JSelectList.vue
@@ -1,11 +1,7 @@
 <template>
   <div>
-    <a-input-search
-      v-model="names"
-      placeholder="请选择"
-      readOnly
-      @search="onSearch">
-    </a-input-search>
+    <a-input-search v-if="kind === 'material'" v-model="names" placeholder="请选择" @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"/>
     <j-select-sn-modal v-if="kind === 'sn'" ref="selectModal" :modal-width="modalWidth" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
@@ -16,6 +12,9 @@
   import JSelectMaterialModal from './modal/JSelectMaterialModal'
   import JSelectBatchModal from './modal/JSelectBatchModal'
   import JSelectSnModal from './modal/JSelectSnModal'
+  import { getMpListShort } from "@/utils/util"
+  import {getMaterialByBarCode} from '@/api/api'
+  import Vue from 'vue'
 
   export default {
     name: 'JSelectList',
@@ -72,7 +71,26 @@
         this.names = name
       },
       onSearch() {
-        this.$refs.selectModal.showModal()
+        if(this.kind === 'material') {
+          let param = {
+            barCode: this.names,
+            mpList: getMpListShort(Vue.ls.get('materialPropertyList')),  //扩展属性
+            prefixNo: this.prefixNo
+          }
+          getMaterialByBarCode(param).then((res) => {
+            if (res && res.code === 200) {
+              let mList = res.data
+              if(mList && mList.length === 1) {
+                //如果条码可以查到商品，则直接加载，不用弹窗再选择
+                this.$emit("change", this.names)
+              } else {
+                this.$refs.selectModal.showModal(this.names)
+              }
+            }
+          })
+        } else {
+          this.$refs.selectModal.showModal()
+        }
       },
       selectOK(rows, idstr) {
         console.log("选中id", idstr)
diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index 959c89a3..1f788238 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -215,8 +215,9 @@
           this.scrollTrigger = {};
         }
       },
-      showModal() {
+      showModal(barCode) {
         this.visible = true;
+        this.queryParam.q = barCode
         this.loadData();
         this.form.resetFields();
       },