Przeglądaj źródła

项目信息调整
1.赣能新规则的报告号处理错误
2.项目归档,报告归档管理员 没有新增或修改归档编号的信息(需添加)
3.质量复核,咨询员选择后证件信息非必填
4.去除盖章数量信息

user5 2 lat temu
rodzic
commit
ad9d60e4be
19 zmienionych plików z 73 dodań i 50 usunięć
  1. 6 3
      src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryRelationController.java
  2. 3 0
      src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportRecordService.java
  3. 1 1
      src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java
  4. 16 4
      src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java
  5. 1 1
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java
  6. 0 3
      src/main/webapp/WEB-INF/tags/table/exportExcel.tag
  7. 2 2
      src/main/webapp/webpage/modules/projectAccessory/projectAccessoryRelation/projectAccessoryRelationList.jsp
  8. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp
  9. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify.jsp
  10. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp
  11. 8 0
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp
  12. 3 9
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordForm.jsp
  13. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAdminModify.jsp
  14. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp
  15. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp
  16. 6 0
      src/main/webapp/webpage/modules/ruralprojectrecords/view/projectReportRecordView.jsp
  17. 2 2
      src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp
  18. 2 2
      src/main/webapp/webpage/modules/sealApplyFor/sealApplyForAudit.jsp
  19. 2 2
      src/main/webapp/webpage/modules/sealApplyFor/sealApplyForModify.jsp

+ 6 - 3
src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryRelationController.java

