浏览代码

Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

# Conflicts:
#	fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue
seyason 3 年之前
父节点
当前提交
b9831964eb
共有 1 个文件被更改,包括 1 次插入4 次删除
  1. 1 4
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

+ 1 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -153,13 +153,10 @@
 
                                             <!--每个项目上单独审核 -->
                                             <span style="float:right;">
-                                                <!-- <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="primary" :loading="logining"  -->
                                                 <el-button v-if="(permissions.projectReportReview || user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="primary" :loading="logining" 
                                                 size="small" @click="approve(item1.id, item2)">通过</el-button>
-                                                <!-- <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="danger" :loading="logining"  -->
                                                 <el-button v-if="(permissions.projectReportReview ||user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="danger" :loading="logining" 
                                                 size="small" @click="showDenyDialog(item1.id,0, item2)">驳回</el-button>
-                                                <!-- <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item2.projectAuditorId) && item2.state == 1" type="normal" :loading="logining" size="small"  -->
                                                 <el-button v-if="(permissions.projectReportReview ||user.id == item2.projectAuditorId) && item2.state == 1" type="normal" :loading="logining" size="small" 
                                                 @click="showDenyDialog(item1.id,1, item2)">撤销</el-button>
                                                 <!--自己可以撤回待审核状态的报告 -->
@@ -2655,7 +2652,7 @@
                 let day = (this.choseDay+1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 var param = {date:this.date + day};
                 if (this.user.manageDeptId != 0 && !this.permissions.reportsCompany) {
-                    param.manageDeptId = this.user.manageDeptId;
+                    param.manageDeptId = this.user.manageDeptId; 
                 }
                 this.http.post("/report/getMembList", param,
                 res => {