展示页面相关优化

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -2664,33 +2664,36 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 
 	public List<ProjectTemplateInfo> disposeDataAttachment(List<ProjectTemplateInfo> fileAttachmentList){
 		List<ProjectTemplateInfo> list = Lists.newArrayList();
-		for (ProjectTemplateInfo info: fileAttachmentList) {
-			info.getParent().setId("0");
-			info.setParentIds("0,");
-			info.setFlag(0);
-			list.add(info);
-			//处理附件信息
-			if(null != info.getWorkAttachments()){
-				for (WorkClientAttachment attachment: info.getWorkAttachments()) {
-					ProjectTemplateInfo attach = new ProjectTemplateInfo();
-					ProjectTemplateInfo parent = new ProjectTemplateInfo();
-					parent.setId(info.getId());
-					attach.setId(attachment.getId());
-					attach.setParent(parent);
-					attach.setMustFlag(0);
-					attach.setParentIds("0,"+info.getId()+",");
-					attach.setFlag(1);
-					attach.setAttachName(attachment.getAttachmentName());
-					attach.setUrl(attachment.getUrl());
-					attach.setAttachTypes(attachment.getType());
-					attach.setCollectFlag(attachment.getCollectFlag());
-					attach.setCreateBy(UserUtils.getUser());
-					attach.setCreateDate(attachment.getCreateDate());
-					attach.setFileSize(attachment.getFileSize());
-					attach.setDescription(attachment.getDescription());
-					//添加临时查看url（阿里云）
-					attach.setTemporaryUrl(attachment.getTemporaryUrl());
-					list.add(attach);
+		if(null != fileAttachmentList){
+
+			for (ProjectTemplateInfo info: fileAttachmentList) {
+				info.getParent().setId("0");
+				info.setParentIds("0,");
+				info.setFlag(0);
+				list.add(info);
+				//处理附件信息
+				if(null != info.getWorkAttachments()){
+					for (WorkClientAttachment attachment: info.getWorkAttachments()) {
+						ProjectTemplateInfo attach = new ProjectTemplateInfo();
+						ProjectTemplateInfo parent = new ProjectTemplateInfo();
+						parent.setId(info.getId());
+						attach.setId(attachment.getId());
+						attach.setParent(parent);
+						attach.setMustFlag(0);
+						attach.setParentIds("0,"+info.getId()+",");
+						attach.setFlag(1);
+						attach.setAttachName(attachment.getAttachmentName());
+						attach.setUrl(attachment.getUrl());
+						attach.setAttachTypes(attachment.getType());
+						attach.setCollectFlag(attachment.getCollectFlag());
+						attach.setCreateBy(UserUtils.getUser());
+						attach.setCreateDate(attachment.getCreateDate());
+						attach.setFileSize(attachment.getFileSize());
+						attach.setDescription(attachment.getDescription());
+						//添加临时查看url（阿里云）
+						attach.setTemporaryUrl(attachment.getTemporaryUrl());
+						list.add(attach);
+					}
 				}
 			}
 		}

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -266,7 +266,7 @@
 							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
-				,{field:'projMaster', align:'center',title: '审核人', width:100,templet:function(d){
+				,{field:'projMaster', align:'center',title: '盖章审核人', width:100,templet:function(d){
 						return "<span title=\"" + d.reviewerPerson + "\">" + d.reviewerPerson + "</span>";
 					}}
 				/*,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -267,7 +267,7 @@
 							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
-				,{field:'projMaster', align:'center',title: '审核人', width:100,templet:function(d){
+				,{field:'projMaster', align:'center',title: '盖章审核人', width:100,templet:function(d){
 						return "<span title=\"" + d.reviewerPerson + "\">" + d.reviewerPerson + "</span>";
 					}}
 				/*,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){

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

@@ -918,7 +918,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">审核人：</label>
+                    <label class="layui-form-label">盖章审核人：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.reviewerPerson}"/>
                     </div>

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

@@ -1054,10 +1054,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>审核人:</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>盖章审核人:</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="projectMaster" name="reviewerPersonId" value="${ruralProjectRecords.reviewerPersonId}" labelName="reviewerPerson" labelValue="${ruralProjectRecords.reviewerPerson}"
-                                                    cssStyle="background-color:#fff" title="审核人" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                                    cssStyle="background-color:#fff" title="盖章审核人" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -583,7 +583,7 @@
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
 					}}
-                ,{field:'reviewerPerson', align:'center',title: '审核人', width:100,templet:function(d){
+                ,{field:'reviewerPerson', align:'center',title: '盖章审核人', width:100,templet:function(d){
                         return "<span title=\"" + d.reviewerPerson + "\">" + d.reviewerPerson + "</span>";
                     }}
                 /*,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){

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

@@ -879,7 +879,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">审核人：</label>
+                    <label class="layui-form-label">盖章审核人：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.reviewerPerson}"/>
                     </div>

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

@@ -1100,10 +1100,10 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>审核人：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>盖章审核人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="projectMaster" name="reviewerPersonId" value="${ruralProjectRecords.reviewerPersonId}" labelName="reviewerPerson" labelValue="${ruralProjectRecords.reviewerPerson}"
-                                                    cssStyle="background-color:#fff" title="审核人" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                                    cssStyle="background-color:#fff" title="盖章审核人" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -230,7 +230,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">审核人：</label>
+					<label class="layui-form-label">盖章审核人：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.reviewerPerson}"/>
 					</div>

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForAudit.jsp

@@ -138,7 +138,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">审核人：</label>
+                    <label class="layui-form-label">盖章审核人：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.reviewerPerson}"/>
                     </div>

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForForm.jsp

@@ -206,7 +206,7 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">审核人：</label>
+                        <label class="layui-form-label">盖章审核人：</label>
                         <div class="layui-input-block">
                             <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.reviewerPerson}"/>
                         </div>

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForModify.jsp

@@ -209,7 +209,7 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw6">
-                        <label class="layui-form-label">审核人：</label>
+                        <label class="layui-form-label">盖章审核人：</label>
                         <div class="layui-input-block">
                             <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.reviewerPerson}"/>
                         </div>

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForView.jsp

@@ -111,7 +111,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">审核人：</label>
+                    <label class="layui-form-label">盖章审核人：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.reviewerPerson}"/>
                     </div>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -829,11 +829,12 @@
 						}
                         //合同借用
                         else if(d.contrractRecordStatus =="5"){
-							if((d.borrowStatus != undefined && d.borrowStatus == "0")|| d.borrowStatus == "4" || (d.giveStatus != undefined && d.giveStatus == "5"))
-							{
-								xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('借用申请', '${ctx}/workContractBorrow/workContractBorrow/form?id="+ d.id +"&tabId=4','95%','95%')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-orange\" > 借用</a>";
-							}
-
+							<shiro:hasPermission name="workcontractrecord:workContractRecord:borrow">
+								if((d.borrowStatus != undefined && d.borrowStatus == "0")|| d.borrowStatus == "4" || (d.giveStatus != undefined && d.giveStatus == "5"))
+								{
+									xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('借用申请', '${ctx}/workContractBorrow/workContractBorrow/form?id="+ d.id +"&tabId=4','95%','95%')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-orange\" > 借用</a>";
+								}
+							</shiro:hasPermission>
 							if(d.cancancelBorrow != undefined && d.cancancelBorrow == "1")
 								xml += "<a href=\"${ctx}/workContractBorrow/workContractBorrow/cancelInvalidate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 撤回借用</a>";
 							/*if(d.caneditBorrow1 != undefined && d.caneditBorrow1 == "1")