diff --git a/.env.development b/.env.development
index 6a303b8..743a4a3 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API='http://192.167.20.118:8080/'
+VUE_APP_BASE_API='https://cz-hjjc-test.115.langye.net/'
 #VUE_APP_BASE_API='http://czemc.localhost'
 VUE_APP_UPLOAD_API='https://cz-hjjc-test.115.langye.net/api/upload-file'
 VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 0ccdf66..93a8ee2 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -12,7 +12,8 @@ const getDefaultState = () => {
     yearHoliday: 0,
     department: {},
     role: [],
-    roles:[]
+    roles: [],
+    moduleRoles: {}
   }
 }
 
@@ -48,6 +49,9 @@ const mutations = {
   },
   SET_USERNAME: (state, username) => {
     state.username = username
+  },
+  SET_MODULE_ROLES: (state, moduleRoles) => {
+    state.moduleRoles = moduleRoles
   }
 }
 
@@ -72,20 +76,29 @@ const actions = {
   getInfo({ commit, state }) {
     return new Promise((resolve, reject) => {
       getInfo(getToken()).then(response => {
-
-        const { name, avatar, id, role, roles, department, username, year_holiday } = response
+        const { name, avatar, id, role, roles, department, username, year_holiday, module_roles } = response
         let rolesArr = []
-        if(roles&&roles.length>0){
-          rolesArr = roles.map(i=>i.name)
+        if (roles && roles.length > 0) {
+          rolesArr = roles.map(i => i.name)
+        }
+        // 处理 module_roles：转换为 { module_name: roles } 格式
+        const moduleRolesObj = {}
+        if (module_roles && Array.isArray(module_roles) && module_roles.length > 0) {
+          module_roles.forEach(item => {
+            if (item.module_name && item.roles) {
+              moduleRolesObj[item.module_name] = item.roles
+            }
+          })
         }
-        commit('SET_DEPARTMENT',department)
+        commit('SET_DEPARTMENT', department)
         commit('SET_NAME', name)
         commit('SET_AVATAR', avatar)
         commit('SET_ADMIN_ID', id)
         commit('SET_ROLE', role)
         commit('SET_ROLES', rolesArr)
         commit('SET_USERNAME', username)
-        commit('SET_YEAR_HOLIDAY', year_holiday??0)
+        commit('SET_YEAR_HOLIDAY', year_holiday ?? 0)
+        commit('SET_MODULE_ROLES', moduleRolesObj)
         resolve(response)
       }).catch(error => {
         reject(error)
diff --git a/src/views/attendance/YearStatistics.vue b/src/views/attendance/YearStatistics.vue
index 19eb6bc..f36d063 100644
--- a/src/views/attendance/YearStatistics.vue
+++ b/src/views/attendance/YearStatistics.vue
@@ -4,14 +4,14 @@
       <vxe-toolbar print custom export>
         <template #buttons>
           <el-date-picker v-model="select.year" type="year" size="small" value-format="yyyy" placeholder="年份"
-            format="yyyy" />
-          <el-select  style="width:250px;margin-left:6px" clearable v-model="select.month" placeholder="请选择月份" size="small">
-              <el-option
-                v-for="item in monthOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
+            format="yyyy" />
+          <el-select  style="width:250px;margin-left:6px" clearable v-model="select.month" placeholder="请选择月份" size="small">
+              <el-option
+                v-for="item in monthOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
             </el-select>
           <!-- <el-date-picker style="width:250px;margin-left:6px" v-model="select.month" type="month" size="small" placeholder="月份"
               /> -->
@@ -85,20 +85,20 @@
           keyword: ''
         },
         tableData: [],
-        departments: [],
-        monthOptions:[
-          {'value':1,label:'一月'},
-          {'value':2,label:'二月'},
-          {'value':3,label:'三月'},
-          {'value':4,label:'四月'},
-          {'value':5,label:'五月'},
-          {'value':6,label:'六月'},
-          {'value':7,label:'七月'},
-          {'value':8,label:'八月'},
-          {'value':9,label:'九月'},
-          {'value':10,label:'十月'},
-          {'value':11,label:'十一月'},
-          {'value':12,label:'十二月'}
+        departments: [],
+        monthOptions:[
+          {'value':1,label:'一月'},
+          {'value':2,label:'二月'},
+          {'value':3,label:'三月'},
+          {'value':4,label:'四月'},
+          {'value':5,label:'五月'},
+          {'value':6,label:'六月'},
+          {'value':7,label:'七月'},
+          {'value':8,label:'八月'},
+          {'value':9,label:'九月'},
+          {'value':10,label:'十月'},
+          {'value':11,label:'十一月'},
+          {'value':12,label:'十二月'}
         ]
       }
     },
diff --git a/src/views/attendance/leavechart.vue b/src/views/attendance/leavechart.vue
index 3d8ab68..6203391 100644
--- a/src/views/attendance/leavechart.vue
+++ b/src/views/attendance/leavechart.vue
@@ -1,32 +1,32 @@
-<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"
+<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"
+          </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'
+         :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 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="over_off" title="结余调休时间">
           <template #default="{ row }">
@@ -63,43 +63,43 @@
             </div>
           </template>
         </vxe-column>
-
-      </vxe-table>
-    </card-container>
-  </div>
-</template>
-
-<script>
-  import {
-    leaveList
+
+      </vxe-table>
+    </card-container>
+  </div>
+</template>
+
+<script>
+  import {
+    leaveList
   } from "@/api/chart"
   import {
     departmentListNoAuth
   } from "@/api/common.js"
-  import store from "@/store/modules/user.js"
-  export default {
-    data() {
-      return {
-        loading: false,
-        tableData: [],
-        select: {
-          page: 1,
-          page_size: 10,
-          month: this.$moment().format('YYYY-MM'),
-          department_id: ''
+  import store from "@/store/modules/user.js"
+  export default {
+    data() {
+      return {
+        loading: false,
+        tableData: [],
+        select: {
+          page: 1,
+          page_size: 10,
+          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 {
+        dName:'全部科室'
+      }
+    },
+    methods: {
+      async getList() {
+        this.loading = true;
+        try {
           const res = await leaveList(this.select, false);
           let _arr = res?.timeOff || []
           _arr.forEach(item=>{
@@ -108,16 +108,16 @@
           })
           _arr.sort((a,b)=>{
             return a.sortnumber - b.sortnumber
-          })
+          })
           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);
-          this.loading = false;
-        }
+          this.exportName = `${date}${this.dName}调休统计表`
+          this.loading = false;
+        } catch (err) {
+          console.error(err);
+          this.loading = false;
+        }
       },
       async getDepartmentList() {
         try {
@@ -176,30 +176,34 @@
         });
         return mergeCells;
       },
-
-    },
-    computed: {},
+
+    },
+    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
+        if(store.state.moduleRoles.oa.includes("考勤")){
+          this.is_bgs = true
+        }else{
+          this.is_bgs = 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>
-
+      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 {
@@ -209,5 +213,5 @@
   ::v-deep th.vxe-header--column{
       border-left: 1px solid #333 !important;
       border-bottom: 2px solid #333 !important;
-      }
+      }
 </style>
diff --git a/src/views/attendance/leavedetailchart.vue b/src/views/attendance/leavedetailchart.vue
index 123d1ad..395e55e 100644
--- a/src/views/attendance/leavedetailchart.vue
+++ b/src/views/attendance/leavedetailchart.vue
@@ -1,72 +1,72 @@
-<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"
+<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"
+          </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'
+         :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 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="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
+
+      </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: ''
+  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 {
+        dName:'全部科室'
+      }
+    },
+    methods: {
+      async getList() {
+        this.loading = true;
+        try {
           const res = await leaveDetail(this.select, false);
           console.log("res",res)
           let _arr = res?.users || []
@@ -93,16 +93,16 @@
             return a.sortnumber - b.sortnumber
           })
 
-          console.log("leave_arr",leave_arr)
+          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;
-        }
+          this.exportName = `${date}${this.dName}调休统计表`
+          this.loading = false;
+        } catch (err) {
+          console.error(err);
+          this.loading = false;
+        }
       },
       async getDepartmentList() {
         try {
@@ -161,30 +161,34 @@
         });
         return mergeCells;
       },
-
-    },
-    computed: {},
+
+    },
+    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
+        if(store.state.moduleRoles.oa.includes("考勤")){
+          this.is_bgs = true
+        }else{
+          this.is_bgs = 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>
-
+      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 {
@@ -194,5 +198,5 @@
   ::v-deep th.vxe-header--column{
       border-left: 1px solid #333 !important;
       border-bottom: 2px solid #333 !important;
-      }
+      }
 </style>
diff --git a/src/views/attendance/otherovertimechart.vue b/src/views/attendance/otherovertimechart.vue
index 8d3fde9..3559c79 100644
--- a/src/views/attendance/otherovertimechart.vue
+++ b/src/views/attendance/otherovertimechart.vue
@@ -4,7 +4,7 @@
       <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" />
+            format="yyyy-MM" />
             <!-- v-if="is_bgs" -->
           <el-select v-if="is_bgs" style="width:250px;margin-left:6px" size="small" @change="changeDepartment"
             v-model="select.department_id" placeholder="请选择">
@@ -13,11 +13,11 @@
           </el-select>
           <!-- <el-switch  style="margin-left:15px" v-model="select.is_week" :active-value="1" :inactive-value="0"
             active-text="双休" inactive-text="节假日">
-          </el-switch> -->
-          <el-radio-group style="margin-left:15px" v-model="select.is_week">
-              <el-radio :label="0">工作日/节假日</el-radio>
-              <el-radio :label="1">双休</el-radio>
-            </el-radio-group>
+          </el-switch> -->
+          <el-radio-group style="margin-left:15px" v-model="select.is_week">
+              <el-radio :label="0">工作日/节假日</el-radio>
+              <el-radio :label="1">双休</el-radio>
+            </el-radio-group>
 
           <el-button icon="el-icon-search" type="primary" plain size="small" style="margin-left: 15px;"
             @click="getList">搜索</el-button>
@@ -53,15 +53,15 @@
 
         <!-- <vxe-column header-align="center" align="center" field="day" title="day"></vxe-column> -->
         <!-- <vxe-column width="120" header-align="center" align="center" field="allConvertTime"
-          title="本月折算累计(h)"></vxe-column> -->
-        <vxe-column width="120" header-align="center" align="center" field="allDay" title="本月累计(h)"></vxe-column>
-
-        <vxe-column width="120" header-align="center" align="center" field="time_off"
-          title="调休汇总(h)"></vxe-column>
-        <vxe-column width="120" header-align="center" align="center" field="deduct_hour_sum"
-          title="扣减调休后汇总(h)"></vxe-column>
-        <vxe-column width="120" header-align="center" align="center" field="discount_hour_sum"
-          title="本月折算累计(h)"></vxe-column>
+          title="本月折算累计(h)"></vxe-column> -->
+        <vxe-column width="120" header-align="center" align="center" field="allDay" title="本月累计(h)"></vxe-column>
+
+        <vxe-column width="120" header-align="center" align="center" field="time_off"
+          title="调休汇总(h)"></vxe-column>
+        <vxe-column width="120" header-align="center" align="center" field="deduct_hour_sum"
+          title="扣减调休后汇总(h)"></vxe-column>
+        <vxe-column width="120" header-align="center" align="center" field="discount_hour_sum"
+          title="本月折算累计(h)"></vxe-column>
 
       </vxe-table>
     </card-container>
@@ -135,9 +135,9 @@
             id,
             name,
             department,
-            overtime,
-            time_off,
-            deduct_hour_sum,
+            overtime,
+            time_off,
+            deduct_hour_sum,
             discount_hour_sum,
           } = item;
           let obj = {}
@@ -165,9 +165,9 @@
             overtimeItem.sortnumber = department.sortnumber
             overtimeItem.department_id = department.id
             overtimeItem.allDay = parseFloat(allDay).toFixed(2);
-            overtimeItem.allConvertTime = parseFloat(allConvertTime).toFixed(2);
-            overtimeItem.time_off = parseFloat(time_off).toFixed(2);
-            overtimeItem.deduct_hour_sum = parseFloat(deduct_hour_sum).toFixed(2);
+            overtimeItem.allConvertTime = parseFloat(allConvertTime).toFixed(2);
+            overtimeItem.time_off = parseFloat(time_off).toFixed(2);
+            overtimeItem.deduct_hour_sum = parseFloat(deduct_hour_sum).toFixed(2);
             overtimeItem.discount_hour_sum = parseFloat(discount_hour_sum).toFixed(2);
             result.push(overtimeItem);
             // 累计折算时长
@@ -199,7 +199,7 @@
       // 合并单元格
       generateMergeCells(data) {
         const columns = this.$refs.table.getColumns();
-        let mergeCells = [];
+        let mergeCells = [];
 // ,'time_off','use_overtime','discount'
         const columnsToMerge = ['department_name', 'name', 'allDay', 'allConvertTime','time_off','deduct_hour_sum','discount_hour_sum'];
 
@@ -208,8 +208,8 @@
           if (col === -1) {
             return;
           }
-          if (key === 'allDay' || key === 'allConvertTime'||
-          key === 'time_off' || key === 'deduct_hour_sum'||
+          if (key === 'allDay' || key === 'allConvertTime'||
+          key === 'time_off' || key === 'deduct_hour_sum'||
           key === 'discount_hour_sum') {
             // 对于 allDay 和 allConvertTime 列，先按 name 分组处理
             const groupedByName = {};
@@ -281,7 +281,11 @@
       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
+        if(store.state.moduleRoles.oa.includes("考勤")){
+          this.is_bgs = true
+        }else{
+          this.is_bgs = false
+        }
         this.select.department_id = this.my_department_id
 
       }
@@ -308,4 +312,4 @@
     border-left: 1px solid #333 !important;
     border-bottom: 2px solid #333 !important;
   }
-</style>
+</style>
diff --git a/src/views/attendance/overtimechart.vue b/src/views/attendance/overtimechart.vue
index 0481303..ad7a103 100644
--- a/src/views/attendance/overtimechart.vue
+++ b/src/views/attendance/overtimechart.vue
@@ -11,31 +11,31 @@
             </el-option>
           </el-select>
           <el-button icon="el-icon-search" type="primary" plain size="small" style="margin-left: 15px;"
-            @click="getList">搜索</el-button>
-            <el-popover
-              v-if="is_bgs"
-              placement="bottom-start"
-              title="导入加班"
-              width="400"
-              trigger="click">
-              <template #reference>
-                <el-button style="margin-left: 10px;" type="primary" size="small" icon="el-icon-upload">导入加班</el-button>
-              </template>
-              <template #default>
-                <el-upload
-                  ref="upload"
-                  :action="action"
-                  :on-success="uploadSuccess"
-                  accept=".xls,.xlsx"
-                  :headers="{
-                        'Authorization': 'Bearer ' + getToken()
-                      }"
-                  :auto-upload="false">
-                  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-                  <el-button style="margin-left: 10px;" size="small" type="success" @click="uploadData">上传到服务器</el-button>
-                  <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件</div>
-                </el-upload>
-              </template>
+            @click="getList">搜索</el-button>
+            <el-popover
+              v-if="is_bgs"
+              placement="bottom-start"
+              title="导入加班"
+              width="400"
+              trigger="click">
+              <template #reference>
+                <el-button style="margin-left: 10px;" type="primary" size="small" icon="el-icon-upload">导入加班</el-button>
+              </template>
+              <template #default>
+                <el-upload
+                  ref="upload"
+                  :action="action"
+                  :on-success="uploadSuccess"
+                  accept=".xls,.xlsx"
+                  :headers="{
+                        'Authorization': 'Bearer ' + getToken()
+                      }"
+                  :auto-upload="false">
+                  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+                  <el-button style="margin-left: 10px;" size="small" type="success" @click="uploadData">上传到服务器</el-button>
+                  <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件</div>
+                </el-upload>
+              </template>
             </el-popover>
         </template>
       </vxe-toolbar>
@@ -77,23 +77,23 @@
   } from "@/api/chart"
   import {
     departmentListNoAuth
-  } from "@/api/common.js"
-  import store from "@/store/modules/user.js"
+  } from "@/api/common.js"
+  import store from "@/store/modules/user.js"
   import { getToken } from "@/utils/auth";
   export default {
     data() {
       return {
         loading: false,
-        tableData: [],
-        action: `${process.env.VUE_APP_BASE_API}/api/oa/statistics/import-overtime`, // 导入加班
+        tableData: [],
+        action: `${process.env.VUE_APP_BASE_API}/api/oa/statistics/import-overtime`, // 导入加班
 
         select: {
           page: 1,
           page_size: 10,
           month: this.$moment().format('YYYY-MM'),
           department_id: '',
-        },
-        my_department_id:"",
+        },
+        my_department_id:"",
         is_bgs:false, // 是否是办公室
         departments: [],
         mergeCells: [],
@@ -101,26 +101,26 @@
         dName: '全部科室'
       }
     },
