|
|
@@ -252,7 +252,7 @@
|
|
|
size="small" @click="approve(item1.id, item2)">{{$t('btn.through')}}</el-button>
|
|
|
<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)">{{$t('btn.rejected')}}</el-button>
|
|
|
- <el-button v-if="(permissions.projectReportReview ||user.id == item2.projectAuditorId) && item2.state == 1" type="normal" :loading="logining" size="small"
|
|
|
+ <el-button v-if="(permissions.projectReportReview ||user.id == item2.projectAuditorId || (user.timeType.reportAuditType== 5 && (user.id == item2.projectAuditorId || (item2.isDeptAudit == 1 && user.id == item2.auditDeptManagerid)))) && item2.state == 1" type="normal" :loading="logining" size="small"
|
|
|
@click="showDenyDialog(item1.id,1, item2)">{{$t('btn.undo')}}</el-button>
|
|
|
<!--自己可以撤回待审核状态的报告 -->
|
|
|
<el-button v-if="user.id == item1.id && (item2.state == 0 || item2.state == -1)" type="normal" :loading="logining" size="small" @click="cancel(item1)">{{$t('btn.withdraw')}}</el-button>
|
|
|
@@ -5024,11 +5024,10 @@
|
|
|
var end = this.dateChange(-2, ends)
|
|
|
this.zhoRqi = [stat, end]
|
|
|
this.zhoRqis()
|
|
|
- // this.jiazai()
|
|
|
},
|
|
|
// 新增日期
|
|
|
newDates() {
|
|
|
- // console.log(this.zhoRqi, '看卡')
|
|
|
+ const millisecond = 1000 * 60 * 60 * 24
|
|
|
let edate = new Date(this.zhoRqi[1])
|
|
|
let nowdate = new Date()
|
|
|
let nowdate2
|
