gjy

pageB/contract/contract.vue

@@ -16,7 +16,7 @@
 			<text></text>
 		</view>
 		<view class="cu-form-group">
-			<view class="title">玉米:<text>{{item.goodsName}}</text></view>
+			<view class="title">{{item.goodsName}}:<text>{{item.goodsName}}</text></view>
 			<view class="title">单价:<text>{{item.unitPrice}}</text></view>
 			<view class="title">基差:<text>{{item.basis}}</text></view>
 		</view>
@@ -26,7 +26,7 @@
 					
 
 			<text><button class="cu-btn commit margin-tb-sm lg" style=" margin-left: 15px; width: 75px;height: 25px;"
-					@click="commit">点价</button></text>
+					@click="someprice(item)">点价</button></text>
 					
 					
 			<text><button class="cu-btn commit margin-tb-sm lg" style=" margin-left: 15px; width: 75px;height: 25px;"
@@ -35,43 +35,29 @@
 		</view>
 		
 		</view>
-		
-		<hr>
-		<!-- <view class="cu-form-group">
-			<view class="title">采购</view>
-			<text style="margin-left: -30%;">编号{{goods.contractNo}}{{goods.procurementPlanType}}</text>
-			<text>{{goods.status}}</text>
-		</view>
-		<view class="cu-form-group">
-			<view class="title">买方</view>
-			<text style="margin-left: -45%;">{{goods.customer}}</text>
-			<text></text>
-		</view>
-		<view class="cu-form-group">
-			<view class="title">玉米:<text>{{goods.goodsName}}</text></view>
-			<view class="title">单价:<text>{{goods.unitPrice}}</text></view>
-			<view class="title">基差:<text>{{goods.basis}}</text></view>
-		</view>
-		<view class="cu-form-group">
-			<view class="title">
-			
-			</view>
-		</view>
-		<view class="c-row b-b">
-			<text><button class="cu-btn commit margin-tb-sm lg" style=" width: 75px;height: 25px; margin-left: 15px;"
-					@click="commit">附件</button>
-					
-					</text>
-
-			<text><button class="cu-btn commit margin-tb-sm lg" style=" margin-left: 15px; width: 75px;height: 25px;"
-					@click="commit">点价</button></text>
-		</view> -->
-		<view class="cu-bar bg-white margin-top">
-			<view class="action">
+        <view v-if='pricestatus' class='shade'>
+        	<view class='shade-content'>
+        		<view class='shade-content-item'>
+        			<input v-model='price' placeholder="请输入点价价格" type="number">元/吨
+        		</view>
+				<view>
+					<button style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</button>
+					<button  style='width:50%;display:inline-block;' @click='amendprice'>确定</button>
+				</view>
 
+        	</view>
+        </view>
+		<view v-if='shadestatus' class='shade'>
+			<view class='shade-content'>
+				<view class='shade-content-item'>
+					<view>请于以下时间段进行点价操作：</view>
+					<view>11：30  ~  12：30</view>
+					<view>15：30  ~  20：00</view>
+					<view>23：00  ~  08：00</view>
+				</view>
+				<button style='width:50%;display:inline-block;' @click='shadestatus=false'>取消</button>
 			</view>
 		</view>
-
 		<view class="padding flex flex-direction">
 			<!-- <button class="cu-btn commit margin-tb-sm lg" @click="commit">提交</button> -->
 		</view>
