From 20a91eadcf64eaf554a660b60427b60b3e439651 Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Sat, 2 Mar 2024 09:02:28 +0800
Subject: [PATCH] pda

---
 pages/release/index.scss                      | 14 +++----
 pages/release/index.vue                       | 40 ++++++++++++++-----
 .../components/select-lay/select-lay.vue      |  8 +++-
 3 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/pages/release/index.scss b/pages/release/index.scss
index 2734273..c430ecd 100644
--- a/pages/release/index.scss
+++ b/pages/release/index.scss
@@ -121,11 +121,11 @@
 					align-items: center;
 					width: 70%;
 					.goods-title {
-						font-size: 28rpx;
+						font-size: 42rpx;
 						color: #555555;
 					}
 					.goods-value {
-						font-size: 28rpx;
+						font-size: 42rpx;
 						color: #666666;
 						margin-left: 20rpx;
 					}
@@ -152,14 +152,14 @@
 				// align-items: center;
 				// position: relative;
 				.item-title {
-					font-size: 22rpx;
+					font-size: 36rpx;
 					color: #555555;
-					width: 130rpx;
+					width: 160rpx;
 					text-align: right;
 					// right: 0;
 				}
 				.item-value {
-					font-size: 24rpx;
+					font-size: 32rpx;
 					color: #666666;
 					margin-left: 14rpx;				}
 			}
@@ -193,7 +193,7 @@
   line-height: 50rpx;
   white-space: nowrap;
   border-spacing: 2rem 0;
-  font-size: 30rpx;
+  font-size: 36rpx;
   color: gray
 }
 
@@ -211,7 +211,7 @@
 		position:fixed;
 		height: 40px;		
 		width: 100%;
-		bottom:58px;
+		bottom:120px;
 		button{
 			height: 100%;
 			margin-top: 20px;
diff --git a/pages/release/index.vue b/pages/release/index.vue
index bb6fafc..415bdd2 100644
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -6,9 +6,9 @@
   <!--        <u-input v-model="dataForm.containerCode" border input-align="left" height="70" style="background-color: #ffffff;height: 38px;line-height: 38px;"   placeholder="请扫描台车编号"
             @confirm="inputQuery()" :focus="firstFocus">
 			</u-input> -->
-       <select-lay  :options="datalist1" style="width: 92%;margin-left: 2vh; margin-top: 4vh;"
-       smoldName="ptName" slabel="ptDesc" smodel="ptName" name="name3"  svalue="id" @selectitem="queryList" 
-       :value="dataForm.ptName" placeholder="请选择物料编码"> </select-lay>
+       <select-lay  :options="datalist1" @itemclick="cpnclick" style="width: 92%;margin-left: 2vh; margin-top: 4vh;"
+       smoldName="ptName" slabel="ptDesc"  smodel="ptName" name="name3"  svalue="id" @selectitem="queryList" 
+       :value="dataForm.ptName" placeholder="扫描或选择要释放位置编码"> </select-lay>
 		</u-form-item>
       </u-form>
  
@@ -25,11 +25,12 @@
 		<view class="sh-card" v-for="(item, index) in dataList" :keys="item.id" :index="item.id" v-if="dataList.length > 0"
 		       style="border-radius: 20rpx;">
 			<view  class="sh-card-title"   style="border-radius: 20rpx;">
-				   <image src="@/static/icon/edit.png" @click="editBtn(index)" style="width: 2.5vh;height: 2.5vh;position: absolute;right: 1vh;margin-top: 1vh;" />
+				<!-- @click="editBtn(index)" -->
+				   <image src="@/static/icon/edit.png"  style="width: 2.5vh;height: 2.5vh;position: absolute;right: 1vh;margin-top: 1vh;" />
 		      <view class="card-content">
 			
 		        <view class="card-content-item" width="60%" style="margin-top: 1vh;">
-		          <text class="item-title" >物料编号:</text>
+		          <text class="item-title" >托盘编号:</text>
 		          <text class="item-value">{{item.ttPart}}</text>
 		        </view>
 		      </view>
@@ -47,7 +48,7 @@
 		       </view>
 			
 		     </view> -->
-		     <view class="card-content">
+	<!-- 	     <view class="card-content">
 		       <view class="card-content-item">
 		         <text class="item-title">缴库数量:</text>
 		         <text class="item-value">{{item.ttQtyRct}}</text>
@@ -57,7 +58,7 @@
 		         <text class="item-value">{{item.ttQtyRct}}</text>
 		       </view>
 		    
-		     </view> 
+		     </view> -->
 			
 		    
 		    </view>
@@ -83,9 +84,17 @@
     </view> -->
     <!-- <button @click="open">测试</button> -->
 	<view class="bottom">
-		<button @click="pickUp()" >完成出库</button>
+		<button @click="pickUp()" >释放点位</button>
 	</view>
     
+	<view style=" position: absolute;
+             top: 92%;
+             left: 40%;
+             transform: translate(-30%,-50%); 
+			 color: rgb(213, 21, 32);">
+		释放点位后，需确认已将点位上的托盘取下
+		且无任何障碍物！
+	</view>
   </view>
 </template>
 
@@ -102,7 +111,7 @@
           pageNum: 1,
           pageSize: 10
         },
