From c51978a24a5f61a8a4ef7431300f5596bde43e0b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 19 八月 2022 13:58:05 +0800
Subject: [PATCH] #

---
 pages/basics/matQuery.vue |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index 12f1e5b..0e48142 100644
--- a/pages/basics/matQuery.vue
+++ b/pages/basics/matQuery.vue
@@ -4,25 +4,25 @@
 			<view class="container">
 				<view class="text-box">
 					<view class="text-title"><text>鍟嗗搧缂栫爜</text></view>
-					<view class="text-title"><text>{{matData.matnr}}</text></view>
+					<view class="text-title"><text>{{matData.matNo}}</text></view>
 				</view>
 				<view class="text-box">
 					<view class="text-title"><text>鍟嗗搧鍚嶇О</text></view>
-					<view class="text-title">{{matData.maktx}}</view>
+					<view class="text-title">{{matData.matName}}</view>
 				</view>
 				<view class="text-box">
 					<view class="text-title"><text>瑙勬牸</text></view>
-					<view class="text-title">{{matData.specs}}</view>
+					<view class="text-title">{{matData.str2}}</view>
 				</view>
 				<view class="text-box">
-					<view class="text-title"><text>鎵瑰彿</text></view>
-					<view class="text-title"><input type="text" v-model="matData.batch"></view>
+					<view class="text-title"><text>鍗曚綅</text></view>
+					<view class="text-title"><input type="text" v-model="matData.str1"></view>
 				</view>
 				<view class="text-box">
 					<view class="text-title"><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 v-model="matData.count" :max="99999" color="#747474"  @change="changeValue"/>
 						</view>
 					</view>
 				</view>
@@ -40,11 +40,10 @@
 	export default {
 		data() {
 			return {
-				matList:[],
 				matData: {
-					matnr: null,
-					maktx: null,
-					batch: null,
+					matNo: null,
+					matName: null,
+					str2: null,
 					anfme: null,
 				},
 				baseIP:'',
@@ -61,13 +60,14 @@
 			// #endif
 			
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-			eventChannel.on('acceptDataFromOpenerPage', function(data) {
+			eventChannel.on('matData', function(data) {
 			that.matData = data.data
+			console.log(that.matData)
 			})
 			
 		},
 		onShow() {
-			// this.matData = this.matData
+			this.matData.count = 0
 		},
 		methods: {
 			blur() {
@@ -80,7 +80,12 @@
 				
 			},
 			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({
 					
 				})

--
Gitblit v1.9.1