|
|
@@ -615,7 +615,7 @@ export default {
|
|
|
// scheduleContent.style.paddingLeft = '0px'
|
|
|
// }
|
|
|
},
|
|
|
- getScheduleList (self) { // 获取选择排班下拉的选项
|
|
|
+ getScheduleList (self, flag) { // 获取选择排班下拉的选项
|
|
|
const { first, second } = this.$store.getters.level || {}
|
|
|
const params = {
|
|
|
parameters: [{
|
|
|
@@ -630,13 +630,16 @@ export default {
|
|
|
}
|
|
|
queryStaffSchedule(params).then((res) => {
|
|
|
const scheduleList = res.data.dataResult || []
|
|
|
- self.scheduleOptions = scheduleList
|
|
|
+ if (flag) {
|
|
|
+ self.scheduleOptions = scheduleList.filter(s => s.id !== self.formData.id) // 历史排班选项数据
|
|
|
+ } else {
|
|
|
+ self.scheduleOptions = scheduleList// 历史排班选项数据
|
|
|
+ }
|
|
|
})
|
|
|
},
|
|
|
loadData () {
|
|
|
this.loading = true
|
|
|
const self = this
|
|
|
- this.getScheduleList(self)
|
|
|
// 获取配置数据
|
|
|
queryScheduleConfig({
|
|
|
parameters: [],
|
|
|
@@ -653,6 +656,7 @@ export default {
|
|
|
self.configOptions.forEach((el) => {
|
|
|
el.options = el.options.filter(obj => obj.diDian === (second || first))
|
|
|
})
|
|
|
+ self.getScheduleList(self, false)
|
|
|
// console.log(this.configOptions)
|
|
|
if (self.$utils.isEmpty(self.pageParams.id)) {
|
|
|
self.loading = false
|
|
|
@@ -685,6 +689,7 @@ export default {
|
|
|
return d.type === 'allday' ? '全天' : `当天 ${d.startTime}至${d.isSecondDay === 'Y' ? '第二天' : '当天'} ${d.endTime}`
|
|
|
})
|
|
|
}))
|
|
|
+ self.getScheduleList(self, true)
|
|
|
console.log('formData', self.formData)
|
|
|
self.scheduleData = self.transformScheduleData(records, overview, temp)
|
|
|
self.responseData = { ...self.responseData, records, overview, temp }
|
|
|
@@ -1019,7 +1024,7 @@ export default {
|
|
|
const self = this
|
|
|
if (val) {
|
|
|
await getStaffSchedule({ id: val }).then((res) => {
|
|
|
- const { staffScheduleDetailPoList: records, title, endDate, startDate, overview, config,type } = res.data
|
|
|
+ const { staffScheduleDetailPoList: records, title, endDate, startDate, overview, config, type } = res.data
|
|
|
const temp = config ? JSON.parse(config) : {}
|
|
|
self.responseData = res.data
|
|
|
self.formData = {
|
|
|
@@ -1041,6 +1046,11 @@ export default {
|
|
|
return d.type === 'allday' ? '全天' : (`当天 ${d.startTime}` + ' 至 ' + `${d.isSecondDay === 'Y' ? '第二天' : '当天'} ${d.endTime}`)
|
|
|
})
|
|
|
}))
|
|
|
+ // 把子表数据的id和parentid去除
|
|
|
+ records.forEach((item) => {
|
|
|
+ item.id = ''
|
|
|
+ item.parentId = ''
|
|
|
+ })
|
|
|
console.log('formData', self.formData)
|
|
|
self.scheduleData = self.transformScheduleData(records, overview, temp)
|
|
|
self.responseData = { ...self.responseData, records, overview, temp }
|
|
|
@@ -1164,7 +1174,7 @@ export default {
|
|
|
diDian: second || first,
|
|
|
title,
|
|
|
oldScheduleId,
|
|
|
- status: type ? '已发布' : '未发布',
|
|
|
+ status: type ? '已发布' : (this.formData.status ? this.formData.status : '未发布'),
|
|
|
startDate: dateRange[0],
|
|
|
endDate: dateRange[1],
|
|
|
type: scheduleType,
|