{{ item.day }}
{{ item.workdayName }}
-
+
{{ time.startTime }}-{{ time.endTime }}
@@ -65,6 +49,14 @@ export default {
this.scheduleCycle = scheduleCycle
this.changeInspectionPeriod()
},
+ notify(_params) {
+ this.days = _params.days;
+ this.scheduleCycle = _params.scheduleCycle;
+ if (_params.days && _params.days.length > 0) {
+ return;
+ }
+ this.changeInspectionPeriod();
+ },
changeInspectionPeriod() {
this.days = []
for (let cycleIndex = 0; cycleIndex < 31; cycleIndex++) {
@@ -77,7 +69,7 @@ export default {
}
},
changeWorkdayInfo(item) {
- this.$emit('edit-day', item)
+ this.$emit('editDay', item)
},
getDaysData() {
return this.days
diff --git a/src/components/org/scheduleClassesWeek.vue b/src/components/org/scheduleClassesWeek.vue
index 07015adc3..46b135dec 100644
--- a/src/components/org/scheduleClassesWeek.vue
+++ b/src/components/org/scheduleClassesWeek.vue
@@ -54,6 +54,15 @@ export default {
this.scheduleCycle = scheduleCycle
this.changeInspectionPeriodWeek()
},
+ notify(params) {
+ this.days = params.days;
+ this.scheduleCycle = parseInt(params.scheduleCycle);
+
+ if (params.days && params.days.length > 0) {
+ return;
+ }
+ this.changeInspectionPeriodWeek();
+ },
changeInspectionPeriodWeek() {
this.days = []
for (let weekIndex = 0; weekIndex < this.scheduleCycle; weekIndex++) {
@@ -67,10 +76,10 @@ export default {
})
}
}
- this.$emit('cycle-change', this.scheduleCycle)
+ this.$emit('cycleChange', this.scheduleCycle)
},
changeWorkdayWeekInfo(item) {
- this.$emit('edit-day', item)
+ this.$emit('editDay', item)
},
getWeek(week) {
return `${week}${this.$t('scheduleClassesWeek.week')}`
diff --git a/src/views/fee/payFeeOrderList.vue b/src/views/fee/payFeeOrderList.vue
index 1a9b506de..35cf29a2d 100644
--- a/src/views/fee/payFeeOrderList.vue
+++ b/src/views/fee/payFeeOrderList.vue
@@ -129,16 +129,16 @@
-
-
-
diff --git a/src/views/org/addScheduleClassesList.vue b/src/views/org/addScheduleClassesList.vue
index 617693711..c89293114 100644
--- a/src/views/org/addScheduleClassesList.vue
+++ b/src/views/org/addScheduleClassesList.vue
@@ -23,10 +23,10 @@
-
+
-
+
@@ -81,11 +81,26 @@ export default {
this.addScheduleClassesInfo.scheduleCycle = 1
if (this.addScheduleClassesInfo.scheduleType === '1001') {
- this.$refs.scheduleDay.initData(this.addScheduleClassesInfo.scheduleCycle)
+ setTimeout(() => {
+ this.$refs.scheduleDay.notify({
+ scheduleCycle: this.addScheduleClassesInfo.scheduleCycle,
+ days: this.addScheduleClassesInfo.days
+ })
+ }, 500)
} else if (this.addScheduleClassesInfo.scheduleType === '2002') {
- this.$refs.scheduleWeek.initData(this.addScheduleClassesInfo.scheduleCycle)
+ setTimeout(() => {
+ this.$refs.scheduleWeek.notify({
+ scheduleCycle: this.addScheduleClassesInfo.scheduleCycle,
+ days: this.addScheduleClassesInfo.days
+ })
+ }, 500)
} else if (this.addScheduleClassesInfo.scheduleType === '3003') {
- this.$refs.scheduleMonth.initData(this.addScheduleClassesInfo.scheduleCycle)
+ setTimeout(() => {
+ this.$refs.scheduleMonth.notify({
+ scheduleCycle: this.addScheduleClassesInfo.scheduleCycle,
+ days: this.addScheduleClassesInfo.days
+ })
+ }, 500)
}
},
async saveScheduleClassesInfo() {
@@ -120,6 +135,9 @@ export default {
// 由于 editScheduleClassesDay 组件现在直接修改传入的对象
// 这里不需要额外的处理,但保留方法以保持代码完整性
console.log('Day updated:', updatedItem)
+ },
+ changeScheduleCycle(cycle) {
+ this.addScheduleClassesInfo.scheduleCycle = cycle
}
}
}
diff --git a/src/views/org/editScheduleClassesLang.js b/src/views/org/editScheduleClassesLang.js
index d2d1c7e29..18ed6020c 100644
--- a/src/views/org/editScheduleClassesLang.js
+++ b/src/views/org/editScheduleClassesLang.js
@@ -32,15 +32,7 @@ export const messages = {
scheduleInfo: 'Schedule Information',
rest: 'Rest'
},
- editScheduleClassesDay: {
- editTitle: 'Edit Schedule Day',
- status: 'Status',
- startTime: 'Start Time',
- startTimePlaceholder: 'Required, please enter start time',
- endTime: 'End Time',
- endTimePlaceholder: 'Required, please enter end time',
- rest: 'Rest'
- }
+
},
zh: {
editScheduleClasses: {
@@ -75,14 +67,5 @@ export const messages = {
scheduleInfo: '排班信息',
rest: '休息'
},
- editScheduleClassesDay: {
- editTitle: '修改',
- status: '状态',
- startTime: '上班时间',
- startTimePlaceholder: '必填,请填写上班时间',
- endTime: '下班时间',
- endTimePlaceholder: '必填,请填写下班时间',
- rest: '休息'
- }
}
}
\ No newline at end of file
diff --git a/src/views/org/editScheduleClassesList.vue b/src/views/org/editScheduleClassesList.vue
index 96d4a8dff..0b0937798 100644
--- a/src/views/org/editScheduleClassesList.vue
+++ b/src/views/org/editScheduleClassesList.vue
@@ -24,16 +24,16 @@
-
+
-
+
-
+
@@ -114,7 +114,7 @@ export default {
scheduleCycle: this.editScheduleClassesInfo.scheduleCycle,
days: this.editScheduleClassesInfo.days
})
- }, 100)
+ }, 500)
}
},
async editScheduleClasses() {
@@ -162,6 +162,9 @@ export default {
},
editDay(item) {
this.$refs.editDayDialog.open(item)
+ },
+ changeScheduleCycle(cycle) {
+ this.editScheduleClassesInfo.scheduleCycle = cycle
}
}
}
diff --git a/src/views/user/login/Login.vue b/src/views/user/login/Login.vue
index 1cc6ee1b2..3f680715a 100644
--- a/src/views/user/login/Login.vue
+++ b/src/views/user/login/Login.vue
@@ -44,8 +44,8 @@ export default {
logo: '',
companyName:'',
loginForm: {
- username: 'wuxw',
- passwd: 'admin',
+ username: '',
+ passwd: '',
validateCode: ''
},
captchaUrl: '',