From 94556bf6165db297e1d1891b36e0930b74574a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 7 Feb 2023 21:40:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E7=94=A8=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E5=95=86=E5=93=81=E4=B8=8D=E8=83=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/user/Login.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/jshERP-web/src/views/user/Login.vue b/jshERP-web/src/views/user/Login.vue
index 4a17e2b3..cfb641fd 100644
--- a/jshERP-web/src/views/user/Login.vue
+++ b/jshERP-web/src/views/user/Login.vue
@@ -280,14 +280,10 @@
       },
       //加载商品属性
       initMPropertyShort(){
-        let mPropertyListShort = '';
-        let params = {};
-        params.currentPage = 1;
-        params.pageSize = 100;
-        getAction('/materialProperty/list', params).then((res) => {
+        getAction('/materialProperty/getAllList').then((res) => {
           if(res && res.code === 200){
             if(res.data) {
-              let thisRows = res.data.rows; //属性列表
+              let thisRows = res.data; //属性列表
               Vue.ls.set('materialPropertyList', thisRows, 7 * 24 * 60 * 60 * 1000);
             }
           }