@@ -90,6 +76,8 @@
 		data() {
 			return {
 				lists:[],
+				shadestatus:false,
+				pricestatus:false,
 				goods: {
 					pageSize:10,
 					currentPage:1,
@@ -123,12 +111,13 @@
 					carNoImg1: ''
 
 				},
+				id:0,
 				PageCur: "trust",
 				TabCur: 0,
 				priceTypeIndex: -1,
 				priceType: ['库内价', '到库价', '到港价'],
 				unitPrice: 0,
-				price: '',
+				price: 0,
 				seller: '',
 				sellerPhone: '',
 				minSale: '',
@@ -177,30 +166,74 @@
 			this.getList()
 		},
 		methods: {
-				commit1(item){
-					uni.navigateTo({
-						url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
-					})
-				},
+			amendprice(){
+				this.$api.doRequest('post','/purchaseOrder/api/pointPrice',{id:this.id,unitPrice:Number(this.price)}).then(res => {
+						if(res.data.code==200){
+							this.pricestatus=false
+						}else{
+							uni.showToast({
+							 title: res.data.message,
+							 icon:'none',
+							 duration: 2000
+							})
+						}
+				    })
+				    .catch(res => {
+				     uni.showToast({
+				      title: res.errmsg,
+				      icon:'none',
+				      duration: 2000
+				     })
+				    });
+			},
+			someprice(item){
+				var time=new Date().getTime()
+				var time1=new Date(new Date(new Date().toLocaleDateString()).getTime()-(1*60*60*1000))
+				var time2=new Date()
+				time2.setHours(8);
+				time2.setMinutes(0);
+				time2.setSeconds(0);
+				var time3=new Date()
+				time3.setHours(11);
+				time3.setMinutes(30);
+				time3.setSeconds(0);
+				var time4=new Date()
+				time4.setHours(12);
+				time4.setMinutes(30);
+				time4.setSeconds(0);
+				var time5=new Date()
+				time5.setHours(15);
+				time5.setMinutes(30);
+				time5.setSeconds(0);
+				var time6=new Date()
+				time6.setHours(20);
+				time6.setMinutes(0);
+				time6.setSeconds(0);
+				if(time<time2.getTime()&&time>time1||time<time4.getTime()&&time>time3.getTime()||time<time6.getTime()&&time>time5.getTime()){
+					this.id=item.id
+					this.pricestatus=true
+				}else{
+					this.shadestatus=true
+				}
+			},
+			commit1(item){
+				uni.navigateTo({
+					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
+				})
+			},
 			getList(){
 				this.goods.commonId = this.userInfo.id
 	
 			this.$api.doRequest('get','/purchaseOrder/selectPurchaseOrder',this.goods).then(res => {
-			    
-				console.log(res,"fanhuijie")
-				this.lists = res.data.data.records
-				 console.log("调用接口")
-			      that.sendDisabled = true
-			      let sec = 60
-			      let interval = setInterval(() => {
-			       sec--;
-			       that.sendText = sec + 's后重发'
-			       if (sec <= 0) {
-			        that.sendDisabled = false
-			        that.sendText = "获取验证码"
-			        clearInterval(interval)
-			       }
-			      }, 1000)
+					if(res.data.code==200){
+						this.lists = res.data.data.records
+					}else{
+						uni.showToast({
+						 title: res.data.message,
+						 icon:'none',
+						 duration: 2000
+						})
+					}
 			    })
 			    .catch(res => {
 			     uni.showToast({
@@ -661,4 +694,27 @@
 		background: linear-gradient(45deg, #DF331C, #DA611A);
 		color: #fff;
 	}
+	.shade{
+		position:fixed;
+		top:0;
+		left:0;
+		width:100%;background:rgba(0,0,0,0.5);
+		height:100%;
+		z-index:999999;
+	}
+	.shade-content{
+		background:#fff;
+		position:absolute;
+		top:50%;
+		left:50%;
+		transform: translateX(-50%) translateY(-50%);
+		z-index:999999;
+		text-align:center;
+	}
+	.shade-content-item{
+		width: 277px;
+		text-align:center;
+		height:121px;
+		padding:35px 10px;
+	}
 </style>

pageB/contract/contract_detail.vue

@@ -3,11 +3,11 @@
 		<!-- <block v-if="TabCur==2"> -->
 			<view class="cu-form-group">
 				<view class="title">派车编号</view>
-				<input  name="input" v-model="goods.tranCarNo"></input>
+				<input disabled  name="input" v-model="goods.tranCarNo"></input>
 			</view>
 			<view class="cu-form-group">
 				<view class="title">车牌号</view>
-				<input placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
+				<input maxlength='7' placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
 			</view>
 			<view class="cu-form-group">
 				<view class="title">司机手机号</view>
@@ -23,9 +23,16 @@
 			</view>
 			<view class="cu-form-group">
 				<view class="title">净重(吨)</view>
-				<input placeholder="自动计算" type="mobile" name="input" v-model="goods.netWeight"></input>
+				<input placeholder="自动计算" type="mobile" name="input" v-model="goods.loadNetWeight"></input>
+			</view>
+			<view class="cu-form-group">
+				<view class="title">发货日期</view>
+				<picker mode="date"  :start="startDate" :end="endDate" :value="goods.sendDateStart"  @change="DateChange">
+					<view class="picker">
+						{{goods.sendDateStart}}
+					</view>
+				</picker>
 			</view>
-			   
 			<view class="cu-bar bg-white margin-top">
 				<view class="action">
 					上传磅单照片
@@ -33,19 +40,13 @@
 			</view>
 			<view class="cu-form-group">
 				<view class="grid col-4 grid-square flex-sub">
-					<view class="bg-img" v-if="personNoImg != ''" @tap="ViewImage" :data-url="personNoImg">
-					 <image :src="personNoImg" mode="aspectFit"></image>
+					<view class="bg-img" v-if="goods.loadPoundImg != ''" @tap="ViewImage" :data-url="goods.loadPoundImg">
+					 <image :src="goods.loadPoundImg" mode="aspectFit"></image>
 						<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="0">
 							<text class='cuIcon-close'></text>
 						</view>
 					</view>
-					<view class="bg-img" v-if="personNoImg1 != ''" @tap="ViewImage" :data-url="personNoImg1">
-					 <image :src="personNoImg1" mode="aspectFit"></image>
-						<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="1">
-							<text class='cuIcon-close'></text>
-						</view>
-					</view>
-					<view class="solids" @tap="ChooseImagePerson" v-if="personNoImg == '' || personNoImg1 == ''">
+					<view class="solids" @tap="ChooseImagePerson" v-if="goods.loadPoundImg == ''">
 						<text class='cuIcon-cameraadd'></text>
 					</view>
 				</view>
@@ -71,12 +72,11 @@
 						carNo:'',
 						grossWeight:'',
 						tare:'',
-						netWeight:'',
-						personNoImg:'',
-						personNoImg1:'',
-
+						loadNetWeight:'',
+						loadPoundImg:'',
 						 contractNo:'',
 						 goodsName:'',
+						 sendDateStart:'请选择'
 						
 					},
 					carNo:'',
@@ -125,17 +125,28 @@
 				};
 			},
 			computed: {
-				...mapState(['hasLogin','userInfo'])
+				...mapState(['hasLogin','userInfo']),
+					startDate() {
+					//限制开始时间;
+					//也可以直接限定为当天日期 var date= new Date(); return date
+						return new Date(new Date(new Date().toLocaleDateString()).getTime()-(1*60*60*1000))
+					},
+					endDate() {
+						return new Date()
+					}
 				},	
 			onShow() {
 			},
 			onLoad(option) {
-				this.goods.netWeight =option.netWeight
-				
+				this.goods.goodsName=option.goodsName
+				this.goods.contractNo = option.contractNo
+				this.goods.tranCarNo=option.tranCarNo
 				
 			},
 			methods: {
-				 
+				 DateChange(e) {
+				 	this.goods.sendDateStart = e.detail.value
+				 },
 				commit1(item){
 					uni.navigateTo({				
 						url: `/pageB/contract/look?id=${item.id}&netWeight=${item.netWeight}&carNo=${item.carNo}&sendDateStart=${item.sendDateStart}`
@@ -143,33 +154,66 @@
 				},
 				grossWeightchange(e) {
 				      if (this.goods.grossWeight && this.goods.tare) {
-				        this.goods.netWeight = Number(
+				        this.goods.loadNetWeight = Number(
 				          this.goods.grossWeight - this.goods.tare
 				        )
 				      }
 				    },
 				tarechange(e) {
 				      if (this.goods.grossWeight && this.goods.tare) {
-				        this.goods.netWeight = Number(
+				        this.goods.loadNetWeight = Number(
 				          this.goods.grossWeight - this.goods.tare
 				        )
 				      }
 				    },
 				getList(){
-					console.log(this.goods,"duixiang")
+					// tranCarNo:'',
+					// carNo:'',
+					// grossWeight:'',
+					// tare:'',
+					// loadNetWeight:'',
+					// loadPoundImg:'',
+					//  contractNo:'',
+					//  goodsName:'',
+					if(this.goods.carNo.length==0){
+						this.$api.msg('车牌号不能为空')
+						return
+					}
+					if(this.goods.carNo.length!=7){
+						this.$api.msg('车牌号输入错误')
+						return
+					}
+					if(this.goods.driverPhone.length==0){
+						this.$api.msg('手机号不能为空')
+						return
+					}
+					if(this.goods.driverPhone.length!=11){
+						this.$api.msg('司机手机号输入错误')
+						return
+					}
+					if(this.goods.grossWeight>100){
+						this.$api.msg('毛重输入错误')
+						return
+					}
+					if(this.goods.tare>50){
+						this.$api.msg('皮重输入错误')
+						return
+					}
 				this.$api.doRequest('post','/tranCarInfo/api/addTranTask',this.goods).then(res => {
-				     console.log("调用接口")
-				      that.sendDisabled = true
-				      let sec = 60
-				      let interval = setInterval(() => {
-				       sec--;
-				       that.sendText = sec + 's后重发'
-				       if (sec <= 0) {
-				        that.sendDisabled = false
-				        that.sendText = "获取验证码"
-				        clearInterval(interval)
-				       }
-				      }, 1000)
+				    if(res.data.code==200){
+						uni.showToast({
+						 title: '添加发车信息成功',
+						 icon:'none',
+						 duration: 2000
+						})
+						uni.navigateBack();
+					}else if(res.data.code==11015){
+						uni.showToast({
+						 title: '该司机未认证身份，请司机认证后再操作',
+						 icon:'none',
+						 duration: 2000
+						})
+					}
 				    })
 				    .catch(res => {
 				     uni.showToast({
@@ -187,13 +231,11 @@
 						success: (res) => {
 							//上传图片
 							//图片路径可自行修改
-							uploadImage(res.tempFilePaths[0], 'personNoImg/',
+							
+							uploadImage(res.tempFilePaths[0], 'loadPoundImg/',
 								result => {
-								 if (this.personNoImg.length != 0) {
-								 	this.personNoImg1 = result
-								 } else {
-								 	this.personNoImg = result
-								 }
+	
+								 	this.goods.loadPoundImg = result
 								 uni.hideLoading();
 								}
 							)
@@ -281,305 +323,6 @@
 						}
 					})
 				},
-				commit(){
-					if (!this.hasLogin) {
-						uni.showModal({
-							title: '登录提示',
-							content: '您尚未登录，是否立即登录？',
-							showCancel: true,
-							confirmText: '登录',
-							success: (e) => {
-								if (e.confirm) {
-									uni.navigateTo({
-										url: '/pages/public/login'
-									})
-								}
-							},
-							fail: () => {},
-							complete: () => {}
-						})
-					}
-					else{
-						const that = this
-						if(this.TabCur == 0){
-							if(!that.seller){
-								this.$api.msg('请填写车牌号');
-								return;
-							}
-							if(!that.sellerPhone){
-								this.$api.msg('请填写司机手机号码');
-								return;
-							}
-							if(!that.exsitCount){
-								this.$api.msg('请填写毛重');
-								return;
-							}
-							if(!that.minSale){
-								this.$api.msg('请填写皮重');
-								return;
-							}
-							
-							that.saleInfo.seller = that.seller
-							that.saleInfo.sellerPhone = that.sellerPhone
-							that.saleInfo.priceType = that.price
-							that.saleInfo.unitPrice = that.unitPrice
-							that.saleInfo.minSale = that.minSale
-							that.saleInfo.exsitCount = that.exsitCount
-							that.saleInfo.origin = that.origin
-							that.saleInfo.stock = that.stock
-							that.saleInfo.verifyCode = that.verifyCode
-							that.saleInfo.goodsName = that.goodsName
-							that.saleInfo.buyer = that.buyer
-							that.saleInfo.buyerPhone = that.buyerPhone
-							that.saleInfo.level = that.level
-						}else if(this.TabCur == 1){
-							if(!that.buyer){
-								this.$api.msg('请填写买方');
-								return;
-							}
-							if(!that.buyerPhone){
-								this.$api.msg('请填写手机号码');
-								return;
-							}
-							if(!that.goodsName){
-								this.$api.msg('请填写货名');
-								return;
-							}
-							if(!that.verifyCode){
-								this.$api.msg('请填写验证码');
-								return;
-							}
-							
-							if (!that.price) {
-								that.$api.msg('请选择价格类型')
-								return
-							}
-							if(!that.unitPrice){
-								that.$api.msg('请填写协议价格（元/吨）');
-								return
-							}
-							if(!that.origin){
-								this.$api.msg('请填写产地');
-								return;
-							}
-							if(!that.stock){
-								this.$api.msg('请填写库存地');
-								return;
-							}
-							if(!that.level){
-								this.$api.msg('请填写国标等级');
-								return;
-							}
-							that.saleInfo.seller = that.seller
-							that.saleInfo.sellerPhone = that.sellerPhone
-							that.saleInfo.priceType = that.price
-							that.saleInfo.unitPrice = that.unitPrice
-							that.saleInfo.minSale = that.minSale
-							that.saleInfo.exsitCount = that.exsitCount
-							that.saleInfo.origin = that.origin
-							that.saleInfo.stock = that.stock
-							that.saleInfo.verifyCode = that.verifyCode
-							that.saleInfo.goodsName = that.goodsName
-							that.saleInfo.buyer = that.buyer
-							that.saleInfo.buyerPhone = that.buyerPhone
-							that.saleInfo.level = that.level
-						}
-						else if(this.TabCur == 2){
-							if(!that.sender){
-								this.$api.msg('请填写发货方');
-								return;
-							}
-							if(!that.senderPhone){
-								this.$api.msg('请填写发货方手机号码');
-								return;
-							}
-							if(!that.receiver){
-								this.$api.msg('请填写收货方');
-								return;
-							}
-							if(!that.receiverPhone){
-								this.$api.msg('请填写收货方手机号码');
-								return;
-							}
-							if(!that.goodsName){
-								this.$api.msg('请填写货名');
-								return;
-							}
-							if(!that.verifyCode){
-								this.$api.msg('请填写验证码');
-								return;
-							}
-							that.tran.sender = that.sender
-							that.tran.senderPhone = that.senderPhone
-							that.tran.receiver = that.receiver
-							that.tran.receiverPhone = that.receiverPhone
-							that.tran.verifyCode = that.verifyCode
-							that.tran.goodsName = that.goodsName
-							that.tran.total = that.total
-							that.tran.price = that.price
-							that.tran.startPlace = that.startPlace
-							that.tran.endPlace = that.endPlace
-						}
-						else if(this.TabCur == 3){
-							if(!that.startPlace){
-								this.$api.msg('请填写起始地');
-								return;
-							}
-							if(!that.endPlace){
-								this.$api.msg('请填写目的地');
-								return;
-							}
-							if(!that.driver){
-								this.$api.msg('请填写承运人');
-								return;
-							}
-							if(!that.driverPhone){
-								this.$api.msg('请填写承运人手机号码');
-								return;
-							}
-							if(!/(^1[3|4|5|7|8][0-9]{9}$)/.test(that.driverPhone)){
-								that.$api.msg('请输入正确的承运人手机号码');
-								return
-							}
-							if(!that.carNo){
-								this.$api.msg('请填写车牌号');
-								return;
-							}
-							if(!that.verifyCode){
-								this.$api.msg('请填写验证码');
-								return;
-							}
-							if (!that.personNoImg || !that.personNoImg1) {
-								that.$api.msg('请上传磅单');
-								return
-							}
-							if (!that.driverNoImg || !that.driverNoImg1) {
-								that.$api.msg('请上传驾驶证主、副页照片');
-								return
-							}
-							if (!that.carNoImg || !that.carNoImg1) {
-								that.$api.msg('请上传行车证主、副页照片');
-								return
-							}
-							that.tran.driver = that.driver
-							that.tran.driverPhone = that.driverPhone
-							that.tran.verifyCode = that.verifyCode
-							that.tran.price = that.price
-							that.tran.startPlace = that.startPlace
-							that.tran.endPlace = that.endPlace
-							that.tran.carNo = that.carNo
-							that.tran.personNoImg = that.personNoImg
-							that.tran.personNoImg1 = that.personNoImg1
-							that.tran.driverNoImg = that.driverNoImg
-							that.tran.driverNoImg1 = that.driverNoImg1
-							that.tran.carNoImg = that.carNoImg
-							that.tran.carNoImg1 = that.carNoImg1
-						}
-						// 获取用户的当前设置，判断是否点击了“总是保持以上，不在询问”
-						wx.getSetting({
-						 	// withSubscriptions: true,//是否获取用户订阅消息的订阅状态，默认false不返回
-						   success(res){
-						   if(res.authSetting['scope.subscribeMessage']){
-						     uni.openSetting({ // 打开设置页
-						       success(res) {
-									console.log(res.authSetting)
-						       }
-						     });
-						   }else{// 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
-						     uni.requestSubscribeMessage({
-						       tmplIds: ['8cVkckXi_8zfHeScXRHhjN6cgZFYYCWIMPDTiPWagXY'],// 
-						       success (res) {
-						         console.log(res)
-						         if(res['8cVkckXi_8zfHeScXRHhjN6cgZFYYCWIMPDTiPWagXY'] == "accept"){// 字段就是tmplIds模板id
-						            uni.showLoading({
-						            		title: '正在提交',
-											mask:true
-						            	})
-						            	if(that.TabCur == 0){
-						            		that.$api.request('sale', 'addSale',that.saleInfo, failres => {
-						            			uni.hideLoading()
-						            			that.$api.msg(failres.errmsg);
-						            			
-						            		}).then(res => {
-						            			uni.hideLoading()
-						            			uni.showModal({
-						            				title: '提示',
-						            				content: "发布提交成功，工作人员会尽快联系该号码："+that.sellerPhone,
-						            				showCancel: false,
-						            				confirmText: '确定',
-						            				success: () => {
-						            					uni.navigateBack()
-						            				}
-						            			})
-						            			// that.$api.prePage().refreshList(data, that.manageType);
-						            		})
-						            	}
-						            	else if(that.TabCur == 1){
-						            		that.$api.request('sale', 'addBuy',that.saleInfo, failres => {
-						            			uni.hideLoading()
-						            			that.$api.msg(failres.errmsg);
-						            			
-						            		}).then(res => {
-						            			uni.hideLoading()
-						            			uni.showModal({
-						            				title: '提示',
-						            				showCancel: false,
-						            				content: "发布提交成功，工作人员会尽快联系该号码："+that.buyerPhone,
-						            				confirmText: '确定',
-						            				success: () => {
-						            					uni.navigateBack()
-						            				}
-						            			})
-						            			// that.$api.prePage().refreshList(data, that.manageType);
-						            		})
-						            	}
-						            	else if(that.TabCur == 2){
-						            		that.$api.request('tran', 'addTran',that.tran, failres => {
-						            			uni.hideLoading()
-						            			that.$api.msg(failres.errmsg);
-						            		}).then(res => {
-						            			uni.hideLoading()
-						            			uni.showModal({
-						            				title: '提示',
-						            				showCancel: false,
-						            				content: "发布提交成功，工作人员会尽快联系该号码："+that.senderPhone,
-						            				confirmText: '确定',
-						            				success: () => {
-						            					uni.navigateBack()
-						            				}
-						            			})
-						            			// that.$api.prePage().refreshList(data, that.manageType);
-						            		})
-						            		
-						            	}
-						            	else if(that.TabCur == 3){
-						            		that.$api.request('tran', 'addCarDriver',that.tran, failres => {
-						            			uni.hideLoading()
-						            			that.$api.msg(failres.errmsg);
-						            		}).then(res => {
-						            			uni.hideLoading()
-						            			uni.showModal({
-						            				title: '提示',
-						            				showCancel: false,
-						            				content: "发布提交成功，工作人员会尽快联系该号码："+that.driverPhone,
-						            				confirmText: '确定',
-						            				success: () => {
-						            					uni.navigateBack()
-						            				}
-						            			})
-						            			// that.$api.prePage().refreshList(data, that.manageType);
-						            		})
-						            		
-						            	}
-						            
-						         }
-						       }
-						      })
-						     }
-						   }
-						})
-						}
-				}
 			},
 		}
 </script>

pageB/contract/look.vue

@@ -21,99 +21,64 @@
 				<view class="c-row b-b">
 					<text class="tit">累计收发:</text>
 					<view class="con-list">
-						<text>{{goods.unloadPoundImg}}发&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp{{goods.loadPoundImg}}收</text>
+						<text>发收</text>
 						<!-- <text>{{goods.level}}收</text> -->
 					</view>
 				</view>
-				<!-- <view v-for="(item , index) in lists" :Key="index"> -->
+				<view v-for="(item , index) in carlist" :Key="index">
 				<view   class="c-row b-b">
-					<text>{{goods.carNo}}</text>
+					<text>{{item.carNo}}</text>
 					
 						<view class="con-list">
-						<text>{{goods.sendDateStart}}发</text>
+						<text>{{item.sendDateStart}}发</text>
 					</view>
 				</view>
 				<view   class="c-row b-b">
 					<text class="tit">结算价(元/吨)</text>
 					<view class="con-list">
-						<text>{{goods.settlementPrice}}</text>
+						<text>{{item.settlementPrice}}</text>
 					</view>
 				</view>
 				<view  class="c-row b-b">
 					<text class="tit">净重(吨)</text>
 					<view class="con-list">
-						<text>{{goods.netWeight}}发&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp{{goods.loadPoundImg}}收</text>
+						<text>{{item.loadNetWeight}}发{{item.unloadNetWeight}}收</text>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<text class="tit">扣款(元/吨)</text>
 					<view class="con-list">
-						<text>{{goods.deductionAmount}}</text>
+						<text>{{item.deductionAmount}}</text>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<text class="tit">扣款原因</text>
 					<view class="con-list">
-						<text>{{goods.deductionItems}}</text>
+						<text>{{item.deductionItems}}</text>
 					</view>
 				</view>
 				<view class="c-row b-b">
-					<!-- <text class="tit">库存地</text> -->
-					<!-- <view class="con-list"> -->
-					<text><button class="cu-btn commit margin-tb-sm lg" style="background-color:  #4CD964; width: 210rpx;height: 30px; " @click="commit">发货磅单</button></text>
-					
-					<text><button class="cu-btn commit margin-tb-sm lg" style="background-color:  #1CBBB4; margin-left: 15px; width: 210rpx;height: 30px;" @click="commit">收货磅单</button></text>
-						
+					<button v-if='item.loadPoundImg' class="cu-btn commit margin-tb-sm lg" style="background-color:  #4CD964; width: 210rpx;height: 30px; " @click="shipments(item)">发货磅单</button>
+					<button v-if='item.unloadPoundImg' class="cu-btn commit margin-tb-sm lg" style="background-color:  #1CBBB4; margin-left: 15px; width: 210rpx;height: 30px;" @click="unload(item)">收货磅单</button>
 					<!-- </view> -->
 				</view>
-				<view class="padding flex flex-direction">
-					<button class="cu-btn commit margin-tb-sm lg " style="background-color: #EE9900; color: #FFFDEF ; "   @click="getList">确认卸货</button>
+				<view v-if='item.status=="已送达"&&item.confirmFlag==1' class="padding flex flex-direction">
+					<button class="cu-btn commit margin-tb-sm lg " style="background-color: #EE9900; color: #FFFDEF ; "   @click="confirmunload(item)">确认卸货</button>
+				</view>
 				</view>
-				<!-- </view> -->
 			</view>
-			<!-- <view class="d-header">
-				<text>粮食指标</text>
-			</view> -->
 			<view class="c-list">
-				<view  class="c-row b-b">
-					<view class="con-list">
-						<text>{{goods. carNo}}</text>
-						<text>{{goods.sendDateStart}}发</text>
-					</view>
-				</view>
-				<view   class="c-row b-b">
-					<text class="tit">结算价(元/吨)</text>
-					<view class="con-list">
-						<text>{{goods.settlementPrice}}</text>
-					</view>
-				</view>
-				
-				<view  class="c-row b-b">
-					<text class="tit">净重(吨)</text>
-					<view class="con-list">
-						<text>{{goods.netWeight}}发&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp{{goods.packing}}收</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">扣款(元/吨)</text>
-					<view class="con-list">
-						<text>{{goods.minSale}}</text>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					
-					<!-- <view class="con-list"> -->
-					<text><button class="cu-btn commit margin-tb-sm lg" style="background-color:  #4CD964; width: 210rpx;height: 30px;"  @click="commit">发货磅单</button></text>
-					
-					<!-- </view> -->
-				</view>
 				<view class="padding flex flex-direction">
 					<button class="cu-btn commit margin-tb-sm lg" style="background-color: #4CD964; " @click="commit1(goods)">添加发车信息</button>
 				</view>
-				
-				
 			</view>
-			 
+			 <view v-if='imgstatus' class='shade'>
+			 	<view class='shade-content'>
+			 		<image v-if='img' style='width:100px;height:100px;' :src='img'></image>
+					<button style='' @click='imgstatus=false'>取消</button>
+			 	</view>
+				
+			 </view>
 		</view>
 		
 	</view>
@@ -130,7 +95,7 @@
 		},
 		data() {
 			return {
-		
+				carlist:[],
 				swiperCurrent: 0,
 				titleNViewBackground: '',
 				swiperLength: 0,
@@ -150,51 +115,57 @@
 				gooods1:{
 					contractNo:'',
 				},
+				img:'',
 				share:{
 				   title: '',
 				   imageUrl:'https://taohaoliang.oss-cn-beijing.aliyuncs.com/shareLogo.png',
 				},
+				imgstatus:false,
 				reason:"",
 				price:undefined
 
 			};
 		},
 		onShow() {
+			this.loaddata()
 		},
 		onLoad(option) {
+			this.goods.goodsName=option.goodsName
+			this.goods.customer=option.customer
 			this.id = option.id
 			this.goods.contractNo = option.contractNo
-			// this.goods.customer = option.customer
-			// this.goods.goodsName = option.goodsName
-			// this.goods.netWeight = option.netWeight
-			// this.goods.sendDateStart = option.sendDateStart
-			// this.getList()
-			this.loaddata()
+		
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
 		},
 		methods: {
-			commit1(goods){
+			unload(item){
+				this.img=item.unloadPoundImg
+				this.imgstatus=true
+			},
+			shipments(item){
+				this.img=item.loadPoundImg
+				this.imgstatus=true
+			},
+			commit1(){
+				var tranCarNo=''
+				if(this.carlist.length<=9){
+					tranCarNo='C00'+(this.carlist.length+1)
+				}else if(this.carlist.length<100&&this.carlist.length>9){
+					tranCarNo='C0'+(this.carlist.length+1)
+				}else  if(this.carlist.length<1000&&this.carlist.length>99){
+					tranCarNo='C'+(this.carlist.length+1)
+				}
 				uni.navigateTo({
-					url: `/pageB/contract/contract_detail?id=${goods.id}`
+					url: `/pageB/contract/contract_detail?contractNo=`+this.goods.contractNo+'&goodsName='+this.goods.goodsName+'&tranCarNo='+tranCarNo
 				})
 			},
-			getList(){
-				console.log(15454)
-			this.$api.doRequest('post','/tranCarInfo/api/confirmUnloading',{id:this.id}).then(res => {
-			     console.log("调用接口")
-			      that.sendDisabled = true
-			      let sec = 60
-			      let interval = setInterval(() => {
-			       sec--;
-			       that.sendText = sec + 's后重发'
-			       if (sec <= 0) {
-			        that.sendDisabled = false
-			        that.sendText = "获取验证码"
-			        clearInterval(interval)
-			       }
-			      }, 1000)
+			confirmunload(item){
+			this.$api.doRequest('post','/tranCarInfo/api/confirmUnloading',{id:item.id}).then(res => {
+			     if(res.data.code==200){
+					 item.confirmFlag=3
+				 }
 			    })
 			    .catch(res => {
 			     uni.showToast({
@@ -206,18 +177,9 @@
 			   },
 			   loaddata(){
 			   this.$api.doRequest('get','/tranCarInfo/api/selectTranCarInfoNum',{contractNo:this.goods.contractNo},'application/json;charset=UTF-8').then(res => {
-			        console.log("调用接口")
-			         that.sendDisabled = true
-			         let sec = 60
-			         let interval = setInterval(() => {
-			          sec--;
-			          that.sendText = sec + 's后重发'
-			          if (sec <= 0) {
-			           that.sendDisabled = false
-			           that.sendText = "获取验证码"
-			           clearInterval(interval)
-			          }
-			         }, 1000)
+			        if(res.data.code==200){
+						this.carlist=res.data.data
+					}
 			       })
 			       .catch(res => {
 			        uni.showToast({
@@ -903,4 +865,23 @@
 			}
 		}
 	}
+	.shade{
+		position:fixed;
+		top:0;
+		left:0;
+		width:100%;background:rgba(0,0,0,0.5);
+		height:100%;
+		z-index:999999;
+	}
+	.shade-content{
+		background:#fff;
+		position:absolute;
+		top:50%;
+		left:50%;
+		transform: translateX(-50%) translateY(-50%);
+		z-index:999999;
+		text-align:center;
+		width:325px;
+		padding:10px;
+	}
 </style>