Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList.jsp

@@ -1179,7 +1179,7 @@
                 ,{field:'op',align:'center',title:"操作",width:320,templet:function(d) {
 						////对操作进行初始化
 						var xml = '<div class=\"layui-btn-group\">';
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/electronicSeal/form?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+
 
 						if(d.falg=="1"){
 							if(d.approvalSignatureStatus == 0){
@@ -1195,7 +1195,10 @@
 								<shiro:hasPermission name="ruralProject:ruralProjectMessage:importApprovalFile">
 								if(d.signatureFlag != "1"){
 									xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreByImportFile('上传审定单签章', '${ctx}/ruralProject/ruralProjectMessage/skipImportApprovalWord?id=" + d.id + "&visitType=1','500px', '300px','','导入,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 审定单签章</a>";
+								}else{
+									xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.signatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\">审定单签章下载</a>"
 								}
+
 								</shiro:hasPermission>
 							}
 
@@ -1212,18 +1215,24 @@
 								<shiro:hasPermission name="ruralProject:ruralProjectMessage:importReportFile">
 								if(d.reportSignatureFlag != "1"){
 									xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreByReportImportFile('上传报告签章', '${ctx}/ruralProject/ruralProjectMessage/skipImportReportWord?id=" + d.id + "&visitType=1','500px', '300px','','导入,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 报告签章</a>";
+								}else{
+									xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadReportAttach?contractId="+ d.reportSignatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\">报告签章下载</a>"
 								}
 
 								//自动生成电子签章报告（在有报告的前提下可使用，没有报告信息则不进行展示该按钮）
 								//xml+="<a href=\"${ctx}/ruralProject/electronicSeal/downloadMassControl?id="+ d.pidId +"\" onclick=\"return confirmx('确认要自动生成报告签章吗？', this.href)\" class=\"layui-btn  layui-btn-xs\" > 自动生成报告签章</a>";
 								</shiro:hasPermission>
 							}
+
+							if(d.prsiId != null && d.prsiId != undefined && d.prsiId != ""){
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签发信息', '${ctx}/ruralProject/electronicSeal/form?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告信息</a>";
+							}
 							if(d.signatureDownloadUrl != null && d.signatureDownloadUrl != undefined && d.signatureDownloadUrl != ""){
-								xml+="<a href=\""+d.signatureDownloadUrl+"\" class=\"layui-btn  layui-btn-xs\">报告下载</a>"
+								xml+="<a href=\""+d.signatureDownloadUrl+"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\">报告下载</a>"
 							}else{
 								if(d.prsiId != null && d.prsiId != undefined && d.prsiId != ""){
 									//报告下载
-									xml+="<a href=\"${ctx}/ruralProject/electronicSeal/downloadMassControl?id="+ d.pidId +"\" class=\"layui-btn  layui-btn-xs\">报告下载</a>"
+									xml+="<a href=\"${ctx}/ruralProject/electronicSeal/downloadMassControl?id="+ d.pidId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\">报告下载</a>"
 								}
 							}
 
@@ -1286,6 +1295,7 @@
 					,"signatureFlag":"${projectRecords.signatureFlag}"
 					,"reportSignatureFlag":"${projectRecords.reportSignatureFlag}"
 					,"signatureContractId":"${projectRecords.signatureContractId}"
+					,"reportSignatureContractId":"${projectRecords.reportSignatureContractId}"
 					,"approvalSignatureStatus":"${projectRecords.approvalSignatureStatus}"
 					,"approvalSignatureProcessInstanceId":"${projectRecords.approvalSignatureProcessInstanceId}"
 					,"reportSignatureStatus":"${projectRecords.reportSignatureStatus}"