Commit be561eb4 by 无尘

fix: 修改排班

parent ef157db0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-07 17:30:04 * @Date: 2019-11-07 17:30:04
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-11-07 22:26:45 * @LastEditTime: 2019-11-08 01:52:05
--> -->
<!-- <!--
...@@ -119,14 +119,54 @@ export default { ...@@ -119,14 +119,54 @@ export default {
*/ */
daySet(item) { daySet(item) {
const that = this; const that = this;
that.itemSchedule.push({ console.log(item);
if (that.itemSchedule.schedules && that.itemSchedule.schedules.length) {
let arr = that.itemSchedule.schedules.map(ele => ele.workDate);
console.log(arr, arr.includes(that.workDate));
if (arr.includes(that.workDate)) {
that.itemSchedule.schedules.forEach(ele => {
console.log('schedules.forEach', ele.workDate, that.workDate);
if (ele.workDate == that.workDate) {
ele.serial = item.serial;
ele.classes = {
id: item.id,
serial: item.serial
};
ele.isRest = true;
console.log('ele:', ele);
}
});
console.log('includes: true', that.itemSchedule);
that.$forceUpdate();
} else {
let newData = JSON.parse(JSON.stringify(that.itemSchedule.schedules));
newData.push({
classes: { classes: {
id: item.id, id: item.id,
serial: item.serial serial: item.serial
}, },
isRest: false, serial: item.serial,
isRest: true,
workDate: that.workDate workDate: that.workDate
}); });
that.itemSchedule.schedules = JSON.parse(JSON.stringify(newData));
console.log('includes: false', that.itemSchedule);
}
} else {
console.log('null', that.itemSchedule);
that.$set(that.itemSchedule, 'schedules', []);
that.itemSchedule.schedules.push({
classes: {
id: item.id,
serial: item.serial
},
serial: item.serial,
isRest: true,
workDate: that.workDate
});
}
console.log('all:[]', that.itemSchedule);
that.$forceUpdate();
} }
} }
}; };
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-09-18 15:25:12 * @Date: 2019-09-18 15:25:12
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-11-07 21:09:33 * @LastEditTime: 2019-11-08 01:09:07
--> -->
<template> <template>
...@@ -44,12 +44,13 @@ ...@@ -44,12 +44,13 @@
<people-day-class :itemSchedule="scope.row" :workDate="item.timeStamp" :classData="classes" :cycleData="cycleData"></people-day-class> <people-day-class :itemSchedule="scope.row" :workDate="item.timeStamp" :classData="classes" :cycleData="cycleData"></people-day-class>
<div class="tool-tip-body" slot="reference"> <div class="tool-tip-body" slot="reference">
<div class="day-work-cell schedule_del_class"> <div class="day-work-cell schedule_del_class">
{{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].serial + '6' : '' }}
<el-tooltip v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp" class="item" effect="dark" :content="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].classes.serial : ''" placement="top-start"> <el-tooltip v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp" class="item" effect="dark" :content="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].classes.serial : ''" placement="top-start">
<div class="day-work-cell_text">{{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].classes.serial : '清空' }}</div> <div class="day-work-cell_text">{{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].serial : '清空' }}</div>
<div v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp && scope.row.schedules[index].isRest" class="day-work-cell_icon"></div> <div v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp && scope.row.schedules[index].isRest" class="day-work-cell_icon"></div>
</el-tooltip> </el-tooltip>
<div v-if="!scope.row.schedules || !scope.row.schedules[index]"> <div v-if="!scope.row.schedules || !scope.row.schedules[index]">
<div class="day-work-cell_text">{{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].classes.serial : '清空' }}</div> <div class="day-work-cell_text">{{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].serial : '清空' }}</div>
<div v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp && scope.row.schedules[index].isRest" class="day-work-cell_icon"></div> <div v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp && scope.row.schedules[index].isRest" class="day-work-cell_icon"></div>
</div> </div>
</div> </div>
...@@ -244,6 +245,7 @@ export default { ...@@ -244,6 +245,7 @@ export default {
id: 468090517, id: 468090517,
serial: '3' serial: '3'
}, },
serial: '3',
isRest: false, isRest: false,
workDate: 1575129600000 workDate: 1575129600000
}, },
...@@ -252,6 +254,7 @@ export default { ...@@ -252,6 +254,7 @@ export default {
id: 468770499, id: 468770499,
serial: '默认班次' serial: '默认班次'
}, },
serial: '默认班次',
isRest: false, isRest: false,
workDate: 1575216000000 workDate: 1575216000000
}, },
...@@ -260,6 +263,7 @@ export default { ...@@ -260,6 +263,7 @@ export default {
id: 468090517, id: 468090517,
serial: '3' serial: '3'
}, },
serial: '3',
isRest: false, isRest: false,
workDate: 1575302400000 workDate: 1575302400000
}, },
...@@ -268,6 +272,7 @@ export default { ...@@ -268,6 +272,7 @@ export default {
id: 460445486, id: 460445486,
serial: '2' serial: '2'
}, },
serial: '2',
isRest: false, isRest: false,
workDate: 1575388800000 workDate: 1575388800000
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment