From 12966b4ef9d35b25760fcd4fcdd569bef9aa8547 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 30 七月 2025 14:10:30 +0800
Subject: [PATCH] #
---
pages/basics/pakin.vue | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 2aad85c..acfd335 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -58,12 +58,14 @@
<view><text style="width: 400rpx;">瑙勬牸锛歿{item.specs}}</text></view>
<!-- <view><text style="width: 400rpx;">鍨嬪彿锛歿{item.model}}</text></view> -->
<view><text style="width: 400rpx;">鎵规锛歿{item.batch}}</text></view>
+ <view style="width: 500rpx;"><text>鍨嬪彿锛歿{item.model}}</text></view>
+ <view><text style="width: 400rpx;">搴撳瓨鐘舵�侊細{{item.cstateid$}}</text></view>
<!-- <view><text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text></view> -->
<view>
<text style="width: 400rpx;">涓绘暟閲忥細{{item.anfme}}</text>
</view>
<view>
- <text style="width: 400rpx;">杈呮暟閲忥細{{item.anfme}}</text>
+ <text style="width: 400rpx;">杈呮暟閲忥細{{item.weight}}</text>
</view>
</view>
<view class="data-list-right">
@@ -86,6 +88,9 @@
<label class="label-btn" style="width: 150rpx;">
<button class="cu-btn" @click="resst()">閲嶇疆</button>
+ </label>
+ <label>
+ 鎬昏杈呮暟閲忥細{{ countWeight }}
</label>
<label class="label-btn">
<button class="cu-btn bg-blue " @click="comb()">缁勬墭</button>
@@ -143,7 +148,8 @@
check:false,
checkText:'鍏ㄩ��',
checkedData:[],
- batch:''
+ batch:'',
+ countWeight: 0
}
},
onShow() {
@@ -245,7 +251,7 @@
}
uni.showLoading();
uni.request({
- url: that.commonUrl + '/mobile/comb/auth',
+ url: that.commonUrl + '/mobile/comb2/auth',
data: JSON.stringify({
barcode: that.barcode,
combMats: that.matList
@@ -312,13 +318,17 @@
let res = result.data
if (res.code === 200 && res.data) {
that.matData = res.data
+
+ let tiaoma = that.matnr;
that.matnr = ''
uni.navigateTo({
url: "matQuery",
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
matList: function(data) {
- that.checkMat(data.data)
+ let resultData = data.data;
+ resultData.tiaoma = tiaoma;
+ that.checkMat(resultData)
// that.matList.push(data.data)
},
},
@@ -351,7 +361,11 @@
var len = this.matList.length
var add = true
for (var i = 0; i < len; i++) {
- if (mat.matnr == this.matList[i].matnr) {
+ if (mat.tiaoma == this.matList[i].tiaoma){
+ uni.showToast({title: "鏉＄爜閲嶅鎵簡", icon: "none", position: 'top'})
+ add = false
+ }
+ if (mat.matnr == this.matList[i].matnr && mat.batch == this.matList[i].batch) {
this.matList[i].anfme += mat.anfme
this.$forceUpdate() // 寮哄埗鍒锋柊
add = false
@@ -359,6 +373,12 @@
}
if (add) {
this.matList.unshift(mat)
+
+ let count = 0;
+ this.matList.forEach((item) => {
+ count += item.weight;
+ })
+ this.countWeight = count;
}
},
change(e) {
@@ -583,7 +603,7 @@
}
.data-list {
border-bottom: 1px solid #d8d8d8;
- height: 280rpx;
+ height: 450rpx;
margin: 15rpx;
border-radius: 20rpx;
}
--
Gitblit v1.9.1