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

common/helper.js

@@ -29,7 +29,7 @@ const getUserAllRoles = (item) => {
 	
 	for(let i = 0;i<item.length;i++){
 		rolesList.push(item[i].name)
-		console.log('用户权限',rolesList)
+		// console.log('用户权限',rolesList)
 		if(item[i].children&&item[i].children.length>0){
 			getUserAllRoles(item[i].children)
 		}

pages/erp/exWarehousing/exWarehousing.vue

@@ -75,16 +75,34 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">出库类型</view>
-				<input v-model='detailData.inOutType' class="right-bottom" :disabled="isSelectType"></input>
+				<input v-model='detailData.inOutType'  class="right-bottom"  :disabled="isSelectType"></input>
 			<!-- 	<u-picker :range="warehousingTypeList" range-key="constValue" @confirm='warehousingTypePicker($event)'
 					v-model="show5" mode="selector">
 				</u-picker> -->
 			</view>
+			<view class="row">
+				<view class="left">出库方式</view>
+				<view @click='show8=true'>{{detailData.outType?detailData.outType:'汽运'}}</view>
+				<u-picker v-model="show8" mode="selector" range-key="name" :range="multiSelector" @confirm='outtypeChange($event)'>
+				</u-picker>
+			</view>
 			<view class="row row-bottom">
 				<view class="left">车牌号</view>
 				<input v-if="!isPC" v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
+			<view v-if='detailData.outType=="集装箱船"||detailData.outType=="火运"' class="row row-bottom">
+				<view class="left">箱号</view>
+				<!-- <view @click='show9=true'>{{usestart?usestart:'汽运'}}</view>
+				<u-picker v-model="show9" mode="selector" range-key="name" :range="multiSelector1" @confirm='usestartChange($event)'>
+				</u-picker> -->
+				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号"></input>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row row-bottom">
+				<view class="left">仓位号</view>
+				<input v-model='detailData.binNo' class="right-bottom" placeholder="请输入仓位号"></input>
+			</view>
 		</view>
 		<view class="content2">
 			<view class="left">上传磅单</view>
@@ -160,6 +178,21 @@
 				show6: false,
 				show7: false,
 				isPC: true,
+				show8:false,
+				usestart:'',
+				multiSelector:[
+					{name:'汽运',value:'0'},
+					{name:'火运',value:'1'},
+					{name:'集装箱船',value:'2'},
+					{name:'散船',value:'3'},
+				],
+				show9:false,
+				multiSelector1:[
+					{name:'汽运',value:'0'},
+					{name:'火运',value:'1'},
+					{name:'集装箱船',value:'2'},
+					{name:'散船',value:'3'},
+				],
 				isSelectType:true,
 				// contractNoList: [{
 				// 	contractNo: ""
@@ -193,6 +226,7 @@
 				warehouseName: '',
 				binNumber: '',
 				detailData: {
+					outType:'汽运',
 					contractNo: "请选择合同编号或移库任务编号",
 					type: "干粮",
 					grade: "请输入品级",
@@ -285,6 +319,9 @@
 			this.handler()
 		},
 		methods: {
+			usestartChange(e){
+				this.usestart=this.multiSelector1[e].name
+			},
 			//计算纯重
 			pureWeightCount() {
 				if (this.netWeight && this.detailData.buckleWeightRatio && this.detailData.solidGrainWater && this
@@ -295,6 +332,10 @@
 					this.detailData.pureWeight = this.detailData.pureWeight.toFixed(3)
 				}
 			},
+			outtypeChange(e){
+				this.detailData.outType=this.multiSelector[e].name
+				console.log(e)
+			},
 			outWarehouse() {
 				this.$api.doRequest('get', '/commonSysParameter/getInfo', {
 					constId: 'CON6'
@@ -600,6 +641,12 @@
 						return
 					}
 				}
+				if(this.detailData.boxNo){
+					this.detailData.boxNo=this.detailData.boxNo.toUpperCase()
+				}
+				if(this.detailData.boxNoOther){
+					this.detailData.boxNoOther=this.detailData.boxNoOther.toUpperCase()
+				}
 				this.detailData.baseId = helper.erpWarehouse.warehouseId
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
 				this.detailData.positionId = helper.erpWarehouse.positionId
@@ -706,7 +753,7 @@
 
 			// border: 0;
 			.right-bottom {
-				width: 300rpx;
+				width: 280rpx;
 				text-align: right;
 			}
 		}

pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -16,22 +16,21 @@
 		</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 class="row bold">
+					<view class="left">{{item.contractNo}}</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 style='color:#878C9C;font-size:14px;' class="row">
+					<view class="left">{{item.updateDate}}</view>
 					<view>{{item.backOffice}}</view>
 				</view>
+				<view v-if="item.outType=='火运'||item.outType=='集装箱船'" style='color:#878C9C;font-size:14px;' class="row">
+					<view v-if='item.boxNo' class="left">箱号：{{item.boxNo}}</view>
+					<view v-if='item.boxNoOther'>箱号2：{{item.boxNoOther}}</view>
+				</view>
+				<view v-if="item.outType=='散船'" style='color:#878C9C;font-size:14px;' class="row">
+					<view v-if='item.binNo' class="left">仓位号：{{item.binNo}}</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -132,11 +131,14 @@
 	}
 
 	.content2 {
+		background: white;
+		margin:10px;
+		border-radius:10px;
 		.row {
 			display: flex;
 			justify-content: space-between;
-			border-bottom: 1px solid #EEEEEE;
-			padding: 21rpx 0;
+			// border-bottom: 1px solid #EEEEEE;
+			padding: 18rpx 10rpx;
 
 			.right,
 			input {
@@ -154,13 +156,19 @@
 	}
 
 	.content2-item {
-		background: white;
-		margin: 0 20rpx 20rpx 20rpx;
-		padding: 10rpx;
-		border-radius: 15rpx;
+		// margin: 0 20rpx 20rpx 20rpx;
+		margin:0 10px;
+		// padding: 10rpx;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.content2-item:last-child{
+		border-bottom: 1px solid transparent;
 	}
-
 	.no-boder {
 		border-bottom: none !important;
 	}
+	.bold{
+		font-size:18px;
+		font-weight:600;
+	}
 </style>

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -79,6 +79,12 @@
 					v-model="show5" mode="selector">
 				</u-picker>
 			</view>
+			<view class="row">
+				<view class="left">出库方式</view>
+				<view @click='show8=true'>{{detailData.outType?detailData.outType:'汽运'}}</view>
+				<u-picker v-model="show8" mode="selector" range-key="name" :range="multiSelector" @confirm='outtypeChange($event)'>
+				</u-picker>
+			</view>
 			<view class="row row-bottom">
 			<!-- 	<view class="left">车牌号</view>
 				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input> -->
@@ -86,6 +92,15 @@
 				<input v-if="!isPC" v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
+			<view v-if='detailData.outType=="集装箱船"||detailData.outType=="火运"' class="row row-bottom">
+				<view class="left">箱号</view>
+				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号"></input>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row row-bottom">
+				<view class="left">仓位号</view>
+				<input v-model='detailData.binNo' class="right-bottom" placeholder="请输入仓位号"></input>
+			</view>
 		</view>
 		<view class="content2">
 			<view class="left">上传磅单</view>
@@ -182,6 +197,13 @@
 						type: "等外"
 					}
 				],
+				show8:false,
+				multiSelector:[
+					{name:'汽运',value:'0'},
+					{name:'火运',value:'1'},
+					{name:'集装箱船',value:'2'},
+					{name:'散船',value:'3'},
+				],
 				handlerList: [],
 				warehousingTypeList: [],
 				action: this.$uploadUrl,
@@ -191,6 +213,7 @@
 				warehouseName: '',
 				binNumber: '',
 				detailData: {
+					outType:'汽运',
 					contractNo: "请选择合同编号或移库任务编号",
 					type: "请选择类型",
 					grade: "请输入品级",
@@ -274,6 +297,10 @@
 			this.handler()
 		},
 		methods: {
+			outtypeChange(e){
+				this.detailData.outType=this.multiSelector[e].name
+				console.log(e)
+			},
 			//计算纯重
 			pureWeightCount() {
 				if (this.netWeight && this.detailData.buckleWeightRatio && this.detailData.solidGrainWater && this
@@ -587,6 +614,13 @@
 						return
 					}
 				}
+				if(this.detailData.boxNo){
+					this.detailData.boxNo=this.detailData.boxNo.toUpperCase()
+				}
+				if(this.detailData.boxNoOther){
+					this.detailData.boxNoOther=this.detailData.boxNoOther.toUpperCase()
+				}
+				
 				this.detailData.baseId = helper.erpWarehouse.warehouseId
 				this.detailData.positionId = helper.erpWarehouse.positionId
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
@@ -692,7 +726,7 @@
 
 			// border: 0;
 			.right-bottom {
-				width: 300rpx;
+				width: 280rpx;
 				text-align: right;
 			}
 		}

pages/erp/improvedWrehousing/improvedWrehousing.vue

@@ -16,7 +16,7 @@
 		</view>
 		<view class="content2">
 			<view class="content2-item" v-for="(item,index) in dataList" @click="goDetail(item)">
-				<view class="row">
+				<!-- <view class="row">
 					<view class="left">合同编号</view>
 					<view>{{item.contractNo}}</view>
 				</view>
@@ -31,6 +31,14 @@
 				<view class="row no-boder">
 					<view class="left">提交人</view>
 					<view>{{item.backOffice}}</view>
+				</view> -->
+				<view class="row bold">
+					<view class="left">{{item.contractNo}}</view>
+					<view>{{item.carNo}}</view>
+				</view>
+				<view style='color:#878C9C;font-size:14px;' class="row">
+					<view class="left">{{item.updateDate}}</view>
+					<view>{{item.backOffice}}</view>
 				</view>
 			</view>
 		</view>
@@ -124,35 +132,38 @@
 		display: flex;
 		margin: 20rpx 0;
 		justify-content: space-between;
-
+	
 		.left,
 		.right {
 			display: flex;
 			align-items: center;
 		}
 	}
-
+	
 	.content1 {
 		padding: 40rpx 20rpx;
 		margin: 20rpx;
 		border-radius: 10rpx;
 		background: #FFFFFF;
 	}
-
+	
 	.content2 {
+		background: white;
+		margin:10px;
+		border-radius:10px;
 		.row {
 			display: flex;
 			justify-content: space-between;
-			border-bottom: 1px solid #EEEEEE;
-			padding: 21rpx 0;
-
+			// border-bottom: 1px solid #EEEEEE;
+			padding: 18rpx 10rpx;
+	
 			.right,
 			input {
 				font-size: 28rpx;
 				color: #333333;
 			}
 		}
-
+	
 		.row-bottom {
 			.right-bottom {
 				width: 300rpx;
@@ -160,15 +171,21 @@
 			}
 		}
 	}
-
+	
 	.content2-item {
-		background: white;
-		margin: 0 20rpx 20rpx 20rpx;
-		padding: 10rpx;
-		border-radius: 15rpx;
+		// margin: 0 20rpx 20rpx 20rpx;
+		margin:0 10px;
+		// padding: 10rpx;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.content2-item:last-child{
+		border-bottom: 1px solid transparent;
 	}
-
 	.no-boder {
 		border-bottom: none !important;
 	}
+	.bold{
+		font-size:18px;
+		font-weight:600;
+	}
 </style>

pages/erp/index.vue

@@ -23,7 +23,7 @@
 				</view>
 			</view>
 
-			<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
+			<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']" v-if="isShowBtn">
 				<view class="cu-item" v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)"
 					v-if="index<gridCol*2">
 					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
@@ -56,6 +56,7 @@
 				isShowAlert: false,
 				compName: '',
 				compList: [],
+				isShowBtn:false,
 				content: '易粮易运ERP系统包含合同管理、仓库管理、运输管理、结算管理等多个模块，可为粮企提供粮食贸易的全流程服务，平台诚邀您的加入。',
 				warehouseName: '暂无仓库',
 				binNumber: '暂无',
@@ -265,6 +266,7 @@
 						let _showCWData = uni.getStorageSync("erpSelectWarehousCW")
 						this.allWarehouse = res.data.data
 						this.warehouseList = res.data.data;
+						this.isShowBtn = true
 						if (_showData) {
 							this.warehouseName = _showData.warehouseName
 							this.compId = _showData.compId