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

pageD/warehousings/warehousingDetails.vue

@@ -8,13 +8,19 @@
 					<text>{{warehouseInOutInfo.contractNo}}</text>
 				</view>
 			</view>
+			<view v-if='warehouseInOutInfo.taskType=="出库任务"' class="c-row ">
+				<text class="tit">收货方</text>
+				<view class="con-list">
+					<text>{{warehouseInOutInfo.consignee}}</text>
+				</view>
+			</view>
 			<view class="c-row ">
 				<text class="tit">货名</text>
 				<view class="con-list">
 					<text>{{warehouseInOutInfo.goodsName}}</text>
 				</view>
 			</view>
-			<view class="c-row ">
+			<view v-if='warehouseInOutInfo.taskType=="入库任务"' class="c-row ">
 				<text class="tit">发车净重(吨)</text>
 				<view class="con-list">
 					<text>{{warehouseInOutInfo.startWeight}}</text>
@@ -26,9 +32,22 @@
 					<text>{{warehouseInOutInfo.carNo}}</text>
 				</view>
 			</view>
+			<view v-if='warehouseInOutInfo.taskType=="出库任务"' class="c-row ">
+				<text class="tit">箱号</text>
+				<view class="con-list">
+					<text>{{warehouseInOutInfo.boxNo}}</text>
+				</view>
+			</view>
+			<view v-if='warehouseInOutInfo.taskType=="出库任务"' class="c-row ">
+				<text class="tit">封号</text>
+				<view class="con-list">
+					<text>{{warehouseInOutInfo.titleNo}}</text>
+				</view>
+			</view>
 		</view>
 		<view class="center">
-			<view class="title_b">入库信息</view>
+			<view v-if='warehouseInOutInfo.taskType=="入库任务"' class="title_c ">入库信息</view>
+			<view v-if='warehouseInOutInfo.taskType=="出库任务"' class="title_c ">出库信息</view>
 			<view class="c-list">
 				<view class="c-row ">
 					<text class="tit">毛重（吨）</text>
@@ -61,25 +80,27 @@
 					</view>
 				</view>
 				<view class="c-row ">
-					<text class="tit">入库类型</text>
+					<text v-if='warehouseInOutInfo.taskType=="入库任务"' class="tit">入库类型 </text>
+					<text v-if='warehouseInOutInfo.taskType=="出库任务"' class="tit">出库类型 </text>
 					<view class="con-list">
 						<text>{{warehouseInOutInfo.inOutType}}</text>
 					</view>
 				</view>
-				<view class="c-row ">
-					<text class="tit">扣款金额（元/吨）</text>
+				<view v-if='warehouseInOutInfo.taskType=="入库任务"' class="c-row ">
+					<text  class="tit">扣款金额（元/吨）</text>
 					<view class="con-list">
 						<text>{{warehouseInOutInfo.deductionAmount}}</text>
 					</view>
 				</view>
-				<view class="c-row ">
+				<view v-if='warehouseInOutInfo.taskType=="入库任务"' class="c-row ">
 					<text class="tit">扣款项</text>
 					<view class="con-list">
 						<text>{{warehouseInOutInfo.deductionItems}}</text>
 					</view>
 				</view>
 				<view class="c-row ">
-					<text class="tit">入库日期</text>
+					<text v-if='warehouseInOutInfo.taskType=="入库任务"' class="tit">入库日期</text>
+					<text v-if='warehouseInOutInfo.taskType=="出库任务"' class="tit">出库日期</text>
 					<view class="con-list">
 						<text>{{warehouseInOutInfo.inOutDate}}</text>
 					</view>

pageD/warehousings/warehousings.vue

@@ -17,13 +17,19 @@
 					<text>{{WarehouseInOutInfo.contractNo}}</text>
 				</view>
 			</view>
+			<view v-if='WarehouseInOutInfo.taskType=="出库任务"' class="c-row ">
+				<text class="tit">收货方</text>
+				<view class="con-list">
+					<text>{{WarehouseInOutInfo.consignee}}</text>
+				</view>
+			</view>
 			<view class="c-row ">
 				<text class="tit">货名</text>
 				<view class="con-list">
 					<text>{{WarehouseInOutInfo.goodsName}}</text>
 				</view>
 			</view>
