From 8643df2e582ae46f9f2ff91efc2f14620e6c3837 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 06 十一月 2025 09:55:19 +0800
Subject: [PATCH] Merge branch 'devlop_wxxr' of http://47.97.1.152:5880/r/pda-master into devlop_wxxr
---
pages/check/TempCheck.vue | 27 ++++++++++-----------------
pages/rece/other.vue | 3 ---
2 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/pages/check/TempCheck.vue b/pages/check/TempCheck.vue
index 87a6595..a31445c 100644
--- a/pages/check/TempCheck.vue
+++ b/pages/check/TempCheck.vue
@@ -234,10 +234,11 @@
})
return;
}
- this.list.push(...this.matnrList)
- this.matnrList = []
- this.isconfirm = !this.isconfirm
+
+ this.confirmAddMatnr()
+ this.matnrList = [];
},
+
remove(index) {
this.matnrList.splice(index, 1);
},
@@ -249,11 +250,7 @@
matnrs: this.matnrList
})
if (code === 200) {
- uni.showToast({
- title: msg,
- icon: "none",
- position: 'top'
- })
+ that.search()
} else {
uni.showToast({
title: msg,
@@ -261,6 +258,7 @@
position: 'top'
})
}
+ this.isconfirm = !this.isconfirm
},
async addMatnr() {
const {
@@ -353,14 +351,9 @@
return;
}
this.repeatClick = true
- const {
- code,
- data,
- msg
- } = await request('/saveCheckDiff', {
- container: that.barcode,
- checkId: that.check.id,
- checkDiffItems: that.list
+ const {code, data, msg } = await request('/temp/check/confirm', {
+ barcode: that.barcode,
+ items: that.list
})
if (code === 200) {
uni.showToast({
@@ -371,7 +364,7 @@
} else {
uni.showToast({
title: msg,
- icon: "none",
+ icon: "error",
})
}
this.repeatClick = false
diff --git a/pages/rece/other.vue b/pages/rece/other.vue
index 0d7bdd3..d1506bf 100644
--- a/pages/rece/other.vue
+++ b/pages/rece/other.vue
@@ -13,10 +13,7 @@
<text class='cuIcon-close text-gray margin-right-xs' v-show="barcode!==''" @click="clearBarcode"></text>
<text class='cuIcon-search text-blue' @click="search"></text>
</view>
-
</form>
-
-
<view class="padding-lr margin-top-sm">
<block v-for="(item, index) in list" :key="index">
<view class="cu-list det menu sm-border margin-bottom-sm " :class="[item.barcode===barcode&&'act']"
--
Gitblit v1.9.1