前端 小程序 sdy

pageA/product/business_buy.vue

@@ -114,7 +114,7 @@
 		<view  v-if="purchaseOrder.procurementPlanType=='期货'"  class=" align-start ">
 			<view class="titles">结算价格</view>
 			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
-			<text style="font-size: 18px;color: #FD714F;margin-left: 120rpx;">￥{{purchaseOrder.settlementPrice}}</text>
+			<text style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
 		</view>

pageA/product/business_sale.vue

@@ -114,9 +114,8 @@
 		<view  v-if="purchaseOrder.salePlanType=='期货'" class=" align-start ">
 			<view class="titles">结算价格</view>
 			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
-			<view class="con-list">
-			<text >{{purchaseOrder.settlementPrice}}</text>
-			</view>
+			<text style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
+			
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
 		<!-- <view style='background:#fff;'>

pageA/product/lookup.vue

@@ -368,7 +368,6 @@
 				} else {
 					param1 = '/salePlanInfo/selectSalePlanInfo'
 				}
-				console.log(this.userInfo)
 				this.$api.doRequest('get', param1,{pageSize:this.pageSize,
 				currentPage:this.currentPage,searchKeyWord:this.searchKeyWord}).then(res => {
 					uni.hideLoading()

pageD/identity/driverIdentityThree.vue

@@ -97,8 +97,6 @@
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.pcFlag = 0
 				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				this.DriverViewInfo.numberCard="210804199909162525"
-				this.DriverViewInfo.driverPhone="15842688524"
 				this.$api.doRequest('post', '/driverViewInfo/api/addInfo', this.DriverViewInfo).then(res => {
 					if(res.data.code=='ERROR001'){
 						uni.showModal({

pageD/identity/driverIdentityTwo.vue

@@ -55,7 +55,7 @@
 			<view class="c-row ">
 				<text class="tit">出厂年份</text>
 				<view class="con-list">
-					<view @click='yearchange'>{{year[index] == null?"请填写出厂年份":year[index]}}</view>
+					<view @click='yearchange'>{{year[index] == null?"请选择出厂年份":year[index]}}</view>
 					<u-picker :params='params' @confirm='yearpicker($event,index)' v-model="show" mode="time">
 					</u-picker>
 				</view>
@@ -183,7 +183,7 @@
 					bankDeposit: "",
 					bankDepositBranch: "",
 					payeeName: "",
-					payeeNumberCard: "",
+					payeeNumberCard:"",
 				}],
 				ModelIndex: 0,
 				Model: '',
@@ -214,6 +214,8 @@
 		},
 		onLoad(options) {
 			this.DriverViewInfo = JSON.parse(options.DriverViewInfo)
+			this.driverPayeeInfoList[0].payeeName = this.DriverViewInfo.driverName
+				this.driverPayeeInfoList[0].payeeNumberCard = this.DriverViewInfo.numberCard
 		},
 		methods: {
 			subBranchChength(){
@@ -395,8 +397,8 @@
 					bankCard: "",
 					bankDeposit: "",
 					bankDepositBranch: "",
-					payeeName: "",
-					payeeNumberCard: "",
+					payeeName: this.DriverViewInfo.driverName,
+					payeeNumberCard: this.DriverViewInfo.numberCard,
 				})
 			},
 			carDel(index) {

pageD/warehousings/ex_warehouse.vue

@@ -97,7 +97,7 @@
 					<text class="tit">出库日期</text>
 
 					<view class="con-list" @click="show = true">
-						{{WarehouseInOutInfo.inOutDate!='' || WarehouseInOutInfo.inOutDate != null ? WarehouseInOutInfo.inOutDate : time1}}
+						{{ WarehouseInOutInfo.inOutDate != null ? WarehouseInOutInfo.inOutDate : time1}}
 					</view>
 					<u-picker :params='params' :default-time='time1' @confirm="DateChange" v-model="show" mode="time">
 					</u-picker>
@@ -290,9 +290,19 @@
 				return new Date()
 			}
 		},
-		onShow() {
+		onLoad(option) {
+			this.WarehouseInOutInfo.contractNo = option.contractNo
+			this.WarehouseInOutInfo.goodsName = option.goodsName
+			this.WarehouseInOutInfo.consignee = option.consignee
+			this.WarehouseInOutInfo.boxNo = option.boxNo
+			this.WarehouseInOutInfo.tranCarNo = option.tranCarNo
+			this.WarehouseInOutInfo.titleNo = option.titleNo
+			this.WarehouseInOutInfo.id = option.id
+			this.WarehouseInOutInfo.carNo = option.carNo
+			this.WarehouseInOutInfo.warehouseName = option.warehouseName
 			this.getList(this.WarehouseInOutInfo.id)
-			console.log( this.WarehouseInOutInfo)
+		},
+		onShow() {	
 			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
 				compId: '2710b21efc1e4393930c5dc800010dc4',
 				warehouseType: 1,
@@ -302,7 +312,6 @@
 					for (var i = 0; i < res.data.data.length; i++) {
 						if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
 							this.warehouseIndex = i
-							console.log(res.data.data,"dsd")
 							this.ids = res.data.data[i].id
 						}
 						arr.push(res.data.data[i].warehouseName)
@@ -310,7 +319,6 @@
 					this.warehouselist = res.data.data
 					this.warehouse = arr
 				}
-
 			})
 			// this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
 			// 	id: this.ids,
@@ -324,63 +332,46 @@
 			// 	this.warehouselist11 = res.data.data
 			// })
 		},
