From 2ea66b8fc8ee4c0256f3a2c0b84cf14497494c10 Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Mon, 25 Mar 2024 16:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E9=87=8A=E6=94=BE=E6=96=B0?=
 =?UTF-8?q?=E5=8A=A0=E5=BC=B9=E7=AA=97=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/AvgOrderPkg/index.vue |  2 +-
 pages/payInto/index.vue     |  2 +-
 pages/release/index.vue     | 40 +++++++++++++++++++------------------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/pages/AvgOrderPkg/index.vue b/pages/AvgOrderPkg/index.vue
index 7f6e0b8..aab5371 100644
--- a/pages/AvgOrderPkg/index.vue
+++ b/pages/AvgOrderPkg/index.vue
@@ -344,7 +344,7 @@
 				this.$u.api.pickBy.pickByContainerCode(this.dataForm).then(res=>{
 					if(!res.data || res.data.length == 0){
 					// console.log(res);
-					this.$u.toast("当前托盘不存在");		
+					this.$u.toast("当前台车不存在");		
 					}else if(res.code == '200'){
 							// console.log(res);
 							res.data.forEach((item)=>{
diff --git a/pages/payInto/index.vue b/pages/payInto/index.vue
index 2988ece..d83f18c 100644
--- a/pages/payInto/index.vue
+++ b/pages/payInto/index.vue
@@ -273,7 +273,7 @@
 	  		  e.text=111
 			  this.$u.api.mouldStorage.callEmptyContainer().then(res=>{
 			  if(res.code==200){
-				  this.$u.toast("已呼叫空托盘");
+				  this.$u.toast("已呼叫台车");
 			  }
 			  })
 
diff --git a/pages/release/index.vue b/pages/release/index.vue
index 3a7908b..9aa4a12 100644
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -61,7 +61,7 @@
 		     </view> -->
 			
 		    </view>
-			<u-popup v-model="show" width='90%' height="220px" :mask-close-able="false" :mask="true" @close="close"  mode="center">
+		<!-- 	<u-popup v-model="show" width='90%' height="220px" :mask-close-able="false" :mask="true" @close="close"  mode="center">
 					  		<view style="height: 44px;text-align: center;line-height: 44px;font-size: 18px;margin-bottom: 18px;">
 					  		<text>数量确认</text>	
 					  		</view>
@@ -74,7 +74,8 @@
 					  			    <button  style="width: 30%;font-size: 16px;line-height: 44px;;" type="default"  @click="enterUp(item)">确认</button>
 					  	 </view>
 					  
-			</u-popup>
+			</u-popup> -->
+			
 		     </view>
 	</view>
 
@@ -83,9 +84,10 @@
     </view> -->
     <!-- <button @click="open">测试</button> -->
 	<view class="bottom">
-		<button @click="pickUp()"class="global-font" >释放点位</button>
+		<button @click="openModal()" class="global-font" >释放点位</button>
 	</view>
-    
+	<u-modal v-model="show" title='点位释放' @confirm="pickUp()" :content='`确定要释放此点位吗`'  show-confirm-button  show-cancel-button></u-modal>
+     <!-- @click="pickUp()" -->
 	<view class="global-font" style=" position: absolute;
              top: 92%;
              left: 40%;
@@ -177,6 +179,8 @@
         this.loadList();
       }, 100);
     },
+	//蹦出弹窗提示
+
 	 onPullDownRefresh () {
 	    this.list = []
 	    //调用获取数据方法
@@ -194,10 +198,7 @@
 			},
     methods: {
 		pickUp(){
-			// console.log('释放点位了');
-			this.$u.api.release.releasePoint({pointNo:this.dataForm.pointNo}).then(res=>{
-				// this.dataList=res.rows
-				// console.log(res);
+				this.$u.api.release.releasePoint({pointNo:this.dataForm.pointNo}).then(res=>{
 				this.dataForm.pointNo = ''
 			})
 		},
@@ -207,7 +208,18 @@
 			 })
 		 },
 		 cpnclick(item){
-			// console.log('cpnclick', item)
+		 
+		 },
+		 openModal(){
+		  if(this.dataForm.pointNo === null
+		  || this.dataForm.pointNo === '' 
+		  || this.dataForm.pointNo === 0
+		  || this.dataForm.pointNo === undefined
+		  || this.dataForm.pointNo === 'undefined'){
+		  	 this.$u.toast("点位释放为空");
+		  	 return; 
+		  } 
+		 	this.show = true;
 		 },
 		//点击变色
 		btn(index,item){
@@ -222,35 +234,25 @@
 			
 		},
 		confirmChange(){
-			// console.log(11111111+"你好,念天琊");
 		},
 		editBtn(){
 			this.show=true
 		},
 		queryList(index,item){
-			// console.log(index,item);
 		this.dataForm.pointNo=item.value
 		},
 			
 		enterUp(item){
-			console.log(item);
 		this.$u.api.replaceCar.upateBusinItemInDataForQty(item).then(res=>{
-			// console.log(res);
 		})
 		},
       /**搜索框查询*/
       inputQuery() {
-        // if (this.queryFlag !== '') {
-        //   clearTimeout(this.queryFlag);
-        //    this.loadList()
-        // }
         if (this.dataForm.pointNo == '' || this.dataForm.pointNo == null || this.dataForm.pointNo ==
           undefined) {
           return
         }
-        // this.queryFlag = setTimeout(() => {
           this.loadList()
-        // }, 500)
       },
 	  onNavigationBarButtonTap(e){
 		  // console.log(e);