From ae6fccae984271d6380567b22e0e5bdd8da9b52b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 09 八月 2024 14:38:32 +0800
Subject: [PATCH] #

---
 pages/pakin/pakin.vue |   49 ++++++++++++++++++++++++++-----------------------
 1 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 9c3458a..13b6f6e 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -15,17 +15,6 @@
 					<uni-icons type="right" color="#c1c1c1"></uni-icons>
 				</view>
 			</view>
-			<view class="item">
-				<view class="code-decs">婊℃墭:</view>
-				<radio-group @change="floor">
-					<label>
-						<radio :checked="ck1"/><text>鏄�</text>
-					</label>
-					<label>
-						<radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text>
-					</label>
-				</radio-group>
-			</view>
 		</view>
 		<view class="mat-list-title">
 			鍟嗗搧鍒楄〃
@@ -56,6 +45,14 @@
 						<view class="left-item">
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">琚嬪彿锛�</view>
+						<view class="left-item">{{item.units}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">閲嶉噺澶囨敞锛�</view>
+						<view class="left-item">{{item.memo}}</view>
 					</view>
 					<!-- <view class="list-left-item">
 						<view class="desc">閲嶉噺锛�</view>
@@ -96,6 +93,14 @@
 					<view class="popup-item">
 						<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="units"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">閲嶉噺澶囨敞:</view>
+						<view class="popup-item-right"><input type="text" v-model="memo"></view>
 					</view>
 					<!-- <view class="popup-item">
 						<view class="popup-item-left">閲嶉噺:</view>
@@ -167,9 +172,6 @@
 				matFocus: false,
 				matData: '',
 				removeNum: 0,
-				ck1: true,
-				ck2: false,
-				isFull: true
 			}
 		},
 		onLoad() {
@@ -180,12 +182,6 @@
 			this.token = uni.getStorageSync('token');
 		},
 		methods: {
-			floor() {
-				var temp = this.ck1
-				this.ck1 = this.ck2
-				this.ck2 = temp
-				this.isFull = !temp
-			},
 			messageToggle(type) {
 				this.msgType1 = type
 				this.$refs.message.open()
@@ -338,6 +334,8 @@
 				this.matnr = this.dataList[i].matnr
 				this.count = this.dataList[i].anfme
 				this.batch = this.dataList[i].batch
+				this.units = this.dataList[i].units
+				this.memo = this.dataList[i].memo
 				this.weight = this.dataList[i].weight
 				this.rowNum = i
 				this.eject()
@@ -367,6 +365,8 @@
 			reviseConfirm() {
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].units = this.units
+				this.dataList[this.rowNum].memo = this.memo
 				this.dataList[this.rowNum].weight = this.weight
 				this.matnr = ''
 				this.messageText = "淇敼鎴愬姛"
@@ -412,7 +412,6 @@
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
 						barcode: that.barcode,
-						isFull: that.isFull,
 						combMats: that.dataList
 					}),
 					method: 'POST',
@@ -471,11 +470,15 @@
 
 <style>
 	@import url('../../static/css/wms.css/wms.css');
+	
+	.list:first-child {
+		margin-top: 280rpx;
+	}
 
 	.code {
 		width: 100%;
 		position: fixed;
-		min-height: 210rpx;
+		min-height: 140rpx;
 		background-color: #FFF;
 		z-index: 10;
 	}
@@ -515,7 +518,7 @@
 		width: 100%;
 		background-color: white;
 		position: fixed;
-		margin-top: 200rpx;
+		margin-top: 140rpx;
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;

--
Gitblit v1.9.1