From 8d61dc60466e243414d2a05106bf8cf173fb47f0 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期六, 31 八月 2024 13:48:55 +0800
Subject: [PATCH] feat:PVC增加分配数

---
 pages/loadUnload-page/selectTarget/selectTarget.vue |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 3406203..7812ede 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -79,6 +79,10 @@
 									<view class="third-line_text">瀹㈡埛鍚嶇О:</view>
 									<view>{{ item.customerName }}</view>
 								</view>
+									<view class="third-line" v-if="/鑱氭隘涔欑儻鏍戣剛/.test(item.productName)">
+									<view class="third-line_text">鍖呰绫诲瀷:</view>
+									<view>{{ proType[item.packingType] }}</view>
+								</view>
 								<view class="third-line"  v-if="item.productName === '浜屾隘涔欑兎(EDC)'">
 									<view class="third-line_text">璐ㄦ鐘舵��:</view>
 									<view> <u-tag :text="checkStatusList[item.checkStatus]" plain > </u-tag></view>
@@ -168,14 +172,14 @@
 				:showCancelButton="true">
 				<view class="slot-content">
 					鏄惁纭瑁呭嵏锛�
-					<view v-if="isNumOk || isClean">
+					<view v-if="isNumOk || isClean||isFlagNum">
 						<text>浜у搧鍚嶇О锛歿{activeObj.productName}}</text>
 						<view class="queren">
 							<text>璇疯緭鍏�</text>锛�
 							  <u--input
 							     type='digit'
 							     border="bottom"
-								:placeholder="isNumOk ?  '鏁伴噺' :'鎶樺惃'"
+								:placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' :  isNumOk ?  '鏁伴噺' :'鎶樺惃'"
 								v-model="checkNum"
 							>
 							</u--input>
@@ -309,6 +313,7 @@
 		},
 		data() {
 			return {
+				proType:['鏁h','娑叉埃鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
 				dataForm: {
 					firstClass: "",
 					secondClass: "",
@@ -327,6 +332,7 @@
 				typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
 				isNumOk:false, //璁′欢
 				isClean:false, // 鎶樺惃
+				isFlagNum:false,// PVCV
 				// 鍦哄湴鎿嶄綔鑿滃崟
 				firstClassActionsList: [],
 				firstClassShow: false,
@@ -483,31 +489,37 @@
 				if( (parintItem.orderType === '澶栬喘' ||parintItem.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
 					this.isNumOk = true;
 					this.isClean = false;
+					this.isFlagNum = false;
 					//鍥炴樉璁℃暟閲�
 				    this.checkNum  = item.productQuantity ? item.productQuantity : '';
 				}else if( parintItem.orderType ==='澶栬喘' &&  item.isWeight === 1){
 					this.isClean = true;
 					this.isNumOk = false;
+				     this.isFlagNum = false;
 				}else{
 					this.isNumOk = false;
 					this.isClean = false;
+				     this.isFlagNum = false;
 				}
 				//鑱氭隘涔欑儻鏍戣剛
 				 if(parintItem.orderType ==='澶栭攢' && (/鑱氭隘涔欑儻鏍戣剛/.test(item.productName) || item.productName === 'PVC')  && (item.packingType === 3 || item.packingType === 4)){
-					this.isNumOk = true;
+					this.isNumOk = false;
 					this.isClean  = false;
+				   this.isFlagNum = true;;
 				}
 				//鐡惰娑叉隘鏉′欢
 				//EDC 璐ㄦ瀹屾垚鏂瑰彲纭
 				if(item.packingType === 1){ 
 					this.isNumOk = true;
 					this.isClean = false;
+					 this.isFlagNum = false;
 				}
 				//
 				//pvc澶у寘鑷姩璁$畻鎶樺惃
 				if((/鑱氭隘涔欑儻鏍戣剛/.test(item.productName) || item.productName === 'PVC')  && item.packingType === 5){
 					this.isNumOk = true;
 					this.isClean = false;
+					 this.isFlagNum = false;
 				}
 				if(parintItem.orderType === '澶栬喘'){
 					this.isEmptyCar = '1';
@@ -546,7 +558,9 @@
 					productQuantity:this.isNumOk ? this.checkNum : '',
 					discount:this.isClean ? this.checkNum : null,
 					isEmptyCar:this.isEmptyCar,
-					isPretendDischar:this.activeObj.isPretendDischar
+					isPretendDischar:this.activeObj.isPretendDischar,
+					realityMeasure:this.isFlagNum ? this.checkNum : null,
+					productId:this.isFlagNum ? this.activeObj.productId : null,
 				 },'json').then(res=>{
 					uni.hideLoading();
 					console.log(res,'rez')

--
Gitblit v1.9.1