gjy 2 rokov pred
rodič
commit
458165d55a

+ 25 - 6
pages/task/audit/warehouse_approval.vue

@@ -26,7 +26,7 @@
 				<view class="left">货名</view>
 				<view class="right">{{list.goodsName}}</view>
 			</view>
-			<view class='row' v-if="list.bulkDensityStandard !=1">
+			<!-- <view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left" >基准水分(%)</view>
 				<view class="right">{{list.waterBase}}</view>
 			</view>
@@ -41,7 +41,7 @@
 			<view v-if="list.paramType == '2' && list.bulkDensityStandard !=1" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
-			</view>
+			</view> -->
 			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<tr>
@@ -55,16 +55,35 @@
 				</table>
 				
 			</view>
-			<view class='row' v-if="list.bulkDensityStandard !=1">
+			<!-- <view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮收购价格(元/公斤)</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
-			</view>
+			</view> -->
 			<view class='row boder'>
 				<view class="left">销售上限</view>
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
 		</view>
-		<view class="content2" v-if="list.bulkDensityStandard !=1">
+		<view class="form_view" v-if="list.bulkDensityStandard !=1">
+			<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
+			<tr>
+				<td>水分</td>
+				<td>一等</td>
+				<td>二等</td>
+				<td>三等</td>
+				<td>等外</td>
+			</tr>
+			<tr v-for="(item,index) in list.detailPrints">
+				<td>{{item.waterMin}}</td>
+				<td>{{item.price1}}</td>
+				<td>{{item.price2}}</td>
+				<td>{{item.price3}}</td>
+				<td>{{item.priceOther}}</td>
+			</tr>
+			</table>
+			
+		</view>
+		<!-- <view class="content2" v-if="list.bulkDensityStandard !=1">
 			<view class="title">粮价设置</view>
 			<view v-for="(item,index) in list.details" :key="index">
 				<view class="row">
@@ -83,7 +102,7 @@
 					<view class="right">{{item1.price}}</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="content3">
 			<view class="title row">
 				流程

+ 25 - 6
pages/task/audit/warehouse_details.vue

@@ -26,7 +26,7 @@
 				<view class="left">货名</view>
 				<view class="right">{{list.goodsName}}</view>
 			</view>
-			<view class='row' v-if="list.bulkDensityStandard !=1">
+			<!-- <view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">基准水分(%)</view>
 				<view class="right">{{list.waterBase}}</view>
 			</view>
@@ -41,7 +41,7 @@
 			<view v-if="list.paramType == '2' && list.bulkDensityStandard !=1" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
-			</view>
+			</view> -->
 			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<tr>
@@ -54,16 +54,35 @@
 				</tr>
 				</table>
 			</view>
-			<view class='row' v-if="list.bulkDensityStandard !=1">
+			<!-- <view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮收购价格(元/公斤)</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
-			</view>
+			</view> -->
 			<view class='row boder'>
 				<view class="left">销售上限</view>
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
 		</view>
-		<view class="content2" v-if="list.bulkDensityStandard !=1">
+		<view class="form_view" v-if="list.bulkDensityStandard !=1">
+			<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
+			<tr>
+				<td>水分</td>
+				<td>一等</td>
+				<td>二等</td>
+				<td>三等</td>
+				<td>等外</td>
+			</tr>
+			<tr v-for="(item,index) in list.detailPrints">
+				<td>{{item.waterMin}}</td>
+				<td>{{item.price1}}</td>
+				<td>{{item.price2}}</td>
+				<td>{{item.price3}}</td>
+				<td>{{item.priceOther}}</td>
+			</tr>
+			</table>
+			
+		</view>
+		<!-- <view class="content2" v-if="list.bulkDensityStandard !=1">
 			<view class="title">粮价设置</view>
 			<view v-for="(item,index) in list.details" :key="index">
 				<view class="row">
@@ -80,7 +99,7 @@
 					<view class="right">{{item1.price}}</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="content3">
 			<view class="title row">
 				流程