From aab4ddd36c63d4bd239d2d7fe9c4780b2fcc76da Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 08 六月 2023 15:16:41 +0800
Subject: [PATCH] Merge branch 'bfwms' of http://47.97.1.152:5880/r/wms_app into bfwms

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

diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index 091f889..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" :max="9999" color="#747474"  @change="changeValue"/>
+							<uni-number-box :value="matData.anfme" :max="9999999" color="#747474" @change="changeValue"/>
 						</view>
 					</view>
 				</view>
@@ -62,11 +74,10 @@
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 			eventChannel.on('matData', function(data) {
 			that.matData = data.data
+			that.matData.anfme = 0
 			})
 			
-		},
-		onShow() {
-			this.matData.anfme = 0
+			
 		},
 		methods: {
 			blur() {
@@ -75,8 +86,8 @@
 			focus() {
 				
 			},
-			changeValue() {
-				
+			changeValue(value) {
+				this.matData.anfme = value
 			},
 			back() {
 				if (this.matData.anfme === 0) {
@@ -100,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%;
@@ -133,7 +145,9 @@
 		border-bottom: 1rpx solid #e8e8e8 ;
 		width: 100%;
 	}
-	
+	.text-desc {
+		line-height: 100rpx;
+	}
 	
 	.foot {
 		width: 100%;

--
Gitblit v1.9.1