项目功能修改

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

@@ -904,8 +904,8 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                         projectReportData.setTechnicistDate(new Date());
                         notifyRole = "审批通过";
                         synchronized (SYN_BYTE) {
-                            String reportNo = createReportNo(reportData.getConditionType());
-                            projectReportData.setNumber(reportNo);
+                            /*String reportNo = createReportNo(reportData.getConditionType());
+                            projectReportData.setNumber(reportNo);*/
                             //添加审核通过日期
                             projectReportData.setAuditPassDate(new Date());
                         }

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

@@ -1083,8 +1083,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                         projectReportData.setTechnicistDate(new Date());
                         notifyRole = "审批通过";
                         synchronized (SYN_BYTE) {
-                            String reportNo = createReportNo(reportData.getConditionType());
-                            projectReportData.setNumber(reportNo);
+                            /*String reportNo = createReportNo(reportData.getConditionType());
+                            projectReportData.setNumber(reportNo);*/
                             //添加审核通过日期
                             projectReportData.setAuditPassDate(new Date());
                         }
@@ -1107,8 +1107,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     exp = "pass";
                     if ("yes".equals(flag)) {
                         notifyRole = "审批通过";
-                        String reportNo = createReportNo(reportData.getConditionType());
-                        projectReportData.setNumber(reportNo);
+                        /*String reportNo = createReportNo(reportData.getConditionType());
+                        projectReportData.setNumber(reportNo);*/
                         //projectReportDataService.updateNumber(projectReportData);
                         workActivityProcess.setIsApproval("1");
                     } else {

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

@@ -29,6 +29,7 @@ import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
+import com.jeeplus.modules.projectreportnum.service.ProjectReportNumService;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectClientLinkmanDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectRecordsDao;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralWorkProjectUserDao;
@@ -153,6 +154,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	private ProjectEngineeringService engineeringService;
 	@Autowired
 	private WorkContractInfoService workContractInfoService;
+	@Autowired
+	private ProjectReportNumService projectReportNumService;
 
 	/**
 	 * 获取咨询项目类别
@@ -442,82 +445,83 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
             this.saveAttachments(projectRecords);
         }
 		//启动审批流程
-		if (projectRecords.getProjectStatus()== ProjectStatusEnum.IN_APRL.getValue()&&(oldStatus==null|| ProjectStatusEnum.REJECTED.getValue()!=oldStatus)) {
+		/*if (projectRecords.getProjectStatus()== ProjectStatusEnum.IN_APRL.getValue()&&(oldStatus==null|| ProjectStatusEnum.REJECTED.getValue()!=oldStatus)) {
 			this.startAudit(projectRecords,projectRecords.getProcessInstanceId());
-			//项目送审之后处理项目合同文件信息
-			//查询咨询合同附件类型id
-			ProjectTemplateInfo projectTemplateInfo = projectTemplateDao.getProjectTemplateInfoByName("咨询合同");
-			//删除该项目咨询合同类型中老合同对应的附件信息
-			WorkClientAttachment attchment = new WorkClientAttachment();
-			attchment.setAttachmentId(projectTemplateInfo.getId());
-			attchment.setProjectId(projectRecords.getId());
-			if(null != oldWorkContractInfo && null != oldWorkContractInfo.getWorkAttachments()){
-				for (WorkClientAttachment info:oldWorkContractInfo.getWorkAttachments()) {
-					attchment.setAttachmentName(info.getAttachmentName());
-					workattachmentService.deleteByAttachIdAndProject(attchment);
-				}
+		}*/
+		//项目送审之后处理项目合同文件信息
+		//查询咨询合同附件类型id
+		ProjectTemplateInfo projectTemplateInfo = projectTemplateDao.getProjectTemplateInfoByName("咨询合同");
+		//删除该项目咨询合同类型中老合同对应的附件信息
+		WorkClientAttachment attchment = new WorkClientAttachment();
+		attchment.setAttachmentId(projectTemplateInfo.getId());
+		attchment.setProjectId(projectRecords.getId());
+		if(null != oldWorkContractInfo && null != oldWorkContractInfo.getWorkAttachments()){
+			for (WorkClientAttachment info:oldWorkContractInfo.getWorkAttachments()) {
+				attchment.setAttachmentName(info.getAttachmentName());
+				workattachmentService.deleteByAttachIdAndProject(attchment);
 			}
-			//将新合同对应的附件信息添加到咨询合同中
-			if(null != newWorkContractInfo && null != newWorkContractInfo.getWorkAttachments()){
-				WorkClientAttachment workattachment = new WorkClientAttachment();
-				for (WorkClientAttachment info:newWorkContractInfo.getWorkAttachments()) {
-					workattachment.setType(info.getType());
-					workattachment.setAttachmentName(info.getAttachmentName());
-					workattachment.setUrl(info.getUrl());
-					workattachment.setAttachmentUser(info.getAttachmentUser());
-					workattachment.setAttachmentFlag(info.getAttachmentFlag());
-					workattachment.setAttachmentId(projectTemplateInfo.getId());
-					workattachment.setProjectId(projectRecords.getId());
-					switch (uploadMode){
-						case "1":
-							workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
-							break;
-						case "2":
-							workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
-							break;
-					}
-					workattachment.preInsert();
-					workClientAttachmentDao.insert(workattachment);
+		}
+		//将新合同对应的附件信息添加到咨询合同中
+		if(null != newWorkContractInfo && null != newWorkContractInfo.getWorkAttachments()){
+			WorkClientAttachment workattachment = new WorkClientAttachment();
+			for (WorkClientAttachment info:newWorkContractInfo.getWorkAttachments()) {
+				workattachment.setType(info.getType());
+				workattachment.setAttachmentName(info.getAttachmentName());
+				workattachment.setUrl(info.getUrl());
+				workattachment.setAttachmentUser(info.getAttachmentUser());
+				workattachment.setAttachmentFlag(info.getAttachmentFlag());
+				workattachment.setAttachmentId(projectTemplateInfo.getId());
+				workattachment.setProjectId(projectRecords.getId());
+				switch (uploadMode){
+					case "1":
+						workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
+						break;
+					case "2":
+						workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
+						break;
 				}
+				workattachment.preInsert();
+				workClientAttachmentDao.insert(workattachment);
 			}
-		}else if(StringUtils.isNotBlank(projectRecords.getModifyFlag()) && "1".equals(projectRecords.getModifyFlag())){
-			//项目送审之后处理项目合同文件信息
-			//查询咨询合同附件类型id
-			ProjectTemplateInfo projectTemplateInfo = projectTemplateDao.getProjectTemplateInfoByName("咨询合同");
-			//删除该项目咨询合同类型中老合同对应的附件信息
-			WorkClientAttachment attchment = new WorkClientAttachment();
-			attchment.setAttachmentId(projectTemplateInfo.getId());
-			attchment.setProjectId(projectRecords.getId());
-			if(null != oldWorkContractInfo && null != oldWorkContractInfo.getWorkAttachments()){
-				for (WorkClientAttachment info:oldWorkContractInfo.getWorkAttachments()) {
-					attchment.setAttachmentName(info.getAttachmentName());
-					workattachmentService.deleteByAttachIdAndProject(attchment);
-				}
+		}
+
+		//项目添加报告号
+		//查询该项目是否已经存在报告号，若存在则不进行添加
+		ProjectReportData reportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
+		if(null == reportData){
+			//添加查询报告号模板的bizCode参数
+			ProjectReportData projectReportData = new ProjectReportData();
+			if("1".equals(projectRecords.getProjectType())){
+				projectReportData.setConditionType("10");
+			}else if("2".equals(projectRecords.getProjectType())){
+				projectReportData.setConditionType("1003");
 			}
-			//将新合同对应的附件信息添加到咨询合同中
-			if(null != newWorkContractInfo && null != newWorkContractInfo.getWorkAttachments()){
-				WorkClientAttachment workattachment = new WorkClientAttachment();
-				for (WorkClientAttachment info:newWorkContractInfo.getWorkAttachments()) {
-					workattachment.setType(info.getType());
-					workattachment.setAttachmentName(info.getAttachmentName());
-					workattachment.setUrl(info.getUrl());
-					workattachment.setAttachmentUser(info.getAttachmentUser());
-					workattachment.setAttachmentFlag(info.getAttachmentFlag());
-					workattachment.setAttachmentId(projectTemplateInfo.getId());
-					workattachment.setProjectId(projectRecords.getId());
-					switch (uploadMode){
-						case "1":
-							workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
-							break;
-						case "2":
-							workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
-							break;
-					}
-					workattachment.preInsert();
-					workClientAttachmentDao.insert(workattachment);
-				}
+			synchronized (SYN_BYTE) {
+				String reportNo = createReportNo(projectReportData.getConditionType());
+				projectReportData.setNumber(reportNo);
+				ProjectRecords project = new ProjectRecords();
+				project.setId(projectRecords.getId());
+				projectReportData.setProject(project);
+				projectReportData.setCompanyId(UserUtils.getSelectCompany().getId());
+				projectReportData.setOfficeId(UserUtils.getSelectOffice().getId());
+				projectReportData.setName(projectRecords.getProjectName());
+				projectReportData.preInsert();
+				projectReportData.setCreateDate(new Date());
+				projectReportDataDao.insert(projectReportData);
 			}
+			//添加项目工作内容表
+			Projectcontentinfo projectcontentinfo = new Projectcontentinfo();
+			projectcontentinfo.setProjectOnRural(projectRecords);
+			projectcontentinfo.setCompanyId(projectRecords.getCompany().getId());
+			projectcontentinfo.setOfficeId(projectRecords.getOffice().getId());
+			projectcontentinfo.setSort(30);
+			projectcontentinfo.setParentIds("0,");
+			projectcontentinfo.setParent(new Projectcontentinfo("0"));
+			projectcontentinfo.setName(projectRecords.getProjectId());
+			projectcontentinfo.preInsert();
+			projectcontentinfoDao.insertOnRural(projectcontentinfo);
 		}
+
 		logger.info("保存项目耗时：{}ms;启动流程耗时：{}ms",t4-t1,System.currentTimeMillis()-t4);
 	}
 
@@ -2129,4 +2133,11 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public void updateProjectMaster(RuralProjectRecords ruralProjectRecords){
 		dao.updateProjectMaster(ruralProjectRecords);
 	}
+	/**
+	 * 生成一个报告号
+	 */
+	public String createReportNo(String bizCode){
+		String msg = projectReportNumService.saveNumber(bizCode);//保存
+		return msg;
+	}
 }

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

@@ -117,9 +117,15 @@ public class RuralCostProjectMessageNewController extends BaseController {
         RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
 
         projectcontentinfo.setProject(records);
-        ProjectReportData projectReportData = new ProjectReportData();
+        //根据项目id查询报告信息
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(records.getId());
+        if(null == projectReportData){
+            projectReportData = new ProjectReportData();
+        }else{
+            projectcontentinfo.setProjectReportData(projectReportData);
+        }
         projectReportData.setType(dictType);
-        if (StringUtils.isNotBlank(projectcontentinfo1.getInfoId())){
+        if (StringUtils.isNotBlank(projectcontentinfo1.getInfoId()) && StringUtils.isBlank(projectReportData.getId())){
             projectReportData = projectReportDataService.get(projectcontentinfo1.getInfoId());
         }else if (projectcontentinfo.getProjectReportData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectReportData().getId())) {
             projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportData().getId());

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

@@ -311,20 +311,20 @@ public class RuralCostProjectRecordsController extends BaseController {
 //            projectRecords.setProjectStatus(ProjectStatusEnum.IN_APRL.getValue());
             if (!projectRecords.getIsNewRecord()) {//编辑表单保存
                 RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
-				if(t.getProjectStatus() == 3 || t.getProjectStatus() == 1) {
+				//if(t.getProjectStatus() == 3 || t.getProjectStatus() == 1) {
 					MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-					projectRecordsService.saveProject(t, ProjectStatusEnum.IN_APRL);//保存
-				}else if(t.getProjectStatus() == 2){
+					projectRecordsService.saveProject(t, ProjectStatusEnum.SIGNED);//保存
+				/*}else if(t.getProjectStatus() == 2){
 					addMessage(redirectAttributes, "项目已送审，无法重复送审");
 					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
 				}else if(t.getProjectStatus() == 5){
 					addMessage(redirectAttributes, "项目已登记完成，无法再次送审");
 					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
-				}
+				}*/
             } else {//新增表单保存
 				//添加查询类型(造价审核)
 				projectRecords.setProjectType("2");
-                projectRecordsService.saveProject(projectRecords, ProjectStatusEnum.IN_APRL);//保存
+                projectRecordsService.saveProject(projectRecords, ProjectStatusEnum.SIGNED);//保存
             }
 			addMessage(redirectAttributes, "保存项目成功");
         }catch (Exception e){
@@ -445,21 +445,8 @@ public class RuralCostProjectRecordsController extends BaseController {
 	@RequiresPermissions("ruralProject:ruralCostProjectRecords:del")
 	@RequestMapping(value = "delete")
 	public String delete(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
-		int status = projectRecords.getProjectStatus();
-		if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
-			projectRecordsService.delete(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/ruralCostProjectRecords/?repage";
-			}
-		}else {
-			addMessage(redirectAttributes, "作废项目失败，只有“暂存”、“驳回”、“撤回”状态的项目才能作废");
-		}
+		projectRecordsService.delete(projectRecords);
+		addMessage(redirectAttributes, "作废项目成功");
 		if (StringUtils.isNotBlank(projectRecords.getHome()) && "home".equals(projectRecords.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		}else {

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

@@ -124,9 +124,15 @@ public class RuralProjectMessageNewController extends BaseController {
         RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
 
         projectcontentinfo.setProject(records);
-        ProjectReportData projectReportData = new ProjectReportData();
+        //根据项目id查询报告信息
+        ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(records.getId());
+        if(null == projectReportData){
+            projectReportData = new ProjectReportData();
+        }else{
+            projectcontentinfo.setProjectReportData(projectReportData);
+        }
         projectReportData.setType(dictType);
-        if (StringUtils.isNotBlank(projectcontentinfo1.getInfoId())){
+        if (StringUtils.isNotBlank(projectcontentinfo1.getInfoId()) && StringUtils.isBlank(projectReportData.getId())){
             projectReportData = projectReportDataService.get(projectcontentinfo1.getInfoId());
         }else if (projectcontentinfo.getProjectReportData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectReportData().getId())) {
             projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportData().getId());

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

@@ -287,20 +287,20 @@ public class RuralProjectRecordsController extends BaseController {
 //            projectRecords.setProjectStatus(ProjectStatusEnum.IN_APRL.getValue());
             if (!projectRecords.getIsNewRecord()) {//编辑表单保存
                 RuralProjectRecords t = projectRecordsService.get(projectRecords.getId());//从数据库取出记录的值
-				if(t.getProjectStatus() == 3 || t.getProjectStatus() == 1) {
+				//if(t.getProjectStatus() == 3 || t.getProjectStatus() == 1) {
 					MyBeanUtils.copyBeanNotNull2Bean(projectRecords, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-					projectRecordsService.saveProject(t, ProjectStatusEnum.IN_APRL);//保存
-				}else if(t.getProjectStatus() == 2){
+					projectRecordsService.saveProject(t, ProjectStatusEnum.SIGNED);//保存
+				/*}else if(t.getProjectStatus() == 2){
 					addMessage(redirectAttributes, "项目已送审，无法重复送审");
 					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
 				}else if(t.getProjectStatus() == 5){
 					addMessage(redirectAttributes, "项目已登记完成，无法再次送审");
 					return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectRecords/?repage";
-				}
+				}*/
             } else {//新增表单保存
 				//添加查询类型(工程咨询)
 				projectRecords.setProjectType("1");
-                projectRecordsService.saveProject(projectRecords, ProjectStatusEnum.IN_APRL);//保存
+                projectRecordsService.saveProject(projectRecords, ProjectStatusEnum.SIGNED);//保存
             }
 			addMessage(redirectAttributes, "保存项目成功");
         }catch (Exception e){
@@ -424,21 +424,8 @@ public class RuralProjectRecordsController extends BaseController {
 	@RequiresPermissions("ruralProject:ruralProjectRecords:del")
 	@RequestMapping(value = "delete")
 	public String delete(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
-		int status = projectRecords.getProjectStatus();
-		if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
-			projectRecordsService.delete(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/ruralCostProjectRecords/?repage";
-			}
-		}else {
-			addMessage(redirectAttributes, "作废项目失败，只有“暂存”、“驳回”、“撤回”状态的项目才能作废");
-		}
+		projectRecordsService.delete(projectRecords);
+		addMessage(redirectAttributes, "作废项目成功");
 		if (StringUtils.isNotBlank(projectRecords.getHome()) && "home".equals(projectRecords.getHome())){
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		}else {

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1468,7 +1468,7 @@ public class WorkProjectNotifyController extends BaseController {
 								mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
 							}
 							//处理送审金额
-							List<MainDictDetail> mainDict = DictUtils.getMainDictList("attachment_project_approval_money");
+							List<MainDictDetail> mainDict = DictUtils.getMainDictList("attachment_project_grade");
 							for (MainDictDetail info: mainDict) {
 								if(ruralProjectRecords.getSubmitMoney().equals(info.getValue())){
 									ruralProjectRecords.setSubmitMoney(info.getLabel());

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -51,7 +51,8 @@
 		a.over_due_status as "overDueStatus",
 		a.attachment_project_sort as "attachmentProjectSort",
 		a.check_remarks as "checkRemarks",
-		a.project_properties As "projectProperties"
+		a.project_properties As "projectProperties",
+		a.submit_scale As "submitScale"
 	</sql>
 
 	<sql id="projectRecordsJoins">
@@ -487,7 +488,8 @@
 			project_master_id,
 			submit_money,
 			engineering_type,
-			project_properties
+			project_properties,
+			submit_scale
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -536,7 +538,8 @@
 			#{projectMasterId},
 		    #{submitMoney},
 		    #{engineeringType},
-		    #{projectProperties}
+		    #{projectProperties},
+		    #{submitScale}
 		)
 	</insert>
 
@@ -586,7 +589,8 @@
 			</if>
 			,submit_money =#{submitMoney},
 			engineering_type =#{engineeringType},
-			project_properties =#{projectProperties}
+			project_properties =#{projectProperties},
+			submit_scale =#{submitScale}
 		WHERE id = #{id}
 	</update>
 	<update id="updateDate">
@@ -631,7 +635,8 @@
 		    start_date =  #{startDate},
 		    ending_date =  #{endingDate},
 		    estimate_total_fees = #{estimateTotalFees},
-		    attachment_project_sort = #{attachmentProjectSort}
+		    attachment_project_sort = #{attachmentProjectSort},
+			submit_scale = #{submitScale}
 			<if test="engineeringType != null and engineeringType != ''">
 				,engineering_type =#{engineeringType}
 			</if>
@@ -708,53 +713,55 @@
 	<update id="updateSelectiveById">
 		UPDATE  rural_project_records
 		<set>
-			<if test="updateBy!=null and updateBy.id!=null and updateBy.id!=''">
 				update_by = #{updateBy.id},
-			</if>
-			<if test="updateDate!=null">
-				update_date = #{updateDate},
-			</if>
+				update_date = #{updateDate}
 			<if test="workContractInfo!=null and workContractInfo.id!=null and workContractInfo.id!=''">
-				contract_id = #{workContractInfo.id},
+				,contract_id = #{workContractInfo.id}
 			</if>
 			<if test="projectId!=null and projectId!=''">
-				project_id = #{projectId},
+				,project_id = #{projectId}
 			</if>
 			<if test="projectName!=null and projectName!=''">
-				project_name = #{projectName},
+				,project_name = #{projectName}
 			</if>
 			<if test="scaleType!=null and scaleType!=''">
-				scale_type = #{scaleType},
+				,scale_type = #{scaleType}
 			</if>
 			<if test="scaleUnit!=null and scaleUnit!=''">
-				scale_unit = #{scaleUnit},
+				,scale_unit = #{scaleUnit}
 			</if>
 			<if test="scaleQuantity !=null and scaleQuantity != ''">
-				scale_quantity = #{scaleQuantity},
+				,scale_quantity = #{scaleQuantity}
 			</if>
 			<if test="area!=null and area.id!=null and area.id!=''">
-				area_id = #{area.id},
+				,area_id = #{area.id}
 			</if>
 			<if test="projectSite!=null and projectSite!=''">
-				project_site = #{projectSite},
+				,project_site = #{projectSite}
 			</if>
 			<if test="projectDesc!=null and projectDesc!=''">
-				project_desc = #{projectDesc},
+				,project_desc = #{projectDesc}
 			</if>
 			<if test="remarks!=null and remarks!=''">
-				remarks = #{remarks},
+				,remarks = #{remarks}
 			</if>
 			<if test="projectStatus !=null and projectStatus != 0">
-				status = #{projectStatus},
+				,status = #{projectStatus}
 			</if>
 			<if test="company!=null and company.id!=null and company.id!=''">
-				company_id = #{company.id},
+				,company_id = #{company.id}
 			</if>
 			<if test="office!=null and office.id!=null and office.id!=''">
-				office_id = #{office.id},
+				,office_id = #{office.id}
 			</if>
 			<if test="alterProcessId!=null and alterProcessId!=''">
-                alter_process_id = #{alterProcessId}
+                ,alter_process_id = #{alterProcessId}
+			</if>
+			<if test="submitMoney!=null and submitMoney!=''">
+                ,submit_money = #{submitMoney}
+			</if>
+			<if test="submitScale!=null and submitScale!=''">
+                ,submit_scale = #{submitScale}
 			</if>
 		</set>
 		WHERE id = #{id}

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

@@ -935,7 +935,7 @@
 					}
 					if(d.projectReportStatus == 1){
 						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
+						//xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 					if(d.projectReportStatus == 2){
 						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回报告</a>";
@@ -943,7 +943,7 @@
 					if(d.projectReportStatus == 3){
 						//撤回操作
 						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
+						//xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 					if(d.projectReportStatus == 4){
 						//驳回操作
@@ -953,7 +953,7 @@
 							xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改报告</a>";
 						}
 
-						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
+						//xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 
 					//线上归档操作

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

@@ -832,13 +832,19 @@
                     </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">
-                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
+                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
                             <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
+                    <div class="layui-input-block">
+                        <form:input path="submitScale" id="submitScale" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control required layui-input number"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">

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

@@ -71,6 +71,11 @@
                         parent.layer.msg("投资性质未选择!", {icon: 5});
                         return false;
                     }
+                    var submitScale=$("#submitScale").val();
+                    if(submitScale==''){
+                        parent.layer.msg("送审规模未填写!", {icon: 5});
+                        return false;
+                    }
                     var flag = $("#flagFile").val();
                     if(flag == 'false'){
                         top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
@@ -82,7 +87,7 @@
                     }
                     var submitMoney=$('input:radio[name="submitMoney"]:checked').val();
                     if (null == submitMoney){
-                        parent.layer.msg("送审规模未填写!", {icon: 5});
+                        parent.layer.msg("项目等级未填写!", {icon: 5});
                         return false;
                     }
                 }
@@ -968,9 +973,9 @@
                 </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">
-                            <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
+                            <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
                                 <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                             </c:forEach>
 <%--                        <form:select path="submitMoney" lay-verify="judgment" class="form-control judgment simple-select">--%>
@@ -980,6 +985,12 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
+                    <div class="layui-input-block">
+                        <form:input path="submitScale" id="submitScale" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input judgment number"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
                         <input class="laydate-icondate form-control layui-input layer-date laydate-icon" style="background-color: #fff" readonly="readonly" id="startDate" name="startDate" placeholder="请选择开始日期" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -76,7 +76,7 @@
                 maxmin: true, //开启最大化最小化按钮
                 content: url,
                 skin: 'three-btns',
-                btn: ['送审', '暂存', '关闭'],
+                btn: ['提交', '关闭'],
                 btn1: function(index, layero){
                     var body = top.layer.getChildFrame('body', index);
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -93,25 +93,7 @@
                         setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
                     }
                 },
-                btn2:function(index,layero){
-                    var body = top.layer.getChildFrame('body', index);
-                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    var inputForm = body.find('#inputForm');
-                    var top_iframe;
-                    if(target){
-                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
-                    }else{
-                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                    }
-                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-                    if(iframeWin.contentWindow.doSubmit(2) ){
-                        // top.layer.close(index);//关闭对话框。
-                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-                    }else {
-                        return false;
-                    }
-                },
-                btn3: function (index) {
+                btn2: function (index) {
                 }
             });
         }
@@ -546,10 +528,10 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",width:150,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",width:180,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
-						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+						/*if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
 						{
 							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
@@ -572,7 +554,7 @@
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
                             xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
-                        }
+                        }*/
 						//项目在没有归档完成之前可对文档进行操作
 						if(d.recordStatus != undefined && d.recordStatus =="1")
 						{
@@ -587,6 +569,11 @@
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
 							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/adminDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 						}
+						if(d.modifyRecords != undefined && d.modifyRecords =="1")
+						{
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
+						}
 						xml+="</div>"
                         return xml;
 
@@ -621,6 +608,7 @@
                     </shiro:hasPermission>
                     ,"cancancel":<c:choose><c:when test="${projectRecords.projectStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					,"modifyRecords":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '2' != projectRecords.projectReportStatus && '5' != projectRecords.projectReportStatus && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 
 					</c:when>
                     <c:otherwise>

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

@@ -976,12 +976,21 @@
                     </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">
-                        <form:select path="submitMoney" class="form-control required simple-select">
+                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
+                            <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
+                        </c:forEach>
+                        <%--<form:select path="submitMoney" class="form-control required simple-select">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
+                        </form:select>--%>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
+                    <div class="layui-input-block">
+                        <form:input path="submitScale" id="submitScale" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input required number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -16,6 +16,11 @@
 				var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
 				$("#opinion").val(ss);
                 if(obj == 1) {
+					var submitScale=$("#submitScale").val();
+					if(submitScale==''){
+						parent.layer.msg("送审规模未填写!", {icon: 5});
+						return false;
+					}
 					$("#iframe").load(function(){
 						var ss= $("#iframe")[0].contentWindow.opinion();
 						alert(ss)
@@ -313,10 +318,10 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<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">
-						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
-							<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
+						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
+							<input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
 						</c:forEach>
 <%--						<form:select path="submitMoney" disabled="true" class="form-control required simple-select">--%>
 <%--							<form:option value=""/>--%>
@@ -327,6 +332,12 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
+					<div class="layui-input-block">
+						<form:input path="submitScale" id="submitScale" readonly="true" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
 						<input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -54,11 +54,6 @@
 
                 var startDate = new Date($("#startDate").val());
                 var endingDate = new Date($("#endingDate").val());
-                var projectProperties=$("#projectProperties").val();
-                if(projectProperties==''){
-                    parent.layer.msg("投资性质未选择!", {icon: 5});
-                    return false;
-                }
                 if(startDate.getTime() > endingDate.getTime()){
                     parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                     return false;
@@ -82,6 +77,16 @@
                 if(i==2){
                     $("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectRecords/tstore");
                 }else if(i==1){
+                    var projectProperties=$("#projectProperties").val();
+                    if(projectProperties==''){
+                        parent.layer.msg("投资性质未选择!", {icon: 5});
+                        return false;
+                    }
+                    var submitScale=$("#submitScale").val();
+                    if(submitScale==''){
+                        parent.layer.msg("送审规模未填写!", {icon: 5});
+                        return false;
+                    }
                     var flag = $("#flagFile").val();
                     if(flag == 'false'){
                         top.layer.msg('附件信息未上传完成，请等待！', {icon: 0});
@@ -93,7 +98,7 @@
                     }
                     var submitMoney=$('input:radio[name="submitMoney"]:checked').val();
                     if (null == submitMoney){
-                        parent.layer.msg("送审规模未填写!", {icon: 5});
+                        parent.layer.msg("项目等级未填写!", {icon: 5});
                         return false;
                     }
                 }
@@ -986,9 +991,9 @@
                     </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">
-                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
+                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
                             <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${ruralProjectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
 <%--                        <form:select path="submitMoney" class="form-control judgment simple-select">--%>
@@ -998,6 +1003,12 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
+                    <div class="layui-input-block">
+                        <form:input path="submitScale" id="submitScale" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input judgment number"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
                         <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -75,7 +75,7 @@
                 maxmin: true, //开启最大化最小化按钮
                 content: url,
                 skin: 'three-btns',
-                btn: ['送审', '暂存', '关闭'],
+				btn: ['提交', '关闭'],
                 /*yes: function (index, layero) {
                     var body = top.layer.getChildFrame('body', index);
                     var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
@@ -112,25 +112,7 @@
                         setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
                     }
                 },
-                btn2:function(index,layero){
-                    var body = top.layer.getChildFrame('body', index);
-                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-                    var inputForm = body.find('#inputForm');
-                    var top_iframe;
-                    if(target){
-                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
-                    }else{
-                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                    }
-                    inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-                    if(iframeWin.contentWindow.doSubmit(2) ){
-                        // top.layer.close(index);//关闭对话框。
-                        setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
-                    }else {
-                        return false;
-                    }
-                },
-                btn3: function (index) {
+                btn2: function (index) {
                 }
             });
         }
@@ -515,10 +497,10 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",width:150,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",width:180,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
-                        if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
+                        /*if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
                         {
 							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
                         }
@@ -541,7 +523,7 @@
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
                             xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
-                        }
+                        }*/
                         //项目在没有归档完成之前可对文档进行操作
                         if(d.recordStatus != undefined && d.recordStatus =="1")
                         {
@@ -556,6 +538,11 @@
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
 							xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/adminDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                         }
+						if(d.modifyRecords != undefined && d.modifyRecords =="1")
+						{
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id +"','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 作废</a>";
+						}
                         xml+="</div>"
                         return xml;
 
@@ -591,7 +578,8 @@
                     ,"cancancel":<c:choose><c:when test="${projectRecords.projectStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 
                     ,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    </c:when>
+					,"modifyRecords":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '2' != projectRecords.projectReportStatus && '5' != projectRecords.projectReportStatus && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					</c:when>
                     <c:otherwise>
                     ,"candel":"0"
                     ,"canedit1":"0"

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

@@ -969,9 +969,9 @@
                     </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">
-                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" var="v">
+                        <c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
                             <input type="radio" name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
                         </c:forEach>
 <%--                        <form:select path="submitMoney" class="form-control required simple-select">--%>
@@ -981,6 +981,12 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>送审规模（万元）：</label>
+                    <div class="layui-input-block">
+                        <form:input path="submitScale" id="submitScale" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input required number"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
                         <input placeholder="请选择开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -259,7 +259,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">
 <%--						<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">--%>
 <%--							<form:option value=""/>--%>
@@ -269,6 +269,12 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label double-line">送审规模（万元）：</label>
+					<div class="layui-input-block">
+						<form:input path="submitScale" id="submitScale" readonly="true" style="background-color: #f1f1f1" maxlength="12" htmlEscape="false" onkeyup="wirteNum(this)" placeholder="请输入送审规模" class="form-control layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
 						<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">

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

@@ -936,7 +936,7 @@
 					}
 					if(d.projectReportStatus == 1){
 						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralProjectMessageNew/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
+						//xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 					if(d.projectReportStatus == 2){
 						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 撤回报告</a>";
@@ -944,7 +944,7 @@
 					if(d.projectReportStatus == 3){
 						//撤回操作
 						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralProjectMessageNew/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
+						//xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 					if(d.projectReportStatus == 4){
 						//驳回操作
@@ -953,7 +953,7 @@
 						}else{
 							xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
 						}
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
+						//xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 
 					//线上归档操作

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

@@ -4,8 +4,27 @@
 <head>
 	<title>项目审批管理</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script>
 		$(document).ready(function () {
+
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+
 			var tt = $("#contractNum").val();
 			if (tt == null || tt === "") {
 				$("#divv").hide();
@@ -27,7 +46,12 @@
 				}
 			}
 
+			layui.use('form', function () {
+				var form = layui.form;
+				form.render();
+			});
 		})
+
 	</script>
 </head>
 <body>
@@ -56,7 +80,7 @@
 	</div>
 	</div>
 	<div class="container view-form" style="margin-top: 50px;">
-		<form:form id="inputForm" modelAttribute="projectRecords" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectRecords" method="post" class="form-horizontal layui-form">
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目合同信息</h2></div>
                <div id="divv">
@@ -204,12 +228,21 @@
 					</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">
-						<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
+						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
+							<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
+						</c:forEach>
+						<%--<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
 							<form:option value=""/>
 							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>
+						</form:select>--%>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label double-line">送审规模（万元）：</label>
+					<div class="layui-input-block">
+						<form:input path="submitScale" readonly="true" style="background-color: #f1f1f1" id="submitScale" maxlength="12" htmlEscape="false" placeholder="请输入送审规模" class="form-control layui-input number"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">