考勤-修复4421、4459

src/views/business/​scheduleManage/components/adjust-edit.vue

@@ -383,20 +383,22 @@ export default {
                 const { scheduleId, reason, status, rejectReason, executor, executeDate, adjustmentDetailPoList } = data || {}
                 this.reScheduleValue = data.type
                 // this.reScheduleValue = 'paiban'
-                self.formData = {
-                    scheduleId,
-                    reason,
-                    status,
-                    rejectReason,
-                    adjustList: adjustmentDetailPoList.map((i, index) => ({
-                        ...i,
-                        beforeAdjust: i.beforeAdjust ? i.beforeAdjust.split(',') : [],
-                        afterAdjust: i.afterAdjust ? i.afterAdjust.split(',') : [],
-                        beforeShiftList: self.handleDateInit(i.beforeDate, index, 'beforeShiftList', i.createBy, i.beforeAdjust),
-                        afterShiftList: self.handleDateInit(i.afterDate, index, 'afterShiftList', i.party, i.afterAdjust)
-                    }))
-                }
-                console.log('formData', self.formData)
+                setTimeout(() => {
+                    self.formData = {
+                        scheduleId,
+                        reason,
+                        status,
+                        rejectReason,
+                        adjustList: adjustmentDetailPoList.map((i, index) => ({
+                            ...i,
+                            beforeAdjust: i.beforeAdjust ? i.beforeAdjust.split(',') : [],
+                            afterAdjust: i.afterAdjust ? i.afterAdjust.split(',') : [],
+                            beforeShiftList: self.handleDateInit(i.beforeDate, index, 'beforeShiftList', i.createBy, i.beforeAdjust),
+                            afterShiftList: self.handleDateInit(i.afterDate, index, 'afterShiftList', i.party, i.afterAdjust)
+                        }))
+                    }
+                    console.log('formData', self.formData)
+                }, 200)
             }
             self.loading = true
             try {
@@ -577,20 +579,20 @@ export default {
                     this.$message.warning(row.afterDate + '您已有【' + val + '】班次，不能作为目标班次！')
                     return true
                 } else if (duplicateElements.length === 0 && type === 'after') {
-                    const targetData1 = this.afterDateList.filter(obj => obj.value == row.beforeDate) // 目标人在调班日期的班次
+                    const targetData1 = this.afterDateList.filter(obj => obj.value === row.beforeDate) // 目标人在调班日期的班次
                     const targetBanCiNum1 = targetData1[0].banci.split(',').length // 目标人在调班日期的班次数量
                     // 判断班次不能大于3个
                     if ((targetBanCiNum1 + row.beforeAdjust.length - row.afterAdjust.length) > 3) {
-                        const name = this.userList.filter(obj => obj.userId == row.party)[0].userName
+                        const name = this.userList.filter(obj => obj.userId === row.party)[0].userName
                         this.$message.warning('调班后【' + name + '】【 ' + row.afterDate + '】班次大于3个！')
                         row.afterAdjust = []
                         return true
                     }
-                    const targetData2 = this.beforeDateList.filter(obj => obj.value == row.afterDate) // 调班人在目标日期的班次
+                    const targetData2 = this.beforeDateList.filter(obj => obj.value === row.afterDate) // 调班人在目标日期的班次
                     const targetBanCiNum2 = targetData2[0].banci.split(',').length // 调班人在目标日期的班次数量
                     // 判断班次不能大于3个
                     if ((targetBanCiNum2 + row.afterAdjust.length - row.beforeAdjust.length) > 3) {
-                        const name = this.userList.filter(obj => obj.userId == this.$store.getters.userId)[0].userName
+                        const name = this.userList.filter(obj => obj.userId === this.$store.getters.userId)[0].userName
                         this.$message.warning('调班后【' + name + '】【 ' + row.beforeDate + '】班次大于3个！')
                         row.beforeAdjust = []
                         return true
@@ -616,20 +618,20 @@ export default {
                     this.$message.warning(row.beforeDate + '目标人员已有【' + val + '】班次，不能作为调班班次！')
                     return true
                 } else if (duplicateElements.length === 0 && type === 'before') {
-                    const targetData1 = this.afterDateList.filter(obj => obj.value == row.beforeDate) // 目标人在调班日期的班次
+                    const targetData1 = this.afterDateList.filter(obj => obj.value === row.beforeDate) // 目标人在调班日期的班次
                     const targetBanCiNum1 = targetData1[0].banci.split(',').length // 目标人在调班日期的班次数量
                     // 判断班次不能大于3个
                     if ((targetBanCiNum1 + row.beforeAdjust.length - row.afterAdjust.length) > 3) {
-                        const name = this.userList.filter(obj => obj.userId == row.party)[0].userName
+                        const name = this.userList.filter(obj => obj.userId === row.party)[0].userName
                         this.$message.warning('调班后【' + name + '】【 ' + row.afterDate + '】班次大于3个,请重新选择！')
                         row.afterAdjust = []
                         return true
                     }
-                    const targetData2 = this.beforeDateList.filter(obj => obj.value == row.afterDate) // 调班人在目标日期的班次
+                    const targetData2 = this.beforeDateList.filter(obj => obj.value === row.afterDate) // 调班人在目标日期的班次
                     const targetBanCiNum2 = targetData2[0].banci.split(',').length // 调班人在目标日期的班次数量
                     // 判断班次不能大于3个
                     if ((targetBanCiNum2 + row.afterAdjust.length - row.beforeAdjust.length) > 3) {
-                        const name = this.userList.filter(obj => obj.userId == this.$store.getters.userId)[0].userName
+                        const name = this.userList.filter(obj => obj.userId === this.$store.getters.userId)[0].userName
                         this.$message.warning('调班后【' + name + '】【 ' + row.beforeDate + '】班次大于3个,请重新选择！')
                         row.beforeAdjust = []
                         return true
@@ -1082,7 +1084,7 @@ export default {
                     blockList.forEach((itemA, index) => {
                         if (itemA.value === itemB.value) {
                             // 合并banci并去重
-                            let mergedBanci = Array.from(new Set([...itemA.banci.split(','), ...itemB.banci.split(',')]))
+                            const mergedBanci = Array.from(new Set([...itemA.banci.split(','), ...itemB.banci.split(',')]))
                             blockList[index].banci = mergedBanci.join(',')
                             found = true
                         }
@@ -1094,11 +1096,11 @@ export default {
                 })
             } else if (type === 'del') {
                 blockGrouped.forEach((itemB) => {
-                    let toDeleteIndex = []
+                    const toDeleteIndex = []
                     blockList.forEach((itemA, index) => {
                         if (itemA.value === itemB.value) {
                             // 获取a中子项banci删除掉含有b中子项banci的部分后的新banci
-                            let newBanci = itemA.banci.split(',').filter((banciA) => !itemB.banci.split(',').includes(banciA))
+                            const newBanci = itemA.banci.split(',').filter((banciA) => !itemB.banci.split(',').includes(banciA))
                             if (newBanci.length === 0) {
                                 // 如果新banci为空，标记该项需要删除
                                 toDeleteIndex.push(index)

src/views/business/​scheduleManage/edit.vue

@@ -1054,7 +1054,7 @@ export default {
                         ...self.formData,
                         title,
                         config: temp.id,
-                        dateRange: [startDate, endDate],
+                        // dateRange: [startDate, endDate],
                         approver: temp.approver || [],
                         overview: overview,
                         scheduleType: type,