瀏覽代碼

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

ccjgmwz 3 年之前
父節點
當前提交
d22eb2f043

+ 1 - 1
pageB/contract/contract.vue

@@ -62,7 +62,7 @@
 				<view class='shade-content-item'>
 					<view class="titles">请于以下时间段进行点价操作:</view>
 					<view class="timeslot">11:30 ~ 12:30</view>
-					<view class="timeslot">15:20 ~ 20:00</view>
+					<view class="timeslot">15:30 ~ 20:00</view>
 					<view class="timeslot">23:00 ~ 08:00</view>
 				</view>
 				<view class="cancel" @click='shadestatus=false'>知道了</view>

+ 10 - 3
pageD/myRelease/Identity_switching.vue

@@ -58,6 +58,7 @@
 				current: 1,
 				id:0,
 				checked:false,
+				status:0,
 				goodsName:'',
 				receivePrivate:'',
 				receiveCity:'',
@@ -79,7 +80,7 @@
 			};
 		},
 		onLoad(options) {
-			this.id=options.id
+			this.status=options.status
 		},
 		onShow(){
 			this.getList()
@@ -150,14 +151,20 @@
 			// },
 			navToDetailPage(item) {
 				console.log(11111)
+				var url=''
+				if(this.status==1){
+					url='/pageD/myRelease/buyGrain'
+				}else{
+					url='/pageD/myRelease/sellGrain'
+				}
 				// if (index == 1) {
 					if(item.customerTypeFlag==1){
 						uni.navigateTo({
-						url: `/pageD/myRelease/buyGrain?id=${item.id}&customerName=${item.customerName}`
+						url: url+`?id=${item.id}&customerName=${item.customerName}`
 					})
 					}else{
 						uni.navigateTo({
-							url: `/pageD/myRelease/buyGrain?id=${item.id}&customerName=${item.compName}`
+							url: url+`?id=${item.id}&customerName=${item.compName}`
 						})
 					}
 					

+ 63 - 32
pageD/myRelease/buyEdit.vue

@@ -66,66 +66,64 @@
 		<view class="c-row b-b">
 			<text class="tit">买方手机号</text>
 			<view class="con-list">
-				<input placeholder="请输入买方手机号" name="input" v-model="deptList.buyerPhone"></input>
+				<input placeholder="请输入买方手机号" @input='phoneinput' name="input" v-model="deptList.buyerPhone"></input>
 			</view>
 		</view>
-		<view style='width:100%;position:relative;padding:10px;' class="flex">
+		<view class="c-row">
 			<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
 				class='getcode'>{{sendText}}</button>
-			<view style='width:70%;position:relative;margin-left: 200px;'>
 				<view class="con-list">
 					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
 				</view>
-			</view>
 		</view>
 		</view>
 		<view  class="area">
 		<view class="c-row b-b">
 			<checkbox style='transform: scale(0.8);' :checked="checked" @click='checkedbox'></checkbox><text 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">
@@ -133,7 +131,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" v-model="deptList.grade">
 				<view class="con-list">
@@ -141,22 +139,22 @@
 				</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">
-					{{nianIndex>-1?nianType[nianIndex]:'请选择产出年份'}}
-				</view>
-			</picker>
+			<view class="con-list">
+			<view @click='yearchange'>{{deptList.outputYear == null?"请选择出厂年份":deptList.outputYear}}</view>
+			<u-picker :params='params2' @confirm='yearpicker($event)' v-model="show2" mode="time" :start-year="startData" :end-year="endData">
+			</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="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 				<view class="con-list">
@@ -164,13 +162,13 @@
 				</view>
 			</picker>
 		</view>
-		<view  v-if='!checked&&baoIndex==2||!checked&&baoIndex==3'  class="c-row b-b">
+		<view  v-if='checked&&baoIndex!=0'  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">
+		<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">
@@ -232,20 +230,32 @@
 				sendText:'获取验证码',
 				show:false,
 				show1:false,
+				show2:false,
 				region:'请选择收货地区',
 				region1:'请选择产地',
 				baoIndex: -1,
 				baoType: ['散装', '大袋', '小袋'],
 				chengIndex: -1,
 				chengType: ['可议', '买方承担', '卖方承担'],
-				codestatus: false,
+				codestatus: true,
 				sendDisabled: false,
 				sendText: '获取验证码',
 				verifyCode:"",
+				params2: {
+					year: true,
+				},
 			}
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo'])
+			...mapState(['hasLogin','userInfo']),
+			startData(){
+					var data = new Date()
+					return data.getFullYear() - 30
+				},
+				endData(){
+					var data = new Date()
+					return data.getFullYear()
+				}
 		},
 		onLoad(options){
 			this.id=options.id
@@ -268,6 +278,11 @@
 			})
 		},
 		methods: {
+			phoneinput(e){
+				if(e.detail.value.length==11){
+					this.codestatus=true
+				}
+			},
 			getList(){
 				this.$api.doRequest('get','/procurementPlanInfo/getProcurementPlan',{id:this.id}).then(res => {
 					if(res.data.code==200){
@@ -281,7 +296,13 @@
 						}
 						 let number = this.deptList.basisPrice
 						this.deptList.basisPrice = Math.abs(number)
-						this.region1=this.deptList.outputPrivate+'-'+this.deptList.outputCity
+						if(this.deptList.outputPrivate&&this.deptList.outputCity){
+							this.region1=this.deptList.outputPrivate+'-'+this.deptList.outputCity
+						}
+						if(this.deptList.procurementPlanType == '期货'){
+							let number = this.deptList.basisPrice
+							this.deptList.basisPrice = Math.abs(number)
+						}
 						this.region=this.deptList.receivePrivate+'-'+this.deptList.receiveCity+'-'+this.deptList.receiveArea
 						if(this.deptList.procurementPlanTypeKey==2){
 							this.typesIndex=1
@@ -308,6 +329,17 @@
 					})
 				});
 			},
