|
@@ -1238,23 +1238,29 @@ export default {
|
|
|
}
|
|
}
|
|
|
// 如果有班次变化,将其与userId记录到结果中
|
|
// 如果有班次变化,将其与userId记录到结果中
|
|
|
if (changes.length > 0) {
|
|
if (changes.length > 0) {
|
|
|
- const userNameObj = this.userNameList.filter(item => item.userId === newItem.userId)
|
|
|
|
|
|
|
+ const userNameObj = this.userList.filter(item => item.userId === newItem.userId)
|
|
|
const perOverView = userNameObj[0]?.userName + changes.join(',')
|
|
const perOverView = userNameObj[0]?.userName + changes.join(',')
|
|
|
result.push(perOverView)
|
|
result.push(perOverView)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
- return '排班管理员调整如下:' + result.join('。')
|
|
|
|
|
|
|
+ return result.join('。')
|
|
|
},
|
|
},
|
|
|
// 提交调班申请数据
|
|
// 提交调班申请数据
|
|
|
submitAdjust (submitData) {
|
|
submitAdjust (submitData) {
|
|
|
- const overView = this.getOverViews(this.responseData, submitData.staffScheduleDetailPoList)
|
|
|
|
|
|
|
+ let overView = ''
|
|
|
|
|
+ if (submitData.id) {
|
|
|
|
|
+ overView = this.getOverViews(this.responseData || null, submitData.staffScheduleDetailPoList)
|
|
|
|
|
+ }
|
|
|
|
|
+ if (overView === '') {
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
const { first, second } = this.$store.getters.level || {}
|
|
const { first, second } = this.$store.getters.level || {}
|
|
|
const adjustData = {
|
|
const adjustData = {
|
|
|
scheduleId: submitData.id,
|
|
scheduleId: submitData.id,
|
|
|
reason: '排班管理员调整排班',
|
|
reason: '排班管理员调整排班',
|
|
|
diDian: second || first,
|
|
diDian: second || first,
|
|
|
- overview: overView,
|
|
|
|
|
|
|
+ overview: '排班管理员调整:' + overView,
|
|
|
status: '已通过',
|
|
status: '已通过',
|
|
|
updateTime: Date.now(),
|
|
updateTime: Date.now(),
|
|
|
adjustmentDetailPoList: []
|
|
adjustmentDetailPoList: []
|