|
@@ -3933,19 +3933,19 @@
|
|
|
//事项完成不展示退回按钮
|
|
|
var tstate = "${tstate}"
|
|
|
/* @author:inspired(胡启林) describe:阶段已汇总则不展示退回按钮 date: 2020/1/16*/
|
|
|
- var isPhaseLatestSum = report.isPhaseLatestSum
|
|
|
- var tempHtml = "<a class=\"mt-btn-font\" href=\"JavaScript:;\" onclick=\"javascript:rejectReport('${taskId}','" + report.id + "'," + phaseGather + ");\">[" + $.i18n("task.return") + "]</a><br><nobr>";
|
|
|
+ //var isPhaseLatestSum = report.isPhaseLatestSum
|
|
|
+ //var tempHtml = "<a class=\"mt-btn-font\" href=\"JavaScript:;\" onclick=\"javascript:rejectReport('${taskId}','" + report.id + "'," + phaseGather + ");\">[" + $.i18n("task.return") + "]</a><br><nobr>";
|
|
|
//已经退回了的不在展示退回按钮 //已移除:不显示退回按钮 //送审中,当前汇报的数据还在送审中不应该展示已退回按钮,只要不是正常通过的汇报数据,都不能进行退回 report.status==4 lijing 23/3/14
|
|
|
- if (isPhaseLatestSum || isDelete || (report.status != 0 && report.status != 1)) {
|
|
|
- tempHtml = "";
|
|
|
- }
|
|
|
+ // if (isPhaseLatestSum || isDelete || (report.status != 0 && report.status != 1)) {
|
|
|
+ // tempHtml = "";
|
|
|
+ // }
|
|
|
//进度核实按钮
|
|
|
var sendCommentHtml = "<a class=\"sendComment\" onclick=\"sendComment(this)\" task_id=\"${taskId }\" did='"+report.departmentId+"' rid='"+report.id+"' mid="+report.memberId+" href=\"javascript:;\">["+$.i18n("task.button.progress.check")+"]</a><br>";
|
|
|
if (isDelete){
|
|
|
//已移除:不显示进度核实按钮
|
|
|
sendCommentHtml = "";
|
|
|
}
|
|
|
- html.push("<td width=\"100px\" class=\"tb-sticky\">" + sendCommentHtml + tempHtml +
|
|
|
+ html.push("<td width=\"100px\" class=\"tb-sticky\">" + sendCommentHtml +
|
|
|
"<a class=\"mt-btn-font\" href=\"JavaScript:;\" onclick=\"javascript:reportInfo('${taskId}','','"+report.departmentId+"','"+report.memberId+"','"+report.phaseId+"','"+report.phaseReportConfigId+"');\">["+repRecordsBut+"]</a></nobr><br>");
|
|
|
if(isNeedOpenReportLeave=='true'&&(isSupervisePerson||isSuperviseBoss) && !isDelete){
|
|
|
//isDelete已移除:不显示汇报留言按钮
|
|
@@ -3970,6 +3970,8 @@
|
|
|
|
|
|
// 如果当前人是管理员,切改成员是被我分派的,我可以进行退回
|
|
|
var returnBut = $.i18n("task.return");
|
|
|
+ //是否需要push退回 按钮
|
|
|
+ var pushRejectReport = true;
|
|
|
if(dispatch && !!report.departmentId){
|
|
|
html.push("<td width=\"100px\" class=\"tb-sticky\"><nobr><a class=\"mt-btn-font\" href=\"JavaScript:;\" onclick=\"javascript:reportInfo('${taskId}','','"+report.departmentId+"','"+report.memberId+"','"+report.phaseId+"','"+report.phaseReportConfigId+"');\">["+repRecordsBut+"]" +
|
|
|
"</a><br>");
|
|
@@ -3982,11 +3984,12 @@
|
|
|
html.push(sendCommentHtml)
|
|
|
}
|
|
|
//核实记录都要有
|
|
|
- html.push(evaluationRecord)
|
|
|
+ html.push(evaluationRecord);
|
|
|
|
|
|
if(isDepMaster && report.reportStatus!=1 && !!report.lamp && (report.lamp.phaseState==102 || report.lamp.phaseState==105)){
|
|
|
+ pushRejectReport = false;
|
|
|
html.push("</nobr><a class=\"mt-btn-font\" href=\"JavaScript:;\" onclick=\"javascript:rejectReport('${taskId}','"+report.id+"',"+phaseGather+");\">["+returnBut+"]</a>"+
|
|
|
- reportExtend+"</td>");
|
|
|
+ reportExtend);
|
|
|
}
|
|
|
|
|
|
//承办单位查看自己相关的评价记录
|
|
@@ -3998,17 +4001,29 @@
|
|
|
if(isNeedOpenReportLeave=='true' && report.id!='0'){
|
|
|
html.push("</nobr><br><a class=\"mt-btn-font\" href=\"JavaScript:;\" onclick=\"javascript:reportLeave('${taskId}','"+report.id+"');\">["+$.i18n("task.button.report.message")+"]</a>")
|
|
|
}
|
|
|
- html.push(reportExtend+"<br>"+evaluationRecord+"</td>");
|
|
|
+ html.push(reportExtend+"<br>"+evaluationRecord);
|
|
|
}
|
|
|
|
|
|
/* @author:inspired(胡启林) describe: 牵头单位可查看责任单位(协办单位)的清单和汇报内容 date: 2019/10/11*/
|
|
|
else if(flag){
|
|
|
html.push("<td width=\"100px\" class=\"tb-sticky\"><nobr><a class=\"mt-btn-font\" href=\"JavaScript:;\" onclick=\"javascript:reportInfo('${taskId}','','"+report.departmentId+"','"+report.memberId+"','"+report.phaseId+"','"+report.phaseReportConfigId+"');\">["+repRecordsBut+"]</a></nobr>"+
|
|
|
- reportExtend+"<br>"+evaluationRecord+"</td>");
|
|
|
+ reportExtend+"<br>"+evaluationRecord);
|
|
|
}
|
|
|
else{
|
|
|
- html.push("<td></td>");
|
|
|
+ html.push("<td>");
|
|
|
}
|
|
|
+
|
|
|
+ //主办单位可退回协办单位的汇报内容 --wanyuan 2024-5-8
|
|
|
+ if (pushRejectReport && report.isParticipant) {
|
|
|
+ var tempHtml = "</nobr><a class=\"mt-btn-font\" href=\"JavaScript:;\" onclick=\"javascript:rejectReport('${taskId}','" + report.id + "'," + phaseGather + ");\">[" + returnBut + "]</a>";
|
|
|
+ //已经退回了的不在展示退回按钮 //已移除:不显示退回按钮 //送审中,当前汇报的数据还在送审中不应该展示已退回按钮,只要不是正常通过的汇报数据,都不能进行退回 report.status==4 lijing 23/3/14
|
|
|
+ if (report.isPhaseLatestSum || isDelete || (report.status != 0 && report.status != 1)) {
|
|
|
+ tempHtml = "";
|
|
|
+ }
|
|
|
+ html.push(tempHtml);
|
|
|
+ }
|
|
|
+ html.push("</td>");
|
|
|
+
|
|
|
//协办单位查看自己相关的评价记录
|
|
|
}else if(isParticipant) {
|
|
|
if(!!report.departmentId){
|