@@ -11,14 +11,15 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.sys.dao.MainDictDetailDao;
-import com.jeeplus.modules.sys.entity.Area;
-import com.jeeplus.modules.sys.entity.MainDictDetail;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
@@ -61,6 +62,7 @@ public class ProjectAccessoryRelationController extends BaseController {
 	@RequiresPermissions("projectAccessoryRelation:projectAccessoryRelation:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(ProjectAccessoryRelationInfo projectAccessoryRelationInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+		projectAccessoryRelationInfo.setAttachmentProjectApprovalMoney("1");
 		//进行查询之后进行任何操作,返回还是查询之后的数据页面
 		if (StringUtils.isNotBlank(projectAccessoryRelationInfo.getToflag())){
 			request.getSession().removeAttribute("searchProjectAccessoryRelationInfo");
@@ -82,6 +84,7 @@ public class ProjectAccessoryRelationController extends BaseController {
 	@RequestMapping(value = "getAccessoryRelationList")
 	@ResponseBody
 	public Map<String,List> getAccessoryRelationList(ProjectAccessoryRelationInfo projectAccessoryRelationInfo){
+		projectAccessoryRelationInfo.setAttachmentProjectApprovalMoney("1");
 		Map map = new HashMap();
 		if(StringUtils.isBlank(projectAccessoryRelationInfo.getAttachmentProjectType()) || StringUtils.isBlank(projectAccessoryRelationInfo.getAttachmentProjectSort())){
 			map.put("data",new ArrayList<ProjectAccessoryRelationInfo>());

+ 3 - 0
src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportRecordService.java

@@ -1904,6 +1904,9 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 				projectReportDataService.updateFileStatus(projectReportData);
 				projectReportRecord.setStatus("5");
 
+				//重新获取报告归档编号
+				projectReportRecord.setRecordNum(reportRecord.getRecordNum());
+
 				//修改审批状态
 				if(!"3".equals(record.getProjectType())){
 

+ 1 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -310,7 +310,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String caseStatus;				//案例项目的状态
 	private String caseProcessId;			//案例项目的流程id
 	private String ziXunBDE;			//上报中的咨询标的额
-	private String companyType;			//公司类型(1:赣能;0:东兴)
+	private String companyType;			//公司类型(1:赣能;0:东兴; 2:一达嘉鸿
 
 
 

+ 16 - 4
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -2759,11 +2759,14 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				projectReportData.setConditionType("1003");
 			}*/
 			switch (projectRecords.getProjectType()){
+				// 1.工程咨询 2.造价审核
 				case "1":
 					if("1".equals(projectRecords.getCompanyType())){
 						projectReportData.setConditionType("1008");
 					}else if("0".equals(projectRecords.getCompanyType())){
 						projectReportData.setConditionType("1010");
+					}else if("2".equals(projectRecords.getCompanyType())){
+						projectReportData.setConditionType("1002");
 					}
 					break;
 				case "2":
@@ -2771,6 +2774,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 						projectReportData.setConditionType("1008");
 					}else if("0".equals(projectRecords.getCompanyType())){
 						projectReportData.setConditionType("1009");
+					}else if("2".equals(projectRecords.getCompanyType())){
+						projectReportData.setConditionType("1001");
 					}
 					/*if("5".equals(projectRecords.getAttachmentProjectSort()) || "6".equals(projectRecords.getAttachmentProjectSort())){
 						projectReportData.setConditionType("1005");
@@ -2784,11 +2789,14 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}
 
 			synchronized (SYN_BYTE) {
-				String contractNo = contractInfoService.getContractByProjectId(projectRecords.getId());
 				String reportNo = createReportNo(projectReportData.getConditionType());
-				reportNo = reportNo.substring(5);
-				StringBuffer reportNoNew =new StringBuffer("【"+contractNo+"】"+"-"+reportNo);
-				projectReportData.setNumber(reportNoNew.toString());
+				if("1".equals(projectRecords.getCompanyType())){
+					String contractNo = contractInfoService.getContractByProjectId(projectRecords.getId());
+					StringBuffer reportNoNew =new StringBuffer("【"+contractNo+"】" + reportNo);
+					projectReportData.setNumber(reportNoNew.toString());
+				}else{
+					projectReportData.setNumber(reportNo.toString());
+				}
 				ProjectRecords project = new ProjectRecords();
 				project.setId(projectRecords.getId());
 				projectReportData.setProject(project);
@@ -2811,12 +2819,16 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 					reportData.setConditionType("1008");
 				}else if("0".equals(projectRecords.getCompanyType())){
 					reportData.setConditionType("1010");
+				}else if("2".equals(projectRecords.getCompanyType())){
+					reportData.setConditionType("1002");
 				}
 			}else if("2".equals(projectRecords.getProjectType())){
 				if("1".equals(projectRecords.getCompanyType())){
 					reportData.setConditionType("1008");
 				}else if("0".equals(projectRecords.getCompanyType())){
 					reportData.setConditionType("1009");
+				}else if("2".equals(projectRecords.getCompanyType())){
+					reportData.setConditionType("1001");
 				}
 			}
 			synchronized (SYN_BYTE) {

+ 1 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -136,7 +136,7 @@ public class RuralCostProjectRecordsController extends BaseController {
     @RequiresPermissions("ruralProject:ruralCostProjectRecords:list")
     @RequestMapping(value = {"list", ""})
     public String list(RuralProjectRecords projectRecords, HttpServletRequest request, HttpServletResponse response, Model model) {
-        //添加标识
+        //添加标识 companyType 0: 东兴; 1:赣能; 2:一达嘉鸿
         String flag = projectRecords.getCompanyType();
         model.addAttribute("companyType",flag);
         //进行查询之后进行任何操作,返回还是查询之后的数据页面

+ 0 - 3
src/main/webapp/WEB-INF/tags/table/exportExcel.tag

@@ -15,9 +15,6 @@ $(document).ready(function() {
 		    	var url =  $("#searchForm").attr("action");
 		    	var pageNo =  $("#pageNo").val();
 		    	var pageSize = $("#pageSize").val();
-		    	//导出excel
-                console.log(url)
-                alert(url)
 		        $("#searchForm").attr("action","${url}");
 			    $("#pageNo").val(-1);
 				$("#pageSize").val(-1);

+ 2 - 2
src/main/webapp/webpage/modules/projectAccessory/projectAccessoryRelation/projectAccessoryRelationList.jsp

@@ -275,7 +275,7 @@
 						</div>
 						<div style="    clear:both;"></div>
 					</div>
-					<div id="moresees" class="commonQuery lw6">
+					<%--<div id="moresees" class="commonQuery lw6">
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">项目等级:</label>
 							<div class="layui-input-block readOnlyFFF">
@@ -286,7 +286,7 @@
 							</div>
 						</div>
 						<div style="clear:both;"></div>
-					</div>
+					</div>--%>
 				</form:form>
 			</div>
 		</div>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -713,7 +713,7 @@
 					if(d.projectReportStatus == 5){
 							if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
 								if(8 != d.attachmentProjectSort){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?project.companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?companyType=${companyType}&projectId=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 修改质量复核</a>";
 								}
 
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?companyType=${companyType}&reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 归档</a>";

+ 4 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify.jsp

@@ -53,7 +53,7 @@
                     parent.layer.msg("项目归属部门未填写!", {icon: 5});
                     return false;
                 }*/
-                var contractsNum = $("#contractsNum").val();
+                /*var contractsNum = $("#contractsNum").val();
                 if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
                     parent.layer.msg("盖章数量不能为空!", {icon: 5});
                     return false;
@@ -69,7 +69,7 @@
                 if(isNaN(contractsNum)){
                     parent.layer.msg("请输入正确盖章数量!", {icon: 5});
                     return false;
-                }
+                }*/
                 $("#inputForm").submit();
                 return true;
             }else{
@@ -1002,12 +1002,12 @@
                         </form:select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>盖章数量:</label>
                     <div class="layui-input-block">
                         <form:input path="contractsNum" placeholder="盖章数量" htmlEscape="false" onkeyup="num(this)"  class="form-control number judgment layui-input" id="contractsNum"/>
                     </div>
-                </div>
+                </div>--%>
                 <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程结构:</label>
                     <div class="layui-input-block">

+ 4 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -159,11 +159,11 @@
                         parent.layer.msg("请选择工程类型!", {icon: 5});
                         return false;
                     }
-                    var contractsNum = $("#contractsNum").val();
+                    /*var contractsNum = $("#contractsNum").val();
                     if(contractsNum<=0){
                         parent.layer.msg("盖章数量必须大于0!", {icon: 5});
                         return false;
-                    }
+                    }*/
 
 
                     var flag = $("#flagFile").val();
@@ -1147,12 +1147,12 @@
                         <span class="spanzj">与归档资料关联,请仔细选择</span>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>盖章数量:</label>
                     <div class="layui-input-block">
                         <form:input path="contractsNum" placeholder="盖章数量" htmlEscape="false" onkeyup="num(this)"  class="form-control number judgment layui-input" id="contractsNum"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <div class="layui-input-block">
                         <form:input path="companyType" htmlEscape="false"  readonly="true" class="form-control layui-input" value="${companyType}"/>

+ 8 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -310,6 +310,14 @@
 									<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
 								</div>
 							</div>
+							<c:if test="${type != '1'}">
+								<div class="layui-item layui-col-sm6 lw7">
+									<label class="layui-form-label"><span class="require-item">*</span>归档编号:</label>
+									<div class="layui-input-block">
+										<form:input path="recordNum" htmlEscape="false" class="form-control required layui-input" value="${projectReportRecord.recordNum}"/>
+									</div>
+								</div>
+							</c:if>
 							<div class="layui-item layui-col-sm6 lw6 with-textarea">
 								<label class="layui-form-label">工程概况:</label>
 								<div class="layui-input-block">

+ 3 - 9
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordForm.jsp

@@ -238,12 +238,12 @@
 						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input judgment"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>归档编号:</label>
 					<div class="layui-input-block">
 						<form:input id="recordNum" path="recordNum" htmlEscape="false" maxlength="64" class="form-control layui-input judgment" readonly="true"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档时间:</label>
 					<div class="layui-input-block">
@@ -251,13 +251,7 @@
 							   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6  with-textarea">
-					<label class="layui-form-label">归档内容:</label>
-					<div class="layui-input-block">
-						<form:textarea placeholder="请输入归档内容:" path="recordRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6  with-textarea">
+				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明:</label>
 					<div class="layui-input-block">
 						<form:textarea placeholder="请输入说明:" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>

+ 4 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAdminModify.jsp

@@ -48,7 +48,7 @@
                   parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                   return false;
               }
-              var contractsNum = $("#contractsNum").val();
+              /*var contractsNum = $("#contractsNum").val();
               if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
                   parent.layer.msg("盖章数量不能为空!", {icon: 5});
                   return false;
@@ -64,7 +64,7 @@
               if(isNaN(contractsNum)){
                   parent.layer.msg("请输入正确盖章数量!", {icon: 5});
                   return false;
-              }
+              }*/
 			  $("#inputForm").submit();
 			  return true;
 		  }else{
@@ -998,12 +998,12 @@
                         <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>盖章数量:</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.contractsNum}"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况:</label>
                     <div class="layui-input-block">

+ 4 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -99,7 +99,7 @@
                             return false;
                         }
                     }
-                    var contractsNum = $("#contractsNum").val();
+                    /*var contractsNum = $("#contractsNum").val();
                     if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
                         parent.layer.msg("盖章数量不能为空!", {icon: 5});
                         return false;
@@ -115,7 +115,7 @@
                     if(isNaN(contractsNum)){
                         parent.layer.msg("请输入正确盖章数量!", {icon: 5});
                         return false;
-                    }
+                    }*/
 
                     var projectProperties=$("#projectProperties").val();
                     if(projectProperties==''){
@@ -1195,12 +1195,12 @@
                         <span class="spanzj">与归档资料关联,请仔细选择</span>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>盖章数量:</label>
                     <div class="layui-input-block">
                         <form:input path="contractsNum" placeholder="盖章数量" htmlEscape="false"  onkeyup="num(this)" class="form-control judgment layui-input" id="contractsNum"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <div class="layui-input-block">
                         <form:input path="companyType" htmlEscape="false"  readonly="true" class="form-control layui-input" value="${companyType}"/>

+ 4 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -1180,18 +1180,18 @@
                                     <td>
 <%--                                        <sys:reportedtreeselectUserZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"--%>
 <%--                                            title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
-                                    		    <sys:treeselectt id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
-                                         		title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                    		    <sys:reimburtreeselectUserNotRequiredZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                            	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 
 									<td>
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control"/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>

+ 6 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/view/projectReportRecordView.jsp

@@ -294,6 +294,12 @@
 						<form:input id="projectName" path="projectName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">归档编号:</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectReportRecord.recordNum}"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>归档申请人:</label>
 					<div class="layui-input-block">

+ 2 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -316,12 +316,12 @@
 						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>盖章数量:</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.contractsNum}"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">工程概况:</label>
 					<div class="layui-input-block">

+ 2 - 2
src/main/webapp/webpage/modules/sealApplyFor/sealApplyForAudit.jsp

@@ -220,12 +220,12 @@
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.attachmentProjectSort}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">盖章数量:</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.contractsNum}"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
                     <label class="layui-form-label">工程概况:</label>
                     <div class="layui-input-block">

+ 2 - 2
src/main/webapp/webpage/modules/sealApplyFor/sealApplyForModify.jsp

@@ -240,12 +240,12 @@
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.attachmentProjectSort}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">盖章数量:</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${sealApplyForInfo.projectRecords.contractsNum}"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm12 lw6 with-textarea">
                     <label class="layui-form-label">工程概况:</label>
                     <div class="layui-input-block">