前端 小程序 sdy

pageB/contract/contract.vue

@@ -1,10 +1,10 @@
 <template>
-	<view class="center">	
+	<view class="center">
 		<view v-for="(item , index) in lists" :Key="index" class="region">
 			<view>
 				<view class="c-row ">
 					<text class="tit" v-if="item.orderType == '采购'">{{item.orderType}}</text>
-						<text class="tit2" v-if="item.orderType == '销售'">{{item.orderType}}</text>
+					<text class="tit2" v-if="item.orderType == '销售'">{{item.orderType}}</text>
 					<view class="enterprise">
 						编号{{item.contractNo}}({{item.procurementPlanType}})
 					</view>
@@ -14,12 +14,12 @@
 					<text class="status status1" v-if="item.status == '审核中'">{{item.status}}</text>
 					<text class="status status1" v-if="item.status == '执行中'">{{item.status}}</text> -->
 					<text class="status status1">{{item.status}}</text>
-					
+
 				</view>
 			</view>
 			<view>
 				<view class="c-row ">
-					<text class="tit1" v-if="item.orderType == '采购'" >买方</text>
+					<text class="tit1" v-if="item.orderType == '采购'">买方</text>
 					<text class="tit1" v-if="item.orderType == '销售'">卖方</text>
 					<view class="enterprise">
 						{{item.contracter}}
@@ -32,8 +32,9 @@
 				<view class="title">基差:￥<text>{{item.basis}}</text></view>
 			</view>
 			<view class="c-row flex annius">
-				<text class="anniu" @click="commit"> 附件</text>
-				<text class="anniu" @click="someprice(item)" v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
+				<text class="anniu" @click="commit(item)"> 附件</text>
+				<text class="anniu" @click="someprice(item)"
+					v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
 				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'"> 发货</text>
 				<text class="anniu1" @click="commit2(item)" v-if="item.orderType == '销售'"> 收货</text>
 			</view>
@@ -59,7 +60,7 @@
 					<view class="timeslot">15：20 ~ 20：00</view>
 					<view class="timeslot">23：00 ~ 08：00</view>
 				</view>
-				<view  class="cancel" @click='shadestatus=false'>知道了</view>
+				<view class="cancel" @click='shadestatus=false'>知道了</view>
 			</view>
 		</view>
 		<view class="padding flex flex-direction">
@@ -90,7 +91,7 @@
 					pageSize: 10,
 					currentPage: 1
 				},
-				price:"",
+				price: "",
 				tran: {
 					total: 0,
 					price: 0,
@@ -221,6 +222,11 @@
 					this.shadestatus = true
 				}
 			},
