From c0e67ee3bfa0ae1908122629761420e8fbd337d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 24 Jan 2022 21:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=95=8C=E9=9D=A2=E7=9A=84=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecgbiz/modal/JSelectMaterialModal.vue   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index ac8c89c2..ab9186ac 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -40,7 +40,7 @@
               </a-col>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="6" :sm="24">
-                  <a-button type="primary" @click="loadData(1)">查询</a-button>
+                  <a-button type="primary" @click="loadMaterialData(1)">查询</a-button>
                   <a-button style="margin-left: 8px" @click="searchReset(1)">重置</a-button>
                 </a-col>
               </span>
@@ -164,8 +164,6 @@
     created() {
       // 该方法触发屏幕自适应
       this.resetScreenSize()
-      this.loadTreeData()
-      this.getDepotList()
     },
     methods: {
       initBarCode() {
@@ -176,13 +174,13 @@
           this.$emit('initComp', '')
         }
       },
-      async loadData(arg) {
+      loadMaterialData(arg) {
         if (arg === 1) {
           this.ipagination.current = 1;
         }
         this.loading = true
         let params = this.getQueryParams()//查询条件
-        await getMaterialBySelect(params).then((res) => {
+        getMaterialBySelect(params).then((res) => {
           if (res) {
             this.dataSource = res.rows
             this.ipagination.total = res.total
@@ -225,8 +223,10 @@
         this.title = '选择商品'
         this.queryParam.q = barCode
         this.$nextTick(() => this.$refs.material.focus());
+        this.loadTreeData()
+        this.getDepotList()
         this.initDepotSelect()
-        this.loadData();
+        this.loadMaterialData();
         this.form.resetFields();
       },
       getQueryParams() {
@@ -247,7 +247,7 @@
         let that = this;
         if (num !== 0) {
           that.queryParam = {};
-          that.loadData(1);
+          that.loadMaterialData(1);
         }
         that.selectedRowKeys = [];
         that.selectMaterialIds = [];
@@ -262,7 +262,7 @@
           this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc';
         }
         this.ipagination = pagination;
-        this.loadData();
+        this.loadMaterialData();
       },
       handleSubmit() {
         let that = this;
@@ -317,14 +317,14 @@
             this.selectedRowKeys = arr
             this.handleSubmit()
           } else {
-            this.loadData(1)
+            this.loadMaterialData(1)
           }
         } else {
-          this.loadData(1)
+          this.loadMaterialData(1)
         }
       },
       modalFormOk() {
-        this.loadData()
+        this.loadMaterialData()
       },
       rowAction(record, index) {
         return {