Browse Source

修改出诊设置展示日期不一致问题

hosSet-fix-1212
zq 4 days ago
parent
commit
a3b19d8565
  1. 3
      src/views/HosInformation.vue
  2. 4
      src/views/conflictDialog.vue

3
src/views/HosInformation.vue

@ -2335,8 +2335,8 @@ export default {
this.generateMonthSchedule(this.currentDay); this.generateMonthSchedule(this.currentDay);
this.countMonthlyConflicts(); // this.countMonthlyConflicts(); //
}, },
//
async setDepartWorkTime() { async setDepartWorkTime() {
console.log('=====执行了');
this.$refs.conflictDialog.setDepartWorkTime() this.$refs.conflictDialog.setDepartWorkTime()
}, },
formatMonth(date, dayFlag) { formatMonth(date, dayFlag) {
@ -3239,6 +3239,7 @@ export default {
} }
.conflictTip { .conflictTip {
width: 50px;
height: 22px; height: 22px;
display: flex; display: flex;
justify-content: center; justify-content: center;

4
src/views/conflictDialog.vue

@ -299,6 +299,8 @@ export default {
this.visitShowCancelBtn = false; this.visitShowCancelBtn = false;
} }
return; return;
}else{
await this.saveWorkTimeDirect()
} }
}, },
async saveWorkTimeDirect() { async saveWorkTimeDirect() {
@ -462,7 +464,7 @@ export default {
return conflict; return conflict;
}, },
getWeekDayName(weekDay) { getWeekDayName(weekDay) {
const weekDays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']; const weekDays = [ '周一', '周二', '周三', '周四', '周五', '周六', '周日'];
return weekDays[weekDay - 1] || `${weekDay}`; return weekDays[weekDay - 1] || `${weekDay}`;
}, },
getConflictShift(newPlan, existingPlan) { getConflictShift(newPlan, existingPlan) {

Loading…
Cancel
Save