From 09da01ae7d2f97fe780c453c8921be5110830ff0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十二月 2024 15:25:35 +0800
Subject: [PATCH] #

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

diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index 3ca74db..df856a3 100644
--- a/pages/basics/matQuery.vue
+++ b/pages/basics/matQuery.vue
@@ -3,11 +3,11 @@
 		<view>
 			<view class="container">
 				<view class="text-box">
-					<view class="text-title"><text>鍟嗗搧缂栫爜</text></view>
+					<view class="text-title"><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>鐗╂枡鍚�</text></view>
 					<view class="text-title">{{matData.maktx}}</view>
 				</view>
 				<view class="text-box">
@@ -18,15 +18,23 @@
 					<view class="text-title"><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"><input type="text" v-model="matData.unit"></view>
+				<view class="text-box" style="display: flex;line-height: normal;align-items: center;">
+					<view><text>寮�濮嬫椂闂�</text></view>
+					<view class="text-title">
+						<uni-datetime-picker type="datetime" v-model="matData.startTime" @change="changeLog" />
+					</view>
+				</view>
+				<view class="text-box" style="display: flex;line-height: normal;align-items: center;">
+					<view><text>缁撴潫鏃堕棿</text></view>
+					<view class="text-title">
+						<uni-datetime-picker type="datetime" v-model="matData.endTime" @change="changeLog" />
+					</view>
 				</view>
 				<view class="text-box">
 					<view class="text-title"><text>鏁伴噺</text></view>
 					<view class="text-title">
 						<view>
-							<uni-number-box :value="matData.anfme" :max="999999999" :step="0.0001"  color="#747474" @change="changeValue"/>
+							<uni-number-box :value="matData.anfme" :max="999999999" :step="1"  color="#747474" @change="changeValue"/>
 						</view>
 					</view>
 				</view>
@@ -50,6 +58,8 @@
 					batch: null,
 					anfme: null,
 					unit: null,
+					startTime: '',
+					endTime: ''
 				},
 				baseIP:'',
 				basePORT:'',
@@ -67,7 +77,7 @@
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 			eventChannel.on('matData', function(data) {
 			that.matData = data.data
-			that.matData.anfme = 66
+			that.matData.anfme = 1
 			})
 			
 			
@@ -79,6 +89,9 @@
 			focus() {
 				
 			},
+			changeLog() {
+				
+			},
 			changeValue(value) {
 				this.matData.anfme = value
 			},
diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index d78c3e6..055bf43 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -62,6 +62,8 @@
 						<view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
 						<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
 						<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+						<view><text style="width: 400rpx;">寮�濮嬫椂闂达細{{item.startTime}}</text></view>
+						<view><text style="width: 400rpx;">缁撴潫鏃堕棿锛歿{item.endTime}}</text></view>
 						<view>
 							<text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
 							<text style="margin-left: 100rpx;">鍗曚綅锛歿{item.unit}}</text>
@@ -652,7 +654,7 @@
 
 	.data-list {
 		border-bottom: 1px solid #d8d8d8;
-		height: 180rpx;
+		height: 240rpx;
 		margin: 15rpx;
 		border-radius: 20rpx;
 	}
@@ -677,7 +679,7 @@
 		display: inline-block;
 		float: left;
 		margin-left: 6%;
-		height: 180rpx;
+		height: 240rpx;
 		color: #676767;
 	}
 
@@ -688,8 +690,8 @@
 	.data-list-right {
 		display: inline-block;
 		float: right;
-		height: 180rpx;
-		line-height: 180rpx;
+		height: 240rpx;
+		line-height: 240rpx;
 	}
 
 	/* display: inline-block;
@@ -701,6 +703,6 @@
 		display: inline-block;
 		float: left;
 		width: 80rpx;
-		height: 180rpx;
+		height: 240rpx;
 	}
 </style>

--
Gitblit v1.9.1