From db4121aad03495c3e07bf24830ea6ac5a8531e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 30 Sep 2022 19:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=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=E4=B8=AD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=93=81=E7=9A=84=E5=BF=AB=E6=8D=B7=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/jeecgbiz/JSelectList.vue |  2 +-
 .../jeecgbiz/modal/JSelectMaterialModal.vue        | 14 +++++++++++---
 .../src/views/material/modules/MaterialModal.vue   |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/JSelectList.vue b/jshERP-web/src/components/jeecgbiz/JSelectList.vue
index 23047f61..44e0377c 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="条码或名称" @pressEnter="onPressEnter" @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'||kind === 'snAdd'" v-model="names" placeholder="请点开弹窗" readOnly @search="onSearch"></a-input-search>
     <j-select-material-modal v-if="kind === 'material'" ref="selectModal" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
     <j-select-batch-modal v-if="kind === 'batch'" ref="selectModal" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index 1e2d0b26..e1f6168c 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -40,8 +40,9 @@
               </a-col>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="6" :sm="24">
-                  <a-button type="primary" @click="loadMaterialData(1)">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="searchReset(1)">重置</a-button>
+                  <a-button type="primary" icon="search" @click="loadMaterialData(1)" title="查询"></a-button>
+                  <a-button style="margin-left: 8px" icon="reload" @click="searchReset(1)" title="重置"></a-button>
+                  <a-button style="margin-left: 8px" icon="plus" @click="addMaterial" title="添加"></a-button>
                   <a @click="handleToggleSearch" style="margin-left: 8px">
                     {{ toggleSearchStatus ? '收起' : '展开' }}
                     <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
@@ -92,6 +93,7 @@
         </div>
       </a-col>
     </a-row>
+    <material-modal ref="modalForm" @ok="modalFormOk"></material-modal>
   </a-modal>
 </template>
 
@@ -105,7 +107,9 @@
   export default {
     name: 'JSelectMaterialModal',
     mixins:[JeecgListMixin],
-    components: {},
+    components: {
+      MaterialModal: () => import('@/views/material/modules/MaterialModal')
+    },
     props: ['rows', 'multi', 'barCode'],
     data() {
       return {
@@ -289,6 +293,10 @@
         that.selectedRowKeys = [];
         that.selectMaterialIds = [];
       },
+      addMaterial() {
+        this.$refs.modalForm.add()
+        this.$refs.modalForm.title = '新增商品'
+      },
       close() {
         this.searchReset(0);
         this.visible = false;
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index d6d2d6c8..5b0da28c 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -4,6 +4,7 @@
     :width="1300"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    :maskClosable="false"
     v-bind:prefixNo="prefixNo"
     switchHelp
     switchFullscreen