|
@@ -182,7 +182,7 @@ export default window.$crudCommon({
|
|
|
Object.keys(this.form).forEach(key => {
|
|
Object.keys(this.form).forEach(key => {
|
|
|
if (key.indexOf(this.params.yearAndMonth) > -1) {
|
|
if (key.indexOf(this.params.yearAndMonth) > -1) {
|
|
|
let oldObj = _oldMonthData.find(old => old.workDate == key) || {};
|
|
let oldObj = _oldMonthData.find(old => old.workDate == key) || {};
|
|
|
- if (this.form[key] || oldObj.workHours) {
|
|
|
|
|
|
|
+ if (this.form[key] || oldObj.workHours || oldObj.workHours === 0) {
|
|
|
let workHours = this.form[key];
|
|
let workHours = this.form[key];
|
|
|
if (workHours === undefined || workHours === null || workHours === '') {
|
|
if (workHours === undefined || workHours === null || workHours === '') {
|
|
|
workHours = null;
|
|
workHours = null;
|
|
@@ -196,11 +196,13 @@ export default window.$crudCommon({
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
+ console.log(dailyAttendances)
|
|
|
|
|
+
|
|
|
// 获取最新修改过的数据
|
|
// 获取最新修改过的数据
|
|
|
let updatedMonthData = [];
|
|
let updatedMonthData = [];
|
|
|
dailyAttendances.forEach(item => {
|
|
dailyAttendances.forEach(item => {
|
|
|
let oldObj = _oldMonthData.find(old => item.workDate === old.workDate);
|
|
let oldObj = _oldMonthData.find(old => item.workDate === old.workDate);
|
|
|
- if (!!oldObj && Number(item.workHours) !== Number(oldObj.workHours)) {
|
|
|
|
|
|
|
+ if (!!oldObj && item.workHours !== oldObj.workHours) {
|
|
|
updatedMonthData.push(item);
|
|
updatedMonthData.push(item);
|
|
|
} else if (!oldObj) {
|
|
} else if (!oldObj) {
|
|
|
updatedMonthData.push(item);
|
|
updatedMonthData.push(item);
|