Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectPlanConsultingController.java

@@ -129,6 +129,8 @@ public class ProjectPlanConsultingController extends BaseController {
 
     @RequestMapping(value = {"form"})
     public String form(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         boolean flag = false;
         //判断是否为查看信息操作
         if("view".equals(projectRecords.getView())){

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -163,6 +163,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }
         //添加查询类型(造价审核)
         projectRecords.setProjectType("2");
+        projectRecords.setCompanyType(companyType);
         Page<RuralProjectRecords> page = ruralProjectMessageService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
         model.addAttribute("page", page);
         if(null != projectRecords.getWorkContractInfo()){
@@ -1877,7 +1878,7 @@ public class RuralCostProjectMessageController extends BaseController {
     @RequestMapping(value = "updateReported")
     public String updateReported(RuralProjectRecords projectRecords, Model model) {
         String companyType = projectRecords.getCompanyType();
-        model.addAttribute("compannyType",companyType);
+        model.addAttribute("companyType",companyType);
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         if(reported == null){

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewTwoController.java

@@ -251,6 +251,9 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
      */
     @RequestMapping(value = "formRecordModify")
     public String formRecordModify(ProjectReportRecord projectReportRecord, Model model) {
+        String companyType = projectReportRecord.getCompanyType();
+        System.out.println("---------------->" + companyType);
+        model.addAttribute("companyType",companyType);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
@@ -386,6 +389,8 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
      */
     @RequestMapping(value = "formRecordUrgentModify")
     public String formRecordUrgentModify(ProjectReportRecord projectReportRecord, Model model) {
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         //查询“配农网”工程类型id
         String engineeringId = engineeringService.getEngineeringId("202");
         projectReportRecord = projectReportRecordService.get(projectReportRecord.getId());
@@ -755,6 +760,8 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
      */
     @RequestMapping(value = "saveRecord")
     public String save(ProjectReportRecord projectReportRecord, Model model, RedirectAttributes redirectAttributes, Integer saveAuditFlag) throws Exception{
+        String companyType = projectReportRecord.getCompanyType();
+        model.addAttribute("companyType",companyType);
         if (!beanValidator(model, projectReportRecord)){
             return form(projectReportRecord, model);
         }
@@ -767,7 +774,7 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
             String sta = projectReportRecord.getStatus();
             if(user!=null && !UserUtils.getUser().getId().equals(user.getId()) && StringUtils.isNotBlank(user.getId())){
                 addMessage(redirectAttributes, "您不是申请人，无法修改");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
             }
             //状态设置为审核中
             projectReportRecord.setStatus("2");
@@ -781,11 +788,11 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
                 if(null != saveAuditFlag){
                     if(1 == saveAuditFlag && t.getStatus().equals("2")){
                         addMessage(redirectAttributes, "报告归档已送审，请勿重复送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                     }
                     if(t.getStatus().equals("5")){
                         addMessage(redirectAttributes, "报告归档已登记完成，无法再次送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
                     }
                 }
                 MyBeanUtils.copyBeanNotNull2Bean(projectReportRecord,t);//将编辑表单中的非NULL值覆盖数据库记录中的值
@@ -815,10 +822,10 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
             logger.error("保存报告归档失败",e);
         }
         if("1".equals(ruralProjectRecords.getProjectType())){
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage&companyType="+companyType;
         }else if("2".equals(ruralProjectRecords.getProjectType())){
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage&companyType="+companyType;
     }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -230,6 +230,8 @@ public class RuralCostProjectRecordsController extends BaseController {
     @RequiresPermissions(value = {"ruralProject:ruralCostProjectRecords:add", "ruralProject:ruralCostProjectRecords:edit"}, logical = Logical.OR)
     @RequestMapping(value = "form")
     public String form(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         if (projectRecords != null && StringUtils.isNotBlank(projectRecords.getId())) {
             projectRecords = projectRecordsService.get(projectRecords.getId());
 
@@ -590,7 +592,8 @@ public class RuralCostProjectRecordsController extends BaseController {
      */
     @RequestMapping(value = "adminModify")
     public String adminModify(RuralProjectRecords projectRecords, Model model) {
-
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         projectRecords = projectRecordsService.get(projectRecords.getId());
 
         //根据归属部门Id查询归属部门名称显示
@@ -653,6 +656,8 @@ public class RuralCostProjectRecordsController extends BaseController {
     @RequiresPermissions(value = {"ruralProject:ruralCostProjectRecords:edit"}, logical = Logical.OR)
     @RequestMapping(value = "modify")
     public String modify(RuralProjectRecords projectRecords, Model model, RedirectAttributes redirectAttributes) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         projectRecords = projectRecordsService.get(projectRecords.getId());
         ProcessInstance processInstance = actTaskService.getProcIns(projectRecords.getProcessInstanceId());
         if (processInstance != null) {
@@ -763,7 +768,9 @@ public class RuralCostProjectRecordsController extends BaseController {
      */
     @RequiresPermissions("ruralProject:ruralCostProjectRecords:importB")
     @RequestMapping(value = "importB", method = RequestMethod.POST)
-    public String importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
+    public String importFile(MultipartFile file, RedirectAttributes redirectAttributes,RuralProjectRecords projectRecords) {
+        String companyType = projectRecords.getCompanyType();
+        System.out.println("--------------------->"+companyType);
         try {
             StringBuilder failureMsg = new StringBuilder();
             ImportExcel ei = new ImportExcel(file, 1, 0);
@@ -774,21 +781,22 @@ public class RuralCostProjectRecordsController extends BaseController {
         } catch (Exception e) {
             addMessage(redirectAttributes, "导入B类项目失败！失败信息：" + e.getMessage());
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+companyType;
     }
 
     /**
      * 下载导入造价审核B类项目数据模板
      */
     @RequestMapping(value = "importB/template")
-    public String importFileTemplateB(HttpServletResponse response, HttpServletRequest request) {
+    public String importFileTemplateB(HttpServletResponse response, HttpServletRequest request,RuralProjectRecords projectRecords) {
+        String companyType = projectRecords.getCompanyType();
         try {
             ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
             download.download("审核类项目批量导入模板.xlsx", request, response);
         } catch (Exception e) {
             logger.error("审核类项目批量导入模板下载失败！", e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+companyType;
     }
 
     /**
@@ -862,6 +870,7 @@ public class RuralCostProjectRecordsController extends BaseController {
     public String revoke(HttpServletRequest request, RedirectAttributes redirectAttributes) {
         HashMap<String, String> requestMap = findRequestMap(request);
         String processInstanceId = requestMap.get("processInstanceId");
+        String companyType = requestMap.get("companyType");
         String id = requestMap.get("id");
         //获取项目状态
         Integer projectStatus = Integer.parseInt(requestMap.get("projectStatus"));
@@ -869,7 +878,7 @@ public class RuralCostProjectRecordsController extends BaseController {
             RuralProjectRecords projectRecords = projectRecordsService.get(id);
             if (projectRecords.getProjectStatus() != projectStatus) {
                 addMessage(redirectAttributes, "项目登记不是送审状态，无法撤回");
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+companyType;
             }
             projectRecordsService.cancelProcess(projectRecords);
             addMessage(redirectAttributes, "撤回该项目登记成功");
@@ -877,7 +886,7 @@ public class RuralCostProjectRecordsController extends BaseController {
             logger.info(e.getMessage());
             addMessage(redirectAttributes, "撤回该项目登记失败");
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+companyType;
     }
 
     /**
@@ -983,6 +992,8 @@ public class RuralCostProjectRecordsController extends BaseController {
     public String saveAudit(RuralProjectRecords projectRecords, Model model,
                             @RequestParam(value = "upload_files", required = false) MultipartFile[] upload_files,
                             RedirectAttributes redirectAttributes, Integer saveAuditFlag) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         String home = projectRecords.getHome();
         try {
             String taskDefKey = projectRecords.getAct().getTaskDefKey();
@@ -999,12 +1010,12 @@ public class RuralCostProjectRecordsController extends BaseController {
                 if (null != saveAuditFlag) {
                     if (1 == saveAuditFlag && t.getProjectStatus() != 4 && t.getProjectStatus() != 5) {
                         addMessage(redirectAttributes, "项目已送审，请勿重复送审");
-                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+                        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+companyType;
                     }
                 }
                 if (t.getProjectStatus() == 5) {
                     addMessage(redirectAttributes, "项目已登记完成，无法再次送审");
-                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+                    return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+companyType;
                 }
                 String str = projectRecordsService.auditSave(projectRecords, users);
                 addMessage(redirectAttributes, str);
@@ -1017,7 +1028,7 @@ public class RuralCostProjectRecordsController extends BaseController {
         if (StringUtils.isNotBlank(home) && "home".equals(home)) {
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         } else {
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+companyType;
         }
     }
 
@@ -1192,6 +1203,8 @@ public class RuralCostProjectRecordsController extends BaseController {
     @RequiresPermissions(value = {"ruralProject:ruralCostProjectRecords:accessory", "ruralProject:ruralCostProjectRecords:adminAccessory"}, logical = Logical.OR)
     @RequestMapping(value = "formAccessory")
     public String formAccessory(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         if (projectRecords != null && StringUtils.isNotBlank(projectRecords.getId())) {
             projectRecords = projectRecordsService.getQueryProjectUsers(projectRecords.getId());
             RuralProjectcontentinfo ruralProjectcontentinfo = projectRecordsService.formAccessory(projectRecords);
@@ -1199,7 +1212,7 @@ public class RuralCostProjectRecordsController extends BaseController {
             model.addAttribute("projectcontentinfo", ruralProjectcontentinfo);
             model.addAttribute("projectRecords", projectRecords);
         } else {
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage&companyType="+companyType;
         }
         return "modules/ruralprojectrecords/projectAccessoryForm";
     }
@@ -1209,15 +1222,16 @@ public class RuralCostProjectRecordsController extends BaseController {
      */
     @RequestMapping(value = "createReportDataId")
     public String createReportDataId(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+        String companyType = projectRecords.getCompanyType();
         projectRecordsService.createReportDataId(projectRecords);
         addMessage(redirectAttributes, "生成报告号成功");
         if (StringUtils.isNotBlank(projectRecords.getHome()) && "home".equals(projectRecords.getHome())) {
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         } else {
             if ("1".equals(projectRecords.getProjectType())) {
-                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+                return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage&companyType="+companyType;
             }
-            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage";
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectRecords/?repage&companyType="+companyType;
         }
     }
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -176,6 +176,7 @@ public class RuralProjectMessageController extends BaseController {
         }
         //添加查询类型(工程咨询)
         projectRecords.setProjectType("1");
+        projectRecords.setCompanyType(flag);
         Page<RuralProjectRecords> page = ruralProjectMessageService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);
         model.addAttribute("page", page);
         if(null != projectRecords.getWorkContractInfo()){

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -221,6 +221,8 @@ public class RuralProjectRecordsController extends BaseController {
     @RequiresPermissions(value = {"ruralProject:ruralProjectRecords:add", "ruralProject:ruralProjectRecords:edit"}, logical = Logical.OR)
     @RequestMapping(value = "form")
     public String form(RuralProjectRecords projectRecords, Model model) {
+        String companyType = projectRecords.getCompanyType();
+        model.addAttribute("companyType",companyType);
         if (projectRecords != null && StringUtils.isNotBlank(projectRecords.getId())) {
             projectRecords = projectRecordsService.get(projectRecords.getId());
             projectRecordsService.queryProjectDetail(projectRecords);

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

@@ -196,6 +196,11 @@
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/project/projectPlanConsulting/save" method="post" class="form-horizontal">
             <form:hidden path="id"/>
+            <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}"/>
+                </div>
+            </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -711,7 +711,6 @@
 				//线上归档操作
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
-						if(d.emergencyProject == 1){
 							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>";
@@ -746,10 +745,10 @@
 									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
 								}
 							}
-						}
 					}
 				}else{
 					if(d.projectReportStatusTwo == 5){
+						console.log(1)
 						if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
 							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>";
 						}
@@ -778,7 +777,6 @@
 				//归档资料缺失说明
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
-						if(d.emergencyProject == 1){
 							if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5 ){
 								if (d.defectRecordStatus==0) {
 									xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?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>";
@@ -796,7 +794,6 @@
 									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 说明作废</a>";
 								}
 							}
-						}
 					}
 				}else{
 					if(d.projectReportStatusTwo == 5){
@@ -824,7 +821,6 @@
 				/*上报相关按钮*/
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
-						if(d.emergencyProject == 1){
 							if(d.syncStatus == 0){
 								if(d.reportStatus == 0){
 									if(d.reportedState == 0 || d.reportedState == 6){
@@ -848,7 +844,6 @@
 									}
 								}
 							}
-						}
 					}
 				}else{
 					if(d.projectReportStatusTwo == 5){

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

@@ -727,7 +727,11 @@
             <form:hidden path="reportData.id" id="reportDataId" value="${reportData.id}"/>
             <input type="hidden" id="flagFile" value="">
             <input type="hidden" id="emergencyProjectFlag" name="emergencyProject" value="${ruralProjectRecords.emergencyProject}">
-
+            <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}"/>
+                </div>
+            </div>
             <input type="hidden" id="workClientLinkmanInfo" value="${projectRecords.workClientLinkmanList}">
             <div class="form-group layui-row first">
                 <div class="form-group layui-row">

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

@@ -1155,7 +1155,7 @@
                 </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 judgment layui-input" value="${ruralProjectRecords.companyType}"/>
+                        <form:input path="companyType" htmlEscape="false"  readonly="true" class="form-control layui-input" value="${companyType}"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">

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

@@ -750,7 +750,11 @@
 		    <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
             <input type="hidden" id="flagFile" value="">
             <input type="hidden" id="saveAuditFlag" name="saveAuditFlag" value="1">
-
+            <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}"/>
+                </div>
+            </div>
             <input type="hidden" id="workClientLinkmanInfo" value="${projectRecords.workClientLinkmanList}">
             <div class="form-group layui-row first">
                 <div class="form-group layui-row">

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

@@ -406,6 +406,11 @@
 		<form:hidden path="project.id"/>
 			<input type="hidden" id="reviewFee" value="${projectcontentinfo.projectReportData.reviewFee}">
 		<sys:message content="${message}"/>
+			<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}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
 <%--				<div class="layui-item nav-btns">--%>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordForm.jsp

@@ -184,7 +184,11 @@
 			<input type="hidden" id="onsubmit" value="true">
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></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}"/>
+					</div>
+				</div>
 
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>报告号：</label>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordModify.jsp

@@ -200,7 +200,11 @@
 			<form:hidden id="flag" path="act.flag"/>
 			<input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
 			<input type="hidden" name="saveAuditFlag" value="1">
-
+			<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}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
 				<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModify.jsp

@@ -330,7 +330,11 @@
 			<form:hidden id="flag" path="act.flag"/>
 			<input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
 			<input type="hidden" name="saveAuditFlag" value="1">
-
+			<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}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
 				<div class="layui-item layui-col-sm6">

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

@@ -97,19 +97,19 @@
                 }
                 var contractsNum = $("#contractsNum").val();
                 if(contractsNum==""||null==contractsNum||undefined==contractsNum||contractsNum.length==0){
-                    parent.layer.msg("合同数量不能为空!", {icon: 5});
+                    parent.layer.msg("登记数量不能为空!", {icon: 5});
                     return false;
                 }
                 if(contractsNum<=0){
-                    parent.layer.msg("合同数量必须大于0!", {icon: 5});
+                    parent.layer.msg("登记数量必须大于0!", {icon: 5});
                     return false;
                 }
                 if(contractsNum%1!=0){
-                    parent.layer.msg("合同数量必须为整数!", {icon: 5});
+                    parent.layer.msg("登记数量必须为整数!", {icon: 5});
                     return false;
                 }
                 if(isNaN(contractsNum)){
-                    parent.layer.msg("请输入正确合同数量!", {icon: 5});
+                    parent.layer.msg("请输入正确登记数量!", {icon: 5});
                     return false;
                 }
 
@@ -909,6 +909,9 @@
                 }
             })
         }
+        function num(obj){
+            obj.value = obj.value.replace(/[^\d]/g,""); //清除"数字"以外的字符
+        }
     </script>
 </head>
 <body>
@@ -1195,12 +1198,12 @@
                 <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"  class="form-control layui-input" id="contractsNum"/>
+                        <form:input path="contractsNum" placeholder="登记数量" htmlEscape="false"  onkeyup="num(this)" class="form-control layui-input" id="contractsNum"/>
                     </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="${ruralProjectRecords.companyType}"/>
+                        <form:input path="companyType" htmlEscape="false"  readonly="true" class="form-control layui-input" value="${companyType}"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
@@ -1356,7 +1359,7 @@
                     <input id="workClientLinkmanList{{idx}}_delFlag" name="workClientLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
                 </td>
                 <td>
-                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
+                    <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_clientName" name="workClientLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control judgment"/>
                 </td>
                 <td>
                     <input <input style="background-color: #FFFFFF;"  id="workClientLinkmanList{{idx}}_name" name="workClientLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>
@@ -1422,7 +1425,7 @@
                         <input id="workConstructionLinkmanList{{idx}}_delFlag" name="workConstructionLinkmanList[{{idx}}].delFlag" type="hidden" value="0"/>
 					</td>
                     <td>
-                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_clientName" name="workConstructionLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control "/>
+                        <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_clientName" name="workConstructionLinkmanList[{{idx}}].clientId.name" type="text" value="{{row.clientId.name}}"    class="form-control judgment"/>
                     </td>
                     <td>
                         <input <input style="background-color: #FFFFFF;"  id="workConstructionLinkmanList{{idx}}_name" name="workConstructionLinkmanList[{{idx}}].name" type="text" value="{{row.name}}"    class="form-control required"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -657,7 +657,6 @@
 				//线上归档操作
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
-						if(d.emergencyProject == 1){
 							/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 							if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessageNew/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>";
@@ -686,7 +685,6 @@
 									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?companyType=${companyType}&id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
 								}
 							}
-						}
 					}
 				}else{
 					if(d.projectReportStatusTwo == 5){
@@ -718,7 +716,6 @@
 				//归档资料缺失说明
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
-						if(d.emergencyProject == 1){
 							if(d.projectReportRecordStatus != 1 && d.projectReportRecordStatus != 2  && d.projectReportRecordStatus != 5){
 								if (d.defectRecordStatus==0) {
 									xml+="<a href=\"#\" onclick=\"openDialogre('新增缺失说明信息', '${ctx}/projectReportDefectRecord/projectReportDefectRecord/formDescription?companyType=${companyType}&reportId=" + d.id +"&view=zixun','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 资料缺失说明</a>";
@@ -737,7 +734,6 @@
 									xml += "<a href=\"${ctx}/projectReportDefectRecord/projectReportDefectRecord/delete?companyType=${companyType}&id=" + d.pmdrId + "&status="+d.defectRecordStatus+"&view=zixun\" onclick=\"return confirmx('确认要作废资料缺失说明信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 说明作废</a>";
 
 								}
-							}
 						}
 					}
 				}else{
@@ -764,36 +760,34 @@
 				/*上报相关按钮*/
 				if(d.projectReportStatusTwo == 0){
 					if(d.projectReportStatus == 5){
-						if(d.emergencyProject == 1){
 							if(d.syncStatus == 0){
 								if(d.reportStatus == 0){
 									if(d.reportedState == 0 || d.reportedState == 6){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 上报</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #5FB878;height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
 										/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
 									}
 								}else{
 									if(d.reportedState == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改上报</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,暂存,关闭')\" style='background-color: #1E9FFF;height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 									}
 									if(d.reportedState == 2){
 										xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?companyType=${companyType}&id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 撤回上报</a>";
 									}
 									/*撤回修改*/
 									if(d.reportedState == 3){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改上报</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/updateReported?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF;height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 									}
 									/*驳回修改*/
 									if(d.reportedState == 4){
 										//驳回操作
 										// if(d.newReportedNotifyFlag == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 修改上报</a>";
+										xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessageNew/reportedModify?companyType=${companyType}&id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF;height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
 										<%--}else{--%>
 										<%--	xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";--%>
 										<%--}--%>
 
 									}
 								}
-							}
 						}
 					}
 				}else{
@@ -1247,9 +1241,9 @@
                 ,{align:'center', title: '上报',  width:90,templet:function(d){
                         var st = getReportedState(d.reportedState);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
-                            var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span style='height: 32px;margin-top: 5px;margin-bottom: 5px; 'style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
 				/*,{align:'center', title: '案例项目申报',  width:150,templet:function(d){