From a7a950fa1feabacbd30a2d2d530ad2dbaa722d1a Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 28 十二月 2022 10:30:34 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue    |    9 ++++++++-
 pages/basics/matQuery.vue |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index 38aad6c..29e4728 100644
--- a/pages/basics/matQuery.vue
+++ b/pages/basics/matQuery.vue
@@ -47,7 +47,7 @@
 				matData: {
 					matnr: null,
 					maktx: null,
-					batch: null,
+					batch: '',
 					anfme: null,
 				},
 				baseIP:'',
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 5e167e3..1767665 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -139,6 +139,7 @@
 
 <script>
 	import permision from "@/common/permission.js"
+import loginVue from "../login/login.vue";
 	export default {
 		data() {
 			return {
@@ -347,12 +348,12 @@
 						'token':uni.getStorageSync('token')
 				    },
 					success(result) {
-						console.log(result);
 						uni.vibrateShort();
 						let res = result.data
 						if (res.code === 200 && res.data) {
 							that.matData = res.data
 							that.matnr = ''
+							that.matData['batch'] = ''
 							uni.navigateTo({
 								url: "matQuery",
 								events: {
@@ -390,6 +391,8 @@
 			checkMat(mat) {
 				var len = this.matList.length
 				var add = true
+				var date = new Date()
+				var today = date.getFullYear() + '/' + (date.getMonth()+1) + '/' + date.getDate()
 				for (var i = 0; i < len; i++) {
 					if (mat.matnr == this.matList[i].matnr) {
 						this.matList[i].anfme += mat.anfme 
@@ -398,6 +401,10 @@
 					}
 				}
 				if (add) {
+					console.log(mat);
+					if(mat.batch == '') {
+						mat.batch = today
+					}
 					this.matList.unshift(mat)
 				}
 			},

--
Gitblit v1.9.1