前端小程序 sdy

pageA/product/business_buy.vue

@@ -117,13 +117,8 @@
 			<text style="font-size: 18px;color: #FD714F;margin-left: 120rpx;">￥{{purchaseOrder.settlementPrice}}</text>
 			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 		</view>
-		<!-- <view style='background:#fff;'>
-			结算价格=点价+基差+发票费用+包装费
-		</view> -->
 		</view>
-	
 			<button class="btn" @click="commit()">提交</button>
-	
 	</view>
 </template>
 

pageB/contract/collectLook.vue

@@ -36,29 +36,33 @@
 						<text>{{item.settlementPrice}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row" v-bind:class="item.confirmFlag == 1 ? 'b-b' : ''">
 					<text class="tit">净重(吨)</text>
+					<view style="font-size: 18px;margin-left: 80px;">{{item.loadNetWeight}}<text class="hair">发</text></view>
 					<view class="con-list">
-						<text style="font-size: 18px;">{{item.loadNetWeight}}<text
-								class="hair">发</text>{{item.unloadNetWeight}}<text class="collect">收</text></text>
+						
+						<view v-if="item.confirmFlag == 1" style="color: #FE6430;">未收货</view>
+						<view v-if="item.confirmFlag == 3" style="color: #22C572;">已收货</view>
 					</view>
 				</view>
-				<view class="c-row ">
-					<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 v-if="item.confirmFlag == 1" >
+					<view class="titles">磅单照片</view>
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+						:size-type="['compressed']" @on-success="getImgUrl" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType"
+						v-if="item.loadPoundImg == null || item.loadPoundImg == '' "></upload>
+					<image :src="item.loadPoundImg" mode="" v-if="item.loadPoundImg != null || item.loadPoundImg != ''"
+						class="picture "></image>
+				</view>
+				<view class="c-row" v-if="item.confirmFlag == 1">
+					<view class="flex" style="justify-content: flex-end;width: 100%;">
+						<view class="commit" @click="confirmunload(item)">
+							确认收货
+						</view>
+					</view>
 				</view>
-
 			</view>
 		</view>
-		<view class="c-list">
-			<button class=" btn btns" style="background-color: #22C572; color: #FFFFFF ; "
-				@click="confirmunload(item)">确认收货</button>
-
-		</view>
 		<view v-if='imgstatus' class='shade'>
 			<view class='shade-content'>
 				<image v-if='img' style='width:100px;height:100px;' :src='img'></image>
@@ -88,16 +92,7 @@
 				swiperLength: 0,
 				id: '',
 				goods: {
-					// id:"",
-					// contractNo:'',
-					// contractNo:'',
-					// unloadPoundImg:'',
-					// loadPoundImg:'',
-					// carNo:'',
-					// sendDateStart:'',
-					// settlementPrice:'',
-					// deductionAmount:'',
-					// deductionItems:'',
+
 				},
 				gooods1: {
 					contractNo: '',
@@ -123,7 +118,7 @@
 		},
 		onLoad(option) {
 			this.goods.goodsName = option.goodsName
-			this.goods.customer = option.customer
+			this.goods.customer = option.contracter
 			this.id = option.id
 			this.planId = option.planId
 			this.goods.contractNo = option.contractNo
@@ -141,7 +136,10 @@
 			collect() {
 				var num = 0
 				for (var i = 0; i < this.carlist.length; i++) {
-					num += this.carlist[i].unloadNetWeight
+					if( this.carlist[i].confirmFlag == 3){
+						num += this.carlist[i].loadNetWeight
+					}
+					
 				}
 				return num
 			}
@@ -180,6 +178,7 @@
 					}).then(res => {
 						if (res.data.code == 200) {
 							item.confirmFlag = 3
+							this.$api.msg('确认成功！')
 						}
 					})
 					.catch(res => {
@@ -220,12 +219,6 @@
 			reasonInput(e) {
 				this.reason = e.detail.value
 			},
-			// navToDetailPage() {
-			// 	const that = this
-			// 	uni.navigateTo({
-			// 		url: `/pageA/product/detail_upload?id=${that.goods.id}`
-			// 	})
-			// },
 
 			endSale() {
 				const that = this
@@ -410,58 +403,6 @@
 			color: $uni-color-primary;
 		}
 	}
-
-	/* .c-list {
-		font-size: $font-sm + 2upx;
-		color: $font-color-base;
-		background: #fff;
-
-		.c-row {
-			display: flex;
-			align-items: center;
-			padding: 20upx 30upx;
-			position: relative;
-		}
-
-		.tit {
-			width: 220upx;
-		}
-
-		.con {
-			flex: 1;
-			color: $font-color-dark;
-
-			.selected-text {
-				margin-right: 10upx;
-			}
-		}
-
-		.bz-list {
-			height: 40upx;
-			font-size: $font-sm+2upx;
-			color: $font-color-dark;
-
-			text {
-				display: inline-block;
-				margin-right: 30upx;
-			}
-		}
-
-		.con-list {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			color: $font-color-dark;
-			line-height: 40upx;
-			text-align: right;
-			padding-right: 20upx;
-		}
-
-		.red {
-			color: $uni-color-primary;
-		}
-	} */
-
 	/* 评价 */
 	.eva-section {
 		display: flex;
@@ -1001,4 +942,25 @@
 	.btns {
 		background-color: #22C572;
 	}
+
+	.picture {
+		width: 75px;
+		height: 75px;
+		border-radius: 10px;
+		margin-left: 16px;
+	}
+
+	.commit {	
+		width: 85px;
+		height: 35px;
+		border-radius: 16px;
+		border: 1px solid #22C572;
+		text-align: center;
+		line-height: 33px;
+		color: #22C572;
+	}
+	.titles{
+		margin: 10px 0 10px 16px;
+		font-size: 15px;
+	}
 </style>

pageB/contract/contract.vue

@@ -228,7 +228,7 @@
 			},
 			commit2(item) {
 				uni.navigateTo({
-					url: `/pageB/contract/collectLook?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
+					url: `/pageB/contract/collectLook?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}&contracter=${item.contracter}`
 				})
 			},
 			getList() {

pageB/contract/look.vue

@@ -2,8 +2,6 @@
 	<view class="center">	
 		<view class="c-list">
 			<view class="xinxiup">
-
-
 				<view class="c-row b-b">
 					<text class="tit">合同编号:</text>
 					<view class="con-list">
@@ -51,7 +49,7 @@
 						<text>{{item.deductionAmount}}</text>
 					</view>
 				</view>
-				<view class="c-row b-b">
+				<view class="c-row b-b" v-if=" item.deductionItems == null && item.confirmFlag == 1">
 					<text class="tit">扣款原因</text>
 					<view class="con-list">
 						<text>{{item.deductionItems}}</text>

pageD/identity/companyIdentity.vue

@@ -106,10 +106,18 @@
 						this.$api.msg('公司名称不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.compName.length < 2 || this.identityAuthenticationInfo.compName.length > 25) {
+						this.$api.msg('公司名称输入错误')
+						return
+					}
 					if (!this.identityAuthenticationInfo.payTaxesCard) {
 						this.$api.msg('纳税人识别号不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.payTaxesCard.length < 15 || this.identityAuthenticationInfo.payTaxesCard.length > 20) {
+						this.$api.msg('纳税人识别号输入错误')
+						return
+					}
 					if (this.identityAuthenticationInfo.businessLicenseAddressUrl == "" || this.identityAuthenticationInfo
 						.businessLicenseAddressUrl == null) {
 						this.$api.msg('请上传营业执照')
@@ -135,10 +143,18 @@
 						this.$api.msg('姓名不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.customerName.length < 2 || this.identityAuthenticationInfo.customerName.length > 10) {
+						this.$api.msg('姓名输入错误')
+						return
+					}
 					if (!this.identityAuthenticationInfo.customerNumberCard) {
 						this.$api.msg('身份证号不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
+						this.$api.msg('身份证号输入错误')
+						return
+					}
 					this.identityAuthenticationInfo.customerTypeFlag = "1"
 					this.identityAuthenticationInfo.customerType = "个人"
 					var model = JSON.stringify(this.identityAuthenticationInfo);
@@ -197,8 +213,16 @@
 								that.id1 = strToObj.url
 								that.identityImgs1.personImg = strToObj.url
 								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
-									that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
-									that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+										that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+										that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+										}
+									}			
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -225,6 +249,27 @@
 								var strToObj = JSON.parse(data)			
 								that.id[1] = strToObj.url
 								that.id2 = strToObj.url
+								that.identityImgs1.personImg = strToObj.url
+								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+										that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+										that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+										}
+									}
+									
+									
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
 							}
 						})
 					}

pageD/identity/companyIdentityThree.vue

@@ -133,6 +133,10 @@
 		},
 		onLoad(options) {
 			this.identityAuthenticationInfo = JSON.parse(options.identityAuthenticationInfo)
+			if(this.identityAuthenticationInfo.customerTypeFlag == 1){
+				this.identityAuthenticationInfo.payeeName = this.identityAuthenticationInfo.customerName
+				this.identityAuthenticationInfo.payeeNumberCard = this.identityAuthenticationInfo.customerNumberCard
+			}
 		},
 		methods: {
 			obtain(){
@@ -154,13 +158,20 @@
 								that.bank1 = strToObj.url
 								that.certificates = false
 								that.bankImgs1.bankImg = strToObj.url
-								that.$api.doRequest('get', '/driverViewInfo/bankShibie', that
-									.bankImgs1).then(res => {
-									that.$set(that.identityAuthenticationInfo, 'bankCard', res
-										.data.data.bankNo)
-									that.$set(that.identityAuthenticationInfo, 'bankDeposit',
-										res.data.data.bankName)
-									that.bankType = res.data.data.bankNameZhihang
+								that.$api.doRequest('get', '/driverViewInfo/bankShibie', that.bankImgs1).then(res => {
+									if(res.data.data.bankNo != null){
+										if(res.data.data.bankNo != ""){
+											that.$set(that.identityAuthenticationInfo, 'bankCard', res.data.data.bankNo)
+										}
+									}
+									if(res.data.data.bankName != null ){
+										if(res.data.data.bankName != "") {
+											that.$set(that.identityAuthenticationInfo, 'bankDeposit',res.data.data.bankName)
+										}
+									}
+									if(res.data.data.bankNameZhihang.length != 0){
+											that.bankType = res.data.data.bankNameZhihang
+									}
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -187,6 +198,28 @@
 								that.bankid[1] = strToObj.url
 								that.bank2 = strToObj.url
 								that.certificatesTwo = false
+								that.bankImgs1.bankImg = strToObj.url
+								that.$api.doRequest('get', '/driverViewInfo/bankShibie', that.bankImgs1).then(res => {
+									if(res.data.data.bankNo != null){
+										if(res.data.data.bankNo != ""){
+											that.$set(that.identityAuthenticationInfo, 'bankCard', res.data.data.bankNo)
+										}
+									}
+									if(res.data.data.bankName != null ){
+										if(res.data.data.bankName != "") {
+											that.$set(that.identityAuthenticationInfo, 'bankDeposit',res.data.data.bankName)
+										}
+									}
+									if(res.data.data.bankNameZhihang != null){
+											that.bankType = res.data.data.bankNameZhihang
+									}
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
 								
 							}
 						})
@@ -215,14 +248,26 @@
 					this.$api.msg('银行卡号不能为空')
 					return
 				}
+				if (this.identityAuthenticationInfo.bankCard.length < 16 || this.identityAuthenticationInfo.bankCard.length > 19 ) {
+					this.$api.msg('银行卡号输入错误')
+					return
+				}
 				if (!this.identityAuthenticationInfo.bankDeposit) {
 					this.$api.msg('开户行不能为空')
 					return
 				}
+				if (this.identityAuthenticationInfo.bankDeposit.length < 4 || this.identityAuthenticationInfo.bankDeposit.length > 15) {
+					this.$api.msg('开户行输入错误')
+					return
+				}
 				if (!this.identityAuthenticationInfo.bankDepositBranch) {
 					this.$api.msg('开户支行不能为空')
 					return
 				}
+				if (this.identityAuthenticationInfo.bankDepositBranch.length < 4 || this.identityAuthenticationInfo.bankDepositBranch.length > 30) {
+					this.$api.msg('开户支行输入错误')
+					return
+				}
 				if (!this.identityAuthenticationInfo.customerPhone) {
 					this.$api.msg('手机号不能为空')
 					return
@@ -236,19 +281,35 @@
 						this.$api.msg('收款人姓名不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.payeeName < 2 || this.identityAuthenticationInfo.payeeName > 10 ) {
+						this.$api.msg('收款人姓名输入错误')
+						return
+					}
 					if (!this.identityAuthenticationInfo.payeeNumberCard) {
 						this.$api.msg('收款人身份证号不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.payeeNumberCard.length != 18) {
+						this.$api.msg('收款人身份证号输入错误')
+						return
+					}
 					if (!this.identityAuthenticationInfo.compAddress) {
 						this.$api.msg('联系地址不能为空')
 						return
 					}
+					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo.compAddress.length > 20) {
+						this.$api.msg('联系地址输入错误')
+						return
+					}
 				}else if(this.identityAuthenticationInfo.customerTypeFlag == 2){
 					if (!this.identityAuthenticationInfo.compAddress) {
 						this.$api.msg('公司地址不能为空')
 						return
 					}  
+					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo.compAddress.length > 20) {
+						this.$api.msg('公司地址输入错误')
+						return
+					}  
 				}
 			
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
@@ -261,15 +322,6 @@
 				this.$api.doRequest('post', '/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this
 						.identityAuthenticationInfo)
 					.then(res => {
-						// console.log(res.data.message)
-						// if(res.data.message == "Success"){
-						// 	uni.navigateTo({
-						// 		url: `/pages/attestation/indexTwo` ,
-						// 	})
-						// }else{				
-						// 		this.$api.msg(res.data.message)
-						// 		return
-						// }
 						if(res.data.code=='11018'){
 							uni.showModal({
 								title: '提示',

pageD/identity/companyIdentityTwo.vue

@@ -76,10 +76,18 @@
 					this.$api.msg('姓名不能为空')
 					return
 				}
+				if (this.identityAuthenticationInfo.customerName.length < 2 || this.identityAuthenticationInfo.customerName.length > 10) {
+					this.$api.msg('姓名输入错误')
+					return
+				}
 				if (!this.identityAuthenticationInfo.customerNumberCard) {
 					this.$api.msg('身份证号不能为空')
 					return
 				}	
+				if (this.identityAuthenticationInfo.customerNumberCard.length != 18) {
+					this.$api.msg('身份证号输入错误')
+					return
+				}
 				var model = JSON.stringify(this.identityAuthenticationInfo);
 				uni.navigateTo({
 					url: `/pageD/identity/companyIdentityThree?identityAuthenticationInfo=` + model,
@@ -101,8 +109,16 @@
 								that.certificates = false
 								that.identityImgs1.personImg = strToObj.url
 								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
-									that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
-									that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+										that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+										that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+										}
+									}
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -129,6 +145,27 @@
 								that.id[1] = strToObj.url
 								that.id2 = strToObj.url
 								that.certificatesTwo = false
+								that.identityImgs1.personImg = strToObj.url
+								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+											that.$set(that.identityAuthenticationInfo,'customerName',res.data.data.recPerson)
+										}
+										
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+											that.$set(that.identityAuthenticationInfo,'customerNumberCard',res.data.data.recPersonNo)
+										}
+										
+									}
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
 							}
 						})
 					}

pageD/identity/driverIdentity.vue

@@ -55,7 +55,9 @@
 			<view class="c-row ">
 				<text class="tit">常驻城市</text>
 				<view class="con-list">
-					<input placeholder="请填写常驻城市" name="input" v-model="DriverViewInfo.residentCityProvincial"></input>
+					<!-- <input placeholder="请填写常驻城市" name="input" v-model="DriverViewInfo.residentCityProvincial"></input> -->
+					<view @click='regionchange'>{{region}}</view>
+					<u-picker :params='params' @confirm='regionpicker' mode="region" v-model="show"></u-picker>
 				</view>
 			</view>
 		</view>
@@ -103,7 +105,12 @@
 				certificatesTwo:true,
 				certificates:true,
 				verification:true,
-
+				region:"请填写常驻城市",
+				show:false,
+				params: {
+					province: true,
+					city: true,
+				},
 			}
 		},
 		computed: {
@@ -115,6 +122,15 @@
 			// 		this.codestatus = true
 			// 	}
 			// },
+			regionchange() {
+				this.show = true
+			},
+			regionpicker(e) {
+				// this.deptList.outputPrivate = e.province.label
+				// this.deptList.outputCity = e.city.label
+				this.region = e.province.label + '-' + e.city.label
+				this.DriverViewInfo.residentCityProvincial = e.province.label + e.city.label
+			},
 			jumpUrl() {
 				if (this.id[0] == "" || this.id[0] == null) {
 					this.$api.msg('请上传身份证正面！')
@@ -128,10 +144,19 @@
 					this.$api.msg('姓名不能为空')
 					return
 				}
+				if (this.DriverViewInfo.driverName.length < 2 || this.DriverViewInfo.driverName.length > 10) {
+					this.$api.msg('姓名输入错误')
+					return
+				}
+			
 				if (!this.DriverViewInfo.numberCard) {
 					this.$api.msg('身份证号不能为空')
 					return
 				}
+				if (this.DriverViewInfo.numberCard.length != 18) {
+					this.$api.msg('身份证号输入错误')
+					return
+				}
 				if (!this.DriverViewInfo.driverPhone) {
 					this.$api.msg('手机号不能为空')
 					return
@@ -249,8 +274,16 @@
 								that.certificates = false
 								that.personImgs.personImg = that.id[0]
 								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.personImgs).then(res => {
-									that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
-									that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+											that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+											that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
+										}
+									}
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -277,6 +310,25 @@
 								that.id[1] = strToObj.url
 								that.id2 = strToObj.url
 								that.certificatesTwo = false
+								that.personImgs.personImg = that.id[1]
+								that.$api.doRequest('get', '/driverViewInfo/personShibie', that.personImgs).then(res => {
+									if(res.data.data.recPerson != null){
+										if(res.data.data.recPerson != ""){
+											that.$set(that.DriverViewInfo,'driverName',res.data.data.recPerson)
+										}
+									}
+									if(res.data.data.recPersonNo != null){
+										if(res.data.data.recPersonNo != ""){
+											that.$set(that.DriverViewInfo,'numberCard',res.data.data.recPersonNo)
+										}
+									}
+								}).catch(res => {
+									uni.showToast({
+										title: res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								})
 							}
 						})
 					}

pageD/identity/driverIdentityTwo.vue

@@ -78,17 +78,22 @@
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">账户类型</text>
-				<view class="con-list">
+				<!-- <view class="con-list">
 					<input placeholder="请填写账户类型" name="input" v-model="items.accountType"></input>
-				</view>
+					
+				</view> -->	
+				<picker @change="accountChange($event,index)" :value="accountarr[index]" :range="accountType" class="con-list">
+					<view class="picker" v-model="items.accountType">
+						{{accountarr[index] != null ? accountarr[index]:'请填写账户类型'}}
+					</view>
+				</picker>
 			</view>
 			<view class="c-row b-b"> 
 				<text class="tit">银行卡照片（可选）</text>
 				<view class="con-list">
-					<!-- <input placeholder="请上传照片" name="input" v-model="items.payeeAddressUrl" @clisk="bankimg(items)"></input> -->
-					<view  v-if="bankimg == ''"  @click="bankimgs(index)">请上传照片</view>
-					<view  v-if="bankimg != ''" @click="bankimgs(index)">
-						<image v-bind:src="bankimg" style="width: 40px; height: 40px;"></image>
+					<view  v-if="bankimg[index] == null"  @click="bankimgs(index)">请上传照片</view>
+					<view  v-if="bankimg[index] != null" @click="bankimgs(index)">
+						<image v-bind:src="bankimg[index]" style="width: 40px; height: 40px;"></image>
 					</view>
 					
 				</view>
@@ -109,9 +114,9 @@
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户支行</text>
-				<picker @change="bankChange" :value="bankIndex" :range="bankType" class="con-list">
+				<picker @change="bankChange($event,index)" :value="bankarr[index]" :range="bankType[index]" class="con-list">
 				<view class="con-list">
-					{{bankIndex>-1?bankType[bankIndex]:'请选择开户支行'}}
+					{{bankarr[index] != null?bankarr[index]:'请选择开户支行'}}
 				</view>
 					</picker>
 			</view>
@@ -159,6 +164,8 @@
 				driverPayeeInfoList: [
 					{
 						accountType:"",
+						accountIndex:'0',
+						binkindex:0,
 						cardAddressUrl:"",
 						bankCard:"",
 						bankDeposit:"",
@@ -174,16 +181,24 @@
 				carLongIndex: 0,
 				carLongType: ['13', '9.6', '8.2', '8.7', '11.7', '12.5', '13.7', '15', '16', '17.5'],
 				DriverViewInfo:{},
-				bankimg:"",
+				bankimg:[],
 				bankImgs1:{},
 				bankIndex:-1,
 				bankType:[],
+				accountType:["个人账户","企业账户"],
+				accountarr:[],
+				bankarr:[],
 			}
 		},
 		onLoad(options){
 			this.DriverViewInfo = JSON.parse(options.DriverViewInfo)
 		},
 		methods: {
+			accountChange(e,index){	
+				this.driverPayeeInfoList[index].accountIndex = e.detail.value                                
+				this.driverPayeeInfoList[index].accountType = this.accountType[this.driverPayeeInfoList[index].accountIndex];
+				this.accountarr[index] = this.accountType[e.detail.value];
+			},
 			bankimgs(items){
 				console.log(items)
 				var that = this
@@ -197,15 +212,15 @@
 								var data = res.data
 								var strToObj = JSON.parse(data)
 								// that.id[0] = strToObj.url
-								that.bankimg = strToObj.url
+								that.bankimg[items] = strToObj.url
+								console.log(that.bankimg,"图片数组")
 								 that.bankImgs1.bankImg = strToObj.url
 								that.$api.doRequest('get', '/driverViewInfo/bankShibie', that.bankImgs1).then(res => {
 									console.log(res)
 									that.$set(that.driverPayeeInfoList[items],'bankCard',res.data.data.bankNo)
 									that.$set(that.driverPayeeInfoList[items],'bankDeposit',res.data.data.bankName)
-		
-									that.bankType = res.data.data.bankNameZhihang
-									console.log(that.ban)
+									that.bankType[items] = res.data.data.bankNameZhihang
+									console.log(that.bankType,"支行数组")
 								}).catch(res => {
 									uni.showToast({
 										title: res.data.message,
@@ -224,6 +239,10 @@
 						this.$api.msg('车牌号不能为空')
 						return
 					}
+					if (this.driverCarInfoList[i].carNumber.toString().length != 7) {
+						this.$api.msg('车牌号输入错误')
+						return
+					}
 					if (!this.driverCarInfoList[i].carModel) {
 						this.$api.msg('车型不能为空')
 						return
@@ -236,6 +255,16 @@
 						this.$api.msg('载重不能为空')
 						return
 					}
+					if (this.driverCarInfoList[i].carLoad > 50 ) {
+						this.$api.msg('载重输入错误')
+						return
+					}
+					if (this.driverCarInfoList[i].carLoad.indexOf('.') != -1) {
+						if (this.driverCarInfoList[i].carLoad.split('.')[1].length > 1) {
+							this.$api.msg('载重输入错误')
+							return
+						}
+					}
 					if (!this.driverCarInfoList[i].yearManufacture) {
 						this.$api.msg('出厂年份不能为空')
 						return
@@ -248,32 +277,53 @@
 					}
 					// if (!this.driverCarInfoList[i].cardAddressUrl) {
 					// 	this.$api.msg('银行卡照片不能为空')
-					
 					// }
 					if (!this.driverPayeeInfoList[i].bankCard) {
 						this.$api.msg('银行卡号不能为空')
 						return
 					}
+					if (this.driverPayeeInfoList[i].bankCard.length < 16 || this.driverPayeeInfoList[i].bankCard.length > 19) {
+						this.$api.msg('银行卡号输入错误')
+						return
+					}
 					if (!this.driverPayeeInfoList[i].bankDeposit) {
 						this.$api.msg('开户行不能为空')
 						return
 					}
+					if (this.driverPayeeInfoList[i].bankDeposit.length < 4 || this.driverPayeeInfoList[i].bankDeposit.length > 15) {
+						this.$api.msg('开户行输入错误')
+						return
+					}
 					if (!this.driverPayeeInfoList[i].bankDepositBranch) {
 						this.$api.msg('开户支行不能为空')
 						return
 					}
+					if (this.driverPayeeInfoList[i].bankDepositBranch.length < 4 || this.driverPayeeInfoList[i].bankDepositBranch.length > 30 ) {
+						this.$api.msg('开户支行输入错误')
+						return
+					}
 					if (!this.driverPayeeInfoList[i].payeeName) {
 						this.$api.msg('收款人姓名不能为空')
 						return
 					}
+					if (this.driverPayeeInfoList[i].payeeName.length < 2 || this.driverPayeeInfoList[i].payeeName.length > 10) {
+						this.$api.msg('收款人姓名输入错误')
+						return
+					}
 					if (!this.driverPayeeInfoList[i].payeeNumberCard) {
 						this.$api.msg('收款人身份证号不能为空')
 						return
 					}
+					if (this.driverPayeeInfoList[i].payeeNumberCard.length != 18) {
+						this.$api.msg('收款人身份证号输入错误')
+						return
+					}
 				}
 					this.DriverViewInfo.driverCarInfoList = this.driverCarInfoList
 					this.DriverViewInfo.driverPayeeInfoList = this.driverPayeeInfoList
 					this.DriverViewInfo.driverPayeeInfoList.payeeAddressUrl = this.bankimg
+					console.log(this.DriverViewInfo,"dsdsd")
+					return
 					var model = JSON.stringify(this.DriverViewInfo);
 				uni.navigateTo({
 					url: `/pageD/identity/driverIdentityThree?DriverViewInfo=` + model
@@ -291,6 +341,8 @@
 			userAdd() {
 				this.driverPayeeInfoList.push({
 					accountType:"",
+					accountIndex:'0',
+					binkindex:0,
 					cardAddressUrl:"",
 					bankCard:"",
 					bankDeposit:"",
@@ -315,10 +367,14 @@
 				
 				this.driverCarInfoList[this.driverCarInfoList.length - 1].carModel = this.ModelType[this.ModelIndex];
 			},
-			bankChange(e) {
+			bankChange(e,index) {
+				this.driverPayeeInfoList[index].binkindex = e.detail.value 
 				this.bankIndex = e.detail.value
 				this.Model = this.bankType[this.bankIndex];	
-				this.driverPayeeInfoList[this.driverPayeeInfoList.length - 1].bankDepositBranch = this.bankType[this.bankIndex];
+				this.driverPayeeInfoList[index].bankDepositBranch = this.bankType[this.bankIndex];
+				this.bankarr[index] =  this.bankType[index][this.driverPayeeInfoList[index].binkindex];
+				
+				console.log(this.bankarr[index],"支行")
 			},
 			carLongChange(e) {
 				this.carLongIndex = e.detail.value

pageD/myRelease/sellEdit.vue

@@ -4,7 +4,8 @@
 			<view class="c-row b-b">
 				<text class="tit">名头</text>
 				<view class="con-list">
-					<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text>
+				<!-- 	<text @click="navToDetailPage">{{deptList.procurementPlanNo}}</text> -->
+					<text @click="navToDetailPage">{{deptList.seller}}</text>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -43,7 +44,7 @@
 			<view class="c-row b-b">
 				<text class="tit">价格类型</text>
 				<view class="con-list">
-					<input placeholder="请填写价格类型" name="input" v-model="deptList.priceType"></input>
+					{{deptList.priceType}}
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="this.typesIndex != 1">
@@ -106,8 +107,7 @@
 			<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> -->
-							{{deptList.impurity}}
+							<input placeholder="请填写杂质占比" name="input" v-model="deptList.impurity"></input>
 						</view>
 			</view>
 			<view v-if='!checked' class="c-row b-b">

pageD/warehousings/ex_warehouse.vue

@@ -337,14 +337,21 @@
 						id: id1
 					}).then(res => {
 						this.WarehouseInOutInfo = res.data.data
-						if (this.WarehouseInOutInfo.warehouseInOutDetail != null || this.WarehouseInOutInfo
-							.warehouseInOutDetail != "") {
+						if (this.WarehouseInOutInfo.warehouseInOutDetail != null ) {
 							this.list = this.WarehouseInOutInfo.warehouseInOutDetail
 						}
-						this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey
+						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
-						this.warehouseIndex = this.WarehouseInOutInfo.warehouseNameKey
-						this.pinIndex = this.WarehouseInOutInfo.gradeKey
+						
+						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) {
@@ -925,13 +932,11 @@
 		margin-left: -60px;
 	}
 
-	.picture {
+	/* .picture {
 		width: 90px;
 		height: 90px;
 		border-radius: 10px;
-		/* 
-		position: relative; */
-	}
+	} */
 
 	.picture1 {
 		width: 90px;

pages/release/release.vue

@@ -152,7 +152,6 @@
 										})
 									});
 							} else if (res.cancel) {
-								// console.log('用户点击取消');
 							}
 						},
 					})
@@ -170,6 +169,7 @@
 				}
 			},
 			deleteRelease(item) {
+				var that = this
 				if (item.type == "买粮") {
 					uni.showModal({
 						// title: '登录提示',
@@ -178,12 +178,12 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								this.$api.doRequest('post', '/procurementPlanInfo/api/deleteProcurementPlan', {
+								that.$api.doRequest('post', '/procurementPlanInfo/api/deleteProcurementPlan', {
 										id: item.id
 									}).then(res => {
 										if (res.data.message == "Success") {
-											this.$api.msg('删除成功！')
-											this.getList()
+											that.$api.msg('删除成功！')
+											that.getList()
 											return
 										}
 									})
@@ -209,12 +209,12 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								this.$api.doRequest('post', '/salePlanInfo/api/deleteSalePlanInfo', {
+								that.$api.doRequest('post', '/salePlanInfo/api/deleteSalePlanInfo', {
 										id: item.id
 									}).then(res => {
 										if (res.data.message == "Success") {
-											this.$api.msg('删除成功！')
-											this.getList()
+											that.$api.msg('删除成功！')
+											that.getList()
 											return
 										}
 									})
@@ -232,7 +232,6 @@
 						fail: () => {},
 						complete: () => {}
 					})
-
 				}
 			},
 			releaseChange(e) {