From e2e96137d9b5e5dbac737e69809a941d676ba61e Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 16 七月 2024 17:39:55 +0800
Subject: [PATCH] feat:修改业务文字

---
 pages/loadUnload-page/selectTarget/selectTarget.vue |   45 ++++++++++++++++++++-------------------------
 1 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index b43f71e..4fb39eb 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -48,7 +48,7 @@
 				text="鏌ョ湅璇ヤ粨搴撴敹鍙戝崟"
 				@click.stop="formHandle"></u-button>
 		</view> -->
-		<!-- 鐓ゅ満 -->
+		<!-- 鍦哄湴 -->
 		<view class='div-box'>
 				<u-empty mode="data"
 							icon="http://cdn.uviewui.com/uview/empty/data.png"
@@ -101,11 +101,11 @@
 						<uni-th width='140'
 						align="center">鎿嶄綔</uni-th>
 					    <uni-th align="center" width='120'>浜у搧</uni-th>
-						<uni-th align="center">浠撳簱</uni-th>
-						<uni-th align="center">鐨噸</uni-th>
-						<uni-th align="center">姣涢噸</uni-th>
-						<uni-th align="center">鍑�閲�</uni-th>
-						<uni-th align="center">鏁伴噺</uni-th>
+						<uni-th align="center" width='220'>浠撳簱</uni-th>
+						<uni-th align="center" width='120'>鐨噸</uni-th>
+						<uni-th align="center" width='120'>姣涢噸</uni-th>
+						<uni-th align="center" width='120'>鍑�閲�</uni-th>
+						<uni-th align="center" width='120'>鏁伴噺</uni-th>
 					    <!-- <uni-th align="center">浠撳簱</uni-th> -->
 						<!-- <uni-th align="center">鐘舵��</uni-th> -->
 						
@@ -120,16 +120,16 @@
 						<uni-td align="center">
 							<view>{{ subItem.productName }}</view></uni-td>
 					<uni-td>
-						<view class="name">{{ subItem.bunkerName }}</view>
+						<view>{{ subItem.bunkerName }}</view>
 					</uni-td>
 					<uni-td>
-						<view class="name">{{ subItem.skin }}</view>
+						<view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || ''  }}</view>
 					</uni-td>
 					<uni-td>
-						<view class="name">{{ subItem.hair }}</view>
+						<view class="name" v-if="subItem.hair"> {{  Number(subItem.hair).toFixed(2) || ''  }}</view>
 					</uni-td>
 						<uni-td>
-						<view class="name">{{ subItem.clean }}</view>
+						<view class="name" v-if="(subItem.clean || (subItem.clean && subItem.clean === 0))">{{ Number(subItem.clean).toFixed(2) || ''}}</view>
 					</uni-td>
 					<uni-td>
 						<view class="name">{{ subItem.productQuantity }}</view>
@@ -212,7 +212,7 @@
 							</u-radio-group></view>
 				</view>
 			</u-modal>
-		<!-- 鐓や粨 -->
+		<!-- 浠撳簱 -->
 		<!-- <u-action-sheet :actions="secondClassActionsList"
 			:show="secondClassShow"
 			cancelText='鍙栨秷'
@@ -284,10 +284,10 @@
 				typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
 				isNumOk:false, //璁′欢
 				isClean:false, // 鎶樺惃
-				// 鐓ゅ満鎿嶄綔鑿滃崟
+				// 鍦哄湴鎿嶄綔鑿滃崟
 				firstClassActionsList: [],
 				firstClassShow: false,
-				// 鐓や粨鎿嶄綔鑿滃崟
+				// 浠撳簱鎿嶄綔鑿滃崟
 				secondClassActionsList: [],
 				secondClassShow: false,
 				coalList: [],
@@ -333,7 +333,7 @@
 				})
 			},
 		
-			// 鑾峰彇鐓ゅ満
+			// 鑾峰彇鍦哄湴
 			getDeptIdFiled() {
 				uni.showLoading({
 					title: "鍔犺浇涓�"
@@ -395,7 +395,7 @@
 				this.filedId = val.id
 			},
 			formHandle() {
-				if (!this.dataForm.firstClass) return this.$u.toast('璇烽�夋嫨鐓ゅ満鎴栬�呯叅浠�');
+				if (!this.dataForm.firstClass) return this.$u.toast('璇烽�夋嫨鍦哄湴鎴栬�呬粨搴�');
 				this.$nextTick(()=>{
  					uni.navigateTo({
 						url: `/pages/loadUnload-page/loadUnload-detail/loadUnload-detail?bunkerId=${this.dataForm.bunkerId}`
@@ -409,10 +409,6 @@
 			close(){
 
 			},
-
-					
-
-			
 			open(){},
 			enterOk(parintItem,item){
 				console.log(parintItem,'priintItem')
@@ -483,11 +479,10 @@
 				    uni.showLoading({
                     title:'鍔犺浇涓�'
                 });
-				if(this.activeObj.productName ==='EDC'){
-					if( this.activeObj.checkStatus !== 7){
-								this.$u.toast(`璇锋鏌ュ綋鍓岴DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
-								return
-					}
+				console.log(this.activeObj,'12313')
+				if(this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 7){
+					this.$u.toast(`璇锋鏌ュ綋鍓岴DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
+					return
 					
 				}else if( this.isEmptyCar === null){
 					this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
@@ -584,7 +579,7 @@
 			.self-deliver {
 			position: relative;
 				top: vww(10);
-				width: 95%;
+				width: 98%;
 				height: vww(40);
 				margin: vww(8) 10rpx;
 				padding: 0 vww(8);

--
Gitblit v1.9.1