From 4fe03b6ba321418a0356e37de44417be03cda5af Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 12 四月 2024 10:24:10 +0800
Subject: [PATCH] #
---
pages/pakin/pakin.vue | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 21fd78a..45561a7 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -41,17 +41,25 @@
<view class="left-item">{{item.specs}}</view>
</view>
<view class="list-left-item">
+ <view class="desc">澶囨敞锛�</view>
+ <view class="left-item">{{item.memo}}</view>
+ </view>
+ <view class="list-left-item">
<view class="desc">鎵瑰彿锛�</view>
<view class="left-item">
<uni-tag :text="item.batch" type="warning"></uni-tag>
</view>
</view>
<view class="list-left-item">
+ <view class="desc">绫虫暟锛�</view>
+ <view class="left-item">{{item.meter ? item.meter : '--'}}</view>
+ </view>
+ <!-- <view class="list-left-item">
<view class="desc">閲嶉噺锛�</view>
<view class="left-item">
<uni-tag :text="item.weight" type="warning"></uni-tag>
</view>
- </view>
+ </view> -->
<view class="list-left-item">
<view class="desc">鏁伴噺锛�</view>
<view class="left-item">{{item.anfme}}</view>
@@ -82,13 +90,13 @@
style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
</view>
</view>
- <!-- <view class="popup-item">
+ <view class="popup-item">
<view class="popup-item-left">鎵瑰彿:</view>
<view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view> -->
+ </view>
<view class="popup-item">
- <view class="popup-item-left">閲嶉噺:</view>
- <view class="popup-item-right"><input type="text" v-model="weight"></view>
+ <view class="popup-item-left">绫虫暟:</view>
+ <view class="popup-item-right"><input type="text" v-model="meter"></view>
</view>
<view class="popup-item">
<view class="popup-item-left">鏁伴噺:</view>
@@ -156,6 +164,7 @@
matFocus: false,
matData: '',
removeNum: 0,
+ meter: ''
}
},
onLoad() {
@@ -221,6 +230,7 @@
that.matData = result.data
that.matnr = ''
that.matData['batch'] = ''
+ that.matData['meter'] = ''
uni.navigateTo({
url: "../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -237,9 +247,9 @@
},
},
});
- } else if (res.code == 403) {
+ } else if (result.code == 403) {
uni.showToast({
- title: res.msg,
+ title: result.msg,
icon: "none",
position: 'top'
})
@@ -250,7 +260,7 @@
}, 1000);
} else {
uni.showToast({
- title: res.msg,
+ title: result.msg,
icon: "none",
position: 'top'
})
@@ -319,6 +329,7 @@
this.count = this.dataList[i].anfme
this.batch = this.dataList[i].batch
this.weight = this.dataList[i].weight
+ this.meter = this.dataList[i].meter
this.rowNum = i
this.eject()
},
@@ -348,6 +359,7 @@
this.dataList[this.rowNum].anfme = this.count
this.dataList[this.rowNum].batch = this.batch
this.dataList[this.rowNum].weight = this.weight
+ this.dataList[this.rowNum].meter = this.meter
this.matnr = ''
this.messageText = "淇敼鎴愬姛"
this.messageToggle('success')
@@ -388,11 +400,19 @@
return;
}
}
+ let tmpData = JSON.parse(JSON.stringify(that.dataList))
+ for (let k of tmpData) {
+ if(k.batch == '' || k.batch == null) {
+ k.batch = ""
+ }else {
+ k.batch = k.batch + '_' + k.meter
+ }
+ }
uni.request({
url: that.baseUrl + '/mobile/comb/auth',
data: JSON.stringify({
barcode: that.barcode,
- combMats: that.dataList
+ combMats: tmpData
}),
method: 'POST',
header: {
@@ -498,6 +518,6 @@
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
- box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
}
</style>
--
Gitblit v1.9.1