1

pages/erp/deliveryfeedback/details.vue

@@ -218,8 +218,8 @@
 				<view class="row">
 					<view class="left">装车日期</view>
 					<view>
-						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.sendDateStart}}</view>
-						<view v-else @click='train(index)'>{{item.sendDateStart?item.sendDateStart:'请选择日期'}}</view>
+						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
+						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
 						<u-picker :mask-close-able='false' v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange2($event,index)' :params="params">
 						</u-picker>
 					</view>

pages/erp/deliveryfeedback/list.vue

@@ -19,6 +19,10 @@
 					<view style='color:#9698A2;' class="left">{{item.goodsName}}</view>
 					<view>{{item.weight}}</view>
 				</view>
+				<view style='font-size:14px;' v-if="item.sendWarehouse" class="row">
+					<view style='flex:1;color:#9698A2;' class="left">发货库</view>
+					<view style='flex:2;text-align:right;'>{{item.sendWarehouse}}</view>
+				</view>
 				<view style='font-size:14px;' class="row">
 					<view style='flex:1;color:#9698A2;' class="left">发货</view>
 					<view style='flex:2;text-align:right;'>{{item.send}}</view>

pages/erp/exWarehousing/exWarehousing.vue

@@ -510,7 +510,7 @@
 						}
 					}
 					this.$api.doRequest('get', '/contractManagementInfo/getOutContract', {
-						contractNo:this.detailData.contractNo,compId:uni.getStorageSync('pcUserInfo').compId
+						contractNo:this.detailData.contractNo,warehouseName: this.warehouseName,compId:uni.getStorageSync('pcUserInfo').compId
 					}).then(res => {
 
 						if (res.data.code == 200) {
@@ -541,6 +541,9 @@
 										}
 										this.carList = res.data.data.tranCarInfoList //车牌号下拉列表
 									}
+									else{
+										this.carList =[]
+									}
 							uni.hideLoading()
 						}
 					})
@@ -575,7 +578,7 @@
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
 				this.$api.doRequest('get', '/contractManagementInfo/getOutContract', {
-					contractNo:this.detailData.contractNo,compId:uni.getStorageSync('pcUserInfo').compId
+					contractNo:this.detailData.contractNo,warehouseName: this.warehouseName,compId:uni.getStorageSync('pcUserInfo').compId
 				}).then(res => {
 					this.contractList=res.data.data
 					if(this.detailData.inOutType != '移库出库'){