From fd232a4478aeb37f207902cb0c2353ee5d4f2bf1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 07 七月 2023 15:46:00 +0800
Subject: [PATCH] #

---
 pages/basics/matQuery.vue |   50 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index 12f1e5b..78150b2 100644
--- a/pages/basics/matQuery.vue
+++ b/pages/basics/matQuery.vue
@@ -3,26 +3,38 @@
 		<view>
 			<view class="container">
 				<view class="text-box">
-					<view class="text-title"><text>鍟嗗搧缂栫爜</text></view>
+					<view class="text-title text-desc"><text>鍟嗗搧缂栫爜</text></view>
 					<view class="text-title"><text>{{matData.matnr}}</text></view>
 				</view>
 				<view class="text-box">
-					<view class="text-title"><text>鍟嗗搧鍚嶇О</text></view>
+					<view class="text-title text-desc"><text>鍟嗗搧鍚嶇О</text></view>
 					<view class="text-title">{{matData.maktx}}</view>
 				</view>
 				<view class="text-box">
-					<view class="text-title"><text>瑙勬牸</text></view>
+					<view class="text-title text-desc"><text>瑙勬牸</text></view>
 					<view class="text-title">{{matData.specs}}</view>
 				</view>
 				<view class="text-box">
-					<view class="text-title"><text>鎵瑰彿</text></view>
+					<view class="text-title text-desc"><text>鍏ュ簱鍖哄煙</text></view>
+					<view class="text-title">{{matData.matType$}}</view>
+				</view>
+				<view class="text-box">
+					<view class="text-title text-desc"><text>鎵瑰彿</text></view>
 					<view class="text-title"><input type="text" v-model="matData.batch"></view>
 				</view>
 				<view class="text-box">
-					<view class="text-title"><text>鏁伴噺</text></view>
+					<view class="text-title text-desc"><text>澶囨敞</text></view>
+					<view class="text-title"><input type="text" v-model="matData.memo"></view>
+				</view>
+				<view class="text-box">
+					<view class="text-title text-desc"><text>瀹㈡埛淇℃伅</text></view>
+					<view class="text-title"><input type="text" v-model="matData.cstmr"></view>
+				</view>
+				<view class="text-box">
+					<view class="text-title text-desc"><text>鏁伴噺</text></view>
 					<view class="text-title">
 						<view>
-							<uni-number-box v-model="matData.anfme" value="0" :max="9999" color="#747474"  @change="changeValue"/>
+							<uni-number-box :value="matData.anfme" :max="9999999" color="#747474" @change="changeValue"/>
 						</view>
 					</view>
 				</view>
@@ -40,7 +52,6 @@
 	export default {
 		data() {
 			return {
-				matList:[],
 				matData: {
 					matnr: null,
 					maktx: null,
@@ -61,13 +72,12 @@
 			// #endif
 			
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-			eventChannel.on('acceptDataFromOpenerPage', function(data) {
+			eventChannel.on('matData', function(data) {
 			that.matData = data.data
+			that.matData.anfme = 0
 			})
 			
-		},
-		onShow() {
-			// this.matData = this.matData
+			
 		},
 		methods: {
 			blur() {
@@ -76,11 +86,16 @@
 			focus() {
 				
 			},
-			changeValue() {
-				
+			changeValue(value) {
+				this.matData.anfme = value
 			},
 			back() {
-				this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: this.matData});
+				if (this.matData.anfme === 0) {
+					uni.showToast({title: '璇疯緭鍏ユ暟閲�', icon: "none", position: 'top'});
+					return;
+				}
+				this.getOpenerEventChannel().emit('matList', {data: this.matData});
+				uni.vibrateShort();
 				uni.navigateBack({
 					
 				})
@@ -96,8 +111,9 @@
 		background-color: #ffffff;
 	}
 	.text-box {
+		display: flex;
 		height: 100rpx;
-		line-height: 100rpx;
+		/* line-height: 100rpx; */
 		margin-top: 20rpx;
 		margin-left: 10%;
 		width: 80%;
@@ -129,7 +145,9 @@
 		border-bottom: 1rpx solid #e8e8e8 ;
 		width: 100%;
 	}
-	
+	.text-desc {
+		line-height: 100rpx;
+	}
 	
 	.foot {
 		width: 100%;

--
Gitblit v1.9.1