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

pageB/contract/contract.vue

@@ -34,7 +34,7 @@
 			<view class="c-row flex annius">
 				<text class="anniu" @click="commit"> 附件</text>
 				<text class="anniu" @click="someprice(item)" v-if="item.procurementPlanType == '期货' && (item.status == '已成交' || item.status == '已挂单')"> 点价</text>
-				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'"> 发货</text>
+				<text class="anniu1" @click="commit1(item)" v-if="item.orderType == '采购'&&item.status != '待审核'"> 发货</text>
 				<text class="anniu1" @click="commit2(item)" v-if="item.orderType == '销售'"> 收货</text>
 			</view>
 		</view>

pageD/identity/companyIdentityThree.vue

@@ -338,8 +338,8 @@
 							this.identityAuthenticationInfo.commonId = this.userInfo.id
 							this.identityAuthenticationInfo.payeeAddressUrl = this.bankid.toString()
 							this.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-							this.$api.doRequest('post',
-									'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo', this
+							this.$api.doRequest('get',
+									'/identityAuthenticationInfo/selectPhone', this
 									.identityAuthenticationInfo)
 								.then(res => {
 									if (res.data.code == '11018') {
@@ -348,9 +348,8 @@
 											content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
 											success: function(res) {
 												if (res.confirm) {
-													that.identityAuthenticationInfo.cover = 1
 													that.$api.doRequest('post',
-														'/identityAuthenticationInfo/api/editIdentityAuthenticationInfo',
+														'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',
 														that.identityAuthenticationInfo).then(
 														res => {
 															uni.showToast({

pageD/identity/driverIdentity.vue

@@ -39,7 +39,7 @@
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" v-model="DriverViewInfo.driverPhone"></input>
+					<input placeholder="请填写手机号" maxlength = "11"  name="input" v-model="DriverViewInfo.driverPhone"></input>
 				</view>
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
@@ -48,7 +48,7 @@
 				<view style='width:70%;position:relative;margin-left: 200px;'>
 					<view class="con-list">
 						<!-- style='width:70%;position:relative;margin-left: 200px;' -->
-						<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+						<input v-model='verifyCode' maxlength = "6"  placeholder="请输入验证码" type="text">
 					</view>
 				</view>
 			</view>
@@ -161,6 +161,7 @@
 					this.$api.msg('手机号不能为空')
 					return
 				}
+				debugger
 				if (this.DriverViewInfo.driverPhone.length != 11) {
 					this.$api.msg('手机号输入错误')
 					return

pageD/identity/driverIdentityEdit.vue

@@ -233,8 +233,8 @@
 				id2:"",
 				travels:"",
 				drives:"",
-				practices:"",
 				operates:"",
+				practices:"",
 				// bank1:"",
 				// bank2:"",
 				// bankid:[],
@@ -358,8 +358,8 @@
 							this.address = this.drivers.addressUrl.split(","),
 								this.travels = this.address[0]
 							this.drives = this.address[1]
-							this.practices = this.address[2]
-							this.operates = this.address[3]
+							this.operates = this.address[2]
+							this.practices = this.address[3]
 						}
 					})
 					.catch(res => {

pageD/identity/driverIdentityThree.vue

@@ -125,7 +125,20 @@
 							        }
 							    }
 							});
-					}else if(res.data.code==200){
+					}
+					else if(res.data.code=='ERROR002'){
+					 	uni.showModal({
+					 		title: '提示',
+					 		content: '司机身份证号重复',
+					 		});
+					 }
+					 else if(res.data.code=='ERROR003'){
+					  	uni.showModal({
+					  		title: '提示',
+					  		content: '收款人身份证号重复',
+					  		});
+					  }
+					else if(res.data.code==200){
 						uni.showToast({
 							title: '提交成功',
 							icon: 'none',

pageD/identity/driverIdentityTwo.vue

@@ -176,6 +176,7 @@
 				}],
 				driverPayeeInfoList: [{
 					accountType: "个人账户",
+					accountTypeFlag: "1",
 					accountIndex: '0',
 					binkindex: 0,
 					cardAddressUrl: "",
@@ -235,6 +236,7 @@
 				this.driverPayeeInfoList[index].accountIndex = e.detail.value
 				this.driverPayeeInfoList[index].accountType = this.accountType[this.driverPayeeInfoList[index]
 					.accountIndex];
+				this.driverPayeeInfoList[index].accountTypeFlag= e.detail.value+1;
 				this.accountarr[index] = this.accountType[e.detail.value];
 			},
 			bankimgs(items) {
@@ -353,23 +355,26 @@
 						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
+					if(this.driverPayeeInfoList[i].accountTypeFlag==1){
+						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

pageD/myRelease/buyEdit.vue

@@ -446,16 +446,16 @@
 					return
 				}
 				if(this.deptList.procurementPlanType == '现货'){
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.procurementPrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice>100000||this.deptList.unitPrice<1) {
+					if (this.deptList.procurementPrice>100000||this.deptList.procurementPrice<1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.')!=-1) {
-						if(this.deptList.unitPrice.split('.')[1].length>2){
+					if (this.deptList.procurementPrice.indexOf('.')!=-1) {
+						if(this.deptList.procurementPrice.split('.')[1].length>2){
 							this.$api.msg('单价输入错误')
 							return
 						}