{{row.expire=='0.00'?'0':row.expire}}
@@ -82,20 +87,29 @@
month: this.$moment().format('YYYY-MM'),
department_id: ''
},
- departments:[]
+ departments:[],
+ mergeCells:[],
+ exportName:'调休统计表',
+ dName:'全部科室'
}
},
methods: {
async getList() {
this.loading = true;
try {
- const res = await leaveList(this.select, false);
- console.log(res);
+ const res = await leaveList(this.select, false);
let _arr = res?.timeOff || []
_arr.forEach(item=>{
item.department_name = item.user.department.name
+ item.sortnumber = item.user.department.sortnumber
+ })
+ _arr.sort((a,b)=>{
+ return a.sortnumber - b.sortnumber
})
- this.tableData = _arr;
+ this.tableData = _arr;
+ this.mergeCells = this.generateMergeCells(this.tableData)
+ let date = this.$moment(this.select.month).format("YYYY年MM月")
+ this.exportName = `${date}${this.dName}调休统计表`
this.loading = false;
} catch (err) {
console.error(err);
@@ -105,7 +119,6 @@
async getDepartmentList() {
try {
const res = await departmentListNoAuth();
- console.log(res);
let arr = res
this.departments = arr
this.departments.unshift({
@@ -116,43 +129,50 @@
console.error(err);
}
},
- mergeCells({
- row,
- $rowIndex,
- column,
- data
- }) {
- console.log("row, $rowIndex, column, data", {
- row,
- $rowIndex,
- column,
- data
- })
- let fields = ["department_name"]
- let cellValue = row[column.property]
- if (cellValue && fields.includes(column.property)) {
- let prevRow = data[$rowIndex - 1]
- let nextRow = data[$rowIndex + 1]
- if (prevRow && prevRow[column.property] === cellValue) {
- return {
- rowspan: 0,
- colspan: 0
+ changeDepartment(e){
+ if(e){
+ this.departments.map(item=>{
+ if(item.id==e){
+ this.dName = item.name
}
- } else {
- let countRowspan = 1
- while (nextRow && nextRow[column.property] === cellValue) {
- nextRow = data[++countRowspan + $rowIndex]
+ })
+ }else{
+ this.dName = '全部科室'
+ }
+ },
+ // 合并单元格
+ generateMergeCells(data) {
+ const columns = this.$refs.table.getColumns()
+ let mergeCells = [];
+ const columnsToMerge = ['department_name'];
+ columnsToMerge.forEach(key => {
+ const col = columns.findIndex(item => item['field'] === key);
+ if (col === -1) {
+ return;
+ }
+ for (let i = 0; i < data.length; i++) {
+ let rowspan = 1;
+ const currentValue = data[i][key];
+ for (let j = i + 1; j < data.length; j++) {
+ if (data[j][key] === currentValue) {
+ rowspan++;
+ } else {
+ break;
+ }
}
- if (countRowspan > 1) {
- return {
- rowspan: countRowspan,
+ if (rowspan > 1) {
+ mergeCells.push({
+ row: i,
+ col,
+ rowspan,
colspan: 1
- }
+ });
+ i += rowspan - 1;
}
}
- }
-
- }
+ });
+ return mergeCells;
+ },
},
computed: {},
diff --git a/src/views/attendance/overtimechart.vue b/src/views/attendance/overtimechart.vue
index 98d7d06..474c03b 100644
--- a/src/views/attendance/overtimechart.vue
+++ b/src/views/attendance/overtimechart.vue
@@ -5,7 +5,8 @@
-
+
@@ -14,12 +15,12 @@
-
+ }" :data="tableData" :merge-cells="mergeCells">
+
@@ -68,44 +69,9 @@
department_id: ''
},
departments: [],
- mergeCells: [
- // { row: 0, col: 2, rowspan: 1, colspan: 2 },
- // { row: 2, col: 2, rowspan: 2, colspan: 1 }
- ],
- columns: [{
- field: 'department_name',
- title: '科室'
- },
- {
- field: 'name',
- title: '姓名'
- },
- {
- field: 'kaishiriqi',
- title: '开始日期'
- },
- {
- field: 'yuanyinshuoming',
- title: '加班事由'
- },
- {
- field: 'jiabanshijian',
- title: '加班时间'
- },
- {
- field: 'yuanyinshuoming',
- title: '加班事由'
- },
- {
- field: 'jiabanshichang',
- title: '加班时长(h)'
- },
- {
- field: 'allDay',
- title: '本月累计(d)'
- }
-
- ]
+ mergeCells: [],
+ exportName: '加班统计表',
+ dName: '全部科室'
}
},
methods: {
@@ -115,9 +81,9 @@
const res = await overtimeList(this.select, false);
console.log(res);
let data = res?.users || [];
- this.tableData = this.overtimeData(data)
- console.log("this.tableData", this.tableData)
- // this.setRowSpans()
+ this.tableData = this.overtimeData(data)
+ let date = this.$moment(this.select.month).format("YYYY年MM月")
+ this.exportName = `${date}${this.dName}加班统计表`
this.loading = false;
} catch (err) {
console.error(err);
@@ -151,15 +117,20 @@
overtime
} = item;
const allDay = overtime.reduce((sum, overtimeItem) => sum + parseFloat(overtimeItem.day), 0);
-
overtime.forEach(overtimeItem => {
overtimeItem.pid = id;
overtimeItem.name = name;
overtimeItem.department_name = department.name
+ overtimeItem.sortnumber = department.sortnumber
+ overtimeItem.department_id = department.id
overtimeItem.allDay = parseFloat(allDay).toFixed(2);
result.push(overtimeItem);
});
+ result.sort((a, b) => {
+ return a.sortnumber - b.sortnumber
+ })
});
+ this.mergeCells = this.generateMergeCells(result)
return result;
},
exportjbMethod({
@@ -167,112 +138,50 @@
}) {
return `${row.kaishiriqi?row.kaishiriqi.substring(11,row.kaishiriqi.length):''}-${row.kaishiriqi?row.jieshushijian.substring(11,row.jieshushijian.length):''}`
},
- spanMethods({
- row,
- $rowIndex,
- column,
- data
- }) {
- let fields = ["department_name", "name", "allDay"]
- let cellValue = row[column.property]
- if (cellValue && fields.includes(column.property)) {
- let prevRow = data[$rowIndex - 1]
- let nextRow = data[$rowIndex + 1]
- if (prevRow && prevRow[column.property] === cellValue) {
- return {
- rowspan: 0,
- colspan: 0
- }
- } else {
- let countRowspan = 1
- while (nextRow && nextRow[column.property] === cellValue) {
- nextRow = data[++countRowspan + $rowIndex]
+ changeDepartment(e) {
+ if (e) {
+ this.departments.map(item => {
+ if (item.id == e) {
+ this.dName = item.name
}
- if (countRowspan > 1) {
- return {
- rowspan: countRowspan,
- colspan: 1
- }
- }
- }
+ })
+ } else {
+ this.dName = '全部科室'
}
-
},
// 合并单元格
- setRowSpans() {
- const options = {
- list: this.tableData, // 表格数据
- columns: this.columns, // 完整表头
- merges: [ "name", "department_name"], // 需要合并的列
- condition: ['pid'], // 合并条件
- field: 'field' // 表头取值的字段
- };
- // 传入此配置项，是指将pid相等的相邻数据合并，如果两条数据不相邻即使pid相等也不会合并
- this.mergeCells = this.setMergeCells(options);
- console.log('this.mergeCells: ', this.mergeCells);
- },
- setMergeCells({
- list = [],
- columns = [],
- merges = [],
- condition = [],
- field = 'field'
- }) {
- console.log("list",list)
- const validMap = new Map(); // 有效合并配置项
- for (let i = 0; i < list.length; i++) {
- // 根据判断条件取出当前行对应的表格数据，生成唯一标识
- console.log("list[i][field])",i,list[i]['pid'])
- const hashKey = condition.map(field => list[i][field]).join('&&');
- let flag = true;
- let count = 1;
- // 从当前索引i开始，往后找，数据相同的话，count自增，否则跳出while循环
- while (flag && i + count < list.length) {
- // 根据判断条件取出下一行的表格数据，生成唯一标识
- const nextRow = condition.map(field => list[i + count][field]).join('&&');
- if (hashKey === nextRow) {
- // 数据相同，count自增
- count++;
- } else {
- // 数据不同，跳出while循环
- flag = false;
+ generateMergeCells(data) {
+ const columns = this.$refs.table.getColumns()
+ let mergeCells = [];
+ const columnsToMerge = ['department_name', 'name', 'allDay'];
+ columnsToMerge.forEach(key => {
+ const col = columns.findIndex(item => item['field'] === key);
+ if (col === -1) {
+ return;
+ }
+ for (let i = 0; i < data.length; i++) {
+ let rowspan = 1;
+ const currentValue = data[i][key];
+ for (let j = i + 1; j < data.length; j++) {
+ if (data[j][key] === currentValue) {
+ rowspan++;
+ } else {
+ break;
+ }
+ }
+ if (rowspan > 1) {
+ mergeCells.push({
+ row: i,
+ col,
+ rowspan,
+ colspan: 1
+ });
+ i += rowspan - 1;
}
}
- // 将有效的合并配置项存入validMap
- count > 1 && validMap.set(hashKey + '_' + i, {
- row: i,
- rowspan: count
- });
- // i 跳过已合并的行，减 1 是因为 i++
- i += count - 1;
- // 重置 while 循环标识
- flag = true;
- }
- // 合并记录转换
- const recordsList = [...validMap.values()];
- console.log("recordsList",recordsList)
- if (recordsList.length == 0) {
- return [];
- }
- // 预处理列索引
- const cols = merges.reduce((acc, mergeField) => {
- const idx = columns.findIndex(item => item[field] === mergeField);
- idx !== -1 && acc.push(idx);
- return acc;
- }, []);
- console.log("cols",cols)
- // 遍历列索引，生成合并单元格配置集合
- const mergeCells = recordsList.flatMap(({
- row,
- rowspan
- }) => cols.map(col => ({
- row,
- col,
- rowspan,
- colspan: 1
- })));
+ });
return mergeCells;
- }
+ },
},
computed: {},