Merge branch 'xqc_957' into debug

pages-roadshow/addActivity/byCell.vue

@@ -40,19 +40,18 @@
 			
 			<van-field 
 				:value="formData.activityType" 
-				:disabled="edit_id||isRaiRole"
 				is-link 
 				readonly 
 				clickable 
 				name="picker" 
 				label="活动类型"
 				placeholder="选择活动类型" 
-				@click.native="() => { if(edit_id||isRaiRole) return; isActivityPicker = true }"
+				@click.native="() => { isActivityPicker = true }"
 			/>
 
 			<van-field 
 				:value="formData.roadshowType" 
-				v-if="['路演','公开会议'].includes(formData.activityType)" 
+				v-if="['路演','公开会议', '沙龙'].includes(formData.activityType)" 
 				is-link
 				readonly 
 				clickable 
@@ -64,7 +63,7 @@
 
 			<van-field 
 				:value="formData.roadshowPlatform"
-				v-if="['路演','公开会议'].includes(formData.activityType) && formData.roadshowType === '线上'" 
+				v-if="['路演','公开会议', '沙龙'].includes(formData.activityType) && formData.roadshowType === '线上'" 
 				clickable
 				:label="`${dynamic_prefix}平台`" 
 				:placeholder="`输入${dynamic_prefix}平台(eg：进门财经、腾讯会议)`" 
@@ -73,7 +72,7 @@
 
 			<van-field 
 				:value="formData.roadshowCity"
-				v-if="['路演','公开会议'].includes(formData.activityType) && formData.roadshowType === '线下'" 
+				v-if="['路演','公开会议', '沙龙'].includes(formData.activityType) && formData.roadshowType === '线下'" 
 				is-link
 				readonly
 				clickable
@@ -118,7 +117,7 @@
 
 			<van-field 
 				:value="formData.meetingTheme" 
-				v-if="['公开会议'].includes(formData.activityType)" 
+				v-if="['公开会议','沙龙'].includes(formData.activityType)" 
 				clickable
 				label="会议主题" 
 				type="textarea" 

pages-roadshow/addActivity/common.js

@@ -2,7 +2,9 @@
 export const RESEARCHLIST = ['ficc_researcher', 'researcher', 'rai_researcher','ficc_admin', 'rai_admin',];
 
 // 销售/组长
-const SELLERLIST = ['ficc_seller', 'rai_seller', 'ficc_group', 'rai_group','ficc_team'];
+const SELLERLIST = ['ficc_seller',  'ficc_group', 'ficc_team'];
+// 权益销售/组长
+const SELLERLIST_RAI = [ 'rai_seller',  'rai_group'];
 
 // admin
 const ADMINLIST = ['admin'];
@@ -22,7 +24,7 @@ export const getDefaultOption = (role,fromType) => {
 			return new Date(date.setDate(date.getDate() + 1)).getTime();
 	}
 	
-	let type = RESEARCHLIST.includes(role) ? 1 : SELLERLIST.includes(role) ? 2 : 3;
+	let type = SELLERLIST_RAI.includes(role) ? 5 : RESEARCHLIST.includes(role) ? 1 : SELLERLIST.includes(role) ? 2 : 3;
 	
 	let res;
 	
@@ -51,6 +53,14 @@ export const getDefaultOption = (role,fromType) => {
 				endTime: defaultEndTime()
 			}
 			break;
+		case 5:
+			res = {
+				defaultActivityType: '报告电话会',
+				activityTypeList:['路演','沙龙'],
+				startTime: defaultStartTime(),
+				endTime: defaultEndTime()
+			}
+			break;
 	}
 	
 	return res;

pages-roadshow/addActivity/index.vue

@@ -9,13 +9,12 @@
 				name="picker" 
 				label="活动类型"
 				placeholder="选择活动类型" 
-				@click.native="() => { if(edit_id||isRaiRole) return; isActivityPicker = true }" 
-				:disabled="edit_id||isRaiRole"
+				@click.native="() => {isActivityPicker = true }" 
 			/>
 
 			<van-field 
 				:value="formData.roadshowType" 
-				v-if="['路演','公开会议'].includes(formData.activityType)" 
+				v-if="['路演','公开会议','沙龙'].includes(formData.activityType)" 
 				is-link
 				readonly 
 				clickable 
