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

pages/erp/receivingfeedback/details.vue

@@ -144,7 +144,12 @@
 			<view style='margin-left:10px;'>卸车详情</view>
 			<view v-for='(item,index) in freightspace' class="content">
 				<view class="row">
-					<view class="left">车厢号-{{index+1}}</view>
+					<view class="left">车厢-{{index+1}}</view>
+					<view style='text-align:right;' v-if="item.status == '未装车'">{{item.status}}</view>
+					<view style='text-align:right;' v-else-if="item.status == '已送达'">已卸车</view>
+				</view>
+				<view class="row">
+					<view class="left">车厢号</view>
 					<view>{{item.boxNo}}</view>
 				</view>
 				<view class="row">
@@ -156,7 +161,15 @@
 					<view v-if="item.status == '未装车' || item.status == '已送达'">{{item.unloadNetWeight}}</view>
 					<view style='text-align:right;' v-else>
 						<input  v-model='item.unloadNetWeight' class="right-bottom"
-					placeholder="输入毛重"></input>
+					placeholder="输入卸车净重"></input>
+					</view>
+				</view>
+				<view v-if="detailData.priceType!=null&&detailData.priceType=='随行就市'" class="row">
+					<view class="left">单价(元/吨)</view>
+					<view v-if="item.status == '未装车' || item.status == '已送达'">{{item.contractPrice}}</view>
+					<view style='text-align:right;' v-else>
+						<input  v-model='item.contractPrice' class="right-bottom"
+					placeholder="输入单价"></input>
 					</view>
 				</view>
 				<view class="row">
@@ -180,9 +193,7 @@
 						</u-picker>
 					</view>
 				</view>
-				<view style='text-align:right;' v-if="item.status == '未装车'">{{item.status}}</view>
-				<view style='text-align:right;' v-else-if="item.status == '已送达'">已卸车</view>
-				<u-button v-else @click='submit(index,2)' type="success">保存</u-button>
+				<u-button v-if="item.status == '已装车'" @click='submit(index,2)' type="success">保存</u-button>
 			</view>
 		</view>
 		<view v-if='detailData.tranType=="汽运"'>
@@ -218,6 +229,14 @@
 					placeholder="输入卸车净重"></input>
 					</view>
 				</view>
+				<view v-if="detailData.priceType!=null&&detailData.priceType=='随行就市'" class="row">
+					<view class="left">单价(元/吨)</view>
+					<view v-if="item.status == '未装车' || item.status == '已送达'">{{item.contractPrice}}</view>
+					<view style='text-align:right;' v-else>
+						<input  v-model='item.contractPrice' class="right-bottom"
+					placeholder="输入单价"></input>
+					</view>
+				</view>
 				<view class="row">
 					<view class="left">卸车日期</view>
 					<view>
@@ -305,6 +324,14 @@
 					placeholder="输入卸船净重"></input>
 					</view>
 				</view>
+				<view v-if="detailData.priceType!=null&&detailData.priceType=='随行就市'" class="row">
+					<view class="left">单价(元/吨)</view>
+					<view v-if="item.status == '未装车' || item.status == '已送达'">{{item.contractPrice}}</view>
+					<view style='text-align:right;' v-else>
+						<input  v-model='item.contractPrice' class="right-bottom"
+					placeholder="输入单价"></input>
+					</view>
+				</view>
 				<view class="row">
 					<view class="left">卸船日期</view>
 					<view>
@@ -818,7 +845,9 @@
 						}else if(res.data.data.tranType=='汽运'){
 							for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
 								res.data.data.tranCarInfoList[i].show2=false
+								if(res.data.data.tranCarInfoList[i].unloadPoundImg){
 									this.imgUrl.push({url:res.data.data.tranCarInfoList[i].unloadPoundImg.split(",")[i]})
+								}
 							}
 							this.freightspace=res.data.data.tranCarInfoList
 						}else if(res.data.data.tranType=='船运'){