|
|
@@ -68,10 +68,7 @@
|
|
|
@eventClick="showSchedule"
|
|
|
@select="selectDates"
|
|
|
>
|
|
|
- <el-checkbox-group v-model="origin" class="origin">
|
|
|
- <el-checkbox :label="0" @change="queryTeamWorkListByTime(calendarView)">任务排期</el-checkbox>
|
|
|
- <el-checkbox :label="1" @change="queryTeamWorkListByTime(calendarView)">日程</el-checkbox>
|
|
|
- </el-checkbox-group>
|
|
|
+ <div style="width: 100px" />
|
|
|
</MyFullCalendar>
|
|
|
<calender-detail
|
|
|
:show.sync="showDetail"
|
|
|
@@ -204,7 +201,7 @@ import {
|
|
|
getTeamBugDisDataBy,
|
|
|
teamReminding
|
|
|
} from '@/api/workSchedule'
|
|
|
-import { scheduleDelete } from '@/api/projectViewDetails'
|
|
|
+import { getSeprateDayInfo, scheduleDelete } from '@/api/projectViewDetails'
|
|
|
import modifySchedule from '@/views/projectManage/projectList/components/modifySchedule'
|
|
|
import ganntViews from '@/views/workbench/team/components/ganntViews'
|
|
|
import MyFullCalendar from '@/views/workbench/person/components/myFullCalendar'
|
|
|
@@ -378,17 +375,29 @@ export default {
|
|
|
]
|
|
|
this.createDialog = true
|
|
|
},
|
|
|
- createSchOrCal(bizId) { // 创建排期或者日程
|
|
|
+ async createSchOrCal(bizId) { // 创建排期或者日程
|
|
|
this.createDialog = false
|
|
|
+ let dayList = getAllTime(...this.selectRangeData, false)
|
|
|
+ const len = dayList.length
|
|
|
+ let schedule = dayList[0] === dayList[len - 1] ? `${dayList[0]}` : `${dayList[0]}-${dayList[len - 1]}`
|
|
|
+ try {
|
|
|
+ const detailDayList = await getSeprateDayInfo(dayList)
|
|
|
+ dayList = detailDayList.data.holidayHasWork
|
|
|
+ schedule = detailDayList.data.seperateDaysNoHoliday
|
|
|
+ } catch (error) {
|
|
|
+ throw error
|
|
|
+ }
|
|
|
if (!bizId) { // 新建日程
|
|
|
this.dateClick({
|
|
|
- dayList: getAllTime(...this.selectRangeData)
|
|
|
+ dayList: dayList,
|
|
|
+ schedule: schedule
|
|
|
})
|
|
|
} else { // 新建排期
|
|
|
this.visibleSchedule = true
|
|
|
this.isDelete = false
|
|
|
this.nowDetailData = {
|
|
|
- dayList: getAllTime(...this.selectRangeData),
|
|
|
+ dayList: dayList,
|
|
|
+ schedule: schedule,
|
|
|
bizId: bizId
|
|
|
}
|
|
|
this.DialogTitle = '新建排期'
|
|
|
@@ -490,12 +499,11 @@ export default {
|
|
|
const colorObj = this.mapMemberColor.get(item.peopleObject.idap)
|
|
|
// const title = item.origin ? '日程' : '排期'
|
|
|
let require = ''
|
|
|
- if (item.requireNames && item.requireNames.length > 0) {
|
|
|
- require = `所属需求：${item.requireNames.join(',')}`
|
|
|
+ if (item.requireList && item.requireList.length > 0) {
|
|
|
+ require = `所属需求：${item.requireList.map(item => item.name).join('，')}`
|
|
|
+ } else if (item.taskList && item.taskList.length > 0) {
|
|
|
+ require = `所属任务：${item.taskList.map(item => item.name).join('，')}`
|
|
|
}
|
|
|
- // else if (item.taskNames && item.taskNames.length > 0) {
|
|
|
- // require = `所属任务：${item.taskNames.join(',')}`
|
|
|
- // }
|
|
|
return {
|
|
|
id: item.id,
|
|
|
title: `【${item.peopleObject.name}】${item.name} ${item.desc ? '：' + item.desc : ''}; ${item.origin ? '' : require}`,
|
wangziqian