Compare commits

...

3 Commits

Author SHA1 Message Date
xy 754f777aac 1
7 months ago
lion 7c9987c711 导出合并
7 months ago
lion d7275fd344 导出合并
7 months ago

@ -927,7 +927,7 @@ export default function formBuilder(
h(
"span",
log.updated_at
? this.$moment(log.updated_at).format("YYYY年MM月DD")
? this.$moment(log.updated_at).format("YYYY年MM月DD")
: ""
),
])
@ -1017,7 +1017,7 @@ export default function formBuilder(
h(
"div",
this.$moment(log.updated_at).format(
"YYYY年MM月DD日 HH时mm分"
"YYYY年MM月DD日"
)
),
]);
@ -1784,7 +1784,7 @@ export default function formBuilder(
h(
"span",
log.updated_at
? this.$moment(log.updated_at).format("YYYY年MM月DD")
? this.$moment(log.updated_at).format("YYYY年MM月DD")
: ""
),
])
@ -1866,7 +1866,7 @@ export default function formBuilder(
h(
"div",
this.$moment(log.updated_at).format(
"YYYY年MM月DD日 HH时mm分"
"YYYY年MM月DD日"
)
),
]);

@ -1,4 +1,5 @@
import store from '@/store'
import moment from 'moment'
/**
* @param{string} printJs 打印模版
* @param{boolean} isLog 是否带审批
@ -11,7 +12,7 @@ export async function print(printJs, isLog, form, logContent) {
['apply_name', `<span>${form.creator?.name}</span>`],
['apply_department_name', `<span>${form.creator_department?.name}</span>`],
['apply_sign', form.creator?.sign_file ? `<img src="${form.creator?.sign_file?.url}" alt="${form.creator?.name}" style="max-height: 80px;max-width: 120px;">` : `<span>${form.creator?.name}</span>`],
['created_at', `<span>${form.created_at}</span>`],
['created_at', `<span>${moment(form.created_at).format('YYYY年MM月DD日')}</span>`],
])
let printStr = printJs

@ -6,7 +6,7 @@
<el-date-picker v-model="select.month"
type="month" size="small" value-format="yyyy-MM"
placeholder="月份" format="yyyy-MM"/>
<el-select style="width:250px;margin-left:6px" size="small" v-model="select.department_id" placeholder="请选择">
<el-select style="width:250px;margin-left:6px" size="small" @change="changeDepartment" v-model="select.department_id" placeholder="请选择">
<el-option v-for="item in departments" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@ -15,11 +15,16 @@
</template>
</vxe-toolbar>
<vxe-table ref="table" stripe :border='true' style="margin-top: 10px;" :loading="loading"
:max-height="1400" :min-height="400" :export-config="{}" :print-config="{}" :column-config="{ resizable: true }"
:max-height="1400" :min-height="400"
:export-config="{type: 'xlsx',filename:exportName,sheetName:exportName}"
:print-config="{}" :column-config="{ resizable: true }"
:expand-config="{
visibleMethod: () => false,
trigger: 'manual'
}" :data="tableData" :span-method="mergeCells">
}" :data="tableData"
:merge-cells="mergeCells"
>
<!-- :span-method="mergeCells" -->
<vxe-column width="240" header-align="center" align="center" field="department_name" title="科室"></vxe-column>
<vxe-column width="180" header-align="center" align="center" field="user.name" title="姓名"></vxe-column>
@ -44,7 +49,7 @@
</div>
</template>
</vxe-column>
<vxe-column header-align="center" align="center" field="expire" title="过期天数">
<vxe-column header-align="center" align="center" field="expire" title="过期时间">
<template #default="{ row }">
<div>
{{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: {},

@ -5,7 +5,8 @@
<template #buttons>
<el-date-picker v-model="select.month" type="month" size="small" value-format="yyyy-MM" placeholder="月份"
format="yyyy-MM" />
<el-select style="width:250px;margin-left:6px" size="small" v-model="select.department_id" placeholder="请选择">
<el-select style="width:250px;margin-left:6px" size="small" @change="changeDepartment"
v-model="select.department_id" placeholder="请选择">
<el-option v-for="item in departments" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@ -14,12 +15,12 @@
</template>
</vxe-toolbar>
<vxe-table ref="table" stripe :border='true' style="margin-top: 10px;" :loading="loading" :max-height="1400"
:min-height="400" :export-config="{type: 'xlsx'}" :print-config="{}" :column-config="{ resizable: true }"
:expand-config="{
:min-height="400" :export-config="{type: 'xlsx',filename:exportName,sheetName:exportName}" :print-config="{}"
:column-config="{ resizable: true }" :expand-config="{
visibleMethod: () => false,
trigger: 'manual'
}" :data="tableData" :span-method="spanMethods">
<!-- :span-method="spanMethods" :merge-cells="mergeCells"-->
}" :data="tableData" :merge-cells="mergeCells">
<!-- :span-method="spanMethods" -->
<vxe-column width="180" header-align="center" align="center" field="department_name" title="科室"></vxe-column>
<vxe-column width="180" header-align="center" align="center" field="name" title="姓名"></vxe-column>
<vxe-column width="180" header-align="center" align="center" field="kaishiriqi" title="日期">
@ -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;
// icountwhile
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: {},

Loading…
Cancel
Save