Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/task/audit/acquisitioncontract.vue

@@ -30,10 +30,10 @@
 			<u-form-item label-width='260' label="收购方电话" :borderBottom="false">
 				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-if="list.seller">
+			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-show="list.jointVentureParties">
 				<u-input v-model="list.jointVentureParties" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-if="list.sellerPhone">
+			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-show="list.jointPhone">
 				<u-input v-model="list.jointPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（起 - 止）" :borderBottom="false">
@@ -47,36 +47,36 @@
 			<!-- <u-form-item label-width='260' label="交货日期（止）" :borderBottom="false">
 				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
 			</u-form-item> -->
-			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false" v-if="list.unitContractPrice">
+			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false" v-show="list.unitContractPrice">
 				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false" v-if="list.totalContractPrice">
+			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false" v-show="list.totalContractPrice">
 				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false" v-if="list.finalTradingVolume">
+			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false" v-show="list.finalTradingVolume">
 				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false" v-if="list.settlementPrice">
+			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false" v-show="list.settlementPrice">
 				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false" v-if="list.contractProcessInfo.goodsNameKey">
+			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false" v-show="list.contractProcessInfo.goodsNameKey">
 				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--"
 					disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false" v-if="list.contractProcessInfo.goodsName">
+			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false" v-show="list.contractProcessInfo.goodsName">
 				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false" v-if="list.contractProcessInfo.waterContent">
+			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false" v-show="list.contractProcessInfo.waterContent">
 				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--"
 					disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false" v-if="list.contractProcessInfo.impurity">
+			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false" v-show="list.contractProcessInfo.impurity">
 				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false" v-if="list.contractProcessInfo.mildewGrain">
+			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false" v-show="list.contractProcessInfo.mildewGrain">
 				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false" v-if="list.contractProcessInfo.grade">
+			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false" v-show="list.contractProcessInfo.grade">
 				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="备注信息" :borderBottom="false">

pages/task/audit/warehouse_details.vue

@@ -26,23 +26,35 @@
 				<view class="left">货名</view>
 				<view class="right">{{list.goodsName}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">基准水分（%）</view>
 				<view class="right">{{list.waterBase}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮水分（%）</view>
 				<view class="right">{{list.waterMin}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">水分上限（%）</view>
 				<view class="right">{{list.waterMax}}</view>
 			</view>
-			<view v-if="list.paramType == '2'" class='row'>
+			<view v-if="list.paramType == '2' && list.bulkDensityStandard !=1" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
 			</view>
-			<view class='row'>
+			<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>
+					<td>容重(g/L)</td>
+					<td>价格(元/公斤)</td>
+				</tr>
+				<tr v-for="(item,index) in list.detailPrints">
+					<td>{{item.bulkDensityMax }} ~ {{ item.bulkDensityMin}}</td>
+					<td>{{item.bulkDensityPrice}}</td>
+				</tr>
+				</table>
+			</view>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮收购价格（元/公斤）</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
 			</view>
@@ -51,7 +63,7 @@
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
 		</view>
-		<view class="content2">
+		<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">
@@ -518,4 +530,18 @@
 			margin-top: 20rpx;
 		}
 	}
+	.form_view{
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+		.table_css td{
+			text-align: center;
+			border: 1rpx solid #DBD9CE;
+			padding: 14rpx 0;
+		}
+		.table_css{
+			border: 1rpx solid #DBD9CE;
+		}
+	}
 </style>