From 97fe71e3082bed5e53193ac08a006cd6d2e8e750 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 18 九月 2023 14:04:07 +0800
Subject: [PATCH] #

---
 pages/mat/matSelected.vue |    6 +++++-
 pages/mat/matQuery.vue    |   21 ++++++++++-----------
 pages/pakin/pakin.vue     |   23 ++++++++++++++++++-----
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index e3713f5..08f968d 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -21,9 +21,9 @@
 						<view class="wms-tag" :style="baColor" >鍟嗗搧</view>
 					</view>
 				</view>
-				<view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
-				<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx  ? item.maktx : '--'}}</view>
-				<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs  ? item.specs : '--'}}</view>
+				<view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matNo}}</view>
+				<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.matName  ? item.matName : '--'}}</view>
+				<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.str2  ? item.str2 : '--'}}</view>
 			</view>
 		</view>
 		<uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
@@ -74,7 +74,7 @@
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
-			this.showTag(1)
+			this.showMat()
 		},
 		methods: {
 			search() {
@@ -147,18 +147,17 @@
 					}
 				});
 			},
-			showMat(tagId) {
+			showMat() {
 				let that = this
-				that.tagIdNow = tagId
-				if (tagId == null || tagId == '' || tagId == undefined) {
-					return;
-				}
+				// that.tagIdNow = tagId
+				// if (tagId == null || tagId == '' || tagId == undefined) {
+				// 	return;
+				// }
 				uni.request({
-				    url: that.baseUrl + '/mat/list/pda/page/auth',
+				    url: that.baseUrl + '/matCode/list/auth',
 				    data: {
 						curr:that.curr,
 						limit: 20,
-						tagId: tagId
 				    },
 					method:"GET",
 				    header: {
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index b50fbbd..295fdd3 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -22,6 +22,10 @@
 				</view>
 			</view>
 			<view class="form-item">
+				<view class="form-item-desc"><text>鏃堕棿</text></view>
+				<uni-datetime-picker type="datetime" v-model="mat.appeTime$" />
+			</view>
+			<view class="form-item">
 				<view class="form-item-desc"><text>鏁伴噺</text></view>
 				<view class="form-item-content">
 					<uni-number-box :value="mat.anfme" :max="99999999" :step='1' color="#747474" @change="changeValue" />
@@ -44,6 +48,7 @@
 					matName: null,
 					str2: null,
 					batch: null,
+					appeTime: null,
 					anfme: 0,
 				},
 				baseIP:'',
@@ -103,7 +108,6 @@
 	}
 	.form-item {
 		height: 100rpx;
-		line-height: 100rpx;
 		border-bottom: 1px solid #DCDFE6;
 		margin-left: 40rpx;
 		display: flex;
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index a4fdd2f..25c558b 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -46,6 +46,12 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
 					</view>
+					<view class="list-left-item">
+						<view class="desc">鏃ユ湡锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.appeTime$" type="warning"></uni-tag>
+						</view>
+					</view>
 					<!-- <view class="list-left-item">
 						<view class="desc">閲嶉噺锛�</view>
 						<view class="left-item">
@@ -86,10 +92,12 @@
 						<view class="popup-item-left">鎵瑰彿:</view>
 						<view class="popup-item-right"><input type="text" v-model="batch"></view>
 					</view> -->
-					<!-- <view class="popup-item">
-						<view class="popup-item-left">閲嶉噺:</view>
-						<view class="popup-item-right"><input type="text" v-model="weight"></view>
-					</view> -->
+					<view class="popup-item">
+						<view class="popup-item-left">鏃ユ湡:</view>
+						<view class="popup-item-right">
+							<uni-datetime-picker type="datetime" v-model="appeTime$" />
+						</view>
+					</view>
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -156,6 +164,7 @@
 				matFocus: false,
 				matData: '',
 				removeNum: 0,
+				appeTime$: ''
 			}
 		},
 		onLoad() {
@@ -319,6 +328,7 @@
 				this.count = this.dataList[i].anfme
 				this.batch = this.dataList[i].batch
 				this.weight = this.dataList[i].weight
+				this.appeTime$ = this.dataList[i].appeTime$ 
 				this.rowNum = i
 				this.eject()
 			},
@@ -348,6 +358,7 @@
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
 				this.dataList[this.rowNum].weight = this.weight
+				this.dataList[this.rowNum].appeTime$ = this.appeTime$
 				this.matnr = ''
 				this.messageText = "淇敼鎴愬姛"
 				this.messageToggle('success')
@@ -450,7 +461,9 @@
 
 <style>
 	@import url('../../static/css/wms.css/wms.css');
-
+	.list:first-child {
+		margin-top: 320rpx;
+	}
 	.code {
 		width: 100%;
 		position: fixed;

--
Gitblit v1.9.1