Merge remote-tracking branch 'origin/master'

client/src/views/OaSystem/personnelManagement/dailyStatistic/index.vue

@@ -3,12 +3,12 @@
     <div class="title">部门日报统计</div>
     <div class="searchBox">
       <el-form :inline="true" class="demo-form-inline">
-        <DeptAndUserSelect
+        <!-- <DeptAndUserSelect
           :defaultDept="deptId"
           :isHideDept="true"
           :deptOnChange="deptOnChange"
           :userOnChange="userOnChange"
-        />
+        /> -->
         <el-form-item label="月份:">
           <el-date-picker
             v-model="reportYearAndMonth"
@@ -138,15 +138,18 @@ const pageTotal = ref(0)
 // 获取日报统计数据
 const getDailyStatisticData = async (): Promise<void> => {
   loading.value = true
-  const params = {
+  const params: any = {
     reportType: 'daily',
     year: moment(reportYearAndMonth.value).format('YYYY'),
     month: moment(reportYearAndMonth.value).format('M'),
-    deptId: deptId.value,
+    // deptId: deptId.value,
     userId: userId.value,
     pageSize: pageSize.value,
     pageNo: pageNo.value
   }
+  if (currentRoute.value?.query?.deptId) {
+    params.deptId = currentRoute.value.query.deptId
+  }
   const { list = [], total = 0 } = await request.get({
     url: '/adm/reportStatistics/query-report-statistics',
     params

client/src/views/OaSystem/personnelManagement/weeklyStatistic/index.vue

@@ -3,12 +3,12 @@
     <div class="title">部门周报统计</div>
     <div class="searchBox">
       <el-form :inline="true" class="demo-form-inline">
-        <DeptAndUserSelect
+        <!-- <DeptAndUserSelect
           :defaultDept="deptId"
           :isHideDept="true"
           :deptOnChange="deptOnChange"
           :userOnChange="userOnChange"
-        />
+        /> -->
         <el-form-item label="月份:">
           <el-date-picker
             v-model="reportYearAndMonth"
@@ -140,15 +140,18 @@ const pageTotal = ref(0)
 // 获取周报统计数据
 const getWeeklyStatisticData = async (): Promise<void> => {
   loading.value = true
-  const params = {
+  const params: any = {
     reportType: 'weekly',
     year: moment(reportYearAndMonth.value).format('YYYY'),
     month: moment(reportYearAndMonth.value).format('M'),
-    deptId: deptId.value,
+    // deptId: deptId.value,
     userId: userId.value,
     pageSize: pageSize.value,
     pageNo: pageNo.value
   }
+  if (currentRoute.value?.query?.deptId) {
+    params.deptId = currentRoute.value.query.deptId
+  }
   const { list = [], total = 0 } = await request.get({
     url: '/adm/reportStatistics/query-report-statistics',
     params