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

pageD/identity/companyIdentity.vue

@@ -75,10 +75,7 @@
 			</view>
 			<button class="btns btn" @click="jumpUrl">下一步</button>
 		</view>
-
-
 	</view>
-
 </template>
 
 <script>
@@ -137,7 +134,9 @@
 				tempFilePaths: [],
 				businessLicenseAddressUrl: "",
 				certificates: true,
-				isEdit:false
+				isEdit:false,
+				invitation:"",
+				inviteCompany:"",
 			};
 		},
 		computed: {
@@ -145,6 +144,8 @@
 		},
 		onLoad(options) {
 			// this.isEdit = options.isEdit;
+			this.invitation = options.ids //通过二维码进来的认证粮商，认证后无需审核通过，就直接通过邀请
+			this.inviteCompany = options.compId
 			if(options.status){
 				this.status=true
 				this.consentStatus = false
@@ -335,6 +336,8 @@
 					// }
 					this.identityAuthenticationInfo.customerTypeFlag = "2"
 					this.identityAuthenticationInfo.customerType = "企业"
+					this.identityAuthenticationInfo.invitation = this.invitation
+					this.identityAuthenticationInfo.inviteCompany = this.inviteCompany
 					var model = JSON.stringify(this.identityAuthenticationInfo);
 					uni.navigateTo({
 						url: `/pageD/identity/companyIdentityTwo?identityAuthenticationInfo=` + model,
@@ -368,6 +371,8 @@
 					}
 					this.identityAuthenticationInfo.customerTypeFlag = "1"
 					this.identityAuthenticationInfo.customerType = "个人"
+					this.identityAuthenticationInfo.invitation = this.invitation
+					this.identityAuthenticationInfo.inviteCompany = this.inviteCompany
 					var model = JSON.stringify(this.identityAuthenticationInfo);
 					uni.navigateTo({
 						url: `/pageD/identity/companyIdentityThree?identityAuthenticationInfo=` + model,

pageD/identity/companyIdentityThree.vue

@@ -331,7 +331,7 @@
 						return
 					}
 					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
-						.compAddress.length > 20) {
+						.compAddress.length > 40) {
 						this.$api.msg('联系地址输入错误')
 						return
 					}
@@ -363,8 +363,6 @@
 					showCancel: true,
 					confirmText: '确定',
 					success: function(res) {
-
-						console.log('confirmInfo', that.identityAuthenticationInfo)
 						if (res.confirm) {
 							uni.showLoading({
 								title: "正在提交",
@@ -374,15 +372,13 @@
 									phone: that.identityAuthenticationInfo.customerPhone,
 									verifyCode: that.verifyCode
 								}).then(res => {
-									console.log("loginVerifyCode:", res)
 									if (res.data.code == 200) {
 										if (that.userInfo) {
 											that.identityAuthenticationInfo.commonId = that.userInfo.id
 										} else {
 											that.identityAuthenticationInfo.commonId = res.data.data.id
 										}
-										that.identityAuthenticationInfo.payeeAddressUrl = that.bankid
-											.toString()
+										that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
 										// that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 										that.identityAuthenticationInfos.customerPhone = that
 											.identityAuthenticationInfo.customerPhone
@@ -390,7 +386,6 @@
 												'/identityAuthenticationInfo/selectPhone', that
 												.identityAuthenticationInfos)
 											.then(res => {
-												console.log("selectPhone:", res)
 												if (res.data.code == '11018') {
 													uni.showModal({
 														title: '提示',
@@ -455,23 +450,46 @@
 																			.identityAuthenticationInfo
 																		)
 																		.then(res => {
-																			if (res
-																				.data
-																				.code ==
-																				200) {
+																			if (res.data.code ==200) {
 																				uni.showToast({
 																					title: '提交成功',
 																					icon: 'none',
 																					duration: 2000
 																				})
-																				setTimeout
-																					(() => {
+																				//判断是不是从邀请页面进来的，如果是邀请进来的就直接邀请成功！
+																				if(that.identityAuthenticationInfo.invitation || that.identityAuthenticationInfo.inviteCompany){
+																					that.$api.doRequest('get', '/identityAuthenticationInfo/saveCompanyIdentity', {
+																							id: res.data.data,
+																							compId:	that.identityAuthenticationInfo.inviteCompany,
+																						}, 'application/json;charset=UTF-8').then(res => {
+																							if (res.data.code == 200) {
+																								// this.getList()
+																							}
+																						})
+																						.catch(res => {
+																							if (res.message) {
+																								uni.showToast({
+																									title: res.message,
+																									icon: 'none',
+																									duration: 2000
+																								})
+																							} else {
+																								uni.showToast({
+																									title: "接受邀请失败，请稍后再试。",
+																									icon: 'none',
+																									duration: 2000
+																								})
+																							}
+																						});
+																				}
+																					setTimeout(() => {
 																							uni.navigateBack({
 																								delta: 3
 																							})
 																						},
 																						2000
 																					);
+																				
 																			}
 																		})
 																}
@@ -527,6 +545,32 @@
 																		icon: 'none',
 																		duration: 2000
 																	})
+																	//判断是不是从邀请页面进来的，如果是邀请进来的就直接邀请成功！
+																	if(that.identityAuthenticationInfo.invitation || that.identityAuthenticationInfo.inviteCompany){
+																		that.$api.doRequest('get', '/identityAuthenticationInfo/saveCompanyIdentity', {
+																				id: res.data.data,
+																				compId:	that.identityAuthenticationInfo.inviteCompany,
+																			}, 'application/json;charset=UTF-8').then(res => {
+																				if (res.data.code == 200) {
+																					// this.getList()
+																				}
+																			})
+																			.catch(res => {
+																				if (res.message) {
+																					uni.showToast({
+																						title: res.message,
+																						icon: 'none',
+																						duration: 2000
+																					})
+																				} else {
+																					uni.showToast({
+																						title: "接受邀请失败，请稍后再试。",
+																						icon: 'none',
+																						duration: 2000
+																					})
+																				}
+																			});
+																	}
 																	setTimeout(() => {
 																		uni.navigateBack({
 																			delta: 3
@@ -582,6 +626,7 @@
 						}
 					}
 				})
+			
 
 			},
 			getcode() {

pages/bill/index.vue

@@ -256,6 +256,7 @@
 						searchKeyWord: this.searchKeyWord,
 						searchType: this.searchType,
 						managementType: 1,
+						appFlag:1,
 						customerPhone: this.userInfo.phone,
 						// pcFlag:1
 						// warehouseName:'',

pages/erpbusiness/QRCode/QRCode.vue

@@ -25,7 +25,6 @@
 		},
 		onReady() {
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
-					console.log("checkSession", res)
 					if (res.data.data == "INVALID") {
 						this.isShowAlert = true;
 						// uni.showModal({
@@ -86,7 +85,6 @@
 			},
 			getQRCode() {
 				this.$api.doRequest('get', '/identityAuthenticationInfo/generateQRCodeImage').then(res => {
-						console.log(res)
 						this.imgSrc = res.data.data
 					})
 					.catch(res => {

pages/erpbusiness/sm/sm.vue

@@ -69,14 +69,12 @@
 			  this.user.title = options.data.split(',')[2]
 			  this.user.companyId = options.data.split(',')[1]
 			  //#endif
-			  console.log("options:",options,this.user.title,this.user.companyId)
 		},
 		onShow() {
 			this.getList()
 		},
 		methods: {
 			selectItem(item) {
-				console.log("item", item)
 				if(item.authenticationStatus=="已接受") return
 				for (let i = 0; i < this.grainMerchantList.length; i++) {
 					if (this.grainMerchantList[i].id == item.id) {
@@ -93,13 +91,14 @@
 			},
 			//粮商认证
 			toGrainMerchantCertification(){
+				var that = this
+				// url: `/pageA/product/list?keywords=${key}&TabCur=${TabCur}`
 				uni.navigateTo({
-					url:'/pageD/identity/companyIdentity?status=1'
+					url:`/pageD/identity/companyIdentity?status=1&compId=${that.user.companyId}&ids=${that.user.title}` ,
 				})
 			},
 			
 			getList() {
-				console.log(this.userInfo)
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
 				this.grainMerchantList = []
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
@@ -139,8 +138,6 @@
 						if(this.flag){
 							this.btnVal = "已接受"
 						}
-						console.log("grainMerchantList",this.grainMerchantList)
-
 					})
 					.catch(res => {
 						if (res.message) {
@@ -173,7 +170,6 @@
 						icon: false
 					})
 				}
-				console.log("this.user.compId",this.user.companyId,this.selectID)
 				this.$api.doRequest('get', '/identityAuthenticationInfo/saveCompanyIdentity', {
 						id: this.selectID,
 						compId:this.user.companyId,
@@ -182,10 +178,7 @@
 						if (res.data.code == 200) {
 							// this.getList()
 							uni.navigateBack(-1)
-							
 						}
-
-
 					})
 					.catch(res => {
 						if (res.message) {

pages/task/audit/freight_settlement_approval.vue

@@ -22,6 +22,24 @@
 				<view>合同编号</view>
 				<view>{{list.contractNo}}</view>
 			</view>
+			<view class="person-info">
+					<view class="top1" style="display: flex;">
+						<view>客户</view>
+						<view>{{customerName}}</view>
+					</view>
+				
+					<view class="top1">
+						<view>发货地址</view>
+						<view class="top_info">{{shippingAddress ? shippingAddress : "暂无发货地址"}}</view>
+					</view>
+			
+		
+					<view class="top1">
+						<view>收货地址</view>
+						<view class="top_info">{{receivingAddress ? receivingAddress : "暂无收货地址"}}</view>
+					</view>
+				
+			</view>
 			<view class="car-container">
 				<view class="car-num title" v-if="list.tranTypeKey== '1'">{{list.carNo}} ({{list.tranCarNo}})</view>
 				<view class="car-num title" v-if="list.tranTypeKey== '2'">车厢号{{list.boxNo}}</view>
@@ -97,7 +115,10 @@
 				auditMind:'',
 				autoHeight: true,
 				border: false,
-				everyCheck: ''
+				everyCheck: '',
+				customerName:"",//客户
+				shippingAddress:"",//发货地址
+				receivingAddress:"",//收货地址
 			}
 		},
 		onBackPress(e) {
@@ -121,6 +142,9 @@
 				}).then(res => {
 					this.contractNo = res.data.data.contractNo
 					this.carId = res.data.data.carId
+					this.customerName =  res.data.data.customer
+					this.shippingAddress = res.data.data.send
+					this.receivingAddress = res.data.data.receive
 					if (res.data.code == 200) {
 						this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
 							compId: "2710b21efc1e4393930c5dc800010dc4",
@@ -233,7 +257,19 @@
 			background: white;
 			padding: 30rpx 20rpx;
 			font-size: 36rpx;
-			margin-top: 30rpx;
+			margin-top: 20rpx;
+		}
+		.top1{
+			// display: flex;
+			justify-content: space-between;
+			border-radius: 20rpx;
+			background: white;
+			padding: 10rpx 20rpx;
+			font-size: 30rpx;
+			margin-top: 20rpx;
+		}
+		.top_info{
+		margin: 10rpx 0;
 		}
 
 		.title {
@@ -436,4 +472,34 @@
 	/deep/.u-input__textarea {
 		height: 300rpx !important;
 	}
+	.person-info{
+		background: white;
+		padding: 20rpx 0;
+		border-radius: 20rpx;
+		// margin-bottom: 50rpx;
+		margin: 20rpx 0;
+		.tit{
+			font-size: 36rpx;
+		}
+	}
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+	.c-row1 {
+		// display: -webkit-box;
+		// display: -webkit-flex;
+		// display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
 </style>

pages/task/audit/freight_settlement_details.vue

@@ -19,6 +19,20 @@
 				<view>合同编号</view>
 				<view>{{list.contractNo}}</view>
 			</view>
+			<view class="person-info">
+					<view class="top1" style="display: flex;">
+						<view>客户</view>
+						<view>{{customerName}}</view>
+					</view>
+					<view class="top1">
+						<view>发货地址</view>
+						<view class="top_info">{{shippingAddress ? shippingAddress : "暂无发货地址"}}</view>
+					</view>
+					<view class="top1">
+						<view>收货地址</view>
+						<view class="top_info">{{receivingAddress ? receivingAddress : "暂无收货地址"}}</view>
+					</view>
+			</view>
 			<view class="car-container">
 				<view class="car-num title" v-if="list.tranTypeKey== '1'">{{list.carNo}} ({{list.tranCarNo}})</view>
 				<view class="car-num title" v-if="list.tranTypeKey== '2'">车厢号{{list.boxNo}}</view>
@@ -66,6 +80,9 @@
 				list: {
 					approveStatus: "",
 				},
+				customerName:"",//客户
+				shippingAddress:"",//发货地址
+				receivingAddress:"",//收货地址
 			}
 		},
 		onLoad(options) {
@@ -79,6 +96,9 @@
 				}).then(res => {
 					this.contractNo = res.data.data.contractNo
 					this.carId = res.data.data.carId
+					this.customerName =  res.data.data.customer
+					this.shippingAddress = res.data.data.send
+					this.receivingAddress = res.data.data.receive
 					if (res.data.code == 200) {
 						this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
 							compId: "2710b21efc1e4393930c5dc800010dc4",
@@ -117,6 +137,15 @@
 			font-size: 36rpx;
 			margin-top: 30rpx;
 		}
+		.top1{
+			// display: flex;
+			justify-content: space-between;
+			border-radius: 20rpx;
+			background: white;
+			padding: 10rpx 20rpx;
+			font-size: 30rpx;
+			margin-top: 20rpx;
+		}
 
 		.title {
 			font-size: 28rpx;
@@ -145,7 +174,16 @@
 			font-size: 36rpx;
 		}
 	}
-
+	.person-info{
+		background: white;
+		padding: 20rpx 0;
+		border-radius: 20rpx;
+		// margin-bottom: 50rpx;
+		margin: 20rpx 0;
+		.tit{
+			font-size: 36rpx;
+		}
+	}
 	.bottom-btn {
 		width: 100%;
 		position: fixed;

pages/task/audit/purchase_settlement_approval.vue

@@ -18,10 +18,17 @@
 			</view>
 		</view>
 		<view class="content">
-			<view class="top content-item">
+			<view class="content-item">
+				<view class="top">
 				<view>{{contractNo}} ({{goodsName}})</view>
 				<view>{{unitPrice}}元/吨</view>
+			    </view>
+			<view class="top1">
+				<view>客户</view>
+				<view style="font-size: 30rpx;">{{customerName}}</view>
+			</view>
 			</view>
+			
 			<view class="content-item">
 				<view class="car-container" v-for="(item,index) in list">
 					<view class="car-num title">{{item.carNo}}</view>
@@ -94,6 +101,7 @@
 				border: false,
 				unitPrice: "",
 				goodsName: "",
+				customerName:""//客户
 			}
 		},
 		onBackPress(e) {
@@ -118,6 +126,7 @@
 					this.contractNo = res.data.data.contractNo
 					this.unitPrice = res.data.data.price
 					this.goodsName = res.data.data.goodsName
+					this.customerName = res.data.data.customer//客户
 					if (res.data.code == 200) {
 						this.$api.doRequest('get', '/stockPurchaseReceiptReport/selectPurchaseOrder', {
 							compId: "2710b21efc1e4393930c5dc800010dc4",
@@ -234,6 +243,14 @@
 		.top {
 			display: flex;
 			justify-content: space-between;
+			margin-top: 10rpx;
+			margin-bottom: 30rpx;
+		}
+		.top1 {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 20rpx;
+			font-size: 32rpx;
 		}
 
 		.content-item {

pages/task/audit/purchase_settlement_details.vue

@@ -17,9 +17,16 @@
 			</view>
 		</view>
 		<view class="content">
-			<view class="top content-item">
-				<view>{{contractNo}}({{goodsName}})</view>
-				<view>{{unitPrice}}元/吨</view>
+			<view class="content-item">
+				<view class="top">
+					<view>{{contractNo}}({{goodsName}})</view>
+				     <view>{{unitPrice}}元/吨</view>
+				</view>
+				<view class="top1">
+					<view>客户</view>
+					<view style="font-size: 30rpx;">{{customerName}}</view>
+				</view>
+				
 			</view>
 			<view class="content-item">
 				<view class="car-container" v-for="(item,index) in list">
@@ -63,6 +70,7 @@
 				contractNo: "",
 				unitPrice: "",
 				goodsName:"",
+				customerName:""//客户
 			}
 		},
 		onLoad(options) {
@@ -77,7 +85,7 @@
 					this.contractNo = res.data.data.contractNo
 					this.unitPrice = res.data.data.price
 					this.goodsName = res.data.data.goodsName
-					console.log(this.goodsName)
+					this.customerName = res.data.data.customer//客户
 					if (res.data.code == 200) {
 						this.$api.doRequest('get', '/stockPurchaseReceiptReport/selectPurchaseOrder', {
 							compId: "2710b21efc1e4393930c5dc800010dc4",
@@ -109,7 +117,16 @@
 		.top {
 			display: flex;
 			justify-content: space-between;
+			margin-top: 10rpx;
+			margin-bottom: 30rpx;
 		}
+		.top1 {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 20rpx;
+			font-size: 32rpx;
+		}
+		
 
 		.content-item {
 			border-radius: 20rpx;