2022.6.29 22.37

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -79,7 +79,7 @@
         </el-select>
           
           <!-- 部门筛选 -->
-          <el-cascader v-if="(ins == 9 && permissions.reportAllTimely) || (ins == 8 && permissions.reportAllTimeDivide) || (ins == 6 && permissions.reportAllOvertime) || ins == 10" v-model="departmentIdArray" :options="departmentList" placeholder="请选择部门"
+          <el-cascader v-if="(ins == 9 && permissions.reportAllTimely) || (ins == 8 && permissions.reportAllTimeDivide) || (ins == 6 && permissions.reportAllOvertime)" v-model="departmentIdArray" :options="departmentList" placeholder="请选择部门"
             :props="{ checkStrictly: false,expandTrigger: 'hover' }" :show-all-levels="false" clearable
             @change="selcts(9)" size="small" style="margin-left:10px"
           ></el-cascader>
@@ -441,6 +441,7 @@
             <!-- 日报待审核统计 -->
             <el-table v-if="ins == 10" key="10" border :data="auditRateList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
                 <el-table-column prop="userName" label="审核人" min-width="200" align="center"></el-table-column>
+                <el-table-column prop="departmentName" label="所属部门" min-width="200" align="center"></el-table-column>
                 <el-table-column prop="num" label="待审核条数" min-width="200" align="center"></el-table-column>
             </el-table>
             
@@ -971,12 +972,6 @@ export default {
           if(this.userId){
             sl.userId = this.userId
           }
-          if(this.departmentIdArray.length != 0 && this.departmentOrProject == 0){
-            sl.departmentId = this.departmentIdArray[this.departmentIdArray.length - 1]
-          }
-          if(this.proJuctId && this.departmentOrProject == 1){
-            sl.projectId = this.proJuctId
-          }
         }
           this.http.post(url, sl,
             res => {
@@ -1317,9 +1312,6 @@ export default {
       if(this.userId){
         parameter.userId = this.userId
       }
-      if(this.departmentIdArray.length){
-        parameter.departmentId = this.departmentIdArray[this.departmentIdArray.length - 1]
-      }
       this.listLoading = true
       this.http.post('/project/getWaitingReviewList',parameter,
         res => {