-			<view class="c-row ">
+			<view v-if='WarehouseInOutInfo.taskType=="入库任务"' class="c-row ">
 				<text class="tit">发车净重(吨)</text>
 				<view class="con-list">
 					<text>{{WarehouseInOutInfo.startWeight}}</text>
@@ -35,6 +41,18 @@
 					<text>{{WarehouseInOutInfo.carNo}}({{this.WarehouseInOutInfo.tranCarNo}})</text>
 				</view>
 			</view>
+			<view v-if='WarehouseInOutInfo.taskType=="出库任务"' class="c-row ">
+				<text class="tit">箱号</text>
+				<view class="con-list">
+					<text>{{WarehouseInOutInfo.boxNo}}</text>
+				</view>
+			</view>
+			<view v-if='WarehouseInOutInfo.taskType=="出库任务"' class="c-row ">
+				<text class="tit">封号</text>
+				<view class="con-list">
+					<text>{{WarehouseInOutInfo.titleNo}}</text>
+				</view>
+			</view>
 		</view>
 		<view class="center">
 			<view v-if='WarehouseInOutInfo.taskType=="入库任务"' class="title_c ">入库信息</view>
@@ -99,18 +117,18 @@
 					<picker v-if='WarehouseInOutInfo.taskType=="出库任务"' @change="chuChange" :value="chuIndex"
 						:range="chuType" class="con-list">
 						<view v-model="WarehouseInOutInfo.inOutType">
-							{{chuIndex > -1?chuType[chuIndex]:'请选择入库类型'}}
+							{{chuIndex > -1?chuType[chuIndex]:'请选择出库类型'}}
 						</view>
 					</picker>
 				</view>
-				<view class="c-row b-b">
+				<view  v-if='WarehouseInOutInfo.taskType=="入库任务"' class="c-row b-b">
 					<view class="title">扣款金额</view>
 					<view class="con-list">
 						<input style="font-size:14px" placeholder="请输入扣款金额" name="input"
 							v-model="WarehouseInOutInfo.deductionAmount"></input>
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view v-if='WarehouseInOutInfo.taskType=="入库任务"' class="c-row b-b">
 					<view class="title">扣款项</view>
 					<view class="con-list">
 						<input style="font-size:14px" maxlength='16' placeholder="请输入扣款项" name="input"
@@ -126,6 +144,14 @@
 					</u-picker>
 
 				</view>
+				<!-- <view v-if='WarehouseInOutInfo.taskType=="出库任务"' class="c-row b-b">
+					<text class="tit">经办人</text>
+					<view class="con-list" @click="show1 = true">
+						{{ WarehouseInOutInfo.agent != null ? WarehouseInOutInfo.agent :'请选择经办人' }}
+					</view>
+					<u-picker @confirm="DateChange" v-model="show1" :range="selectorObj" mode="selector">
+					</u-picker>
+				</view> -->
 				<view class="c-row ">
 					<text class="tit">上传磅单照片</text>
 				</view>
@@ -240,11 +266,13 @@
 					inOutType: '采购入库',
 					inOutTypeKey: 1,
 				},
+				selectorObj:[],
 				WarehouseInOutInfo1: {
 					contractNo: {},
 					carNo: {},
 				},
 				pinIndex: -1,
+				show1:false,
 				pinTypes: '',
 				pinType: ['一等品', '二等品', '三等品', '等外'],
 				ruIndex: 0,
@@ -264,6 +292,7 @@
 				isAdd: true,
 				warehouselist: [],
 				warehouselist1: [],
+				compId:'',
 				params: {
 					year: true,
 					month: true,
@@ -296,17 +325,44 @@
 				return new Date()
 			}
 		},
