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

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
-	baseUrlNew: 'http://192.168.1.107:8090/',
+	baseUrlNew: 'http://192.168.1.108:8090/',
 	// baseUrlNew: 'http://192.168.1.122:9100/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages/erp/deliveryfeedback/details.vue

@@ -105,7 +105,7 @@
 				<view class="left">发船日期</view>
 				<view>
 					<view @click='show1=true'>{{detailData.sendDateStart}}</view>
-					<u-picker v-model="show1" mode="time" @confirm='dateChange($event)' :params="params">
+					<u-picker :mask-close-able='false' v-model="show1" mode="time" @confirm='dateChange($event)' :params="params">
 					</u-picker>
 				</view>
 			</view>
@@ -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">
@@ -176,7 +181,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange1($event,item)' :params="params">
+						<u-picker :mask-close-able='false' v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange1($event,item)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -216,7 +221,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.sendDateStart}}</view>
 						<view v-else @click='train(index)'>{{item.sendDateStart?item.sendDateStart:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange2($event,index)' :params="params">
+						<u-picker :mask-close-able='false' v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange2($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -298,7 +303,7 @@
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
 						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
+						<u-picker :mask-close-able='false' v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>

pages/erp/receivingfeedback/details.vue

@@ -180,7 +180,8 @@
 						</u-picker>
 					</view>
 				</view>
-				<view style='text-align:right;' v-if="item.status == '已装车' || item.status == '已送达'">{{item.status}}</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>
 			</view>
 		</view>

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>