root/hht-fujia-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
caill
2025-07-29 16:13:19 +08:00
parent 8b1765c452
commit 5315d61561
6 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/style/layout.styl
View File

@@ -178,6 +178,12 @@ uni-button:after {
border-left: 6rpx solid #ff8227; border-left: 6rpx solid #ff8227;
} }
.slide_new table tr td.wrap{
line-height: 28rpx;
white-space: normal;
word-break: break-all;
}
.item-wrapper { .item-wrapper {
width: 100%; width: 100%;
height: auto; height: auto;

1
pages/home/home.vue
View File

@@ -45,6 +45,7 @@
}; };
}, },
created () { created () {
this.$store.dispatch('setPublicObj', '')
if (this.$store.getters.userInfo) { if (this.$store.getters.userInfo) {
this.userName = JSON.parse(this.$store.getters.userInfo).username this.userName = JSON.parse(this.$store.getters.userInfo).username
} }

2
pages/login/login.vue
View File

@@ -91,7 +91,7 @@
} else { } else {
this.$store.dispatch('delLoginName', '') 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) this.$store.dispatch('saveToken', res.token)
uni.redirectTo({ uni.redirectTo({
url: '/pages/home/home' url: '/pages/home/home'

4
pages/login/setup.vue
View File

@@ -7,10 +7,10 @@
<view class="setup-label">LMS地址</view> <view class="setup-label">LMS地址</view>
<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip"> <input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
</view> </view>
<view class="setup-item"> <!-- <view class="setup-item">
<view class="setup-label">ACS地址</view> <view class="setup-label">ACS地址</view>
<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip"> <input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
</view> </view> -->
<!-- <view class="setup-item"> <!-- <view class="setup-item">
<view class="setup-label">刷新时间(s)</view> <view class="setup-label">刷新时间(s)</view>
<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime"> <input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">

7
pages/manage/common/cxwl.vue
View File

@@ -19,14 +19,14 @@
<thead> <thead>
<tr> <tr>
<th>物料名称</th> <th>物料名称</th>
<th>物料规格</th> <th><view style="width: 300rpx;">物料规格</view></th>
<th>物料编码</th> <th>物料编码</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)"> <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_name}}</td>
<td>{{e.material_spec}}</td> <td class="wrap">{{e.material_spec}}</td>
<td>{{e.material_code}}</td> <td>{{e.material_code}}</td>
</tr> </tr>
</tbody> </tbody>
@@ -83,10 +83,9 @@
}, },
async _getMaterialList () { async _getMaterialList () {
let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '') let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '')
// this.dataList = res.data
this.totalCount = res.totalElements this.totalCount = res.totalElements
if (res.totalElements > 0) { if (res.totalElements > 0) {
const dataMap = res.data const dataMap = res.content
this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap) this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
this.reload = false this.reload = false
} else { } else {

2
pages/manage/wlzp.vue
View File

@@ -118,6 +118,7 @@
this.currentData = {} this.currentData = {}
this.index = '' this.index = ''
this.disabled = false this.disabled = false
this.$store.dispatch('setPublicObj', '')
}, },
async _groupPlate () { async _groupPlate () {
this.disabled = true this.disabled = true
@@ -132,6 +133,7 @@
title: res.message, title: res.message,
icon: 'none' icon: 'none'
}) })
this.toEmpty()
this.disabled = false this.disabled = false
} catch (e) { } catch (e) {
this.disabled = false this.disabled = false