Эх сурвалжийг харах

点击表格添加活动页面 切换类型时研究员数据结构变化

Karsa 3 жил өмнө
parent
commit
1afe086416

+ 16 - 8
pages-roadshow/addActivity/byCell.vue

@@ -274,7 +274,9 @@
 	export default {
 		mixins: [mixin],
 		data() {
-			return {};
+			return {
+				defaultResearcher: []
+			};
 		},
 		methods: {
 
@@ -287,16 +289,22 @@
 					defaultActivityType,
 					activityTypeList
 				} = getDefaultOption(RoleTypeCode, 1);
-				
-				if(options.defaultOpt) {
-					const selectResearchers = JSON.parse(options.defaultOpt);
-					this.formData.selectResearchers = selectResearchers;
-				}
 
 				this.activiytyTypes = activityTypeList;
 				this.formData.activityType = defaultActivityType;
-			
-				console.log(this.formData)
+				
+				if(options.defaultOpt) {
+					this.defaultResearcher = JSON.parse(options.defaultOpt);
+					// 研究员默认结构 内部会议/电话会为数组
+					
+					this.formData.selectResearchers = ['内部会议','报告电话会'].includes(defaultActivityType) 
+						? [{
+								researcherId: [ this.defaultResearcher[0].researcherId ],
+								startTime: this.defaultResearcher[0].startTime,
+								endTime: this.defaultResearcher[0].endTime
+							}]
+						: this.defaultResearcher;
+				}
 				
 				uni.setNavigationBarTitle({
 					title: this.edit_id ? '修改活动' : '添加活动'

+ 15 - 6
pages-roadshow/addActivity/mixin.js

@@ -291,15 +291,24 @@ export default {
 			 // 选择研究员后进入的页面不重置默认研究员
 			let pages = getCurrentPages();
 			let route = pages[pages.length-1].route;
-			this.formData.selectResearchers = route === 'pages-roadshow/addActivity/byCell' 
-			? this.formData.selectResearchers.splice(0,1)
-			: [
-				{
+			
+			if(route === 'pages-roadshow/addActivity/byCell') {
+				
+				this.formData.selectResearchers = ['内部会议','报告电话会'].includes(this.formData.activityType)
+					? [{
+							researcherId: [ this.defaultResearcher[0].researcherId ],
+							startTime: this.defaultResearcher[0].startTime,
+							endTime: this.defaultResearcher[0].endTime
+						}]
+					: this.defaultResearcher;
+			} else {
+				
+				this.formData.selectResearchers = [{
 					researcherId: '',
 					startTime: startTime,
 					endTime: endTime,
-				},
-			];
+				}];
+			}
 		},
 		
 		/* 选择活动类别 */