|
|
@@ -1437,7 +1437,7 @@
|
|
|
:data="monthWorkDataS"
|
|
|
v-el-table-infinite-scroll="listScroll"
|
|
|
border
|
|
|
- :height="500"
|
|
|
+ :height="'70vh'"
|
|
|
highlight-current-row
|
|
|
style="width: 100%"
|
|
|
v-loading="tbload"
|
|
|
@@ -1466,12 +1466,16 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- min-width="105"
|
|
|
+ min-width="60"
|
|
|
v-for="(item, index) in pickDateArray"
|
|
|
:key="index"
|
|
|
- :label="item.label"
|
|
|
+ :label="item"
|
|
|
align="center"
|
|
|
>
|
|
|
+ <template slot="header" slot-scope="scope">
|
|
|
+ <div>{{ scope.column.label.dateStr }}</div>
|
|
|
+ <div>{{ scope.column.label.weekStr }}</div>
|
|
|
+ </template>
|
|
|
<template slot-scope="scope">
|
|
|
<div
|
|
|
v-if="
|
|
|
@@ -1613,7 +1617,7 @@
|
|
|
:data="monthNotWorkDateS"
|
|
|
v-el-table-infinite-scroll="notListScroll"
|
|
|
border
|
|
|
- :height="500"
|
|
|
+ :height="'70vh'"
|
|
|
highlight-current-row
|
|
|
style="width: 100%"
|
|
|
v-loading="tbload"
|
|
|
@@ -1708,7 +1712,7 @@
|
|
|
:data="monthWorkDataS"
|
|
|
v-el-table-infinite-scroll="listScroll"
|
|
|
border
|
|
|
- :height="500"
|
|
|
+ :height="'70vh'"
|
|
|
highlight-current-row
|
|
|
style="width: 100%"
|
|
|
v-loading="tbload"
|
|
|
@@ -4026,7 +4030,13 @@
|
|
|
(res) => {
|
|
|
if (res.code == "ok") {
|
|
|
this.tbload = false;
|
|
|
- this.pickDateArray = res.data.days;
|
|
|
+ this.pickDateArray = res.data.days.map(item => {
|
|
|
+ return {
|
|
|
+ ...item,
|
|
|
+ dateStr: item.label.split('/')[0],
|
|
|
+ weekStr: item.label.split('/')[1]
|
|
|
+ }
|
|
|
+ });
|
|
|
// console.log('dataarray',res.data.days);
|
|
|
this.monthWorkData = res.data.list;
|
|
|
// this.monthWorkDataS = this.monthWorkData
|
Lijy