调休统计表

src/api/chart.js

@@ -9,6 +9,15 @@ export function leaveList(params, isLoading = true) {
   })
 }
 
+export function leaveDetail(params, isLoading = true) {
+  return request({
+    method: 'get',
+    url: '/api/oa/chart/leave-detail',
+    params,
+    isLoading
+  })
+}
+
 export function overtimeList(params,isLoading = true) {
   return request({
     method: 'get',
@@ -26,3 +35,5 @@ export function otherOvertimeList(params,isLoading = true) {
     isLoading
   })
 }
+
+

src/views/attendance/leavedetailchart.vue

@@ -0,0 +1,198 @@
+<template>
+  <div>
+    <card-container>
+      <vxe-toolbar print custom export>
+        <template #buttons>
+          <el-date-picker v-model="select.month"
+            type="month" size="small" value-format="yyyy-MM"
+            placeholder="月份" format="yyyy-MM"/>
+          <el-select v-if="is_bgs" 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>
+          <el-button icon="el-icon-search" type="primary" plain size="small" style="margin-left: 6px;"
+            @click="getList">搜索</el-button>
+        </template>
+      </vxe-toolbar>
+      <vxe-table ref="table" stripe :border='true' style="margin-top: 10px;border:1px solid #333" :loading="loading"
+        :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"
+        :merge-cells="mergeCells"
+        >
+        <!-- :span-method="mergeCells" -->
+        <vxe-column minWidth="240" header-align="center" align="center" field="department_name" title="科室"></vxe-column>
+        <vxe-column minWidth="180" header-align="center" align="center" field="user_name" title="姓名"></vxe-column>
+        <vxe-column width="180" header-align="center" align="center" field="qingjiashiyou" title="请假事由"></vxe-column>
+        <vxe-column width="180" header-align="center" align="center" field="kaishishijian" title="开始时间"></vxe-column>
+        <vxe-column width="180" header-align="center" align="center" field="jieshushijian" title="结束时间"></vxe-column>
+        <vxe-column width="180" header-align="center" align="center" field="qingjiashijian" title="请假时间(h)"></vxe-column>
+        <vxe-column width="180" header-align="center" align="center" field="allDay" title="累计时间(h)"></vxe-column>
+
+      </vxe-table>
+    </card-container>
+  </div>
+</template>
+
+<script>
+  import {
+    leaveDetail
+  } from "@/api/chart"
+  import {
+    departmentListNoAuth
+  } from "@/api/common.js"
+  import store from "@/store/modules/user.js"
+  export default {
+    data() {
+      return {
+        loading: false,
+        tableData: [],
+        select: {
+          month: this.$moment().format('YYYY-MM'),
+          department_id: ''
+        },
+        my_department_id:"",
+        is_bgs:false, // 是否是办公室
+        departments:[],
+        mergeCells:[],
+        exportName:'调休统计表',
+        dName:'全部科室'
+      }
+    },
+    methods: {
+      async getList() {
+        this.loading = true;
+        try {
+          const res = await leaveDetail(this.select, false);
+          console.log("res",res)
+          let _arr = res?.users || []
+          let leave_arr = []
+          _arr.forEach(item=>{
+            let department_name = item.department.name
+            let user_name = item.name
+            let sortnumber = item.department.sortnumber
+            if(item.leave.length>0){
+              const allDay = item.leave.reduce((sum, overtimeItem) => sum + parseFloat(overtimeItem.qingjiashijian), 0);
+              item.leave.forEach(i=>{
+                leave_arr.push({
+                  department_name : item.department.name,
+                  user_name : item.name,
+                  sortnumber : item.department.sortnumber,
+                  allDay:parseFloat(allDay).toFixed(2),
+                  ...i
+                })
+              })
+            }
+
+          })
+          leave_arr.sort((a,b)=>{
+            return a.sortnumber - b.sortnumber
+          })
+
+          console.log("leave_arr",leave_arr)
+          this.tableData = leave_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);
+          this.loading = false;
+        }
+      },
+      async getDepartmentList() {
+        try {
+          const res = await departmentListNoAuth();
+          let arr = res
+          this.departments = arr
+          this.departments.unshift({
+            id: '',
+            name: '全部'
+          })
+        } catch (err) {
+          console.error(err);
+        }
+      },
+      changeDepartment(e){
+        if(e){
+          this.departments.map(item=>{
+            if(item.id==e){
+              this.dName = item.name
+            }
+          })
+        }else{
+          this.dName = '全部科室'
+        }
+      },
+      // 合并单元格
+      generateMergeCells(data) {
+        const columns = this.$refs.table.getColumns()
+        let mergeCells = [];
+        const columnsToMerge = ['department_name','user_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;
+            }
+          }
+        });
+        return mergeCells;
+      },
+
+    },
+    computed: {},
+    created() {
+      console.log("store",store)
+      this.my_department_id = store.state.department?store.state.department.id:''
+      this.dName = store.state.department?store.state.department.name:'全部科室'
+      if(this.my_department_id){
+        this.is_bgs = this.my_department_id==2?true:false
+        this.select.department_id = this.my_department_id
+      }
+      this.getDepartmentList()
+      this.getList()
+    },
+    mounted() {
+      this.$nextTick(() => {
+        if (this.$refs["table"] && this.$refs["toolbar"]) {
+          this.$refs["table"].connect(this.$refs["toolbar"]);
+        }
+      });
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+
+  ::v-deep .vxe-body--column {
+        border-left: 1px solid #333 !important;
+        border-bottom: 1px solid #333 !important;
+  }
+  ::v-deep th.vxe-header--column{
+      border-left: 1px solid #333 !important;
+      border-bottom: 2px solid #333 !important;
+      }
+</style>

src/views/flow/DesktopForm.vue

@@ -235,6 +235,7 @@ export default {
         this.readable.indexOf(field.id) !== -1 || field.type === "label",
       _writeable: this.writeable.indexOf(field.id) !== -1,
     }));
+    console.log("authFields",authFields)
     if (this.needFlowTitle) {
       authFields.unshift({
         name: "flow_title",