+			yearpicker(e) {
+				if(e!=null){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
+				this.deptList.outputYear = e.year
+			},
+			yearchange() {
+				this.show2 = true
+			},
 			getcode(){
 				var that = this
 				if(/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.deptList.buyerPhone)){
@@ -558,8 +590,8 @@
 				}
 				this.insertProcurementPlanInfo = this.deptList
 				if(this.deptList.procurementPlanType == '期货'){
-								this.insertProcurementPlanInfo.basisPrice=-this.insertProcurementPlanInfo.basisPrice
-					}
+					this.insertProcurementPlanInfo.basisPrice=-this.insertProcurementPlanInfo.basisPrice
+				}
 		         this.insertProcurementPlanInfo.commonId = this.userInfo.id
 				 this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				 uni.showModal({
@@ -693,12 +725,14 @@
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
 		flex-direction: column;
-		color: #AFB3BF;
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
+	.con-list input{
+			font-size:14px !important;
+		}
 	.area{
 		background-color: #FFFFFF;
 		border-radius: 20px;
@@ -712,9 +746,6 @@
 	}
 	.getcode {
 		font-size: 14px;
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
 		color: #AFB3BF;
 		background: #F5F6F9;
 		height: 30px;

+ 153 - 121
pageD/myRelease/buyGrain.vue

@@ -10,8 +10,7 @@
 			<view class="c-row b-b">
 				<text class="tit">标题</text>
 				<view class="con-list">
-					<input maxlength='16' minlength='2' placeholder="请输入标题,不超过16个字" name="input"
-						v-model="deptList.title"></input>
+					<input maxlength='16' minlength='2' placeholder="请输入标题,不超过16个字" name="input" v-model="deptList.title"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -68,9 +67,11 @@
 			<view class="c-row b-b">
 				<text class="tit">买方手机号</text>
 				<view class="con-list">
-					<input placeholder="请输入买方手机号" name="input" v-model="deptList.buyerPhone"></input>
+					<input placeholder="请输入买方手机号" @input='phoneinput' name="input" v-model="deptList.buyerPhone"></input>
 				</view>
 			</view>
+
+			<!-- <view style='width:100%;position:relative;padding:10px;' class="flex"> -->
 			<!-- <view class="c-row ">
 				<text class="validate">获取验证码</text>
 				<view class="con-list">
@@ -78,65 +79,64 @@
 				</view>
 			</view> -->
 			
-			<view style='width:100%;position:relative;padding:10px;' class="flex">
+			<view class="c-row b-b">
+
 				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
 					class='getcode'>{{sendText}}</button>
-				<view style='width:70%;position:relative;margin-left: 200px;'>
 					<view class="con-list">
 						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
 					</view>
-				</view>
 			</view>
 		</view>
 		<view class="buylow">
 			<view class="c-row ">
-				<checkbox style='transform: scale(0.8);' :checked="checked" @click='checkedbox'></checkbox><text
+				<checkbox style='transform: scale(0.8);' :disabled="morestatus" :checked="checked" @click='checkedbox'></checkbox><text
 					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>
+							<input @input='moreinput' 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>
+							<input @input='moreinput' 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>
+							<input @input='moreinput' 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>
+							<input @input='moreinput' 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>
+							<input @input='moreinput' 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>
+							<input @input='moreinput' 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>
+							<input @input='moreinput' 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,22 +152,22 @@
 					</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">
-						{{nianIndex>-1?nianType[nianIndex]:'请选择产出年份'}}
-					</view>
-				</picker>
+				<view class="con-list">
+				<view @click='yearchange'>{{deptList.outputYear == null?"请选择出厂年份":deptList.outputYear}}</view>
+				<u-picker :params='params2' @confirm='yearpicker($event)' v-model="show2" mode="time" :start-year="startData" :end-year="endData">
+				</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="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 					<view class="con-list">
@@ -175,13 +175,13 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked&&baoIndex!=0' class="c-row b-b">
+			<view v-if='checked&&baoIndex!=0' class="c-row b-b">
 				<text class="tit">袋装备注</text>
 				<view class="con-list">
-					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
+					<input @input='moreinput' placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
 			</view>
-			<view v-if='!checked' class="c-row">
+			<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">
@@ -213,9 +213,9 @@
 					priceType: "定价采购",
 					procurementPlanType: "现货",
 					grain: "塔粮",
-					grade: "不限(默认)",
+					grade: "",
 					outputYear: "2020",
-					packingType: "不限(默认)",
+					packingType: "",
 					freightPayer: "",
 				},
 				params: {
@@ -233,12 +233,9 @@
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
 				pinIndex: -1,
 				pinType: ['一等品', '二等品', '三等品', '等外'],
-				nianIndex: -1,
-				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
-					'2011'
-				],
 				show: false,
 				show1: false,
+				show2: false,
 				region: '请选择收货地区',
 				region1: '请选择产地',
 				region2:"",
@@ -251,11 +248,24 @@
 				sendText: '获取验证码',
 				verifyCode:"",
 				verification:true,
+				morestatus:false,
+				params2: {
+					year: true,
+				},
 				// DriverViewInfo:{},
 			}
 		},
 		computed: {
-			...mapState(['hasLogin', 'userInfo'])
+			...mapState(['hasLogin', 'userInfo']),
+			startData(){
+					var data = new Date()
+					return data.getFullYear() - 30
+				},
+				endData(){
+					var data = new Date()
+					return data.getFullYear()
+				}
+		
 		},
 		onLoad(options) {
 			if (options.customerName) {
@@ -279,33 +289,27 @@
 			})
 		},
 		methods: {
-			// async amendprice() {
-			// 	var that = this
-			// 	this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
-			// 			phone: this.deptList.buyerPhone,
-			// 			verifyCode: this.verifyCode
-			// 		}).then(res => {
-			// 			if (res.data.code == 200) {	
-			// 			} else {
-			// 				that.verification = false
-			// 				uni.showToast({
-			// 					title: res.data.message,
-			// 					icon: 'none',
-			// 					duration: 2000
-			// 				})
-			// 				return false
-			// 			}
-			// 		})
-			// 		.catch(res => {
-			// 			that.verification = false
-			// 			uni.showToast({
-			// 				title: res.data.message,
-			// 				icon: 'none',
-			// 				duration: 2000
-			// 			})
-			// 			return false
-			// 		});
-			// },
+			phoneinput(e){
+				if(e.detail.value.length==11){
+					this.codestatus=true
+				}
+			},
+			moreinput(e){
+				if(e.detail.value.length>0){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
+				
+			},
+			yearpicker(e) {
+				if(e!=null){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
+				this.deptList.outputYear = e.year
+			},
 			getcode() {
 				var that = this
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.deptList.buyerPhone)) {
@@ -370,6 +374,9 @@
 			checkedbox(e) {
 				this.checked = !this.checked
 			},
+			yearchange() {
+				this.show2 = true
+			},
 			typeChange(e) {
 				this.typesIndex = e.detail.value
 				this.types = this.typesType[this.typesIndex];
@@ -384,7 +391,7 @@
 			},
 			navToDetailPage() {
 				uni.navigateTo({
-					url: `/pageD/myRelease/Identity_switching`
+					url: `/pageD/myRelease/Identity_switching?status=1`
 				})
 			},
 			commit() {
@@ -471,7 +478,6 @@
 						}
 					}
 				}
-				
 				if (!this.region2) {
 					this.$api.msg('收货地区不能为空')
 					return
@@ -567,80 +573,103 @@
 				this.insertProcurementPlanInfo.procurementPlanNo='CGJH'+this.getdate()+this.verifyinit()
 				this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				var that = this
-				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
-						phone: this.deptList.buyerPhone,
-						verifyCode: this.verifyCode
-					}).then(res => {
-						if (res.data.code == 200) {
-							that.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', that
-									.insertProcurementPlanInfo).then(res => {
-									if (res.data.code == 200) {
-										// uni.showToast({
-										// 	title: "发布成功",
-										// 	icon: 'none',
-										// })
-										this.$api.msg('发布成功')
-										that.deptList = {}
-										uni.navigateTo({
-											url: `/pages/release/release`
-										})
-									} else {
+				uni.showModal({
+					title: '提示',
+				    content: '确定发布交易信息?',
+				    success: function (res) {
+						if (res.confirm) {
+							that.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+								phone: that.deptList.buyerPhone,
+								verifyCode: that.verifyCode
+							}).then(res => {
+								if (res.data.code == 200) {
+									that.$api.doRequest('post', '/procurementPlanInfo/api/insertProcurementPlanInfo', that.insertProcurementPlanInfo).then(res => {
+										if (res.data.code == 200) {
+											uni.showToast({
+												title: "发布成功",
+												icon: 'none',
+											})
+													// setTimeout(() => {
+													// 	uni.navigateBack({})
+													// }, 1000)
+											that.deptList = {}
+											uni.navigateTo({
+												url: `/pages/release/release`
+											})
+										} else {
+											uni.showToast({
+												title: res.data.message,
+												icon: 'none',
+												duration: 2000
+											})
+										}
+									})
+									.catch(res => {
 										uni.showToast({
-											title: res.data.message,
+											title: res.errmsg,
 											icon: 'none',
 											duration: 2000
 										})
+									});
+								} 
+								else if(res.data.code=='11003'){
+									uni.showModal({
+										title: '提示',
+										content: '验证码不正确',
+										});
+								}
+								else {
 									}
 								})
 								.catch(res => {
 									uni.showToast({
-										title: res.errmsg,
+										title: res.data.message,
 										icon: 'none',
 										duration: 2000
 									})
-								});
-						} 
-						else if(res.data.code=='11003'){
-							uni.showModal({
-								title: '提示',
-								content: '验证码不正确',
-								});
-						}
-						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) {
+								
 						}
-					})
-					.catch(res => {
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-					});
+						}});
 			},
 			liChange(e) {
+				if(e.detail.value!=-1){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
 				this.liIndex = e.detail.value
 				this.litypes = this.liType[this.liIndex];
 				this.deptList.grainKey = e.detail.value
 				this.deptList.grain = this.liType[this.liIndex]
 			},
 			pinChange(e) {
+				if(e.detail.value!=-1){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
 				this.pinIndex = e.detail.value
 				this.pintypes = this.pinType[this.pinIndex];
 				this.deptList.gradeKey = e.detail.value
 				this.deptList.grade = this.pinType[this.pinIndex]
 			},
-			nianChange(e) {
-				this.nianIndex = e.detail.value
-				this.niantypes = this.nianType[this.nianIndex];
-				this.deptList.outputYear = this.nianType[this.nianIndex]
-			},
+
 
 			baoChange(e) {
+				if(e.detail.value!=-1){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
 				this.baoIndex = e.detail.value
 				this.baotypes = this.baoType[this.baoIndex];
 				this.deptList.packingTypeKey = e.detail.value
@@ -674,6 +703,11 @@
 			  return arr.join('')
 			},
 			chengChange(e) {
+				if(e.detail.value!=-1){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
 				this.chengIndex = e.detail.value
 				this.chengtypes = this.chengType[this.chengIndex];
 				this.deptList.freightPayerKey = e.detail.value + 1
@@ -711,13 +745,14 @@
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
 		flex-direction: column;
-		color: #AFB3BF;
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
-
+.con-list input{
+		font-size:14px !important;
+	}
 	.buyup {
 		background-color: #FFFFFF;
 		border-radius: 20px;
@@ -749,9 +784,6 @@
 	}
 	.getcode {
 		font-size: 14px;
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
 		color: #AFB3BF;
 		background: #F5F6F9;
 		height: 30px;

+ 54 - 34
pageD/myRelease/sellEdit.vue

@@ -81,14 +81,12 @@
 					<input placeholder="请输入买方手机号" name="input" v-model="deptList.sellerPhone"></input>
 				</view>
 			</view>
-			<view style='width:100%;position:relative;padding:10px;' class="flex">
+			<view  class="c-row">
 				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
 					class='getcode'>{{sendText}}</button>
-				<view style='width:70%;position:relative;margin-left: 200px;'>
 					<view class="con-list">
 						<input v-model='verifyCode' maxlength="6" placeholder="请输入验证码" type="text">
 					</view>
-				</view>
 			</view>
 		</view>
 		<view class="buylow">
@@ -97,49 +95,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">
@@ -147,7 +145,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">
@@ -156,15 +154,15 @@
 				</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">
-						{{nianIndex>-1?nianType[nianIndex]:'请选择产出年份'}}
-					</view>
-				</picker>
+				<view class="con-list">
+				<view @click='yearchange'>{{deptList.outputYear == null?"请选择出厂年份":deptList.outputYear}}</view>
+				<u-picker :params='params2' @confirm='yearpicker($event)' v-model="show2" mode="time" :start-year="startData" :end-year="endData">
+				</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="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 					<view class="con-list">
@@ -172,13 +170,13 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked&&baoIndex==2||!checked&&baoIndex==3' class="c-row b-b">
+			<view v-if='checked&&baoIndex!=0' 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">
@@ -222,7 +220,7 @@
 					city: true,
 				},
 				checked: true,
-				codestatus: false,
+				codestatus: true,
 				sendText: '获取验证码',
 				sendDisabled: false,
 				verifyCode: "",
@@ -232,21 +230,30 @@
 				pinIndex: -1,
 				pinType: ['一等品', '二等品', '三等品', '等外'],
 				nianIndex: 3,
-				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
-					'2011'
-				],
 				show: false,
 				show1: false,
+				show2: false,
 				region: '请选择收货地区',
 				region1: '请选择产地',
 				baoIndex: -1,
 				baoType: ['散装', '大袋', '小袋'],
 				chengIndex: -1,
-				chengType: ['可议', '买方承担', '卖方承担']
+				chengType: ['可议', '买方承担', '卖方承担'],
+				params2: {
+					year: true,
+				},
 			}
 		},
 		computed: {
-			...mapState(['hasLogin', 'userInfo'])
+			...mapState(['hasLogin', 'userInfo']),
+			startData(){
+					var data = new Date()
+					return data.getFullYear() - 30
+				},
+				endData(){
+					var data = new Date()
+					return data.getFullYear()
+				}
 		},
 		onLoad(options) {
 			this.getList(options)
@@ -269,6 +276,17 @@
 			})
 		},
 		methods: {
+			yearpicker(e) {
+				if(e!=null){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
+				this.deptList.outputYear = e.year
+			},
+			yearchange() {
+				this.show2 = true
+			},
 			getList(options) {
 				this.$api.doRequest('get', '/salePlanInfo/getSalePlanInfo', {
 						id: options.id
@@ -282,7 +300,10 @@
 								this.deptList.packingType != null || this.deptList.freightPayer != null) {
 								this.checked = false
 							}
-							this.region1 = this.deptList.outputPrivate + '-' + this.deptList.outputCity
+							if(this.deptList.outputPrivate&&this.deptList.outputCity){
+								this.region1 = this.deptList.outputPrivate + '-' + this.deptList.outputCity
+							}
+							
 							this.region = this.deptList.sendPrivate + '-' + this.deptList.sendCity + '-' + this
 								.deptList.sendArea
 							// if(this.deptList.salePlanTypeKey==2){
@@ -728,13 +749,14 @@
 		-webkit-box-direction: normal;
 		-webkit-flex-direction: column;
 		flex-direction: column;
-		color: #AFB3BF;
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
-
+	.con-list input{
+			font-size:14px !important;
+		}
 	.buyup {
 		background-color: #FFFFFF;
 		border-radius: 20px;
@@ -767,9 +789,6 @@
 
 	.getcode {
 		font-size: 14px;
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
 		color: #AFB3BF;
 		background: #F5F6F9;
 		height: 30px;
@@ -777,6 +796,7 @@
 	}
 
 	.getcode.active {
-		border: none;
+		background: #22C572;
+		color: #fff;
 	}
 </style>

+ 118 - 52
pageD/myRelease/sellGrain.vue

@@ -79,65 +79,64 @@
 					<input placeholder="请输入卖方手机号" @input='phoneinput' name="input" v-model="deptList.sellerPhone"></input>
 				</view>
 			</view>
-			<view style='width:100%;position:relative;padding:10px;' class="flex">
+
+			<view  class="c-row b-b">
 				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
 					class='getcode'>{{sendText}}</button>
-				<view style='width:70%;position:relative;margin-left: 200px;'>
 					<view class="con-list">
 						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
 					</view>
-				</view>
 			</view>
 		</view>
 		<view class="buylow">
 			<view class="c-row ">
-				<checkbox style='transform: scale(0.8);' :checked="checked" @click='checkedbox'></checkbox><text
+				<checkbox style='transform: scale(0.8);' value='1' :disabled="morestatus" :checked="checked" @click='checkedbox'></checkbox><text
 					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>
+							<input @input='moreinput' 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>
+							<input @input='moreinput' 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>
+							<input  @input='moreinput' 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>
+							<input @input='moreinput' 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>
+							<input @input='moreinput' 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>
+							<input @input='moreinput' 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>
+							<input @input='moreinput' 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">
@@ -145,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">
@@ -154,15 +153,15 @@
 				</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">
-						{{nianIndex>-1?nianType[nianIndex]:'请选择产出年份'}}
-					</view>
-				</picker>
+				<view class="con-list">
+				<view @click='yearchange'>{{deptList.outputYear == null?"请选择出厂年份":deptList.outputYear}}</view>
+				<u-picker :params='params2' @confirm='yearpicker($event)' v-model="show2" mode="time" :start-year="startData" :end-year="endData">
+				</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="baoChange" :value="baoIndex" :range="baoType" class="con-list">
 					<view class="con-list">
@@ -170,13 +169,13 @@
 					</view>
 				</picker>
 			</view>
-			<view v-if='!checked&&baoIndex!=0' class="c-row b-b">
+			<view v-if='checked&&baoIndex!=0' class="c-row b-b">
 				<text class="tit">袋装备注</text>
 				<view class="con-list">
-					<input placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
+					<input @input='moreinput' placeholder="请填写袋装备注" name="input" v-model="deptList.baggingNotes"></input>
 				</view>
 			</view>
-			<view v-if='!checked' class="c-row ">
+			<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">
@@ -211,7 +210,6 @@
 					priceType: "定价销售",
 					grain: "塔粮",
 					grade: "不限(默认)",
-					outputYear: "2020",
 					packingType: "不限(默认)",
 					freightPayer: "",
 				},
@@ -230,12 +228,9 @@
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
 				pinIndex: -1,
 				pinType: ['一等品', '二等品', '三等品', '等外'],
-				nianIndex: -1,
-				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
-					'2011'
-				],
 				show: false,
 				show1: false,
+				show2:false,
 				region: '请选择发货地区',
 				regions: "",
 				region1: '请选择产地',
@@ -247,12 +242,24 @@
 				codestatus: false,
 				sendDisabled: false,
 				sendText: '获取验证码',
-				verifyCode: "",
-				verification: true,
+				verifyCode:"",
+				verification:true,
+				params2: {
+					year: true,
+				},
+				morestatus:false
 			}
 		},
 		computed: {
-			...mapState(['hasLogin', 'userInfo'])
+			...mapState(['hasLogin', 'userInfo']),
+			startData(){
+					var data = new Date()
+					return data.getFullYear() - 30
+				},
+				endData(){
+					var data = new Date()
+					return data.getFullYear()
+				}
 		},
 		onLoad(options) {
 			if (options.customerName) {
@@ -276,15 +283,59 @@
 			})
 		},
 		methods: {
+			yearchange() {
+				this.show2 = true
+			},
+			moreinput(e){
+				if(e.detail.value.length>0){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
+				
+			},
+			yearpicker(e) {
+				if(e!=null){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
+				this.deptList.outputYear = e.year
+			},
+			// async amendprice() {
+			// 	var that = this
+			// 	this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
+			// 			phone: this.deptList.buyerPhone,
+			// 			verifyCode: this.verifyCode
+			// 		}).then(res => {
+			// 			if (res.data.code == 200) {	
+			// 			} else {
+			// 				that.verification = false
+			// 				uni.showToast({
+			// 					title: res.data.message,
+			// 					icon: 'none',
+			// 					duration: 2000
+			// 				})
+			// 				return false
+			// 			}
+			// 		})
+			// 		.catch(res => {
+			// 			that.verification = false
+			// 			uni.showToast({
+			// 				title: res.data.message,
+			// 				icon: 'none',
+			// 				duration: 2000
+			// 			})
+			// 			return false
+			// 		});
+			// },
 			phoneinput(e){
-				console.log(e)
 				if(e.detail.value.length==11){
-					
+					this.codestatus=true
 				}
 			},
 
 			getcode() {
-				console.log(1111)
 				var that = this
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.deptList.sellerPhone)) {
 					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
@@ -364,7 +415,7 @@
 			navToDetailPage() {
 				// if (index == 1) {
 				uni.navigateTo({
-					url: `/pageD/myRelease/Identity_switching`
+					url: `/pageD/myRelease/Identity_switching?status=2`
 				})
 			},
 			commit() {
@@ -569,7 +620,7 @@
 							that.$api.doRequest('post', '/salePlanInfo/api/insertSalePlanInfo', that
 									.insertSalePlanInfo).then(res => {
 									if (res.data.code == 200) {
-										this.$api.msg('发布成功')
+										that.$api.msg('发布成功')
 										that.deptList = {}
 										uni.navigateTo({
 											url: `/pages/release/release`
@@ -623,24 +674,34 @@
 				// this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 			},
 			liChange(e) {
+				if(e.detail.value!=-1){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
 				this.liIndex = e.detail.value
 				this.litypes = this.liType[this.liIndex];
 				this.deptList.grainKey = e.detail.value
 				this.deptList.grain = this.liType[this.liIndex]
 			},
 			pinChange(e) {
+				if(e.detail.value!=-1){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
 				this.pinIndex = e.detail.value
 				this.pintypes = this.pinType[this.pinIndex];
 				this.deptList.gradeKey = e.detail.value
 				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) {
+				if(e.detail.value!=-1){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
 				this.baoIndex = e.detail.value
 				this.baotypes = this.baoType[this.baoIndex];
 				this.deptList.packingTypeKey = e.detail.value
@@ -674,6 +735,11 @@
 				return arr.join('')
 			},
 			chengChange(e) {
+				if(e.detail.value!=-1){
+					this.morestatus=true
+				}else{
+					this.morestatus=false
+				}
 				this.chengIndex = e.detail.value
 				this.chengtypes = this.chengType[this.chengIndex];
 				this.deptList.freightPayerKey = e.detail.value + 1
@@ -698,6 +764,7 @@
 		align-items: center;
 		padding: 20rpx 30rpx;
 		position: relative;
+		font-size:14px;
 	}
 
 	.con-list {
@@ -714,7 +781,9 @@
 		line-height: 40rpx;
 		text-align: right;
 		padding-right: 20rpx;
-		font-size: 14px;
+	}
+	.con-list input{
+		font-size:14px !important;
 	}
 
 	.buyup {
@@ -749,9 +818,6 @@
 
 	.getcode {
 		font-size: 14px;
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
 		color: #AFB3BF;
 		background: #F5F6F9;
 		height: 30px;

+ 2 - 2
pageD/warehousings/warehousings.vue

@@ -418,7 +418,7 @@ import upload from '@/components/upload.vue';
 						return
 					}
 				}
-				if(this.list.bulkDensity&&this.list.bulkDensity<1||this.list.bulkDensity&&this.list.bulkDensity>40){
+				if(this.list.bulkDensity&&this.list.bulkDensity<500||this.list.bulkDensity&&this.list.bulkDensity>1000){
 					this.$api.msg('容重输入错误')
 					return
 				}
@@ -576,7 +576,7 @@ import upload from '@/components/upload.vue';
 						return
 					}
 				}
-				if(this.list.bulkDensity&&this.list.bulkDensity<1||this.list.bulkDensity&&this.list.bulkDensity>40){
+				if(this.list.bulkDensity&&this.list.bulkDensity<500||this.list.bulkDensity&&this.list.bulkDensity>1000){
 					this.$api.msg('容重输入错误')
 					return
 				}

+ 4 - 1
pages/task/my_task.vue

@@ -59,9 +59,12 @@
 				keyword:""
 			};
 		},
-		onLoad(options) {
+		onShow() {
 			this.getIndexBuyData()
 		},
+		// onLoad(options) {
+		// 	this.getIndexBuyData()
+		// },
 		filters: {
 			formatDate (date) {
 				var date=new Date(date)