From fe8fb74ce94e7bee23ed47b7175236248ac93b98 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 19 十一月 2024 16:24:04 +0800
Subject: [PATCH] Merge branch 'nbncPda' of http://47.97.1.152:5880/r/wms_app into nbncPda
---
pages/mat/matSelected.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index d4fe196..8ac9d36 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -7,7 +7,7 @@
</view>
<view class="form-item">
<view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
- <view class="form-item-content"><text>{{mat.maktx}}</text></view>
+ <view class="form-item-content"><text style="word-wrap:break-word">{{mat.maktx}}</text></view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>瑙勬牸</text></view>
@@ -17,7 +17,7 @@
<view class="form-item-desc"><text>鎵瑰彿</text></view>
<view class="form-item-content">
<view class="form-input">
- <input type="text">
+ <input type="text" v-model="mat.batch">
</view>
</view>
</view>
@@ -44,7 +44,7 @@
maktx: null,
specs: null,
batch: null,
- anfme: null,
+ anfme: 1,
},
baseIP:'',
basePORT:'',
@@ -62,7 +62,7 @@
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('mat', function(data) {
that.mat = data.data
- that.mat.anfme = 0
+ that.mat.anfme = 1
})
@@ -78,13 +78,11 @@
this.mat.anfme = value
},
back() {
- console.log(this.mat.anfme);
if (this.mat.anfme === 0) {
uni.showToast({title: '璇疯緭鍏ユ暟閲�', icon: "none", position: 'top'});
return;
}
this.getOpenerEventChannel().emit('matList', {data: this.mat});
- uni.vibrateShort();
uni.navigateBack({
})
@@ -103,12 +101,13 @@
box-shadow: 0px 0px 50px 0px rgba(0,0,0,0.2) ;
}
.form-item {
- height: 100rpx;
- line-height: 100rpx;
+ min-height: 100rpx;
+ line-height: 1.3;
border-bottom: 1px solid #DCDFE6;
margin-left: 40rpx;
display: flex;
align-items: center;
+ word-wrap: break-word;
}
.form-item-desc {
width: 30%;
--
Gitblit v1.9.1