From 036831ad52733ca354e65b0274b7be9b75973651 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期五, 18 十月 2024 16:10:54 +0800
Subject: [PATCH] feat:车牌号

---
 subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue |   73 +++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
index a5869c0..34a2427 100644
--- a/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
+++ b/subPages/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -72,6 +72,7 @@
 			<view class="table">
 				<uni-table  border 
 		       id="table-box"
+			   v-if="coalDetailsData.isWeight === 1" 
 			emptyText="鏆傛棤鏇村鏁版嵁">
 					<uni-tr>
 					    <uni-th align="center" >浜у搧</uni-th>
@@ -83,7 +84,8 @@
 						<uni-th align="center">姣涢噸</uni-th>
 						<uni-th align="center">鍑�閲�</uni-th>
 					    <uni-th align="center">鎵e惃</uni-th>	
-						<uni-th align="center">浠舵暟</uni-th>		
+						<!-- <uni-th align="center">浠舵暟</uni-th>	 -->
+						<uni-th align="center">鍗曚綅</uni-th>		
 					</uni-tr>
 					<uni-tr v-for="(subItem, index) in tmTaskCoalList" :key="index">
 						<uni-td align="center">
@@ -109,8 +111,59 @@
 				聽   <uni-td align="right">
 					<view>{{ subItem.discount }}</view
 					></uni-td>
+					   <!-- <uni-td align="right">
+					<view>{{ subItem.productQuantity }}</view
+					></uni-td> -->
+					<uni-td align="right">
+					<view>{{ subItem.productUnit }}</view
+					></uni-td>
+				</uni-tr>
+				</uni-table>
+
+				<uni-table  border 
+		       id="table-box"
+			   v-else
+			emptyText="鏆傛棤鏇村鏁版嵁">
+					<uni-tr>
+					    <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">鐨噸</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-tr>
+					<uni-tr v-for="(subItem, index) in tmTaskCoalList" :key="index">
+						<uni-td align="center">
+							<view class="name">{{ subItem.productName }}</view></uni-td>
+								<uni-td align="center">
+							<view class="name">{{ subItem.productGrade }}</view></uni-td>
+								<uni-td align="center">
+							<view class="name">{{ proType[subItem.packingType] }}</view></uni-td>
+								<uni-td align="center">
+							<view class="name">{{ subItem.planMeasure }}</view></uni-td>
+							<uni-td align="center">
+							<view class="name">{{ subItem.realityMeasure }}</view></uni-td>
+					<!-- <uni-td align='right'>
+						<view  v-if="subItem.skin">{{ Number( subItem.skin).toFixed(2)  || ''}}</view>
+					</uni-td>
+					<uni-td align='right'>
+						<view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view>
+					</uni-td>
+					<uni-td align='right'>
+						<view class="name" v-if="subItem.clean">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+					</uni-td> -->
+					
+				聽  
 					   <uni-td align="right">
 					<view>{{ subItem.productQuantity }}</view
+					></uni-td>
+					<uni-td align="right">
+					<view>{{ subItem.productUnit }}</view
 					></uni-td>
 				</uni-tr>
 				</uni-table>
@@ -130,18 +183,19 @@
 			</view>
 		</view>
 		<view class="origin-info"
-			v-if="originInfoVisible">
+			v-if="originInfoVisible && isShowYuanFa">
 			<view class="origin-info_wrapper">
 				<view class="origin-info_content">
 					<!-- 鎶樺彔 -->
 						<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
-					   <view class="" slot='cont'>
+			
 						<u-form :model="originInfoForm"
 						:rules="rules"
 						label-position="top"
 						label-width="160"
 						:label-style="{'marginLeft':'9px'}"
 						ref="originInfoRef">
+						
 						<view v-if="coalDetailsData.isWeight">
 							<u-form-item prop="coalContactSkin">
 							<view class="second-line">
@@ -250,7 +304,7 @@
 								:deletable="!deletable"></u-upload>
 						</u-form-item>
 					</u-form>
-					   </view>
+					  
 					
 					
 				</view>
@@ -536,9 +590,16 @@
 					return  tempArr[index];
 				 }
 
-				
-
 			},
+			//鍒ゆ柇鏄惁灞曠ず 鍘熷彂淇℃伅
+			isShowYuanFa(){
+				if(this.coalContactClean && !this.coalDetailsData.tmTaskCoalList.length){
+					return false
+				}else{
+					return true
+				}
+			}
+			
 		},
 		methods: {
 			...mapMutations(['changewsgVisiable', 'changeisUploadimg', 'changeglobalIsFirstWeighing']),

--
Gitblit v1.9.1