-		
+		datalist1:[],
 		pickUpObj:{
 			pointNo:'',
 			taskCode:'',
@@ -110,7 +119,12 @@
 			containerId:'',
 			dtlAddBos:[]
 		},
-        dataList: [],
+        dataList: [
+			{
+				ttPart:'你好',
+				ptName:'N96'
+			}
+		],
         query: {
           current: 1,
           size: 20
@@ -167,6 +181,9 @@
 			 this.dataList=res.rows
 			  ))
 		 },
+		 cpnclick(item){
+			console.log('cpnclick', item)
+		 },
 		//点击变色
 		btn(index,item){
 			this.pickUpObj.dtlAddBos=[]
@@ -179,6 +196,9 @@
 			this.pickUpObj.dtlAddBos.push({qrCode:item.qrCode} )
 			
 		},
+		confirmChange(){
+			console.log(11111111+"你好,念天琊");
+		},
 		editBtn(){
 			this.show=true
 		},
diff --git a/uni_modules/select-lay/components/select-lay/select-lay.vue b/uni_modules/select-lay/components/select-lay/select-lay.vue
index 0340a13..ca74056 100644
--- a/uni_modules/select-lay/components/select-lay/select-lay.vue
+++ b/uni_modules/select-lay/components/select-lay/select-lay.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="uni-select-lay" :style="{'z-index':zindex}">
-		<input type="text" :name="name" v-model="value" class="uni-select-input">
+		<input type="text" :name="name" v-model="value" @input="()=>{console.log(111)}"  class="uni-select-input">
 		<view class="uni-select-lay-select" :class="{'active':active}">
 			<!-- 禁用mask -->
 			<view class="uni-disabled" v-if="disabled"></view>
@@ -12,7 +12,7 @@
 			<!-- 清空 -->
 			<input type="text" class="uni-select-lay-input" :class="{active:changevalue!=''&&changevalue!=placeholder}"
 				v-model="changevalue" :disabled="disabled" :placeholder="placeholder" @focus="unifocus"
-				@input="intchange" @blur="uniblur">
+				@input="intchange"  @confirm="confirmChange()" @blur="uniblur">
 			<view class="uni-select-lay-icon" :class="{disabled:disabled}" @click.stop="select"><text></text></view>
 		</view>
 		<scroll-view class="uni-select-lay-options" :scroll-y="true" v-show="active" @scroll="selectmove"
@@ -112,6 +112,10 @@
 			}
 		},
 		methods: {
+			confirmChange(item){
+				this.$emit('itemclick', item)
+				// console.log(22233444);
+			},
 			//判断数组跟当前active值
 			itemcheck() {
 				// 此处判断是否有初始value,存在则判断显示文字