From 5d1fee5bb28015f427c53ee36ba2c7fe513226c0 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 22 十月 2024 17:16:22 +0800
Subject: [PATCH] feat:确认装卸文字误删，供应商提交细节

---
 pages/loadUnload-page/selectTarget/selectTarget.vue |   54 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 172a30a..32324d7 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -108,6 +108,7 @@
 									</view>
 								</view>
 								<view class="senddate">{{ item.orderCode }}</view>
+								<view class="rightBtn"><u-button type='primary' text='涓�閿‘璁�' v-if="item.isWeight === 0 && item.tmTaskCoalList.length >1 && item.packingType !== 1"  @click.native.stop="allOkBtn(item)"></u-button></view>
 							</view>
 												 <view class="table">
 			<uni-table border stripe 
@@ -264,7 +265,7 @@
 						 <uni-td  align="center">
 					<view class="btnBox"> 
 						<!--   -->
-						<u-button type='primary' text='淇敼' size='mini'   @click="editOrder(subItem)"></u-button>
+						<!-- <u-button type='primary' text='淇敼' size='mini' v-if="subItem.isWeight === 0 || subItem.isWeight === 2 "   @click="editOrder(subItem)"></u-button> -->
 						<u-button type='primary' text='鎷煎崟' size='mini'  v-if="isPinShow(item)" @click="pinDan(subItem)"></u-button>
 						</view></uni-td>
 						<uni-td w align="center">
@@ -347,6 +348,7 @@
 							<text>璇疯緭鍏�</text>锛�
 							  <u--input
 							     type='digit'
+								 :disabled="yelvFlag"
 							     border="bottom"
 								:placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' :  isNumOk ?  '鏁伴噺' : blend ? '鏁伴噺' : '鎶樺惃'"
 								v-model="checkNum"
@@ -457,6 +459,9 @@
 					</view>
 					
 				</view>
+			</u-modal>
+			<u-modal :show="showConfim" @confirm="confirmEnter"  :showCancelButton="true"	@cancel="showConfim = false" ref="uModal" :asyncClose="true">
+				<view> 鏄惁纭畾涓�閿鍗革紵</view>	
 			</u-modal>
 		<!-- 浠撳簱 -->
 		<!-- <u-action-sheet :actions="secondClassActionsList"
@@ -576,13 +581,16 @@
 				],
 				isCleanFlag:'1',
 				checkNumEdit:'',
+				showConfim:false,
+				remarkContent:'',
 				dataForm: {
 					firstClass: "",
 					secondClass: "",
 					orderType: '',
 					bunkerIds:""
 				},
-				historyData:[], 
+				historyData:[],
+				paramsItem:{}, 
 				messageObj:{
 					carNo:'',
 				},
@@ -595,6 +603,7 @@
 				typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
 				isNumOk:false, //璁′欢
 				isClean:false, // 鎶樺惃   
+				yelvFlag:false,
 				isFlagNum:false,// PVCV
 				// 鍦哄湴鎿嶄綔鑿滃崟
 				firstClassActionsList: [],
@@ -849,7 +858,15 @@
 
 			},
 			open(){},
+			allOkBtn(item){
+				//鐐瑰嚮涓�閿‘璁�
+			    this.paramsItem = item;
+				
+				this.showConfim = true;
+
+			},
 			enterOk(parintItem,item){
+				this.yelvFlag = false;
 				console.log(parintItem,'priintItem')
 				// uni.request({
 				// 	url: `${BaseUrl}/admin/dict/type/tray_weight`,
@@ -918,6 +935,8 @@
 				if(item.packingType === 1){ 
 					this.isNumOk = true;
 					this.isClean = false;
+					this.yelvFlag = true;
+					this.checkNum = item.planMeasure;
 					this.blend = false;
 					this.isCleanFlag = '1';
 					 this.isFlagNum = false;
@@ -976,10 +995,6 @@
 				}else if( this.isEmptyCar === null){
 					this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
 					//瑁呭嵏 涓� 2 锛屼絾鏄繀椤诲緱绉伴噸
-				}else if( (this.activeObj.isWeight === 2 || this.activeObj.packingType === 1) && (!this.activeObj.skin  &&    !this.activeObj.hair) ){
-					console.log('銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬭Е鍙�')
-					this.enterZx = false;
-					this.$u.toast(`璇峰厛绉伴噸鍚庤鍗哥‘璁わ紒`);
 				}
 				else{
 					this.enterZx = false;
@@ -1021,6 +1036,26 @@
 			//鍒ゆ柇鏄惁鏄� 涓夌鐗规畩绫诲瀷瀵瑰簲寮圭獥
 			judgeTypeFun(name){
 			
+
+			},
+			//纭
+			confirmEnter(){
+				this.$reqPost('oneClickLoading',{tmId:this.paramsItem.id},'params').then((res) => {
+					if(res.code == 0){
+					console.log(res,'res')
+					this.$u.toast('涓�閿‘璁ゆ垚鍔�')
+					this.showConfim = false;
+					setTimeout(() => {
+						this.getDetailData();
+					}, 500);
+					}else{
+						this.showConfim = false;
+						this.$u.toast(res.msg ? res.msg : '涓�閿‘璁ゅけ璐�');
+					}
+				
+				}).catch(err=>{
+					this.$u.toast(err ? err : '鎿嶄綔寮傚父')
+				})
 
 			},
 			//鏌ョ湅鏈�杩戜竴娆＄殑鍘熺洂閽欓晛
@@ -1074,6 +1109,11 @@
 	width: auto;
   }
 	
+}
+.rightBtn{
+	position: absolute;
+	right: 100rpx;
+	bottom: 5rpx;
 }
 .notice-bar{
 		margin-left: vww(10);
@@ -1231,6 +1271,7 @@
 					}
 				}
 				.history-information {
+					position: relative;
 			margin-bottom:30rpx;
 			margin-top: 10rpx;
 			background: #ffffff;
@@ -1308,6 +1349,7 @@
 				font-size: 30rpx;
 				font-weight: 300;
 				color: #515151;
+				position: relative;
 				margin: vww(10) vww(10) 0;
 				@include flex;
 

--
Gitblit v1.9.1