From 70937e090d0d0fdaab34e1d6c268a4b1e5699379 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 12:39:20 +0800
Subject: [PATCH] #

---
 manifest.json            |    4 ++--
 pages/basics/combPro.vue |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index 094a20f..c31374a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "涓壃WMS",
     "appid" : "__UNI__DA5854D",
     "description" : "",
-    "versionName" : "20220617A",
-    "versionCode" : "100",
+    "versionName" : "20240729A",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/basics/combPro.vue b/pages/basics/combPro.vue
index b74495a..8156846 100644
--- a/pages/basics/combPro.vue
+++ b/pages/basics/combPro.vue
@@ -42,7 +42,7 @@
 						<!-- <button class="uni-button" size="mini" type="warn" @click="remove(index,item)">鍒犻櫎</button> -->
 					</uni-td>
 					<uni-td align="center">{{item.size}}</uni-td>
-					<uni-td align="center">{{item.matNo}}</uni-td>
+					<uni-td align="center">{{item.matnr}}</uni-td>
 					<uni-td align="center">{{item.matName}}</uni-td>
 					<uni-td align="center">{{item.seqNo}}</uni-td>
 					<uni-td align="center">{{item.itemBatch}}</uni-td>
@@ -263,7 +263,7 @@
 				for(var i=0;i<data.length;i++){
 					var toPush = true;
 					for(var j=0;j<this.matData.length;j++){
-						if(data[i].matNo ===this.matData[j].matNo && data[i].itemBatch === this.matData[j].itemBatch && data[i].specs === this.matData[j].specs){
+						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;
 						}

--
Gitblit v1.9.1