-		onLoad(option) {
-			this.WarehouseInOutInfo.contractNo = option.contractNo
-			this.WarehouseInOutInfo.goodsName = option.goodsName
-			this.WarehouseInOutInfo.consignee = option.consignee
-			this.WarehouseInOutInfo.boxNo = option.boxNo
-			this.WarehouseInOutInfo.tranCarNo = option.tranCarNo
-			this.WarehouseInOutInfo.titleNo = option.titleNo
-			this.WarehouseInOutInfo.id = option.id
-			this.WarehouseInOutInfo.carNo = option.carNo
-			this.WarehouseInOutInfo.warehouseName = option.warehouseName
-			// var date = new Date()
-			// var year = date.getFullYear()
-			// var month = date.getMonth()
-			// var date1 = date.getDate()
-			// if (month + 1 < 10) {
-			// 	month = "0" + (month + 1)
-			// }
-			// this.time = year + '-' + month + "-" + date1
-			this.getList(this.WarehouseInOutInfo.id)
-		},
+		
 		methods: {
 			getList(id1) {
 				var that = this
 				this.$api.doRequest('get', '/warehouseInOutInfo/getInfo', {
 						id: id1
 					}).then(res => {
-						this.WarehouseInOutInfo = res.data.data
-						if (this.WarehouseInOutInfo.warehouseInOutDetail != null ) {
-							this.list = this.WarehouseInOutInfo.warehouseInOutDetail
-						}
-						if(this.WarehouseInOutInfo.inOutTypeKey != null){
-								this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey
-						}
-					    if(this.WarehouseInOutInfo.warehouseNameKey != null){
-							this.warehouseIndex = this.WarehouseInOutInfo.warehouseNameKey
-						}
-						this.warehouseIndex1 = this.WarehouseInOutInfo.binNumberKey
-						
-						if(this.WarehouseInOutInfo.gradeKey != null){
-							this.pinIndex = this.WarehouseInOutInfo.gradeKey
-						}
 						
-						var positionid
-						for (var i = 0; i < this.warehouselist.length; i++) {
-							if (this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
-								this.warehouseIndex = i
-								positionid = this.warehouselist[i].id
-							}
-						}
-					// this.warehouse1 = this.warehouseChange3(positionid)
-					// console.log(this.warehouse1,"仓库号")
-						for (var i = 0; i < this.warehouse1.length; i++) {
-							if (this.warehouse1[i] == this.WarehouseInOutInfo.binNumber) {
-								this.warehouseIndex1 = i
-							}
-						}
 
+						if(res.data.code == 200){
+							this.WarehouseInOutInfo = res.data.data
+							if (this.WarehouseInOutInfo.warehouseInOutDetail != null ) {
+									this.list = this.WarehouseInOutInfo.warehouseInOutDetail
+								}
+								if(this.WarehouseInOutInfo.inOutTypeKey != null){
+										this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey
+								}
+							    if(this.WarehouseInOutInfo.warehouseNameKey != null){
+									this.warehouseIndex = this.WarehouseInOutInfo.warehouseNameKey
+								}
+								this.warehouseIndex1 = this.WarehouseInOutInfo.binNumberKey
+								
+								if(this.WarehouseInOutInfo.gradeKey != null){
+									this.pinIndex = this.WarehouseInOutInfo.gradeKey
+								}
+								
+								var positionid
+								for (var i = 0; i < this.warehouselist.length; i++) {
+									if (this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
+										this.warehouseIndex = i
+										positionid = this.warehouselist[i].id
+									}
+								}
+							this.warehouseChange3(positionid)
+								for (var i = 0; i < this.warehouse1.length; i++) {
+									if (this.warehouse1[i] == this.WarehouseInOutInfo.binNumber) {
+										this.warehouseIndex1 = i
+									}
+								}
+						}
 					})
 					.catch(res => {
 						uni.showToast({
@@ -395,18 +386,22 @@
 			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
 				id: id,
 			}).then(res => {
-				var arr = []
-				for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
-				
-					arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
-				}
-				that.warehouse1 = arr
-				this.warehouselist11 = res.data.data
+				if(res.data.code == 200 ){
+					var arr = []
+					for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
+						arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
+					}
+					that.warehouse1 = arr
+					for(var i = 0 ; i < that.warehouse1.length ; i++){
+						if(that.warehouse1[i] == that.WarehouseInOutInfo.binNumber){
+							that.warehouseIndex1 = i
+						}
+					}
+				}			
 			})
 			return 	that.warehouse1
 		},
 			warehouseChange(e) {
-				console.log(e)
 				var id = ''
 				this.warehouseIndex = e.detail.value
 				this.WarehouseInOutInfo.warehouseName = this.warehouse[this.warehouseIndex]
@@ -420,11 +415,10 @@
 				}).then(res => {
 					var arr = []
 					for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
-						console.log(res.data.data.warehousePositionInfoList[i])
+						// console.log(res.data.data.warehousePositionInfoList[i])
 						arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
 					}
 					this.warehouse1 = arr
-					this.warehouselist11 = res.data.data
 				})
 			},
 			warehouseChange1(e) {
@@ -450,7 +444,6 @@
 				}
 			},
 			getImgUrl(res) {
-				console.log(res)
 				this.imgUrls.push(res);
 			},
 			onRemove(index) {
@@ -565,7 +558,6 @@
 				if (this.imgUrls.length > 0) {
 					this.WarehouseInOutInfo.addressUrl = this.imgUrls[0]
 				}
-				console.log(this.WarehouseInOutInfo, "出库暂存对象")
 				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
 					if (res.data.code == 200) {
 						uni.showToast({
@@ -573,6 +565,9 @@
 							icon: 'none',
 							duration: 2000
 						})
+						uni.navigateTo({
+							url: `/pages/task/my_task`,
+						})
 
 						// setTimeout(() => {
 						// 	uni.navigateBack({})
@@ -616,8 +611,8 @@
 					this.$api.msg('毛重输入错误')
 					return
 				}
-				if (this.WarehouseInOutInfo.grossWeight.indexOf('.') != -1) {
-					if (this.WarehouseInOutInfo.grossWeight.split('.')[1].length > 2) {
+				if (this.WarehouseInOutInfo.grossWeight.toString().indexOf('.') != -1) {
+					if (this.WarehouseInOutInfo.grossWeight.toString().split('.')[1].length > 2) {
 						this.$api.msg('毛重输入错误')
 						return
 					}
@@ -729,9 +724,12 @@
 							title: '提交成功',
 							icon: 'none'
 						})
-						setTimeout(() => {
-							uni.navigateBack({})
-						}, 200)
+						uni.navigateTo({
+							url: `/pages/task/my_task`,
+						})
+						// setTimeout(() => {
+						// 	uni.navigateBack({})
+						// }, 200)
 					} else {
 						uni.showToast({
 							title: res.data.message,

pages/attestation/indexThree.vue

@@ -44,7 +44,7 @@
 					</view>
 					<view class="cancel" @click='pricestatus=false'>×</view>
 					<view class='shade-content-item'>
-						<input v-model='price' placeholder="请输入手机号" type="number" class="tainput">
+						<input v-model='price' placeholder="请输入手机号" maxlength="11" type="number" class="tainput" >
 					</view>
 					<view>
 						<!--<view style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</view>
@@ -64,7 +64,7 @@
 					<text style="color:#AFB3BF;font-size: 14px;">验证码已发送至+86 {{price}}</text>
 					<view class="cancel" @click='pricestatusTwo=false,pricestatus=false'>×</view>
 					<view class='shade-content-item flex'>
-						<input v-model='verifyCode' placeholder="填写验证码" type="number" class="tainput1">
+						<input v-model='verifyCode' placeholder="填写验证码" type="number" class="tainput1" maxlength="6">
 						<text style="color:#AFB3BF;font-size: 14px;" @click="resend()">{{sendText}}</text>
 					</view>
 					<view>
@@ -113,6 +113,9 @@
 		},
 		methods: {
 			resend() {
+				
+				price
+				
 				if (this.sendText == "获取验证码") {
 					this.getcode()
 				}
@@ -149,6 +152,7 @@
 					});
 			},
 			amendprice(item) {
+				var that = this
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.price,
 						verifyCode: this.verifyCode
@@ -160,15 +164,10 @@
 									commonId: this.userInfo.id
 								}, 'application/json;charset=UTF-8').then(res => {
 									if (res.data.code == 200) {
-										uni.navigateTo({
-											url: '/pages/attestation/indexThree'
-										});
-										uni.showToast({
-											title: '修改成功！',
-											icon: 'none',
-											duration: 2000
-										})
-										this.$api.msg('修改成功！')
+										that.$api.msg('修改成功！')
+										that.pricestatusTwo = false
+										that.pricestatus = false
+										that.getList()
 									}
 								})
 								.catch(res => {
@@ -198,7 +197,6 @@
 					});
 			},
 			getcode() {
-		
 					if (!this.price) {
 						uni.showToast({
 							title: '请填写手机号！',
@@ -207,7 +205,6 @@
 						})
 						return
 					}
-			
 				if (this.price.length != 11 ) {
 					uni.showToast({
 						title: '请正确填写手机号！',
@@ -273,13 +270,11 @@
 					success: (e) => {
 						this.$api.doRequest('post', '/driverViewInfo/api/deleteDriver', this.deletes,
 								'application/json;charset=UTF-8').then(res => {
-								this.procurementPlanInfos = res.data.data.records
-								if (res.errmsg == "Success") {
+								if (res.data.code == 200) {
 									this.$api.msg('删除成功！')
 									this.getList()
 									return
 								}
-
 							})
 							.catch(res => {
 								uni.showToast({

pages/attestation/indexTwo.vue

@@ -50,7 +50,7 @@
 					</view>
 					<view class="cancel" @click='pricestatus=false'>×</view>
 					<view class='shade-content-item'>
-						<input v-model='price' placeholder="请输入手机号" type="number" class="tainput">
+						<input v-model='price' placeholder="请输入手机号" type="number" class="tainput" maxlength="11">
 					</view>
 					<view>
 						<!-- 	<view style='width:50%;display:inline-block;' @click='pricestatus=false'>取消</view>
@@ -70,7 +70,7 @@
 					<text style="color:#AFB3BF;font-size: 14px;">验证码已发送至+86 {{price}}</text>
 					<view class="cancel" @click='pricestatusTwo=false,pricestatus=false'>×</view>
 					<view class='shade-content-item flex'>
-						<input v-model='verifyCode' placeholder="填写验证码" type="number" class="tainput1">
+						<input v-model='verifyCode' placeholder="填写验证码" type="number" class="tainput1" maxlength="6">
 						<text style="color:#AFB3BF;font-size: 14px;" @click="resend">{{sendText}}</text>
 					</view>
 					<view>
@@ -206,6 +206,7 @@
 					});
 			},
 			amendprice(item) {
+				var that = this
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 						phone: this.price,
 						verifyCode: this.verifyCode
@@ -216,11 +217,15 @@
 									id: this.id,
 									commonId: this.userInfo.id
 								}, 'application/json;charset=UTF-8').then(res => {
-									if (res.data.code == 200) {
-										uni.navigateTo({
-											url: '/pages/attestation/indexTwo'
-										});
-										this.$api.msg('修改成功！')
+									if (res.data.code == 200) {	
+										that.$api.msg('修改成功！')
+										that.pricestatusTwo = false
+										that.pricestatus = false
+										that.getList()
+										// uni.navigateTo({
+										// 	url: '/pages/attestation/indexTwo'
+										// });
+									
 									} else {
 										uni.showToast({
 											title: res.errmsg,

pages/public/code.vue

@@ -135,6 +135,9 @@
 				var interval = setInterval(() =>{
 					--this.count_down
 				},1000) 
+				if(this.count_down == 0){
+					this.status=false
+				}
 				// 设定一个定时器 60000就是六十秒
 				setTimeout(() =>{
 					this.status=false