From c571fbd81c0b8b3f4aa707606546efbc8b227f33 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 21 九月 2024 09:01:40 +0800
Subject: [PATCH] #
---
manifest.json | 2 +-
pages/basics/combPro.vue | 35 +++++++++++++++++++----------------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/manifest.json b/manifest.json
index c31374a..942055c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "20240729A",
+ "versionName" : "20240921A",
"versionCode" : 101,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/basics/combPro.vue b/pages/basics/combPro.vue
index 4cd3f49..ec1d94c 100644
--- a/pages/basics/combPro.vue
+++ b/pages/basics/combPro.vue
@@ -264,18 +264,21 @@
},
addTableData(data){
this.matData=[];
- for(var i=0;i<data.length;i++){
- var toPush = true;
- for(var j=0;j<this.matData.length;j++){
- if(data[i].matnr ===this.matData[j].matnr && data[i].itemBatch === this.matData[j].itemBatch && data[i].specs === this.matData[j].specs){
- this.matData[j].count = Number(this.matData[j].count) + Number(data[i].count);
- toPush = false;
- }
- }
- if(toPush) {
- // data[i].count = 0
- this.matData.push(data[i]);
- }
+ // for(var i=0;i<data.length;i++){
+ // var toPush = true;
+ // for(var j=0;j<this.matData.length;j++){
+ // if(data[i].matnr ===this.matData[j].matnr && data[i].itemBatch === this.matData[j].itemBatch && data[i].specs === this.matData[j].specs){
+ // this.matData[j].count = Number(this.matData[j].count) + Number(data[i].count);
+ // toPush = false;
+ // }
+ // }
+ // if(toPush) {
+ // // data[i].count = 0
+ // this.matData.push(data[i]);
+ // }
+ // }
+ for (let k of data) {
+ this.matData.push(k);
}
},
@@ -351,7 +354,7 @@
that.couChange=true
that.messageToggle('success')
that.messageText = '缁勬墭鎴愬姛'
- this.getFocus('firstFocus')
+ that.getFocus('firstFocus')
} else if(res.data.code === 403){
setTimeout(() => {
uni.reLaunch({
@@ -389,7 +392,7 @@
that.couChange=true
that.messageToggle('success')
that.messageText = '缁勬墭鎴愬姛'
- this.getFocus('firstFocus')
+ that.getFocus('firstFocus')
} else if(res.data.code === 403){
uni.navigateBack({
delta: 1
@@ -428,7 +431,7 @@
that.couChange=true
that.messageToggle('success')
that.messageText = '缁勬墭鎴愬姛'
- this.getFocus('firstFocus')
+ that.getFocus('firstFocus')
} else if(res.data.code === 403){
uni.navigateBack({
delta: 1
@@ -464,7 +467,7 @@
that.couChange=true
that.messageToggle('success')
that.messageText = '缁勬墭鎴愬姛'
- this.getFocus('firstFocus')
+ that.getFocus('firstFocus')
} else if(res.data.code === 403){
uni.navigateBack({
delta: 1
--
Gitblit v1.9.1