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

apiconfig.js

@@ -4,7 +4,7 @@
 import request from 'request.js'
 class apiconfig {
   constructor(config = {}) {
-        this.baseurl= 'http://120.27.95.106:9999/';
+         this.baseurl= 'http://120.27.95.106:9999/';
 		this.pathconfig={
 			checkUpdate: this.baseurl +'/checkVersion'
 		}

pageD/myRelease/buyGrain.vue

@@ -3,239 +3,394 @@
 		<view class="c-row b-b">
 			<text class="tit">名头</text>
 			<view class="con-list">
-				<input placeholder="请填写名头" name="input" @input="addressInput"></input>
+				<input placeholder="请填写名头" name="input" v-model="deptList.procurementPlanNo"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">标题</text>
 			<view class="con-list">
-				<input placeholder="请填写标题,2-16个子" name="input" @input="addressInput"></input>
+				<input placeholder="请填写标题,2-16个字" name="input" v-model="deptList.title"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">货名</text>
 			<view class="con-list">
-				<input placeholder="请填写货名" name="input" @input="addressInput"></input>
+				<input placeholder="请填写货名" name="input" v-model="deptList.goodsName"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">采购量（吨）</text>
 			<view class="con-list">
-				<input placeholder="请填写出售重量" name="input" @input="addressInput"></input>
+				<input placeholder="请填写采购重量" name="input" v-model="deptList.plannedPurchaseVolume"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">最小成交量（吨）</text>
 			<view class="con-list">
-				<input placeholder="请填写最小成交量" name="input" @input="addressInput"></input>
+				<input placeholder="请填写最小成交量" name="input" v-model="deptList.minimumVolume"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">类型</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="picker">
+			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list"
+				>
+				<view class="picker" v-model="deptList.procurementPlanType">
 					{{typesIndex>-1?typesType[typesIndex]:'请选择类型'}}
 				</view>
 			</picker>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">价格类型</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
 				<view class="con-list">
-					<input placeholder="请填写价格类型" name="input" @input="addressInput"></input>
+					<!-- <input placeholder="请填写价格类型" name="input"  v-model="deptList.priceType"></input> -->
+					{{deptList.priceType}}
 				</view>
-			</picker>
 		</view>
-		<view class="c-row b-b">
+		<view class="c-row b-b" v-if="this.typesIndex != 1">
 			<text class="tit">单价（元/吨）</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写单价（元/吨）" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+			<view class="con-list">
+				<input placeholder="请填写单价（元/吨）" name="input" v-model="deptList.unitPrice"></input>
+			</view>
+		</view>
+		<view class="c-row b-b" v-if="this.typesIndex == 1">
+			<text class="tit">基差（元/吨）</text>
+			<view class="con-list">
+				<input placeholder="请填写单价（元/吨）" name="input" v-model="deptList.basisPrice"></input>
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">收货地区</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写发货地区" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+			<view class="con-list">
+				<input placeholder="请填写收货地区" name="input" v-model="deptList.receiveArea"></input>
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">买方手机号</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写卖方手机号" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+			<view class="con-list">
+				<input placeholder="请填写卖方手机号" name="input" v-model="deptList.buyerPhone"></input>
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<button type="default">获取验证码</button>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写6位短信验证码" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+			<view class="con-list">
+				<input placeholder="请填写6位短信验证码" name="input" v-model="deptList.title1"></input>
+			</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">水分（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写水分占比" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+					<view class="con-list">
+						<input placeholder="请填写水分占比" name="input" v-model="deptList.waterContent"></input>
+					</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">容重（g/L）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写容重" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+					<view class="con-list">
+						<input placeholder="请填写容重" name="input" v-model="deptList.bulkDensity"></input>
+					</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">热损伤（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写热损伤占比" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+					<view class="con-list">
+						<input placeholder="请填写热损伤占比" name="input" v-model="deptList.jiaorenli"></input>
+					</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">杂质（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写杂质占比" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+					<view class="con-list">
+						<input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input>
+					</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">霉变粒（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写霉变粒占比" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+					<view class="con-list">
+						<input placeholder="请填写霉变粒占比" name="input" v-model="deptList.mildewGrain"></input>
+					</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">不完整粒（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写不完整粒占比" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+					<view class="con-list">
+						<input placeholder="请填写不完整粒占比" name="input" v-model="deptList.imperfectGrain"></input>
+					</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">蛋白（%）<= </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
-				<view class="con-list">
-					<input placeholder="请填写蛋白占比" name="input" @input="addressInput"></input>
-				</view>
-			</picker>
+					<view class="con-list">
+						<input placeholder="请填写蛋白占比" name="input" v-model="deptList.protein"></input>
+					</view>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">粒型 </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+			<picker @change="liChange" :value="liIndex" :range="liType" class="con-list" v-model="deptList.grain">
 				<view class="con-list">
-					<input placeholder="请填写粒型" name="input" @input="addressInput"></input>
+					{{liIndex>-1?liType[liIndex]:'请选择粒型'}}
 				</view>
 			</picker>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">品级 </text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+			<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
 				<view class="con-list">
-					<input placeholder="请填写品级" name="input" @input="addressInput"></input>
+					{{pinIndex>-1?pinType[pinIndex]:'请选择品级'}}
 				</view>
 			</picker>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">产出年份</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+			<picker @change="nianChange" :value="nianIndex" :range="nianType" class="con-list">
 				<view class="con-list">
-					<input placeholder="请填写产出年份" name="input" @input="addressInput"></input>
+					{{nianIndex>-1?nianType[nianIndex]:'请选择产出年份'}}
 				</view>
 			</picker>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">包装方式</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+			<picker @change="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 				<view class="con-list">
-					<input placeholder="请填写包装方式" name="input" @input="addressInput"></input>
+					{{baoIndex>-1?baoType[baoIndex]:'请选择包装方式'}}
 				</view>
 			</picker>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">袋装备注</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
 				<view class="con-list">
-					<input placeholder="请填写包装方式" name="input" @input="addressInput"></input>
+					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
-			</picker>
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">运费承担方</text>
-			<picker @change="typeChange" :value="typesIndex" :range="typesType" class="con-list">
+			<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
 				<view class="con-list">
-					<input placeholder="请填写包装方式" name="input" @input="addressInput"></input>
+					{{chengIndex>-1?chengType[chengIndex]:'请选择运费承担方'}}
 				</view>
 			</picker>
 		</view>
-		
-		<button type="default">发布</button>
+
+		<button @click="commit()">发布</button>
 	</view>
 </template>
 
 <script>
+	import {
+	    mapState 
+	} from 'vuex';
 	export default {
 		data() {
 			return {
-				types:'',
-				typesType:["现货","期货"],
-		
+				types: '',
+				typesType: ["现货", "期货"],
+				typesIndex: 0,
+				deptList: {
+					priceType: "定价采购",
+					procurementPlanType:"现货",
+					grain:"塔粮",
+					grade:"不限（默认）",
+					outputYear:"2020",
+					packingType:"不限（默认）",
+					freightPayer:"",
+				},
+				insertProcurementPlanInfo: {},
+				liIndex: 0,
+				liType: ['塔粮', '筛粮', '中粒', '大粒'],
+				pinIndex: 0,
+				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				nianIndex: 3,
+				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
+					'2011'
+				],
+				baoIndex: 0,
+				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				chengIndex: -1,
+				chengType: ['可议', '买方承担', '卖方承担']
 			}
 		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
 		methods: {
-			typeChange(e){
+			typeChange(e) {
 				this.typesIndex = e.detail.value
 				this.types = this.typesType[this.typesIndex];
+				this.deptList.procurementPlanType = this.typesType[this.typesIndex];
+				if (this.typesIndex == 0) {
+					this.deptList.priceType = '定价采购'
+				} else {
+					this.deptList.priceType = '期货盘面价+基差'
+				}
+
+			},
+			commit() {
+				this.insertProcurementPlanInfo = this.deptList
+				// if (!this.deptList.goodsName) {
+				// 	this.$api.msg('货名1不能为空')
+				// 	return
+				// }
+			// 	if (!this.deptList.title) {
+			// 		this.$api.msg('标题不能为空')
+			// 		return
+			// 	}
+				if (!this.deptList.goodsName) {
+					this.$api.msg('货名不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.plannedPurchaseVolume) {
+					this.$api.msg('采购量不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.minimumVolume) {
+					this.$api.msg('最小成交量不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.procurementPlanType) {
+					this.$api.msg('类型不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.priceType) {
+					this.$api.msg('价格类型不能为空')
+					return
+				}
+				if(this.insertProcurementPlanInfo.procurementPlanType == '现货'){
+					if (!this.insertProcurementPlanInfo.unitPrice) {
+						this.$api.msg('单价不能为空')
+						return
+					}
+				}else if(this.insertProcurementPlanInfo.procurementPlanType == '期货'){
+					if (!this.insertProcurementPlanInfo.basisPrice) {
+						this.$api.msg('基差（元/吨）不能为空')
+						return
+					}
+				}
+			
+				if (!this.insertProcurementPlanInfo.buyerPhone) {
+					this.$api.msg('买方手机号不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.waterContent) {
+					this.$api.msg('水分不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.bulkDensity) {
+					this.$api.msg('容重不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.jiaorenli) {
+					this.$api.msg('热损伤不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.impurity) {
+					this.$api.msg('杂质不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.mildewGrain) {
+					this.$api.msg('霉变粒不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.imperfectGrain) {
+					this.$api.msg('不完整粒不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.bulkDensity) {
+					this.$api.msg('蛋白不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.grain) {
+					this.$api.msg('粒型不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.grade) {
+					this.$api.msg('品级不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.outputYear) {
+					this.$api.msg('产出年份不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.packingType) {
+					this.$api.msg('包装方式不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.baggingNotes) {
+					this.$api.msg('装袋备注不能为空')
+					return
+				}
+				if (!this.insertProcurementPlanInfo.freightPayer) {
+					this.$api.msg('运费承担方不能为空')
+					return
+				}
+		         this.insertProcurementPlanInfo.commonId = this.userInfo.id
+				this.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', this
+						.insertProcurementPlanInfo).then(res => {
+						console.log("添加成功")
+						this.procurementPlanInfos = res.data.data
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+			},
+			liChange(e) {
+				this.liIndex = e.detail.value
+				this.litypes = this.liType[this.liIndex];
+				this.deptList.grain = this.liType[this.liIndex]
+			},
+			pinChange(e) {
+				this.pinIndex = e.detail.value
+				this.pintypes = this.pinType[this.pinIndex];
+				this.deptList.grade = this.pinType[this.pinIndex]
+			},
+			nianChange(e) {
+				this.nianIndex = e.detail.value
+				this.niantypes = this.nianType[this.nianIndex];
+				this.deptList.outputYear = this.baoType[this.baoIndex]
+			},
+
+			baoChange(e) {
+				this.baoIndex = e.detail.value
+				this.baotypes = this.baoType[this.baoIndex];
+				this.deptList.packingType = this.chengType[this.chengIndex];
+			},
+			chengChange(e) {
+				this.chengIndex = e.detail.value
+				this.chengtypes = this.chengType[this.chengIndex];
+					this.deptList.freightPayer = this.chengType[this.chengIndex];
 			}
 		}
 	}
 </script>
 
 <style>
-	.center{
+	.center {
 		padding: 10px 20px;
 	}
+
 	.c-row {
-	    display: -webkit-box;
-	    display: -webkit-flex;
-	    display: flex;
-	    -webkit-box-align: center;
-	    -webkit-align-items: center;
-	    align-items: center;
-	    padding: 20rpx 30rpx;
-	    position: relative;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
 	}
+
 	.con-list {
-	    -webkit-box-flex: 1;
-	    -webkit-flex: 1;
-	    flex: 1;
-	    display: -webkit-box;
-	    display: -webkit-flex;
-	    display: flex;
-	    -webkit-box-orient: vertical;
-	    -webkit-box-direction: normal;
-	    -webkit-flex-direction: column;
-	    flex-direction: column;
-	    color: #303133;
-	    line-height: 40rpx;
-	    text-align: right;
-	    padding-right: 20rpx;
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
 		font-size: 14px;
 	}
-
-
 </style>

pageD/warehousings/warehousings.vue

@@ -0,0 +1,273 @@
+<template>
+	<view class="container">
+		<view class="detail-desc">
+			<view class="d-header">
+				<text>发运信息</text>
+			</view>
+
+			<view class="c-list">
+				<view class="c-row b-b">
+					<text class="tit">合同编号</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.contractNo}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">货名</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.goodsName}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">发车净重(吨)</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.startWeight}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">车牌号</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.carNo}}</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="d-header">
+				<text>入库信息</text>
+			</view>
+			<view class="c-list">
+				<view class="cu-form-group align-start">
+					<view class="title">毛重(吨)</view>
+					<input placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">皮重(吨)</view>
+					<input placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"></input>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">净重（吨）</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.grossWeight - WarehouseInOutInfo.tare > 0 ? WarehouseInOutInfo.grossWeight - WarehouseInOutInfo.tare : 0}}</text>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">仓库</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.warehouseName}}</text>
+					</view>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">仓位号</view>
+					<view class="con-list">
+					<input placeholder="请输入仓位号" name="input" v-model="WarehouseInOutInfo.binNumber"></input>
+				</view>
+				</view>
+				
+				<view class="c-row b-b">
+					<text class="tit">入库类型 </text>
+					<picker @change="ruChange" :value="ruIndex" :range="ruType" class="con-list">
+						<view class="con-list">
+							{{ruIndex>-1?ruType[ruIndex]:'请选择入库类型'}}
+						</view>
+					</picker>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">扣款金额</view>
+					<input placeholder="请输入扣款金额" name="input" v-model="WarehouseInOutInfo.deductionAmount"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">扣款项</view>
+					<input placeholder="请输入扣款项" name="input" v-model="WarehouseInOutInfo.deductionItems"></input>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">入库日期</text>
+					<view class="con-list">
+						<text>{{WarehouseInOutInfo.inOutDate}}</text>
+					</view>
+				</view>
+				<view class="padding flex flex-direction">
+					<button class="cu-btn bg-red margin-tb-sm lg">上传磅单照片</button>
+				</view>
+			</view>
+
+			<view class="d-header">
+				<text>化验信息</text>
+			</view>
+			<view class="c-list">
+				<view class="cu-form-group align-start">
+					<view class="title">质检员</view>
+					<input placeholder="请输入质检员姓名" name="input" v-model="list.qualityInspector"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">蛋白(%)>=</view>
+					<input placeholder="请输入蛋白占比" name="input" v-model="list.protein"></input>
+				</view>
+				<view class="cu-form-group align-start">
+					<view class="title">水分(%)<= </view>
+							<input placeholder="请输入水分占比" name="input" v-model="list.waterContent"></input>
+					</view>
+					<view class="cu-form-group align-start">
+						<view class="title">容重(克/升)>= </view>
+						<input placeholder="请输入容重" name="input" v-model="list.bulkDensity"></input>
+					</view>
+					<view class="cu-form-group align-start">
+						<view class="title">热损伤(%)<= </view>
+								<input placeholder="请输入热损伤占比" name="input" v-model="list.jiaorenli"></input>
+						</view>
+						<view class="cu-form-group align-start">
+							<view class="title">杂质(%)<= </view>
+									<input placeholder="请输入杂质占比" name="input" v-model="list.impurity"></input>
+							</view>
+							<view class="cu-form-group align-start">
+								<view class="title">霉变粒(%)<= </view>
+										<input placeholder="请输入霉变粒占比" name="input" v-model="list.mildewGrain"></input>
+								</view>
+								<view class="cu-form-group align-start">
+									<view class="title">不完整粒(%)<= </view>
+											<input placeholder="请输入不完整粒占比" name="input"
+												v-model="list.imperfectGrain"></input>
+									</view>
+									<view class="c-row b-b">
+										<text class="tit">品级 </text>
+										<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
+											<view class="con-list">
+												{{pinIndex>-1?pinType[pinIndex]:'请选择品级'}}
+											</view>
+										</picker>
+									</view>
+								</view>
+
+							</view>
+							<!-- 底部操作菜单 -->
+							<view class="padding flex flex-direction">
+								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">暂存</button>
+								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				packingType: [],
+				packingIndex: "",
+				goods: {},
+				list: {},
+				WarehouseInOutInfo: {
+					warehouseInOutDetail: {}
+				},
+				pinIndex: 0,
+				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				ruIndex: 0,
+				ruType: ['采购入库', '移库入库', '暂存入库', '贸易服务入库', '退库'],
+			}
+		},
+		onLoad(option){
+			this.WarehouseInOutInfo.contractNo = option.contractNo
+			this.WarehouseInOutInfo.goodsName = option.goodsName
+			this.WarehouseInOutInfo.startNetWeight = option.startNetWeight
+			this.WarehouseInOutInfo.carNo = option.carNo+'('+ option.tranCarNo+ ')'
+			this.WarehouseInOutInfo.warehouseName = option.warehouseName
+		},
+		methods: {
+
+			commit() {
+				console.log(this.list)
+				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
+				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
+
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
+			},
+			ruChange(e){
+				this.ruIndex = e.detail.value
+				this.rutypes = this.ruType[this.ruIndex];
+			},
+			pinChange(e) {
+				this.pinIndex = e.detail.value
+				this.pintypes = this.pinType[this.pinIndex];
+			},
+		}
+
+	}
+</script>
+<style scoped>
+	.cu-form-group input {
+		text-align: right;
+	}
+
+	.cu-form-group textarea {
+		text-align: right;
+	}
+
+	.margin-bottom {
+		margin-bottom: 30px;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+	}
+
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+</style>

pages.json

@@ -403,6 +403,24 @@
 		    "style" :                                                                                    
 		    {
 		        "navigationBarTitleText": "买粮详情",
+				"enablePullDownRefresh": false
+		    }
+		}
+        ,{
+            "path" : "pageD/warehousings/warehousings",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "入库",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+		
+		,{
+		    "path" : "pageD/warehousings/warehousingDetails",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "入库详情",
 		        "enablePullDownRefresh": false
 		    }
 		    

pages/attestation/index.vue

@@ -44,6 +44,9 @@
 </template>
 
 <script>
+	import {
+	    mapState 
+	} from 'vuex';
 	export default {
 		name: "buy",
 		data() {
@@ -57,10 +60,34 @@
 				showTran: true,
 				scrollTop: 0,
 				TabCur: 0,
-				current: 1
+				current: 1,
+				identityAuthenticationInfo:{
+					pageSize:10,
+					currentPage:1,
+				},
 			};
 		},
+		onLoad(){
+			this.getList()
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo'])
+		},
 		methods: {
+			getList(){
+				this.identityAuthenticationInfo.commonId = this.userInfo.id
+			this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', this.identityAuthenticationInfo).then(res => {
+					console.log("添加成功")
+					this.procurementPlanInfos = res.data.data
+				})
+				.catch(res => {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none',
+						duration: 2000
+					})
+				});
+				},
 			adddriver(index) {
 				if (index == 1) {
 					uni.navigateTo({

pages/release/release.vue

@@ -1,30 +1,27 @@
 <template>
 	<view class="center">
 		<view class="introduce-section">
-			<view class="informations" @click="details(item)" v-for="(item , index) in procurementPlanInfos" :Key="index">
+			<view class="informations"  v-for="(item , index) in procurementPlanInfos" :Key="index">
+				<view @click="details(item)">
 				<view class="labels">{{item.goodsName}}</view>
 				<view class="labels">{{item.weight}}</view>
 				<view class="labels">{{item.unitPrice}}</view>
 				<view class="title">{{item.receivePrivate}}{{item.receiveCity}}{{item.receiveArea}}</view>
-			    <view class='cu-tag radius line-pink'>删除</view>
+				</view>
+				<view class='cu-tag radius line-pink'>编辑</view>
+				<view class='cu-tag radius line-pink' @click="switch1(item)">显示/隐藏</view>
+			    <view class='cu-tag radius line-pink' @click="deleteRelease(item)">删除</view>
 				<view class='cu-tag radius line-pink put'>{{item.status}}</view>
 			</view>
 		</view>
-		<!-- <button type="default" class="fabuBut" @change="releaseChange">发布 -->
-		<view class="c-row b-b">
-			<text class="tit" >发布</text>
-			<!-- <view class="con-list"> -->
-			<picker @change="releaseChange" :value="releaseIndex" :range="releaseType" class="con-list">
-				<view class="picker " >
-					{{releaseIndex>-1?releaseType[releaseIndex]:'请选择发布内容'}}
-				</view>
-			</picker>
-			<!-- </view> -->
-		</view>
-		<!-- </button> -->
 		<view class="page-bottom">
 			<view class="action-btn-group">
-				<button  type="primary" class=" action-btn no-border add-cart-btn" @click="tradeNow">发布</button>
+				<picker style='display:inline-block;' @change="releaseChange" :value="releases" :range="releaseType">
+					<button  type="primary" class=" action-btn no-border add-cart-btn" >发布</button>
+					<view class="picker">
+						{{releases>-1?releaseType[releases]:''}}
+					</view>
+				</picker>
 			</view>
 		</view>
 	</view>
@@ -36,6 +33,8 @@
 			return {
 				releaseType:["我要卖粮","我要买粮"],
 				release:'',
+				releases:'',
+				receivePrivate:'',
 				procurementPlanInfo:{
 					pageSize:10,
 					currentPage:1
@@ -44,26 +43,87 @@
 				pageSize:10,
 				currentPage:1,
 				procurementPlanInfos:[],
-
-
 			}
 		},
 		onLoad(){
 			this.getList()
 		},
 		methods: {
-			releaseChange(e){
-					this.releaseIndex = e.detail.value
-					this.release = this.releaseType[this.releaseIndex];
-						if(this.release == "我要卖粮"){
-							uni.navigateTo({
-								url: `/pageD/myRelease/sellGrain`
+			switch1(item){
+				if (!this.hasLogin) {
+					uni.showModal({
+						// title: '登录提示',
+						content: '隐藏后该信息不再展示给其他用户，是否确定隐藏？',
+						showCancel: true,
+						confirmText: '确定',
+						success: (e) => {
+							this.$api.doRequest('post','/procurementPlanInfo/api/editStatus',{id:item.id,flag:0}).then(res => {		
+								this.procurementPlanInfos = res.data.data.records
+								if (res.errmsg == "Success") {
+									this.$api.msg('隐藏成功！')
+									return
+								}
+								
 							})
-						}else if(this.release == "我要买粮"){
-							uni.navigateTo({
-								url: `/pageD/myRelease/buyGrain`
+							.catch(res => {
+								uni.showToast({
+									title: res.errmsg,
+									icon:'none',
+									duration: 2000
+								})
+							});
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}
+			},
+			
+			
+			deleteRelease(item){
+				if (!this.hasLogin) {
+					uni.showModal({
+						// title: '登录提示',
+						content: '确定删除该信息？',
+						showCancel: true,
+						confirmText: '确定',
+						success: (e) => {
+							this.$api.doRequest('post','/procurementPlanInfo/api/deleteProcurementPlan',{id:item.id}).then(res => {
+								this.procurementPlanInfos = res.data.data.records
+								if (res.errmsg == "Success") {
+									this.$api.msg('删除成功！')
+									return
+								}
+								
 							})
-						}
+							.catch(res => {
+								uni.showToast({
+									title: res.errmsg,
+									icon:'none',
+									duration: 2000
+								})
+							});
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}	
+			},
+			releaseChange(e){
+				this.receivePrivate = e.detail.value
+				this.release = this.releaseType[this.receivePrivate];
+				this.pageSize = 1
+
+				if(this.release == "我要卖粮"){
+					uni.navigateTo({
+						url: `/pageD/myRelease/sellGrain`
+					})
+				}else if(this.release == "我要买粮"){
+					uni.navigateTo({
+						url: `/pageD/myRelease/buyGrain`
+					})
+				}
+			
 			},
 			details(item){
 				uni.navigateTo({

pages/task/my_task.vue

@@ -8,17 +8,19 @@
 
 		</view>
 		<view style='background:#fff;padding:0 145px;display:table-footer-group ;'>
-			<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>未完成</view>
-			<view @click='tabcarchange(3)' class='line' :class='TabCur==3?"active":""'>已完成</view>
+			<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
+			<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
 		</view>
 		<view class="introduce-section">
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="price-box">
 					<view class='tag tag-bule radius line-pink'>入库任务</view>
-					<view class="title">辽H12345（C001）{{item.car_no}}{{item.tran_car_no}}</view>
+					<view class="title">{{item.carNo}}({{item.tranCarNo}})</view>
+					<view  class="title-tip" v-if="item.statusFlag==3">已完成</view>
+					<view  class="title-tip" v-if="item.statusFlag==1">未完成</view>
 				</view>
-				<view class="titles ">CG12345678{{item.contract_no}}</view>
-				<view class="titles titleds_aa">2021-06-30{{item.predict_date}}</view>
+				<view class="titles ">{{item.contractNo}}</view>
+				<view class="titles titleds_aa">{{item.inOutDate}}</view>
 			</view>
 			<view v-show="isLoadMore">
 				<uni-load-more :status="loadStatus"></uni-load-more>
@@ -41,7 +43,6 @@
 				showTran: true,
 				scrollTop: 0,
 				statusFlag: 1,
-				TabCur: 0,
 				current: 1,
 				warehouseInOutInfo: {
 					pageSize: 10,
@@ -62,10 +63,12 @@
 				var limit = that.limit
 				console.log(2112454)
 				this.warehouseInOutInfo.statusFlag = this.statusFlag
+				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfo', this.warehouseInOutInfo).then(res => {
-					console.log(12545645)
+					console.log(res, "对象")
 					if (res.data.code == 200) {
-						let data = res.data.data
+						let data = res.data.data.records
+						console.log(data, "13246")
 						//采购信息
 						if (data.length > 0) {
 							that.taskInfo = that.taskInfo.concat(data)
@@ -78,6 +81,7 @@
 							that.loadStatus = 'nomore'
 						}
 						uni.hideLoading()
+						this.taskInfo = res.data.data.records
 					} else {
 						uni.showToast({
 							title: res.data.message,
@@ -98,6 +102,20 @@
 				this.pageSize = 1
 				this.getIndexBuyData()
 			},
+			navToDetailPage(item) {
+				console.log(item)
+				if(item.statusFlag == 3){
+				uni.navigateTo({
+					url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
+				})
+				}else{
+					uni.navigateTo({
+						url: `/pageD/warehousings/warehousings?id=${item.id}&contractNo=${item.contractNo}
+						&goodsName=${item.goodsName}&startNetWeight=${item.startNetWeight}
+						&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}`
+					})
+				}
+			}
 
 		}
 	}
@@ -150,25 +168,15 @@
 	}
 
 	.title-tip {
-		color: #E63113;
-		text-align: right;
+		color: #00aa00;
+		text-align: center;
+		font-size: 7px;
 	}
 
 	.tag-bule {
-		background: #CDE7FB;
-		color: #0B4572;
-	}
-
-	.tag-green {
-		background: #C6F7BC;
-		color: #065112;
-	}
-
-	.tag-yellow {
-		background: #FBF4B1;
-		color: #5C4409;
+		background: #a8e4a5;
+		color: #000000;
 	}
-
 	.tag {
 		padding: 5px;
 		display: inline-flex;
@@ -231,34 +239,6 @@
 			line-height: 1;
 			padding-right: 10upx;
 		}
-
-		.goods1 {
-			font-size: $font-sm;
-			color: $font-color-base;
-		}
-
-		.goods2 {
-			font-size: $font-sm;
-			color: $font-color-base;
-			padding-left: 10%;
-		}
-
-		.goods3 {
-			font-size: $font-sm;
-			color: $font-color-base;
-			padding-left: 10%;
-		}
-
-		.goods4 {
-			font-size: $font-sm;
-			color: #ff5500;
-		}
-
-		.goods5 {
-			font-size: $font-sm;
-			color: $font-color-base;
-		}
-
 		.view-item {
 			width: 100%;
 			// line-height: 40upx;
@@ -447,6 +427,7 @@
 
 		.title-tip {
 			flex: 1;
+			-webkit-tap-highlight-color:transparent;
 		}
 
 		.price-box {
@@ -459,7 +440,7 @@
 		}
 
 		.price {
-			font-size: $font-lg + 2upx;
+			font-size: 15px;
 		}
 
 		.m-price {

pages/user/user.vue

@@ -202,7 +202,7 @@
 							name: '我的发布',
 							icon:'cuIcon-news',
 							tips: 0,
-							url:'pages/release/release',
+							url:`pages/release/release`,
 							show:true
 						},
 						{