From 018cf9ea6eaf8ec665c6d6c6cdce51ef0a092803 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 23 Dec 2023 19:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=8A=A5=E8=A1=A8=E9=87=8C=E9=9D=A2=E7=9A=84=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/mixins/JeecgListMixin.js       | 9 +++++++--
 jshERP-web/src/views/report/MaterialStock.vue | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index e067b126..843330c3 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -255,8 +255,13 @@ export const JeecgListMixin = {
     handleTableChange(pagination, filters, sorter) {
       //分页、排序、筛选变化时触发
       if (Object.keys(sorter).length > 0) {
-        this.isorter.column = sorter.field;
-        this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+        if(sorter.order) {
+          this.isorter.column = sorter.field
+          this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
+        } else {
+          this.isorter.column = 'createTime'
+          this.isorter.order = 'desc'
+        }
       }
       if(pagination && pagination.current) {
         this.ipagination = pagination;
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 4982732d..987d531f 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -15,7 +15,7 @@
                     showSearch style="width: 100%"
                     placeholder="请选择仓库"
                     v-model="depotSelected">
-                    <a-select-option v-for="(depot,index) in depotList" :value="depot.id">
+                    <a-select-option v-for="(depot,index) in depotList" :key="index" :value="depot.id">
                       {{ depot.depotName }}
                     </a-select-option>
                   </a-select>
@@ -167,6 +167,7 @@
         categoryTree:[],
         currentStock: '',
         currentStockPrice: '',
+        currentWeight: '',
         // 表头
         columns: [
           {