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

pages/erp/exWarehousing/selectCarNo.vue

@@ -48,6 +48,7 @@
 		methods: {
 			confirm(item){
 				uni.setStorageSync('ContractNo', item);
+				uni.setStorageSync('ContractNoCar',item.carNo);
 				uni.navigateBack({})
 			},
 			getContractNoList() {

pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="wrap">
+	<view class="warp">
 		<view class="dropdown content1">
 			<view class="left" @click='show1=true'>
 				<view>{{warehouseName}}</view>
@@ -14,13 +14,33 @@
 					:range="warehouseCWList"></u-picker>
 			</view>
 		</view>
-		<view class="content2">
+		<!-- <view class="content2">
 			<view class="content2-item" v-for="(item,index) in dataList" @click="goDetail(item)">
 				<view class="item-style">{{item.contractNo}}</view>
 				<view class="item-style">{{item.carNo}}</view>
 				<view class="item-style">{{item.updateDate}}</view>
 				<view class="item-style">{{item.backOffice}}</view>
 			</view>
+		</view> -->
+		<view class="content2">
+			<view class="content2-item" v-for="(item,index) in dataList" @click="goDetail(item)">
+				<view class="row">
+					<view class="left">合同编号</view>
+					<view>{{item.contractNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">车牌号</view>
+					<view>{{item.carNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">暂存时间</view>
+					<view>{{item.updateDate}}</view>
+				</view>
+				<view class="row no-boder">
+					<view class="left">提交人</view>
+					<view>{{item.backOffice}}</view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -100,6 +120,24 @@
 </script>
 
 <style scoped lang="scss">
+	uni-page-body {
+		overflow: hidden;
+	}
+	// .warp {
+	// 	margin: 10rpx;
+	// 	padding: 20rpx 20rpx 140rpx 20rpx;
+	
+	// 	.top {
+	// 		display: flex;
+	// 		margin-bottom: 20rpx;
+	// 		border-radius: 20rpx;
+	// 		background: white;
+	// 		padding: 20rpx;
+	// 		.top-left {
+	// 			margin-right: 20rpx;
+	// 		}
+	// 	}
+	// }
 	.dropdown {
 		display: flex;
 		margin: 20rpx 0;
@@ -119,17 +157,14 @@
 	}
 
 	.content2 {
-		// padding: 20rpx;
 		margin: 20rpx;
-		// border-bottom: 1px solid #ccc;
 		background: #FFFFFF;
 		border-radius: 10rpx;
 
 		.content2-item {
 			padding: 20rpx;
 			margin-bottom: 10rpx;
-			border-bottom: 1px solid #ccc;
-			// padding-bottom: 10px;
+			// border-bottom: 1px solid #ccc;
 		}
 
 		.item-style {
@@ -137,4 +172,43 @@
 			width: 50%;
 		}
 	}
+	.content,
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+	
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+		}
+	
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+	
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+		.row-bottom {
+			.right-bottom {
+				width: 300rpx;
+				text-align: right;
+			}
+		}
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
 </style>

pages/erp/warehousing/selectCarNo.vue

@@ -50,6 +50,7 @@
 		methods: {
 			confirm(item){
 				uni.setStorageSync('erpcarNo', item);
+				uni.setStorageSync('ContractNoCar',item.carNo);
 				uni.navigateBack({})
 			},
 		}

pages/erp/warehousing/warehousing.vue

@@ -243,7 +243,7 @@
 				inOutDate1: "",
 				detailData: {
 					contractNo: "请选择合同编号",
-					carNo: '辽H12345',
+					carNo: '请输入车牌号',
 					type: "干粮",
 					goodsName: "123",
 					inOutDate: '请选择入库日期',
@@ -285,14 +285,24 @@
 				this.detailData.freight = 0
 			}
 			this.detailData.carNo = uni.getStorageSync('erpcarNo')
-			if (!_data.tranCarInfoList) _data.tranCarInfoList = []
+			if (!_data.tranCarInfoList){
+				_data.tranCarInfoList = []
+			} else{
+				this.isPC = true
+				if(uni.getStorageSync('ContractNoCar')){
+					this.detailData.carNo = uni.getStorageSync('ContractNoCar')
+				}else{
+					this.detailData.carNo = _data.tranCarInfoList[0].carNo
+				}
+			}
 			if (!this.detailData.contractNo) {
 				this.detailData.contractNo = '请选择合同编号'
-			} else {
-				if (_data.tranCarInfoList.length == 0) {
-					this.isPC = false
-				}
 			}
+			//  else {
+			// 	if (_data.tranCarInfoList.length == 0) {
+			// 		this.isPC = false
+			// 	}
+			// }
 			if (!this.detailData.goodsName) {
 				this.detailData.goodsName = '货名'
 			}