|
|
@@ -3,13 +3,11 @@ import {
|
|
|
addActivity,
|
|
|
editActivity
|
|
|
} from '@/api/roadshow/index.js';
|
|
|
-import { deepClone } from '../utils/util.js'
|
|
|
+import { getDefaultOption } from './common.js';
|
|
|
+import { areaList } from '../utils/area.js';
|
|
|
+
|
|
|
const moment = require('../utils/moment.js');
|
|
|
|
|
|
-const citys = {
|
|
|
- 浙江: ['杭州', '宁波', '温州', '嘉兴', '湖州'],
|
|
|
- 福建: ['福州', '厦门', '莆田', '三明', '泉州'],
|
|
|
-};
|
|
|
|
|
|
export default {
|
|
|
data() {
|
|
|
@@ -37,6 +35,8 @@ export default {
|
|
|
}
|
|
|
], // 选择的研究员
|
|
|
},
|
|
|
+
|
|
|
+
|
|
|
isActivityPicker: false, //活动类型弹窗
|
|
|
isResearcherPicker: false, //研究员弹窗
|
|
|
isTimePicker: false, //时间弹窗
|
|
|
@@ -52,7 +52,7 @@ export default {
|
|
|
time: '',
|
|
|
}, //picker的默认选中
|
|
|
selectObj: {}, //选中的日期信息 下标
|
|
|
- selectRsObj: {}, //选中的研究员下标
|
|
|
+ selectRsIndex: '', //选中的研究员下标
|
|
|
|
|
|
weekMap: new Map([
|
|
|
['1','周一'],
|
|
|
@@ -63,18 +63,9 @@ export default {
|
|
|
['6','周六'],
|
|
|
['7','周日']
|
|
|
]),
|
|
|
- activiytyTypes: [],
|
|
|
- researcherList: [
|
|
|
- {
|
|
|
- values: Object.keys(citys),
|
|
|
- className: 'column1',
|
|
|
- },
|
|
|
- {
|
|
|
- values: citys['浙江'],
|
|
|
- className: 'column2',
|
|
|
- defaultIndex: 2,
|
|
|
- },
|
|
|
- ],
|
|
|
+ activiytyTypes: [],//活动类型
|
|
|
+ researcherList: [],//研究员列表
|
|
|
+ areaList,//地区数据
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -90,7 +81,34 @@ export default {
|
|
|
watch: {
|
|
|
'formData.activityType': {
|
|
|
handler() {
|
|
|
- this.initSetState();
|
|
|
+
|
|
|
+ const {
|
|
|
+ RoleTypeCode
|
|
|
+ } = JSON.parse(uni.getStorageSync('userInfo')) || null;
|
|
|
+ const {
|
|
|
+ defaultActivityType,
|
|
|
+ activityTypeList,
|
|
|
+ startTime,
|
|
|
+ endTime
|
|
|
+ } = getDefaultOption(RoleTypeCode, 2);
|
|
|
+
|
|
|
+ this.formData.roadshowType = '';
|
|
|
+ this.formData.roadshowPlatform = '';
|
|
|
+ this.formData.roadshowCity = '';
|
|
|
+ this.formData.companyId = 0;
|
|
|
+ this.formData.companyName = '';
|
|
|
+ this.formData.meetingTheme = '';
|
|
|
+ this.formData.partnersName = '';
|
|
|
+ this.formData.activityClass = '';
|
|
|
+ this.companyInfo = '';
|
|
|
+ this.formData.selectResearchers = [
|
|
|
+ {
|
|
|
+ researcherId: '',
|
|
|
+ startTime: startTime,
|
|
|
+ endTime: endTime,
|
|
|
+ },
|
|
|
+ ];
|
|
|
+ // this.$refs.form.clearValidate();
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -100,7 +118,6 @@ export default {
|
|
|
async getResearcherList() {
|
|
|
const res = await researcherList();
|
|
|
if (res.code !== 200) return
|
|
|
- // this.researcherList = this.formatResearcherList(res.data);
|
|
|
this.researcherList = res.data.map(group => ({
|
|
|
...group,
|
|
|
text: group.GroupName,
|
|
|
@@ -110,26 +127,6 @@ export default {
|
|
|
id: child.AdminId
|
|
|
})) : []
|
|
|
}));
|
|
|
- console.log(this.researcherList)
|
|
|
- },
|
|
|
-
|
|
|
- formatResearcherList(list) {
|
|
|
- list.forEach((group) => {
|
|
|
- // 对组做处理
|
|
|
- group.text = group.GroupName;
|
|
|
- // 如果有列表
|
|
|
- if (group.ResearcherList) {
|
|
|
- group.ResearcherList.forEach((item) => {
|
|
|
- // 对研究员做处理
|
|
|
- item.text = item.RealName;
|
|
|
- item.values = item.AdminId;
|
|
|
- });
|
|
|
- } else {
|
|
|
- // 没有列表
|
|
|
- group.values = group.GroupId;
|
|
|
- }
|
|
|
- });
|
|
|
- return list;
|
|
|
},
|
|
|
|
|
|
/* 添加研究员 */
|
|
|
@@ -226,9 +223,18 @@ export default {
|
|
|
|
|
|
if (res.code !== 200) return;
|
|
|
|
|
|
- uni.showToast({
|
|
|
- title: '提交成功',
|
|
|
- icon: 'success'
|
|
|
+ const { text,content,link,query } = this.setDynamicLink(this.formData.activityType);
|
|
|
+
|
|
|
+ uni.showModal({
|
|
|
+ title:text,
|
|
|
+ content,
|
|
|
+ confirmText:'去查看',
|
|
|
+ confirmColor: '#576b95',
|
|
|
+ success: function(res) {
|
|
|
+ if(res.confirm) uni.navigateTo({
|
|
|
+ url:`${link}?type=${query.type}`,
|
|
|
+ })
|
|
|
+ }
|
|
|
})
|
|
|
|
|
|
},
|
|
|
@@ -245,28 +251,27 @@ export default {
|
|
|
|
|
|
/* 选择活动 */
|
|
|
confirmActivityType({detail}) {
|
|
|
+ console.log(detail.value)
|
|
|
this.formData.activityType = detail.value;
|
|
|
this.isActivityPicker = false;
|
|
|
},
|
|
|
|
|
|
/* 前往客户搜索 */
|
|
|
goSearchCompany() {
|
|
|
- // uni.navigateTo({
|
|
|
- // url: ''
|
|
|
- // })
|
|
|
+ uni.navigateTo({
|
|
|
+ url: `/pages-approve/search/index?type=roadshow`
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
/* 选择研究员弹窗展开 */
|
|
|
- clickRsChoose(val,index) {
|
|
|
+ clickRsChoose(index) {
|
|
|
this.isResearcherPicker = true;
|
|
|
this.rs_picker= {
|
|
|
firstindex:0,
|
|
|
- id: this.formData.selectResearchers[index].researcherId || []//选择研究员块级标识
|
|
|
+ id: this.formData.selectResearchers[index].researcherId ? this.formData.selectResearchers[index].researcherId.map(item => item) : []//选择研究员块级标识
|
|
|
}
|
|
|
- // this.selectObj = {
|
|
|
- // index,
|
|
|
- // type
|
|
|
- // }
|
|
|
+
|
|
|
+ this.selectRsIndex = index;
|
|
|
},
|
|
|
|
|
|
/* 选择研究员分组 */
|
|
|
@@ -302,7 +307,7 @@ export default {
|
|
|
/* 选择研究员确认 */
|
|
|
confirmResearcher() {
|
|
|
console.log('确认选择')
|
|
|
- this.formData.selectResearchers[0].researcherId = this.rs_picker.id;
|
|
|
+ this.formData.selectResearchers[this.selectRsIndex].researcherId = this.rs_picker.id;
|
|
|
|
|
|
this.isResearcherPicker = false;
|
|
|
},
|
|
|
@@ -312,7 +317,6 @@ export default {
|
|
|
if(!arr) return '';
|
|
|
if( arr instanceof Array ) {
|
|
|
return arr.map(item => {
|
|
|
- console.log(this.findName(item))
|
|
|
return this.findName(item)
|
|
|
})
|
|
|
}else {
|
|
|
@@ -327,22 +331,31 @@ export default {
|
|
|
this.formData.roadshowType = detail.value;
|
|
|
this.isRoadshowTypePicker = false;
|
|
|
},
|
|
|
+
|
|
|
+ /* 选择地区 */
|
|
|
+ confirmArea({detail}) {
|
|
|
+ const { values } = detail;
|
|
|
+ this.formData.roadshowCity = values.map(item => item.name);
|
|
|
+ console.log(this.formData.roadshowCity)
|
|
|
+
|
|
|
+ this.isAreaPicker = false;
|
|
|
+ },
|
|
|
|
|
|
/* 点击选择时间 */
|
|
|
- clickTimeChoose(val, index, type) {
|
|
|
- this.isTimePicker = true;
|
|
|
- this.pickerForm.time = type === 'start' ? this.formData.selectResearchers[index].startTime : this.formData
|
|
|
- .selectResearchers[index].endTime;
|
|
|
+ clickTimeChoose(index, type) {
|
|
|
+ console.log(this.formData.selectResearchers[index])
|
|
|
+ this.pickerForm.time = type === 'start' ? this.formData.selectResearchers[index].startTime : this.formData.selectResearchers[index].endTime;
|
|
|
this.selectObj = {
|
|
|
index,
|
|
|
type
|
|
|
}
|
|
|
+ setTimeout(() => {
|
|
|
+ this.isTimePicker = true;
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
- /* 选择开始时间 */
|
|
|
- confirmTime({
|
|
|
- detail
|
|
|
- }) {
|
|
|
+ /* 选择时间 */
|
|
|
+ confirmTime({detail}) {
|
|
|
// console.log(val)
|
|
|
const {
|
|
|
index,
|
|
|
@@ -356,6 +369,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
this.isTimePicker = false;
|
|
|
+ this.pickerForm.time = '';
|
|
|
},
|
|
|
|
|
|
/* 添加完成后 拼接动态内容 */
|
|
|
@@ -364,34 +378,45 @@ export default {
|
|
|
case '内部会议' : return {
|
|
|
text: '添加成功，已加入研究员日历',
|
|
|
content: `可前往【我的日历】-【${type}】查看`,
|
|
|
+ link: '/pages-approve/activity/list',
|
|
|
query: {
|
|
|
- act_tab: 3
|
|
|
+ type: 3
|
|
|
},
|
|
|
}
|
|
|
case '报告电话会' : return {
|
|
|
text: '添加成功，已加入研究员日历',
|
|
|
content: `可前往【我的日历】-【${type}】查看`,
|
|
|
+ link: '/pages-approve/activity/list',
|
|
|
query: {
|
|
|
- act_tab: 4
|
|
|
+ type: 4
|
|
|
},
|
|
|
}
|
|
|
case '路演' : return {
|
|
|
text: '活动申请已提交，请等待研究员处理',
|
|
|
- content: `可前往【我的日历】-【待处理申请】查看`,
|
|
|
+ content: `可前往【我的日历】-【活动申请】查看`,
|
|
|
+ link: '/pages-approve/activity/list',
|
|
|
query: {
|
|
|
- act_tab: 1
|
|
|
+ type: 1
|
|
|
},
|
|
|
}
|
|
|
case '公开会议' : return {
|
|
|
text: '活动申请已提交，请等待研究员处理',
|
|
|
- content: `可前往【我的日历】-【待处理申请】查看`,
|
|
|
+ content: `可前往【我的日历】-【活动申请】查看`,
|
|
|
+ link: '/pages-approve/activity/list',
|
|
|
query: {
|
|
|
- act_tab: 1
|
|
|
+ type: 1
|
|
|
},
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
|
|
|
+ /* 绑定input输入value */
|
|
|
+ bindInputHandle(key,{detail}) {
|
|
|
+ console.log(key,detail)
|
|
|
+ this.formData[key] = detail;
|
|
|
+ console.log(this.formData.meetingTheme)
|
|
|
+ },
|
|
|
+
|
|
|
/* 格式化时间显示 */
|
|
|
formatterLabelTime(val) {
|
|
|
if(!val) return '';
|