+			commit(item) {
+				uni.navigateTo({
+					url: `/pageB/contract/enclosures?id=${item.id}`
+				})
+			},
 			commit1(item) {
 				uni.navigateTo({
 					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
@@ -233,7 +239,7 @@
 			},
 			getList() {
 				this.goods.commonId = this.userInfo.id
-                 // this.goods.pcFlag = 0
+				// this.goods.pcFlag = 0
 				this.$api.doRequest('get', '/purchaseOrder/selectPurchaseOrderApp', this.goods).then(res => {
 						if (res.data.code == 200) {
 							this.lists = res.data.data.records
@@ -717,7 +723,7 @@
 		width: 100%;
 		background: rgba(0, 0, 0, 0.5);
 		height: 100%;
-		
+
 		z-index: 999999;
 	}
 
@@ -799,6 +805,7 @@
 		padding: 2px 3px;
 		border-radius: 5px;
 	}
+
 	.tit2 {
 		width: 34px;
 		height: 24px;
@@ -813,12 +820,14 @@
 		font-weight: 600;
 		margin-left: 20px;
 	}
-	.annius{
+
+	.annius {
 		width: 70%;
-	    margin-left: 110px;
-		justify-content:flex-end;
+		margin-left: 110px;
+		justify-content: flex-end;
 	}
-	.anniu{
+
+	.anniu {
 		width: 50px;
 		font-size: 16px;
 		border: 1px solid #CDCDCD;
@@ -828,7 +837,8 @@
 		text-align: center;
 		line-height: 30px;
 	}
-	.anniu1{
+
+	.anniu1 {
 		width: 50px;
 		font-size: 16px;
 		border: 1px solid #22C572;
@@ -839,68 +849,79 @@
 		text-align: center;
 		line-height: 30px;
 	}
-	.titles{
+
+	.titles {
 		color: #333333;
 		font-size: 16px;
 		font-weight: 600;
 		margin-top: -16px;
 		margin-bottom: 10px;
-		
+
 	}
-	.timeslot{
+
+	.timeslot {
 		font-size: 14px;
 		color: #333333;
 		height: 20px;
 	}
-	.cancel{
+
+	.cancel {
 		text-align: center;
 		width: 100%;
-		color:#22C572;
+		color: #22C572;
 		border-top: 1px solid #EEEEEE;
 		margin-bottom: 6px;
 		font-size: 18px;
 		line-height: 40px;
-		display:inline-block;
-		}
-		.pointprice{
-			border-bottom: 1px solid #EEEEEE;
-			text-align: left;
-			padding-left: 10px;
-			width: 70%;
-			margin: 0 auto;
-		}
-		.titles1{
-			color: #333333;
-			font-size: 16px;
-			font-weight: 600;
-			margin-top: 10px;
-		}
-		.btns{
-			width: 50%;
-			line-height: 50px;
-			font-size: 18px;
-			border-top: 1px solid #EEEEEE;
-			margin-top: -20px;
-		}
-		.btn1{
-			color: #AFB3BF;
-			border-right: 1px solid #EEEEEE;
-		}
-		.btn2{
-			color: #22C572;
-		}
-		.status{
-			right: 20px;
-			position: absolute;
-		}
-		.status1{
-			color: #FE6430;
-		}
-		.status2{
-			color: #22C572;
-		}
-		.status3{
-			color: #AFB3BF;
-		}
-	
+		display: inline-block;
+	}
+
+	.pointprice {
+		border-bottom: 1px solid #EEEEEE;
+		text-align: left;
+		padding-left: 10px;
+		width: 70%;
+		margin: 0 auto;
+	}
+
+	.titles1 {
+		color: #333333;
+		font-size: 16px;
+		font-weight: 600;
+		margin-top: 10px;
+	}
+
+	.btns {
+		width: 50%;
+		line-height: 50px;
+		font-size: 18px;
+		border-top: 1px solid #EEEEEE;
+		margin-top: -20px;
+	}
+
+	.btn1 {
+		color: #AFB3BF;
+		border-right: 1px solid #EEEEEE;
+	}
+
+	.btn2 {
+		color: #22C572;
+	}
+
+	.status {
+		right: 20px;
+		position: absolute;
+	}
+
+	.status1 {
+		color: #FE6430;
+	}
+
+	.status2 {
+		color: #22C572;
+	}
+
+	.status3 {
+		color: #AFB3BF;
+	}
 </style>

pageB/contract/enclosures.vue

@@ -0,0 +1,13 @@
+<template>
+	<view class="center">
+		<view class="">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pageD/identity/companyIdentityThree.vue

@@ -335,72 +335,88 @@
 						verifyCode: this.verifyCode
 					}).then(res => {
 						if (res.data.code == 200) {
-							this.identityAuthenticationInfo.commonId = this.userInfo.id
-							this.identityAuthenticationInfo.payeeAddressUrl = this.bankid.toString()
-							this.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-							this.$api.doRequest('post',
-									'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this
-									.identityAuthenticationInfo)
-								.then(res => {
-									if (res.data.code == '11018') {
-										uni.showModal({
-											title: '提示',
-											content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
-											success: function(res) {
-												if (res.confirm) {
-													that.identityAuthenticationInfo.cover = 1
-													that.$api.doRequest('post',
-														'/identityAuthenticationInfo/api/editIdentityAuthenticationInfo',
-														that.identityAuthenticationInfo).then(
-														res => {
-															uni.showToast({
-																title: '提交成功',
-																icon: 'none',
-																duration: 2000
-															})
-															uni.navigateTo({
-																url: `/pages/attestation/indexTwo`,
-															})
-														}).catch(res => {
-														uni.showToast({
-															title: res.data.message,
-															icon: 'none',
-															duration: 2000
-														})
+							that.identityAuthenticationInfo.commonId = that.userInfo.id
+							that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
+							that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
+							
+							
+							uni.showModal({
+								content: "粮商身份信息审核通过后不可修改，是否确定提交？",
+								showCancel: true,
+								confirmText: '确定',
+								success: function(res) {
+									if (res.confirm) {
+										that.$api.doRequest('post',
+												'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', that
+												.identityAuthenticationInfo)
+											.then(res => {
+												if (res.data.code == '11018') {
+													uni.showModal({
+														title: '提示',
+														content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
+														success: function(res) {
+															if (res.confirm) {
+																that.identityAuthenticationInfo.cover = 1
+																that.$api.doRequest('post',
+																	'/identityAuthenticationInfo/api/editIdentityAuthenticationInfo',
+																	that.identityAuthenticationInfo).then(
+																	res => {
+																		uni.showToast({
+																			title: '提交成功',
+																			icon: 'none',
+																			duration: 2000
+																		})
+																		uni.navigateTo({
+																			url: `/pages/attestation/indexTwo`,
+																		})
+																	}).catch(res => {
+																	uni.showToast({
+																		title: res.data.message,
+																		icon: 'none',
+																		duration: 2000
+																	})
+																})
+															} else if (res.cancel) {
+																uni.showToast({
+																	title: '提交失败',
+																	icon: 'none',
+																	duration: 2000
+																})
+															}
+														}
+													});
+												} else if (res.data.code == 200) {
+													uni.showToast({
+														title: '提交成功',
+														icon: 'none',
+														duration: 2000
+													})
+													uni.navigateTo({
+														url: `/pages/attestation/indexTwo`,
 													})
-												} else if (res.cancel) {
+												} else {
 													uni.showToast({
-														title: '提交失败',
+														title: res.data.message,
 														icon: 'none',
 														duration: 2000
 													})
 												}
-											}
-										});
-									} else if (res.data.code == 200) {
-										uni.showToast({
-											title: '提交成功',
-											icon: 'none',
-											duration: 2000
-										})
-										uni.navigateTo({
-											url: `/pages/attestation/indexTwo`,
-										})
-									} else {
-										uni.showToast({
-											title: res.data.message,
-											icon: 'none',
-											duration: 2000
-										})
+										
+											}).catch(res => {
+												uni.showToast({
+													title: res.data.message,
+													icon: 'none',
+													duration: 2000
+												})
+											})
+									} else if (res.cancel) {
+										// console.log('用户点击取消');
 									}
-
-								}).catch(res => {
-									uni.showToast({
-										title: res.data.message,
-										icon: 'none',
-										duration: 2000
-									})
-								})
+								},
+							})
+							
+							
+							
 
 						} else {
 							that.verification = false

pageD/identity/driverIdentityThree.vue

@@ -74,22 +74,18 @@
 			commit() {
 				var that = this
 				if (this.addressUrl[0] == "" || this.addressUrl[0] == null) {
-					console.log(this.addressUrl)
 					this.$api.msg('请上传行驶证！')
 					return
 				}
 				if (this.addressUrl[1] == "" || this.addressUrl[1] == null) {
-					console.log(this.addressUrl)
 					this.$api.msg('请上传驾驶证！')
 					return
 				}
 				if (this.addressUrl[2] == "" || this.addressUrl[2] == null) {
-					console.log(this.addressUrl)
 					this.$api.msg('请上传道路运营证！')
 					return
 				}
 				if (this.addressUrl[3] == "" || this.addressUrl[3] == null) {
-					console.log(this.addressUrl)
 					this.$api.msg('请上传从业资格证')
 					return
 				}
@@ -97,52 +93,67 @@
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.pcFlag = 0
 				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				this.$api.doRequest('post', '/driverViewInfo/api/addInfo', this.DriverViewInfo).then(res => {
-					if(res.data.code=='ERROR001'){
-						uni.showModal({
-							title: '提示',
-							content: '该手机号已认证过司机，再次认证将覆盖之前的认证信息，是否确定认证？',
-							success: function (res) {
-								if (res.confirm) {
-									that.DriverViewInfo.cover=1
-										that.$api.doRequest('post', '/driverViewInfo/api/editInfo', that.DriverViewInfo).then(res => {
-										}).catch(res => {
-											uni.showToast({
-												title: '提交成功',
-												icon: 'none',
-												duration: 2000
-											})
-											uni.navigateTo({
-												url: `/pages/attestation/indexThree` 
-											})
-										})
-							        } else if (res.cancel) {
-							          uni.showToast({
-							          	title: '提交失败',
-							          	icon: 'none',
-							          	duration: 2000
-							          })
-							        }
-							    }
-							});
-					}else if(res.data.code==200){
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none',
-							duration: 2000
-						})
-						uni.navigateTo({
-							url: `/pages/attestation/indexThree` 
-						})
-					}
-					
-				}).catch(res => {
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
+				var that = this
+				uni.showModal({
+					content: "确认提交司机信息？",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/driverViewInfo/api/addInfo', that.DriverViewInfo).then(res => {
+								if(res.data.code=='ERROR001'){
+									uni.showModal({
+										title: '提示',
+										content: '该手机号已认证过司机，再次认证将覆盖之前的认证信息，是否确定认证？',
+										success: function (res) {
+											if (res.confirm) {
+												that.DriverViewInfo.cover=1
+													that.$api.doRequest('post', '/driverViewInfo/api/editInfo', that.DriverViewInfo).then(res => {
+													}).catch(res => {
+														uni.showToast({
+															title: '提交成功',
+															icon: 'none',
+															duration: 2000
+														})
+														uni.navigateTo({
+															url: `/pages/attestation/indexThree` 
+														})
+													})
+										        } else if (res.cancel) {
+										          uni.showToast({
+										          	title: '提交失败',
+										          	icon: 'none',
+										          	duration: 2000
+										          })
+										        }
+										    }
+										});
+								}else if(res.data.code==200){
+									uni.showToast({
+										title: '提交成功',
+										icon: 'none',
+										duration: 2000
+									})
+									uni.navigateTo({
+										url: `/pages/attestation/indexThree` 
+									})
+								}
+								
+							}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+							})
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					},
 				})
+				
+				
+				
 			},
 			travel(){
 				var that = this

pageD/identity/driverIdentityTwo.vue

@@ -56,7 +56,7 @@
 				<text class="tit">出厂年份</text>
 				<view class="con-list">
 					<view @click='yearchange'>{{year[index] == null?"请选择出厂年份":year[index]}}</view>
-					<u-picker :params='params' @confirm='yearpicker($event,index)' v-model="show" mode="time">
+					<u-picker :params='params' @confirm='yearpicker($event,index)' v-model="show" mode="time" :start-year="startData" :end-year="endData">
 					</u-picker>
 				</view>
 			</view>
@@ -204,14 +204,23 @@
 				subBranch:true,
 				params: {
 					year: true,
-					month: false,
-					day: false,
 				},
 				year: [],
+				default_time:'',
 				carModelType: [],
 				carLengtharr: [],
 			}
 		},
+		computed:{
+			startData(){
+				var data = new Date()
+				return data.getFullYear() - 30
+			},
+			endData(){
+				var data = new Date()
+				return data.getFullYear()
+			}
+		},
 		onLoad(options) {
 			this.DriverViewInfo = JSON.parse(options.DriverViewInfo)
 			this.driverPayeeInfoList[0].payeeName = this.DriverViewInfo.driverName

pageD/myRelease/buyDetails.vue

@@ -228,11 +228,11 @@
 	    -webkit-box-direction: normal;
 	    -webkit-flex-direction: column;
 	    flex-direction: column;
-	    color: #303133;
+	    color: #AFB3BF;
 	    line-height: 40rpx;
 	    text-align: right;
 	    padding-right: 20rpx;
-		font-size: 14px;
+	    font-size: 14px;
 	}
 	.title{
 		font-size: 18px;

pageD/myRelease/buyEdit.vue

@@ -657,7 +657,7 @@
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
 		flex-direction: column;
-		color: #303133;
+		color: #AFB3BF;
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;

pageD/myRelease/buyGrain.vue

@@ -94,49 +94,49 @@
 					style="font-size: 14px; ">完善更多信息<text
 						style="font-size: 10px; color: #AFB3BF;">（选填，可由客服人员代为完善）</text></text>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">水分（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写水分占比" name="input" v-model="deptList.waterContent"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">容重（g/L）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写容重" name="input" v-model="deptList.bulkDensity"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">热损伤（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写热损伤占比" name="input" v-model="deptList.jiaorenli"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">杂质（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">霉变粒（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写霉变粒占比" name="input" v-model="deptList.mildewGrain"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">不完整粒（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写不完整粒占比" name="input" v-model="deptList.imperfectGrain"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">蛋白（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写蛋白占比" name="input" v-model="deptList.protein"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">粒型 </text>
 				<picker @change="liChange" :value="liIndex" :range="liType" class="con-list" v-model="deptList.grain">
 					<view class="con-list">
@@ -144,7 +144,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">品级 </text>
 				<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
 					<view class="con-list">
@@ -152,14 +152,14 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">产地</text>
 				<view class="con-list">
 					<view @click='regionchange1'>{{region1}}</view>
 					<u-picker :params='params1' @confirm='regionpicker1' mode="region" v-model="show1"></u-picker>
 				</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">产出年份</text>
 				<picker @change="nianChange" :value="nianIndex" :range="nianType" class="con-list">
 					<view class="con-list">
@@ -167,7 +167,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">包装方式</text>
 				<picker @change="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 					<view class="con-list">
@@ -175,13 +175,13 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='checked&&baoIndex==2||checked&&baoIndex==3' class="c-row b-b">
+			<view v-if='!checked&&baoIndex==2||checked&&baoIndex==3' class="c-row b-b">
 				<text class="tit">袋装备注</text>
 				<view class="con-list">
 					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">运费承担方</text>
 				<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
 					<view class="con-list">
@@ -229,11 +229,11 @@
 				},
 				checked: true,
 				insertProcurementPlanInfo: {},
-				liIndex: 0,
+				liIndex: -1,
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
-				pinIndex: 0,
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
-				nianIndex: 3,
+				pinIndex: -1,
+				pinType: ['一等品', '二等品', '三等品', '等外'],
+				nianIndex: -1,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'
 				],
@@ -241,8 +241,9 @@
 				show1: false,
 				region: '请选择收货地区',
 				region1: '请选择产地',
-				baoIndex: 0,
-				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				region2:"",
+				baoIndex: -1,
+				baoType: ['散装', '大袋', '小袋'],
 				chengIndex: -1,
 				chengType: ['可议', '买方承担', '卖方承担'],
 				codestatus: false,
@@ -353,6 +354,7 @@
 				this.deptList.receiveCity = e.city.label
 				this.deptList.receiveArea = e.area.label
 				this.region = e.province.label + '-' + e.city.label + '-' + e.area.label
+				this.region2 = e.province.label + '-' + e.city.label + '-' + e.area.label
 			},
 			regionchange() {
 				this.show = true
@@ -469,6 +471,11 @@
 						}
 					}
 				}
+				
+				if (!this.region2) {
+					this.$api.msg('收货地区不能为空')
+					return
+				}
 				if (!this.deptList.buyerPhone) {
 					this.$api.msg('买方手机号不能为空')
 					return
@@ -554,10 +561,6 @@
 						}
 					}
 				}
-				// if(this.amendprice() == false){
-				// 	this.$api.msg('验证码输入有误！')
-				// 	return
-				// }
 				this.insertProcurementPlanInfo = this.deptList
 				this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
 				this.insertProcurementPlanInfo.commonId = this.userInfo.id
@@ -635,9 +638,9 @@
 				this.deptList.grade = this.pinType[this.pinIndex]
 			},
 			nianChange(e) {
-				this.nianIndex = e.detail.value
+				this.nianType = e.detail.value
 				this.niantypes = this.nianType[this.nianIndex];
-				this.deptList.outputYear = this.baoType[this.baoIndex]
+				this.deptList.outputYear = this.nianType[this.nianType]
 			},
 
 			baoChange(e) {

pageD/myRelease/sellGrain.vue

@@ -104,49 +104,49 @@
 					style="font-size: 14px; ">完善更多信息<text
 						style="font-size: 10px; color: #AFB3BF;">（选填，可由客服人员代为完善）</text></text>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">水分（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写水分占比" name="input" v-model="deptList.waterContent"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">容重（g/L）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写容重" name="input" v-model="deptList.bulkDensity"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">热损伤（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写热损伤占比" name="input" v-model="deptList.jiaorenli"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">杂质（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">霉变粒（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写霉变粒占比" name="input" v-model="deptList.mildewGrain"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">不完整粒（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写不完整粒占比" name="input" v-model="deptList.imperfectGrain"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">蛋白（%）<= </text>
 						<view class="con-list">
 							<input placeholder="请填写蛋白占比" name="input" v-model="deptList.protein"></input>
 						</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">粒型 </text>
 				<picker @change="liChange" :value="liIndex" :range="liType" class="con-list" v-model="deptList.grain">
 					<view class="con-list">
@@ -154,7 +154,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">品级 </text>
 				<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
 					<view class="con-list">
@@ -163,7 +163,7 @@
 				</picker>
 			</view>
 
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">产出年份</text>
 				<picker @change="nianChange" :value="nianIndex" :range="nianType" class="con-list">
 					<view class="con-list">
@@ -171,7 +171,7 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row b-b">
 				<text class="tit">包装方式</text>
 				<picker @change="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 					<view class="con-list">
@@ -179,13 +179,13 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='checked&&baoIndex==2||checked&&baoIndex==3' class="c-row b-b">
+			<view v-if='!checked&&baoIndex==2||checked&&baoIndex==3' class="c-row b-b">
 				<text class="tit">袋装备注</text>
 				<view class="con-list">
 					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
 			</view>
-			<view v-if='checked' class="c-row b-b">
+			<view v-if='!checked' class="c-row ">
 				<text class="tit">运费承担方</text>
 				<picker @change="chengChange" :value="chengIndex" :range="chengType" class="con-list">
 					<view class="con-list">
@@ -235,20 +235,22 @@
 				},
 				checked: true,
 				insertSalePlanInfo: {},
-				liIndex: 0,
+				liIndex: -1,
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
-				pinIndex: 0,
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
-				nianIndex: 3,
+				pinIndex: -1,
+				pinType: ['一等品', '二等品', '三等品', '等外'],
+				nianIndex: -1,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'
 				],
 				show: false,
 				show1: false,
 				region: '请选择发货地区',
+				regions: "",
 				region1: '请选择产地',
-				baoIndex: 0,
-				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				region2 :"",
+				baoIndex: -1,
+				baoType: ['散装', '大袋', '小袋'],
 				chengIndex: -1,
 				chengType: ['可议', '买方承担', '卖方承担'],
 				codestatus: false,
@@ -358,6 +360,7 @@
 				this.deptList.sendCity = e.city.label
 				this.deptList.sendArea = e.area.label
 				this.region = e.province.label + '-' + e.city.label + '-' + e.area.label
+				this.regions = e.province.label + '-' + e.city.label + '-' + e.area.label
 			},
 			regionchange() {
 				this.show = true
@@ -366,6 +369,7 @@
 				this.deptList.outputPrivate = e.province.label
 				this.deptList.outputCity = e.city.label
 				this.region1 = e.province.label + '-' + e.city.label
+				this.region2 = e.province.label + '-' + e.city.label
 			},
 			regionchange1() {
 				this.show1 = true
@@ -476,6 +480,14 @@
 						}
 					}
 				}