+		onLoad(option) {
+			this.compId = option.compId
+			this.WarehouseInOutInfo.goodsName = option.goodsName
+			this.WarehouseInOutInfo.startWeight = option.startWeight
+			this.WarehouseInOutInfo1.carNo = option.carNo + '(' + option.tranCarNo + ')'
+			this.WarehouseInOutInfo.tranCarNo = option.tranCarNo
+			this.WarehouseInOutInfo.id = option.id
+			this.WarehouseInOutInfo.carNo = option.carNo
+			this.WarehouseInOutInfo.addressUrl = option.addressUrl
+			this.WarehouseInOutInfo.binNumber = option.binNumber
+			this.WarehouseInOutInfo.inOutDate = option.inOutDate
+			var date = new Date()
+			var year = date.getFullYear()
+			var month = date.getMonth()
+			var date1 = date.getDate()
+			if (month + 1 < 10) {
+				month = "0" + (month + 1)
+			}
+			this.time = year + '-' + month + "-" + date1
+			this.getList(this.WarehouseInOutInfo.id)
+		},
 		onShow() {
-			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
-				compId: this.WarehouseInOutInfo.compId,
+			
+			var that=this
+			setTimeout(function(){
+				console.log(that.WarehouseInOutInfo)
+				that.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
+				compId: that.compId,
 				warehouseType: 1,
 			}).then(res => {
 				console.log(res,"cang")
 				if (res.data.code == 200) {
 					var arr = []
 					for (var i = 0; i < res.data.data.length; i++) {
-						if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
-							this.warehouseIndex = i
+						console.log(res.data.data[i].warehouseName,that.WarehouseInOutInfo.warehouseName)
+						if (res.data.data[i].warehouseName == that.WarehouseInOutInfo.warehouseName) {
+							console.log(11111)
+							that.warehouseIndex = i
 						}
 						// if(res.data.data[i].positionId==this.WarehouseInOutInfo.positionId){
 						// 	 this.warehouseIndex=i
@@ -314,56 +370,36 @@
 						arr.push(res.data.data[i].warehouseName)
 						// arr.push(res.data[i].positionId)
 					}
-					this.warehouse = arr
-					this.warehouselist = res.data.data
-					for (var i = 0; i < this.warehouselist.length; i++) {
-						if (this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
-							var id = this.warehouselist[i].id
-							this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+					that.warehouse = arr
+					that.warehouselist = res.data.data
+					for (var i = 0; i < that.warehouselist.length; i++) {
+						if (that.warehouselist[i].warehouseName == that.WarehouseInOutInfo.warehouseName) {
+							var id = that.warehouselist[i].id
+							that.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
 								id: id,
 							}).then(res => {
 								var arr = []
 								var arr1 = []
 								for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
-									if (res.data.data.warehousePositionInfoList[i].binNumber == this
+									if (res.data.data.warehousePositionInfoList[i].binNumber == that
 										.WarehouseInOutInfo.binNumber) {
-										this.warehouseIndex1 = i
+										that.warehouseIndex1 = i
 									}
 									arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
-									this.arr1.push(res.data.data.warehousePositionInfoList[i].binNumber.id)
+									arr1.push(res.data.data.warehousePositionInfoList[i].binNumber.id)
 									// arr.push(res.data.data.warehousePositionInfoList[i].positionId)
 								}
-								this.warehouse1 = arr
-									this.warehouse2 = arr1
-								this.warehouselist11 = res.data.data
+								that.warehouse1 = arr
+									that.warehouse2 = arr1
+								that.warehouselist11 = res.data.data
 							})
 						}
 					}
 					// this.warehouse=arr
 				}
 			})
-		},
-		onLoad(option) {
-			this.WarehouseInOutInfo.compId = option.compId
-			this.WarehouseInOutInfo.goodsName = option.goodsName
-			this.WarehouseInOutInfo.startWeight = option.startWeight
-			this.WarehouseInOutInfo1.carNo = option.carNo + '(' + option.tranCarNo + ')'
-			this.WarehouseInOutInfo.tranCarNo = option.tranCarNo
-			this.WarehouseInOutInfo.warehouseName = option.warehouseName
-			this.WarehouseInOutInfo.id = option.id
-			this.WarehouseInOutInfo.carNo = option.carNo
-			this.WarehouseInOutInfo.addressUrl = option.addressUrl
-			this.WarehouseInOutInfo.binNumber = option.binNumber
-			this.WarehouseInOutInfo.inOutDate = option.inOutDate
-			var date = new Date()
-			var year = date.getFullYear()
-			var month = date.getMonth()
-			var date1 = date.getDate()
-			if (month + 1 < 10) {
-				month = "0" + (month + 1)
-			}
-			this.time = year + '-' + month + "-" + date1
-			this.getList(this.WarehouseInOutInfo.id)
+			},1000)
+			
 		},
 		methods: {
 			navBack() {
@@ -745,7 +781,6 @@
 						this.WarehouseInOutInfo.baseId = this.warehouselist[i].id
 					}
 				}
