修改

pages/erp/deliveryfeedback/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 v-if="item.status == '' ||item.status == null ||item.status == '未装车'">未装车</view>
+					<view v-if="item.status == '已装车' ||item.status == '已送达'">已装车</view>
+				</view>
+				<view class="row">
+					<view class="left">车厢号</view>
 					<view>{{item.boxNo}}</view>
 				</view>
 				<view class="row">

pages/task/audit/freight_settlement_approval.vue

@@ -22,7 +22,10 @@
 				<view>{{list.contractNo}}</view>
 			</view>
 			<view class="car-container">
-					<view class="car-num title">{{list.carNo}} ({{list.tranCarNo}})</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '1'">{{list.carNo}} ({{list.tranCarNo}})</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '2'">车厢号{{list.boxNo}}</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '3'&&list.shipType== '散船'">仓位号{{list.boxNo}}</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '3'&&list.shipType== '集装箱'">箱号{{list.boxNo}}</view>
 					<view class="car-type-item">
 						<view class="left">装</view>
 						<view class="textInfo">{{list.loadingWeight}}吨</view>

pages/task/audit/freight_settlement_details.vue

@@ -20,7 +20,10 @@
 				<view>{{list.contractNo}}</view>
 			</view>
 			<view class="car-container">
-					<view class="car-num title">{{list.carNo}} ({{list.tranCarNo}})</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '1'">{{list.carNo}} ({{list.tranCarNo}})</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '2'">车厢号{{list.boxNo}}</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '3'&&list.shipType== '散船'">仓位号{{list.boxNo}}</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '3'&&list.shipType== '集装箱'">箱号{{list.boxNo}}</view>
 					<view class="car-type-item">
 						<view class="left">装</view>
 						<view class="textInfo">{{list.loadingWeight}}吨</view>