From d05865c903d526e319d49665f573c5345af6ab93 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 08 六月 2023 15:11:49 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue    |   14 +++++++++-----
 pages/basics/matQuery.vue |   25 ++++++++++++++++---------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index 88a91f9..78150b2 100644
--- a/pages/basics/matQuery.vue
+++ b/pages/basics/matQuery.vue
@@ -3,31 +3,35 @@
 		<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>瀹㈡埛淇℃伅</text></view>
+					<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>鏁伴噺</text></view>
+					<view class="text-title text-desc"><text>鏁伴噺</text></view>
 					<view class="text-title">
 						<view>
 							<uni-number-box :value="matData.anfme" :max="9999999" color="#747474" @change="changeValue"/>
@@ -107,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%;
@@ -140,7 +145,9 @@
 		border-bottom: 1rpx solid #e8e8e8 ;
 		width: 100%;
 	}
-	
+	.text-desc {
+		line-height: 100rpx;
+	}
 	
 	.foot {
 		width: 100%;
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 1805797..68f5a8d 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -68,9 +68,12 @@
 						<!-- <view>
 							<checkbox :value="item.id+''" :checked="item.checked" style="display: block;" />
 						</view> -->
-						<view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
+						<table>
+							<tr><td>缂栧彿锛�</td><td>{{item.matnr}}</td></tr>
+						</table>
 						<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
 						<view><text style="width: 400rpx;">瑙勬牸锛歿{item.specs}}</text></view>
+						<view><text style="width: 400rpx;">鍏ュ簱鍖哄煙锛歿{item.matType$}}</text></view>
 						<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
 						<view><text style="width: 400rpx;">瀹㈡埛淇℃伅锛歿{item.cstmr}}</text></view>
 						<view>
@@ -633,7 +636,7 @@
 	}
 	.data-list {
 		border-bottom: 1px solid #d8d8d8;
-		height: 250rpx;
+		min-height: 320rpx;
 		margin: 15rpx;
 		border-radius: 20rpx;
 	}
@@ -655,8 +658,9 @@
 		display: inline-block;
 		float: left;
 		margin-left: 6%;
-		height: 180rpx;
+		min-height: 320rpx;
 		color: #676767;
+		width: 500rpx;
 	}
 	.matnr {
 		padding-top: 10rpx;
@@ -664,8 +668,8 @@
 	.data-list-right {
 		display: inline-block;
 		float: right;
-		height: 250rpx;
-		line-height: 250rpx;
+		min-height: 290rpx;
+		line-height: 290rpx;
 	}
 	/* display: inline-block;
 	float: right;

--
Gitblit v1.9.1