gjy 3 anni fa
parent
commit
57e2da1bf4

+ 9 - 6
pages/erpbusiness/acquisitionInformation.vue

@@ -10,8 +10,8 @@
 			</view>
 			<view class="content-item">
 				<view class="left">收购信息</view>
-				<view class='row'>
-				<textarea placeholder="输入收购信息,不超过2000个字" class="textarea" maxlength="2000" v-model="textareaValue"></textarea>
+				<view class='row textarea'>
+				<textarea placeholder-style="color:#AFB3BF;" placeholder="输入收购信息,不超过2000个字" maxlength="2000" v-model="textareaValue"></textarea>
 				<view class="textarea-left">
 					<view  class="clear" @click="clear()">清除全部</view>
 				</view>
@@ -312,16 +312,19 @@
 		font-size: 28rpx;
 		text-align: left;
 		width: 100%;
-		padding: 30rpx;
+		padding: 30rpx 30rpx;
 		border-radius: 5px;
 		margin-top: 30rpx;
-		height: 45vh;
+		height: 46vh;
 		padding-bottom: 20rpx;
-		color: #AFB3BF ;
+		color: #333 ;
+	}
+	.textarea textarea{
+		height: 90%;
 	}
     .textarea-left{
 		position: absolute;
-		bottom: 20rpx;
+		bottom: 12rpx;
 		left: 20rpx;
 		color: #606266;
 	}

+ 1 - 1
pages/user/depotAcquisition/depotAcquisition.vue

@@ -37,7 +37,7 @@
 			<view class="row4">
 				<view class="time">{{item.updateDate}}</view>
 				<view class="btn"
-					@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration?itemValue="+JSON.stringify(item))'>
+					@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration?warehouseName="+item.warehouseName+"&warehouseId="+item.warehouseId+"&warehousePrivate="+item.warehousePrivate+"&warehouseCity="+item.warehouseCity+"&warehouseArea="+item.warehouseArea+"&detailedAddress="+item.detailedAddress)'>
 					我要送粮
 				</view>
 			</view>

+ 5 - 6
pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -144,14 +144,13 @@
 		},
 
 		onLoad(options) {
-
-			let _pageToData = JSON.parse(options.itemValue)
-			this.warehouseId = _pageToData.warehouseId
-			this.dataList.warehouseName = _pageToData.warehouseName
+console.log(options)
+			this.warehouseId = options.warehouseId
+			this.dataList.warehouseName = options.warehouseName
 			this.startDate = this.getTime()[0]
 			this.dataList.validityDate = this.getTime()[1]
-			this.warehouseNameAddress = _pageToData.warehousePrivate + _pageToData.warehouseCity + _pageToData
-				.warehouseArea + _pageToData.detailedAddress
+			this.warehouseNameAddress = options.warehousePrivate + options.warehouseCity + options
+				.warehouseArea + options.detailedAddress
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),