@@ -27,7 +26,7 @@
 
 			<van-field 
 				:value="formData.roadshowPlatform"
-				v-if="['路演','公开会议'].includes(formData.activityType) && formData.roadshowType === '线上'" 
+				v-if="['路演','公开会议','沙龙'].includes(formData.activityType) && formData.roadshowType === '线上'" 
 				clickable
 				:label="`${dynamic_prefix}平台`" 
 				:placeholder="`输入${dynamic_prefix}平台(eg：进门财经、腾讯会议)`" 
@@ -36,7 +35,7 @@
 
 			<van-field 
 				:value="formData.roadshowCity"
-				v-if="['路演','公开会议'].includes(formData.activityType) && formData.roadshowType === '线下'" 
+				v-if="['路演','公开会议','沙龙'].includes(formData.activityType) && formData.roadshowType === '线下'" 
 				is-link
 				readonly
 				clickable
@@ -82,7 +81,7 @@
 
 			<van-field 
 				:value="formData.meetingTheme" 
-				v-if="['公开会议'].includes(formData.activityType)" 
+				v-if="['公开会议','沙龙'].includes(formData.activityType)" 
 				clickable
 				label="会议主题" 
 				type="textarea" 

pages-roadshow/addActivity/mixin.js

@@ -75,7 +75,7 @@ export default {
 	computed: {
 		/* 动态前缀 路演/会议 */
 		dynamic_prefix() {
-			return this.formData.activityType === '路演' ? '路演' : '会议';
+			return this.formData.activityType === '路演' ? '路演' : this.formData.activityType === '沙龙' ? '沙龙' : '会议';
 		},
 		// 新增的研究员的索引数组
 		addResearchersIdx() {
@@ -209,7 +209,7 @@ export default {
 		/* 提交表单 */
 		async submitHandle() {
 			
-			console.log(this.formData)
+			console.log(this.formData,'------')
 			let isCheck = validateForm(this.formData.activityType,this.formData);
 			console.log(isCheck)
 			if(!isCheck) return
@@ -220,7 +220,7 @@ export default {
 			
 		
 			let parmas;
-			const param_research = ['公开会议', '路演'].includes(
+			const param_research = ['公开会议', '路演', '沙龙'].includes(
 					this.formData.activityType
 				) ?
 				this.formData.selectResearchers.map((item) => ({
@@ -604,6 +604,14 @@ export default {
 						type: '活动申请'
 					},
 				}
+				case '沙龙' : return {
+					text: '活动申请已提交，请等待研究员处理',
+					content: `可前往【我的日历】-【活动申请】查看`,
+					link: '/pages-approve/activity/list',
+					query: {
+						type: '活动申请'
+					},
+				}
 				case 'ficc&rai路演' : return {
 					text:'权益研究员日历已添加成功，ficc研究员日历已发送申请，请等待处理',
 					content:'可前往【我的日历】查看',

pages-roadshow/utils/validate.js

@@ -7,6 +7,7 @@ export const validateForm = (type,form) => {
 		case '内部会议': return validateInsideMeeting(form);
 		case '公开会议': return validateOpenMeeting(form);
 		case '路演': return validateRoadshow(form);
+		case '沙龙': return validateRoadshow(form);
 		case '报告电话会': return validateTelmeeting(form);
 		case '事项': return validateMatter(form);
 	}
@@ -68,14 +69,13 @@ const validateTelmeeting = ({activityType,selectResearchers,activityClass}) => {
 /* 路演校验 */
 const validateRoadshow = ({ activityType,selectResearchers,roadshowType,roadshowPlatform,roadshowCity,companyId  }) => {
 	let haveCheck = false;
-	
 	if(!activityType){
 		Toast('请选择活动类型')
 		return haveCheck 
 	}
 	
 	if(!roadshowType){
-		Toast('请选择路演形式')
+		Toast(`请选择${activityType}形式`)
 		return haveCheck 
 	}
 	
@@ -89,7 +89,7 @@ const validateRoadshow = ({ activityType,selectResearchers,roadshowType,roadshow
 		return haveCheck 
 	}
 	
-	if(!companyId){
+	if(!companyId && activityType!='沙龙'){
 		Toast('请选择客户')
 		return haveCheck 
 	}