+				if (!this.regions) {
+					this.$api.msg('发货地区不能为空')
+					return
+				}
+				if (!this.region2) {
+					this.$api.msg('产地不能为空')
+					return
+				}
 
 				if (!this.deptList.sellerPhone) {
 					this.$api.msg('卖方手机号不能为空')
@@ -724,6 +736,7 @@
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
 		flex-direction: column;
+		color: #AFB3BF;
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;

pages.json

@@ -702,6 +702,12 @@
 						"navigationBarTitleText": "添加"
 					}
 				},
+				// {
+				// 	"path": "contract/warehousings",
+				// 	"style": {
+				// 		"navigationBarTitleText": "附件"
+				// 	}
+				// },
 				{
 					"path": "contract/contract",
 					"style": {
@@ -722,6 +728,13 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "contract/enclosures",
+					"style": {
+						"navigationBarTitleText": "附件",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
 					"path": "video/look",
 					"style": {

pages/release/release.vue

@@ -18,7 +18,7 @@
 					<view class="flex ">
 						<view class="weight">{{item.plannedVolume > 0 ? item.plannedVolume : 0}}吨</view>
 						<view v-if='item.planType=="期货"'>
-							<text class="unitPrice">{{item.basisPrice}} <text class="amount">元/吨</text></text>
+							<!-- <text class="unitPrice">{{item.basisPrice}} <text class="amount">元/吨</text></text> -->
 						</view>
 						<view v-if='item.planType=="现货"'>
 							<text class="unitPrice">{{item.unitPrice}} <text class="amount">元/吨</text></text>
@@ -86,7 +86,6 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-
 							if (res.confirm) {
 								that.$api.doRequest('post', '/procurementPlanInfo/api/editStatus', {
 										id: item.id,