|
|
@@ -110,13 +110,14 @@ export default {
|
|
|
},
|
|
|
//获取工作时间列表
|
|
|
getWorkTimeList(data){
|
|
|
+ this.attrs = [];
|
|
|
workTimeList(data).then(res=>{
|
|
|
let list = res.data.map(v=>{
|
|
|
if(v.ymdDate == dayjs( new Date()).format('YYYY-MM-DD')){
|
|
|
this.$emit('change',v)
|
|
|
}
|
|
|
return{
|
|
|
- key:v.id,
|
|
|
+ key:v.id || ,
|
|
|
customData: v,
|
|
|
highlight: {
|
|
|
color: v.isEnable == 1 ? 'green' : v.isEnable == 0 ? 'yellow' : v.isEnable == null ? 'red' : 'indigo',
|
|
|
@@ -126,6 +127,7 @@ export default {
|
|
|
dates: dayjs(v.ymdDate).format('YYYY-MM-DD'),
|
|
|
}
|
|
|
});
|
|
|
+ console.log(list,'list')
|
|
|
this.attrs = list;
|
|
|
this.date = new Date();
|
|
|
})
|