From fdfc2c66434bdacdd539f228b51a33c8d15e71d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 20 四月 2024 12:32:15 +0800
Subject: [PATCH] #
---
pages/mat/matSelected.vue | 6 +++---
pages/mat/matQuery.vue | 4 ++--
pages/pakin/pakin.vue | 21 ++++++++++++++++++++-
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index c8316fb..7ae5f5a 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -22,7 +22,7 @@
</view>
</view>
<view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
- <view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx ? item.maktx : '--'}}</view>
+ <view class="tag-item" style="word-break: break-all;width: 90%;">鍟嗗搧鍚嶇О锛� {{item.maktx ? item.maktx : '--'}}</view>
<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs ? item.specs : '--'}}</view>
</view>
</view>
@@ -74,7 +74,7 @@
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
- this.showTag(1)
+ this.showTag(10009)
},
methods: {
search() {
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index a0d2b69..efaaf5a 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" style="word-break: break-all;line-height: 1.5;"><text>{{mat.maktx}}</text></view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>瑙勬牸</text></view>
@@ -101,8 +101,8 @@
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;
border-bottom: 1px solid #DCDFE6;
margin-left: 40rpx;
display: flex;
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 8af03fd..f3ac0d3 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -15,6 +15,17 @@
<uni-icons type="right" color="#c1c1c1"></uni-icons>
</view>
</view>
+ <view class="item">
+ <view class="code-decs">婊℃墭:</view>
+ <radio-group @change="isFrozen">
+ <label>
+ <radio :checked="ck1" style="margin-left: 10rpx;"/><text>鏄�</text>
+ </label>
+ <label>
+ <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
+ </label>
+ </radio-group>
+ </view>
</view>
<view class="mat-list-title">
鍟嗗搧鍒楄〃
@@ -156,6 +167,9 @@
matFocus: false,
matData: '',
removeNum: 0,
+ ck1: true,
+ ck2: false,
+ isFull: true
}
},
onLoad() {
@@ -166,6 +180,10 @@
this.token = uni.getStorageSync('token');
},
methods: {
+ isFrozen() {
+ this.isFull = !this.isFull
+ console.log(this.isFull);
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -392,6 +410,7 @@
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
+ isFull: that.isFull,
combMats: that.dataList
}),
method: 'POST',
@@ -462,7 +481,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
--
Gitblit v1.9.1