-				this.WarehouseInOutInfo.taskType = "入库任务"
 				uni.showLoading({
 					title: "正在提交"
 				})
@@ -761,7 +796,7 @@
 						})
 					} else {
 						uni.showToast({
-							title: res.data.message,
+							title: '系统异常，请联系管理员',
 							icon: 'none',
 							duration: 2000
 						})
@@ -770,7 +805,7 @@
 
 				}).catch(res => {
 					uni.showToast({
-						title: res.data.message,
+						title: '系统异常，请联系管理员',
 						icon: 'none',
 						duration: 2000
 					})

pages.json

@@ -1408,7 +1408,7 @@
 				, {
 					"path": "warehousings/warehousingDetails",
 					"style": {
-						"navigationBarTitleText": "入库详情",
+						"navigationBarTitleText": "详情",
 						"enablePullDownRefresh": false
 					}
 

pages/grain_pulse/home.vue

@@ -44,8 +44,8 @@
 			</scroll-view>
 			<view v-if='datalist.length>0' v-for='item in datalist' @click='todetails(item)' class="listitem">
 				<view class="flex">
-					<image class='listitem-left' :src="item.attachmentAddress" mode=""></image>
-					<view class="listitem-right">
+					<image style='width:98px;height:97px;flex:1;' class='listitem-left' :src="item.attachmentAddress" mode=""></image>
+					<view style='flex:2;' class="listitem-right">
 						<view class="companyname Medium">{{item.compName}}</view>
 						<view class='Regular introduce'>{{item.companyProfile}}</view>
 					</view>
@@ -476,6 +476,7 @@
 		height: 200rpx;
 		margin-right: 8px;
 		border-radius: 5px;
+		
 	}
 
 	.companyname {

pages/grain_pulse/my_grain_pulse.vue

@@ -5,8 +5,8 @@
 		</scroll-view>
 		<view v-if='datalist.length>0' v-for='item in datalist' @click='todetails(item)' class="listitem">
 			<view class="flex" v-if='mainBusinessType=="我的企业"'>
-				<image class='listitem-left' :src="item.attachmentAddress" mode=""></image>
-				<view class="listitem-right">
+				<image style='width:144px;height:96px;flex:1;' class='listitem-left' :src="item.attachmentAddress" mode=""></image>
+				<view style='flex:2;' class="listitem-right">
 					<view class="flex justify-between">
 						<view class="companyname Medium">{{item.compName}}</view>
 						<view v-if='item.status=="待审核"' class='listitemStatus audit Regular'>审核中</view>
@@ -27,11 +27,11 @@
 			</view>
 			<view v-else>
 				<view class="flex">
-					<image class='listitem-left' :src="item.attachmentAddress" mode=""></image>
-					<view class="listitem-right">
+					<image style='width:144px;height:96px;flex:1;' class='listitem-left' :src="item.attachmentAddress" mode=""></image>
+					<view style='flex:2;' class="listitem-right">
 						<view class="flex justify-between">
 							<view class="companyname Medium">{{item.compName}}</view>
-							<image style='width:25rpx;height:25rpx;' :src="status1?'../../static/img/liangmai/shoucang1.png':'../../static/img/liangmai/my_shoucang.png'" mode=""></image>
+							<image style='width:25rpx;height:25rpx;position:relative;top:5px;' :src="status1?'../../static/img/liangmai/shoucang1.png':'../../static/img/liangmai/my_shoucang.png'" mode=""></image>
 						</view>
 						<view class='Regular introduce'>{{item.companyProfile}}</view>
 					</view>
@@ -313,9 +313,11 @@
 	.listitem-left{
 		width: 400rpx;
 		height: 200rpx;
-		margin-right: 8px;
 		border-radius: 5px;
 	}
+	.listitem-right{
+		padding-left:5px;
+	}
 	.companyname{
 		font-size:14px;
 		color:#333;