From 690a0b08ef4df6f15157eaf1294b500767e2ac24 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期日, 29 一月 2023 16:25:29 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 5e167e3..9093c46 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -72,6 +72,7 @@
 						<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
 						<view><text style="width: 400rpx;">瑙勬牸锛歿{item.specs}}</text></view>
 						<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+						<view><text style="width: 400rpx;">瀹㈡埛淇℃伅锛歿{item.cstmr}}</text></view>
 						<view>
 							<text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text>
 							<text style="width: 400rpx;margin-left: 100rpx">鏁伴噺锛歿{item.anfme}}</text>
@@ -121,6 +122,10 @@
 					<text style="display: inline-block;float: left;width: 50px;">澶囨敞锛�</text>
 					<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="memo">
 				</view>
+				<view class="" style="position: relative;left: 50px;margin-bottom: 20px;">
+					<text style="display: inline-block;float: left;width: 50px;">瀹㈡埛锛�</text>
+					<input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="cstmr">
+				</view>
 				<view class="changeBox">
 					<view class="num-box">
 						<text style="display: inline-block;float: left;width: 50px;">鏁伴噺锛�</text>
@@ -139,6 +144,7 @@
 
 <script>
 	import permision from "@/common/permission.js"
+import loginVue from "../login/login.vue";
 	export default {
 		data() {
 			return {
@@ -150,7 +156,7 @@
 				searchBox: 'hide',
 				pick:'hide',
 				matnr:'',
-				matList:[],
+				matList:[{}],
 				result: '',
 				enableQty:'',
 				count:'',
@@ -162,6 +168,7 @@
 				checkedData:[],
 				batch:'',
 				memo: '',
+				cstmr: '',
 				ck1: false,
 				ck2: true,
 				frozen: 0,
@@ -290,7 +297,6 @@
 						'token':uni.getStorageSync('token')
 				    },
 					success(result) {
-						console.log(result);
 						uni.hideLoading();
 						var res = result.data
 						if (res.code === 200) {
@@ -347,12 +353,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 +396,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,11 +406,13 @@
 					}
 				}
 				if (add) {
+					if(mat.batch === '' || mat.batch === null) {
+						mat.batch = today
+					}
 					this.matList.unshift(mat)
 				}
 			},
 			change(e) {
-				console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
 			},
 			toggle(type) {
 				this.type = type
@@ -434,13 +444,6 @@
 				this.count = this.matList[index].anfme
 				this.batch = this.matList[index].batch
 				this.memo = this.matList[index].memo
-				// var maxCount = this.matList[index].maxCount
-				// if (maxCount == undefined ) {
-				// 	this.matList[index]["maxCount"] = item.enableQty
-				// } 
-				// this.enableQty = item.enableQty
-				// this.count = this.minCount
-				// this.maxCount = item.maxCount
 				this.rowNum = index
 				this.eject()
 			},
@@ -512,7 +515,7 @@
 	.revise-box {
 		position: relative;
 		width: 500rpx;
-		height: 470rpx;
+		height: 570rpx;
 		border-radius: 25px;
 		background-color: #fff;
 		border-radius: 20rpx;
@@ -628,7 +631,7 @@
 	}
 	.data-list {
 		border-bottom: 1px solid #d8d8d8;
-		height: 220rpx;
+		height: 250rpx;
 		margin: 15rpx;
 		border-radius: 20rpx;
 	}
@@ -659,8 +662,8 @@
 	.data-list-right {
 		display: inline-block;
 		float: right;
-		height: 180rpx;
-		line-height: 180rpx;
+		height: 250rpx;
+		line-height: 250rpx;
 	}
 	/* display: inline-block;
 	float: right;

--
Gitblit v1.9.1