项目等级页面文件上传权限变更

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

@@ -340,11 +340,6 @@
 						{
 							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>";
 						}
-						//项目在没有归档完成之前可对文档进行操作
-						if(d.adminAccessory != undefined && d.adminAccessory =="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>";
-						}
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
                             //xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/ruralProject/ruralCostProjectRecordsAlter/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>";
@@ -399,17 +394,10 @@
 					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:accessory">
 						,"recordStatus":
 							<c:choose>
-								<c:when test="${projectRecords.projectStatus == 5 && 0 ==projectRecords.projectReportRecordStatus}">"1"</c:when>
+								<c:when test="${0 ==projectRecords.projectReportRecordStatus}">"1"</c:when>
 								<c:otherwise>"0"</c:otherwise>
 							</c:choose>
 					</shiro:hasPermission>
-					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:adminAccessory">
-					,"adminAccessory":
-							<c:choose>
-							<c:when test="${projectRecords.projectStatus == 5 && '0' != projectRecords.projectReportStatus}">"1"</c:when>
-					<c:otherwise>"0"</c:otherwise>
-					</c:choose>
-					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>

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

@@ -368,11 +368,6 @@
                         {
 							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>";
@@ -427,17 +422,10 @@
 					<shiro:hasPermission name="ruralProject:ruralProjectRecords:accessory">
 					,"recordStatus":
 					<c:choose>
-							<c:when test="${projectRecords.projectStatus == 5 && 0 == projectRecords.projectReportRecordStatus}">"1"</c:when>
+							<c:when test="${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}">"1"</c:when>
-					<c:otherwise>"0"</c:otherwise>
-					</c:choose>
-					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>