From 75291ece8be07085269e56210e2d3fe10adb4735 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 31 七月 2024 14:56:16 +0800
Subject: [PATCH] #

---
 pages/order/orderPutDown.vue |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/pages/order/orderPutDown.vue b/pages/order/orderPutDown.vue
index 51a04ce..8a64aef 100644
--- a/pages/order/orderPutDown.vue
+++ b/pages/order/orderPutDown.vue
@@ -50,12 +50,12 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
 					</view>
-					<view class="list-left-item">
+					<!-- <view class="list-left-item">
 						<view class="desc">閲嶉噺锛�</view>
 						<view class="left-item">
 							<uni-tag :text="item.weight" type="warning"></uni-tag>
 						</view>
-					</view>
+					</view> -->
 					<view class="list-left-item">
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
@@ -90,10 +90,10 @@
 						<view class="popup-item-left">鎵瑰彿:</view>
 						<view class="popup-item-right"><input type="text" v-model="batch"></view>
 					</view> -->
-					<view class="popup-item">
+					<!-- <view class="popup-item">
 						<view class="popup-item-left">閲嶉噺:</view>
 						<view class="popup-item-right"><input type="text" v-model="weight"></view>
-					</view>
+					</view> -->
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -206,8 +206,15 @@
 			findMat() {
 				let that = this
 				var matnr =  that.matnr.split(";")
-				that.order = matnr[0]
-				that.matnr = matnr[1]
+				if (matnr[1]) {
+					that.order = matnr[0]
+					that.matnr = matnr[1]
+					if (matnr[2] === null) {
+						that.batch = ''
+						matnr[2] = ''
+					}
+					that.anfme = matnr[3]
+				} 
 				uni.request({
 					url: that.baseUrl + '/mat/auth',
 					data: {
@@ -222,7 +229,11 @@
 							that.matData = result.data
 							that.matnr = ''
 							that.matData['batch'] = ''
-							result.data.batch = matnr[2]
+							that.matData['anfme'] = ''
+							if (matnr[2] === null) {
+								result.data.batch = ''
+							}
+							result.data.anfme = matnr[3]
 							uni.navigateTo({
 								url: "../mat/matSelected",
 								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -440,12 +451,12 @@
 		display: flex;
 		min-height: 80rpx;
 		background-color: #FFF;
-		margin: auto 20rpx;
+		margin: 30rpx 20rpx;
 		border-radius: 20rpx;
 		box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
 	}
 	.list:first-child {
-		margin-top: 410rpx;
+		margin-top: 340rpx;
 	}
 	.list:last-child {
 		margin-bottom: 120rpx;

--
Gitblit v1.9.1