3.27文件上传

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -307,7 +307,7 @@
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                         var st = getruralProjectState(d.projectStatus);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
@@ -336,7 +336,7 @@
                             xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
                         }
 						//项目在没有归档完成之前可对文档进行操作
-						if(d.recordStatus != undefined &&(d.recordStatus =="1"||d.recordStatus =="0") && d.projectReportRecordStatus!=2)
+						if(d.recordStatus != undefined && d.recordStatus =="1")
 						{
 							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralCostProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
 						}
@@ -399,7 +399,7 @@
 					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:accessory">
 						,"recordStatus":
 							<c:choose>
-								<c:when test="${projectRecords.projectStatus == 5 && '0' != projectRecords.projectReportStatus && '5' != projectRecords.projectReportRecordStatus}">"1"</c:when>
+								<c:when test="${projectRecords.projectStatus == 5 && 0 ==projectRecords.projectReportRecordStatus}">"1"</c:when>
 								<c:otherwise>"0"</c:otherwise>
 							</c:choose>
 					</shiro:hasPermission>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -364,15 +364,15 @@
                             xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
                         }
                         //项目在没有归档完成之前可对文档进行操作
-                        if(d.recordStatus != undefined && (d.recordStatus =="1"||d.recordStatus =="0") && d.projectReportRecordStatus==0)
+                        if(d.recordStatus != undefined && d.recordStatus =="1")
                         {
 							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
                         }
-						<%--//项目在没有归档完成之前可对文档进行操作--%>
-						<%--if(d.adminAccessory != undefined && d.adminAccessory =="1")--%>
-						<%--{--%>
-						<%--	xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";--%>
-						<%--}--%>
+						//项目在没有归档完成之前可对文档进行操作
+						if(d.adminAccessory != undefined && d.adminAccessory =="1")
+						{
+							xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
+						}
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
                             //xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/ruralProject/ruralProjectRecordsAlter/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
@@ -426,15 +426,15 @@
                     <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralProjectRecords:accessory">
 					,"recordStatus":
-							<c:choose>
-							<c:when test="${projectRecords.projectStatus == 5 && '0' != projectRecords.projectReportStatus && '5' != projectRecords.projectReportRecordStatus}">"1"</c:when>
-					<c:otherwise>"0"</c:otherwise>
+					<c:choose>
+							<c:when test="${projectRecords.projectStatus == 5 && 0 == projectRecords.projectReportRecordStatus}">"1"</c:when>
+							<c:otherwise>"0"</c:otherwise>
 					</c:choose>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralProjectRecords:adminAccessory">
 					,"adminAccessory":
 							<c:choose>
-							<c:when test="${projectRecords.projectStatus == 5 && '0' != projectRecords.projectReportStatus}">"1"</c:when>
+							<c:when test="${projectRecords.projectStatus == 5}">"1"</c:when>
 					<c:otherwise>"0"</c:otherwise>
 					</c:choose>
 					</shiro:hasPermission>