Browse Source

Merge branch 'crm15.5' into debug

cxmo 1 year ago
parent
commit
655c4fa01b

+ 2 - 2
pages-approve/activity/detail.vue

@@ -33,7 +33,7 @@
 				</view>
 				<view class="info-item flex" v-if="info.RsCalendarItem.City">
 					<view class="label">路演城市:</view>
-					<view>{{info.RsCalendarItem.Province}}{{info.RsCalendarItem.City}}</view>
+					<view>{{info.RsCalendarItem.Province}}{{info.RsCalendarItem.City}}{{ info.RsCalendarItem.District||''}}</view>
 				</view>
 				<view class="info-item flex">
 					<view class="label">客户名称:</view>
@@ -42,7 +42,7 @@
 			</view>
 			<view class="section white-wrap">
 				<!-- 权益客户显示 -->
-				<template v-if="info.CompanyDetail.type==='rai'">
+				<template v-if="Role.includes('rai')">
 					<view class="info-item flex">
 						<view class="label">客户状态:</view>
 						<view>{{info.CompanyDetail.Status}}</view>

+ 25 - 18
pages-roadshow/addActivity/byCell.vue

@@ -238,24 +238,31 @@
 
 		<!-- 选择研究员 -->
 		<van-popup :show="isResearcherPicker" position="bottom">
-			<!-- <view class="select-rs-header">
-				<text class="cancel" @click="cancelResearcher">取消</text>
-				<text class="ensure" @click="confirmResearcher">确认</text>
-			</view> -->
-			<!-- <van-tree-select 
-				:items="researcherList" 
-				:main-active-index="rs_picker.firstindex" 
-				:active-id="rs_picker.id"
-				@click-nav="clickFirstHandle" 
-				@click-item="clickItemHandle" 
-			/> -->
-			<van-cascader
-				title="请选择研究员"
-				active-color="#3385FF"
-				:options="researcherList"
-				@close="cancelResearcher"
-				@finish="chooseResearcher"
-			/>
+			<!-- 内部会议可多选研究员,且只有ficc会有内部会议 -->
+			<template v-if="!['路演', '公开会议'].includes(formData.activityType)">
+				<view class="select-rs-header">
+					<text class="cancel" @click="cancelResearcher">取消</text>
+					<text class="ensure" @click="confirmResearcher">确认</text>
+				</view>
+				<van-tree-select 
+					:items="ficcReasearcherList" 
+					:main-active-index="rs_picker.firstindex" 
+					:active-id="rs_picker.id"
+					@click-nav="clickFirstHandle" 
+					@click-item="clickItemHandle" 
+				/>
+			</template>
+			<template v-else>
+				<van-cascader
+					v-if="isResearcherPicker"
+					v-model="this.formData.selectResearchers[this.selectRsIndex].researcherId"
+					title="请选择研究员"
+					active-color="#3385FF"
+					:options="researcherList"
+					@close="isResearcherPicker=false"
+					@finish="chooseResearcher"
+				/>
+			</template>
 		</van-popup>
 
 		<!-- 选择时间 -->

+ 28 - 20
pages-roadshow/addActivity/index.vue

@@ -239,24 +239,32 @@
 
 		<!-- 选择研究员 -->
 		<van-popup :show="isResearcherPicker" position="bottom">
-			<!-- <view class="select-rs-header">
-				<text class="cancel" @click="cancelResearcher">取消</text>
-				<text class="ensure" @click="confirmResearcher">确认</text>
-			</view>
-			<van-tree-select 
-				:items="researcherList" 
-				:main-active-index="rs_picker.firstindex" 
-				:active-id="rs_picker.id"
-				@click-nav="clickFirstHandle" 
-				@click-item="clickItemHandle" 
-			/> -->
-			<van-cascader
-				title="请选择研究员"
-				active-color="#3385FF"
-				:options="researcherList"
-				@close="cancelResearcher"
-				@finish="chooseResearcher"
-			/>
+			<!-- 内部会议可多选研究员,且只有ficc会有内部会议 -->
+			<template v-if="!['路演', '公开会议'].includes(formData.activityType)">
+				<view class="select-rs-header">
+					<text class="cancel" @click="cancelResearcher">取消</text>
+					<text class="ensure" @click="confirmResearcher">确认</text>
+				</view>
+				<van-tree-select 
+					:items="ficcReasearcherList" 
+					:main-active-index="rs_picker.firstindex" 
+					:active-id="rs_picker.id"
+					@click-nav="clickFirstHandle" 
+					@click-item="clickItemHandle" 
+				/>
+			</template>
+			<template v-else>
+				<van-cascader
+					v-if="isResearcherPicker"
+					v-model="this.formData.selectResearchers[this.selectRsIndex].researcherId"
+					title="请选择研究员"
+					active-color="#3385FF"
+					:options="researcherList"
+					@close="isResearcherPicker=false"
+					@finish="chooseResearcher"
+				/>
+
+			</template>
 		</van-popup>
 
 		<!-- 选择时间 -->
@@ -357,10 +365,10 @@
 			
 			if(uni.getStorageSync('roadshow_compantyId')) {
 				this.formData.companyId = Number(uni.getStorageSync('roadshow_compantyId'));
-        this.formData.englishCompany = Number(uni.getStorageSync('roadshow_isEnglishCompany'))
+				this.formData.englishCompany = Number(uni.getStorageSync('roadshow_isEnglishCompany'))
 				this.getCompanyInfo();
 				uni.removeStorageSync('roadshow_compantyId');
-        uni.removeStorageSync('roadshow_isEnglishCompany');
+				uni.removeStorageSync('roadshow_isEnglishCompany');
 			}
 		}
 	}

+ 2 - 0
pages-roadshow/addActivity/mixin.js

@@ -129,12 +129,14 @@ export default {
 				// 对组做处理
 				group.text = group.GroupName
 				group.value = group.GroupId
+				group.id = group.GroupId //非路演,公开会议的活动组件需要用到的字段
 				// 如果有列表
 				if (group.ResearcherList) {
 				  group.ResearcherList.forEach((item) => {
 					// 对研究员做处理
 					item.text = item.RealName
 					item.value = item.AdminId
+					item.id = item.AdminId//非路演,公开会议的活动组件需要用到的字段
 				  });
 				}
 				group.children = group.ResearcherList||[]