From 6550b6dc3abdb9490386b41a5460c6dee64d0db3 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Sat, 23 Jul 2022 15:37:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9=E6=8C=87?=
 =?UTF-8?q?=E6=B4=BE=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/consumer/index.vue        |  1 +
 pages/index/customer.vue              | 47 +++------------------------
 pages/mine/reception/addreception.vue | 23 +++++++++++--
 3 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/pages/index/consumer/index.vue b/pages/index/consumer/index.vue
index 1b8b42d..6c25623 100644
--- a/pages/index/consumer/index.vue
+++ b/pages/index/consumer/index.vue
@@ -408,6 +408,7 @@
 		},
 
 		onPullDownRefresh() {
+			this.buildingID = uni.getStorageSync('buildingID').id;
 			this.LOADING = true
 			this.nextPage = 1;
 			this.isRefresh = true;
diff --git a/pages/index/customer.vue b/pages/index/customer.vue
index 4e3181f..96f428d 100644
--- a/pages/index/customer.vue
+++ b/pages/index/customer.vue
@@ -336,47 +336,9 @@
 			},
 			//新增接待
 			addreception() {
-				const {
-					dataCode,
-					addAccount
-				} = uni.getStorageSync("weapp_session_userInfo_data");
-
-				if (dataCode == 6) {
-					// if (addAccount != 0) {
-					// 	uni.showToast({
-					// 		title: '不允许自建客户！',
-					// 		duration: 2000
-					// 	});
-					// 	return
-					// }
-					if (this.waitCustomList.length == 0) {
-						uni.navigateTo({
-							url: '/pages/mine/reception/addreception'
-						})
-						return
-					} else {
-						for (var i = 0; i < this.waitCustomList.length; i++) {
-							if (this.waitCustomList[i].status == 1) {
-								uni.showLoading({
-									title: '当前还有未完成的客户项'
-								});
-								setTimeout(function() {
-									uni.hideLoading();
-								}, 1000);
-								return
-							} else {
-								uni.navigateTo({
-									url: '/pages/mine/reception/addreception'
-								})
-								return
-							}
-						}
-					}
-				} else {
-					uni.navigateTo({
-						url: '/pages/mine/reception/addreception'
-					});
-				}
+				uni.navigateTo({
+					url: '/pages/mine/reception/addreception'
+				});
 			},
 			assign(item) {
 				let url = `/pages/mine/reception/consultant?id=${item.id}`
@@ -529,7 +491,7 @@
 		}
 
 		.footer-button {
-			// margin-top: 30rpx;
+			padding: 0 30rpx;
 			width: 100%;
 			height: 108rpx;
 			display: flex;
@@ -566,7 +528,6 @@
 				border-radius: 30rpx;
 				border: 1px solid #999999;
 				margin-left: 30rpx;
-				margin-right: 30rpx;
 			}
 		}
 	}
diff --git a/pages/mine/reception/addreception.vue b/pages/mine/reception/addreception.vue
index 5ec4749..20f1e97 100644
--- a/pages/mine/reception/addreception.vue
+++ b/pages/mine/reception/addreception.vue
@@ -69,8 +69,8 @@
 			</view>
 		</view>
 		<view class="clive" @click="$noMultipleClicks(save)">确定</view>
-		<u-select :mask-close-able="false" v-model="Showhiddenunits" mode="single-column" :list="list"
-			@cancel="cancel" @confirm="confirm"></u-select>
+		<u-select :mask-close-able="false" v-model="Showhiddenunits" mode="single-column" :list="list" @cancel="cancel"
+			@confirm="confirm"></u-select>
 		<u-select :mask-close-able="false" v-model="Showhid" mode="single-column" :list="freeList" @cancel="cancel1"
 			@confirm="confirm1"></u-select>
 		<u-modal v-model="show" :mask-close-able="true" :title="'代接待提醒'" :confirm-text="confirmtext"
@@ -119,6 +119,7 @@
 				daitiReceptionobj: {},
 				isShow: false, // 默认隐藏该权限
 				userInfo: {}, // 用户信息
+				isPass: false, // 当前顾问是否正在接待
 			};
 		},
 		onLoad() {
@@ -154,6 +155,16 @@
 				this.baochunfun()
 			},
 			save() {
+				// 校验当前登录人是否是顾问
+				let obj = this.freeList.find(item => {
+					return item.agentId == this.userInfo.accountId
+				}) || null
+				if (!obj && this.userInfo.userRoleType == 6) {
+					this.isPass = true
+				} else {
+					this.isPass = false
+				}
+				
 				if (this.parames.name.length == 0) {
 					uni.showToast({
 						icon: "none",
@@ -175,6 +186,14 @@
 					})
 					return;
 				}
+				// 判断条件2是否选中顾问
+				if (this.isPass && !this.parames.agentId) {
+					uni.showToast({
+						icon: "none",
+						title: "当前顾问正在接待，请选择其他顾问"
+					})
+					return;
+				}
 				const that = this;
 				this.$u.post("customer/daitiReception", {
 					phone: that.parames.phone,