From 5315d61561394dfeec72b9714c8ea857d5d67014 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 29 Jul 2025 16:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl     | 6 ++++++
 pages/home/home.vue          | 1 +
 pages/login/login.vue        | 2 +-
 pages/login/setup.vue        | 4 ++--
 pages/manage/common/cxwl.vue | 7 +++----
 pages/manage/wlzp.vue        | 2 ++
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index 939e85f..d3aaa20 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -178,6 +178,12 @@ uni-button:after {
 	border-left: 6rpx solid #ff8227;
 }
 
+.slide_new table tr td.wrap{
+	line-height: 28rpx;
+	white-space: normal;
+	word-break: break-all;
+}
+
 .item-wrapper {
 	width: 100%;
 	height: auto;
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d884dac..708280f 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -45,6 +45,7 @@
 			};
 		},
 		created () {
+			this.$store.dispatch('setPublicObj', '')
 			if (this.$store.getters.userInfo) {
 				this.userName = JSON.parse(this.$store.getters.userInfo).username
 			}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4a99fa6..fa305f4 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -91,7 +91,7 @@
 					} else {
 						this.$store.dispatch('delLoginName', '')
 					}
-					this.$store.dispatch('saveUserInfo', JSON.stringify(res.user.user))
+					this.$store.dispatch('saveUserInfo', JSON.stringify(res.data.user))
 					this.$store.dispatch('saveToken', res.token)
 					uni.redirectTo({
 						url: '/pages/home/home'
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index a655086..6247a7a 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -7,10 +7,10 @@
 					<view class="setup-label">LMS地址</view>
 					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
 				</view>
-				<view class="setup-item">
+				<!-- <view class="setup-item">
 					<view class="setup-label">ACS地址</view>
 					<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
-				</view>
+				</view> -->
 				<!-- <view class="setup-item">
 					<view class="setup-label">刷新时间(s)</view>
 					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
diff --git a/pages/manage/common/cxwl.vue b/pages/manage/common/cxwl.vue
index 102521f..767dc43 100644
--- a/pages/manage/common/cxwl.vue
+++ b/pages/manage/common/cxwl.vue
@@ -19,14 +19,14 @@
 						<thead>
 							<tr>
 								<th>物料名称</th>
-								<th>物料规格</th>
+								<th><view style="width: 300rpx;">物料规格</view></th>
 								<th>物料编码</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
 								<td>{{e.material_name}}</td>
-								<td>{{e.material_spec}}</td>
+								<td class="wrap">{{e.material_spec}}</td>
 								<td>{{e.material_code}}</td>
 							</tr>
 						</tbody>
@@ -83,10 +83,9 @@
 			},
 			async _getMaterialList () {
 				let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '')
-				// this.dataList = res.data
 				this.totalCount = res.totalElements
 				if (res.totalElements > 0) {
-					const dataMap = res.data
+					const dataMap = res.content
 					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
 					this.reload = false
 				} else {
diff --git a/pages/manage/wlzp.vue b/pages/manage/wlzp.vue
index 9991d11..b7bf406 100644
--- a/pages/manage/wlzp.vue
+++ b/pages/manage/wlzp.vue
@@ -118,6 +118,7 @@
 				this.currentData = {}
 				this.index = ''
 				this.disabled = false
+				this.$store.dispatch('setPublicObj', '')
 			},
 			async _groupPlate () {
 				this.disabled = true
@@ -132,6 +133,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.toEmpty()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false