From 9e901f8641fb3f347d8fb6cd400e8d2f1278baf5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 04 一月 2025 17:08:43 +0800
Subject: [PATCH] #平库入库功能
---
pages/pakin/putOn.vue | 4 ++--
pages/pakin/pakin.vue | 30 ++++++++++++++++++++++--------
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 0090ff2..4c5a965 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -24,9 +24,15 @@
<view class="list-left-item">
<view class="desc">No锛�</view>
<view class="left-item">{{i + 1}}</view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">璁㈠崟鍙凤細</view>
+ <view class="left-item">
+ <uni-tag :text="item.orderNo" type="normal"></uni-tag>
+ </view>
</view>
<view class="list-left-item">
- <view class="desc">缂栫爜锛�</view>
+ <view class="desc">鐗╂枡鐮侊細</view>
<view class="left-item">
<uni-tag :text="item.matnr" type="primary"></uni-tag>
</view>
@@ -215,7 +221,8 @@
}
},
- checkMat(mat) {
+ checkMat(mat) {
+ console.log(mat)
var len = this.dataList.length
var add = true ,sameItem = false
for (var i = 0; i < len; i++) {
@@ -224,7 +231,8 @@
if (mat.batch == this.dataList[j].batch) {
sameItem = true
}
- }
+ }
+
// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
if (mat.batch != this.dataList[i].batch) {
this.$forceUpdate() // 寮哄埗鍒锋柊
@@ -234,11 +242,17 @@
add = true
}
- } else {
- // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
- this.dataList[i].mergeNum += mat.mergeNum
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
+ } else {
+ // 鐩稿悓鐗╂枡锛岀浉鍚屾壒鍙凤紝涓嶅悓璁㈠崟鍙�
+ if (mat.orderNo != this.dataList[i].orderNo) {
+ this.$forceUpdate()
+ add = true
+ } else {
+ // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+ this.dataList[i].mergeNum += mat.mergeNum
+ this.$forceUpdate() // 寮哄埗鍒锋柊
+ add = false
+ }
}
}
}
diff --git a/pages/pakin/putOn.vue b/pages/pakin/putOn.vue
index b47def0..40664e4 100644
--- a/pages/pakin/putOn.vue
+++ b/pages/pakin/putOn.vue
@@ -306,7 +306,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪涓婃灦!'
this.$refs.combConfirm.open()
},
comb() {
@@ -332,7 +332,7 @@
var res = result.data
if (res.code === 200) {
that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.messageText = "涓婃灦鎴愬姛"
that.messageToggle('success')
} else if (res.code == 403) {
that.messageText = res.msg
--
Gitblit v1.9.1