|
@@ -914,7 +914,13 @@
|
|
|
}
|
|
|
|
|
|
</shiro:hasPermission>--%>
|
|
|
- xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.signatureContractId +"\" class=\"layui-btn layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>审定单签章下载</a>"
|
|
|
+
|
|
|
+ if(d.approvalSignatureUrlFlag == 1){
|
|
|
+ xml+="<a href=\""+ d.signatureUrl +"\" class=\"layui-btn layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>审定单签章下载</a>"
|
|
|
+ }else{
|
|
|
+ xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.signatureContractId +"\" class=\"layui-btn layui-btn-xs layui-bg-orange\" style='height:32px;margin-top: 5px;margin-bottom: 5px;'>审定单签章下载</a>"
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
if(d.reportSignatureStatus == 5){
|
|
|
//上传审定单进行签章
|
|
@@ -1451,7 +1457,10 @@
|
|
|
,"prsiId":"${projectRecords.prsiId}"
|
|
|
,"signatureDownloadUrl":"${projectRecords.signatureDownloadUrl}"
|
|
|
,"reportSignatureUrlFlag":"${projectRecords.reportSignatureUrlFlag}"
|
|
|
- ,"reportSignatureUrl":"${projectRecords.reportSignatureUrl}"
|
|
|
+ ,"reportSignatureUrl":"${projectRecords.signatureUrl}"
|
|
|
+ ,"signatureUrl":"${projectRecords.signatureUrl}"
|
|
|
+ ,"approvalSignatureUrlFlag":"${projectRecords.approvalSignatureUrlFlag}"
|
|
|
+
|
|
|
,"falg":
|
|
|
<c:choose>
|
|
|
<c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">
|