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, 8 insertions(+), 7 deletions(-)
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index 2c8db02..8ac9d36 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -7,20 +7,20 @@
</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>
<view class="form-item-content"><text>{{mat.specs}}</text></view>
</view>
- <!-- <view class="form-item">
+ <view class="form-item">
<view class="form-item-desc"><text>鎵瑰彿</text></view>
<view class="form-item-content">
<view class="form-input">
<input type="text" v-model="mat.batch">
</view>
</view>
- </view> -->
+ </view>
<view class="form-item">
<view class="form-item-desc"><text>鏁伴噺</text></view>
<view class="form-item-content">
@@ -44,7 +44,7 @@
maktx: null,
specs: null,
batch: null,
- anfme: 0,
+ 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
})
@@ -101,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