-    methods: {
-      // 导入加班
-      getToken,
-      uploadData() {
-        this.$refs.upload.submit();
-      },
-      uploadSuccess(response) {
-        console.log(response)
-        let arr = response.data
-        let str = ''
-          if(arr.err.length>0){
-            arr.err.map(item=>{
-              str+=`${item}，`
-            })
-            this.$message.error(`${str}导入失败`)
-            this.getList(true)
-          }else{
-            this.$message.success(`导入成功`)
-            this.getList(true)
-          }
+    methods: {
+      // 导入加班
+      getToken,
+      uploadData() {
+        this.$refs.upload.submit();
+      },
+      uploadSuccess(response) {
+        console.log(response)
+        let arr = response.data
+        let str = ''
+          if(arr.err.length>0){
+            arr.err.map(item=>{
+              str+=`${item}，`
+            })
+            this.$message.error(`${str}导入失败`)
+            this.getList(true)
+          }else{
+            this.$message.success(`导入成功`)
+            this.getList(true)
+          }
       },
       async getList() {
         this.loading = true;
@@ -232,13 +232,17 @@
 
     },
     computed: {},
-    created() {
-      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
-
+    created() {
+      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){
+        if(store.state.moduleRoles.oa.includes("考勤")){
+          this.is_bgs = true
+        }else{
+          this.is_bgs = false
+        }
+        this.select.department_id = this.my_department_id
+
       }
       this.getDepartmentList()
       this.getList()
@@ -253,14 +257,14 @@
   }
 </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 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>
+</style>
diff --git a/src/views/attendance/statistics.vue b/src/views/attendance/statistics.vue
index 65e50d4..8562b80 100644
--- a/src/views/attendance/statistics.vue
+++ b/src/views/attendance/statistics.vue
@@ -246,7 +246,11 @@ export default {
   created() {
     this.my_department_id = store.state.department?store.state.department.id:''
     if(this.my_department_id){
-      this.is_bgs = this.my_department_id==2?true:false
+      if(store.state.moduleRoles.oa.includes("考勤")){
+        this.is_bgs = true
+      }else{
+        this.is_bgs = false
+      }
       this.select.department_id = this.my_department_id
     }