报告，工作内容修改

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectReportDataDao.java

@@ -67,4 +67,6 @@ public interface ProjectReportDataDao extends CrudDao<ProjectReportData> {
     void reportNumber(@Param("reportId") String reportId,@Param("number") String number,@Param("url") String url);
 
     int updateUpId(@Param("id")String id,@Param("upId")String upId);
+
+    List<ProjectReportData> findByProjectId(String projectId);
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -86,6 +86,16 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String masterName;
 	private String upId;
 
+
+	private Double reviewFee;  //送审价
+	private Double approvalFee;  //审定价
+	private Double contractFee;   //合同价
+	private Double verifyFee;    //核增核减额
+	private Double verifyRate;    //核增核减率
+	private Double consultFee;    //咨询标的额
+	private Double buildingFee;   //土建额
+	private Double installFee;    //安装额
+
 	public String getUpId() {
 		return upId;
 	}
@@ -486,4 +496,69 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setProjectReviewList(List<WorkReviewAudit> projectReviewList) {
 		this.projectReviewList = projectReviewList;
 	}
+
+
+	public Double getReviewFee() {
+		return reviewFee;
+	}
+
+	public void setReviewFee(Double reviewFee) {
+		this.reviewFee = reviewFee;
+	}
+
+	public Double getApprovalFee() {
+		return approvalFee;
+	}
+
+	public void setApprovalFee(Double approvalFee) {
+		this.approvalFee = approvalFee;
+	}
+
+	public Double getContractFee() {
+		return contractFee;
+	}
+
+	public void setContractFee(Double contractFee) {
+		this.contractFee = contractFee;
+	}
+
+	public Double getVerifyFee() {
+		return verifyFee;
+	}
+
+	public void setVerifyFee(Double verifyFee) {
+		this.verifyFee = verifyFee;
+	}
+
+	public Double getVerifyRate() {
+		return verifyRate;
+	}
+
+	public void setVerifyRate(Double verifyRate) {
+		this.verifyRate = verifyRate;
+	}
+
+	public Double getConsultFee() {
+		return consultFee;
+	}
+
+	public void setConsultFee(Double consultFee) {
+		this.consultFee = consultFee;
+	}
+
+	public Double getBuildingFee() {
+		return buildingFee;
+	}
+
+	public void setBuildingFee(Double buildingFee) {
+		this.buildingFee = buildingFee;
+	}
+
+	public Double getInstallFee() {
+		return installFee;
+	}
+
+	public void setInstallFee(Double installFee) {
+		this.installFee = installFee;
+	}
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -32,6 +32,8 @@ import com.jeeplus.modules.workgoout.entity.GoOut;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -75,6 +77,8 @@ public class ProjectcontentinfoController extends BaseController {
 	private WorkReviewStandardService workReviewStandardService;
 	@Autowired
 	private ActTaskService actTaskService;
+	@Autowired
+	protected HistoryService historyService;
 
 	@ModelAttribute("projectcontentinfo")
 	public Projectcontentinfo get(@RequestParam(required=false) String id) {
@@ -629,6 +633,18 @@ public class ProjectcontentinfoController extends BaseController {
 				projectReportData = projectReportChangeService.get(projectcontentinfo.getProjectReportData().getId());
 				ProjectReportData beforeEntity = projectReportDataService.get(projectReportData.getReportId());
 				projectReportData.setBeforeEntity(beforeEntity);
+			}else if(projectcontentinfo.getView().equals("reportViewGzr")){
+				if (StringUtils.isNotBlank(projectcontentinfo.getInfoId())){
+					projectReportData = projectReportDataService.get(projectcontentinfo.getInfoId());
+					if(StringUtils.isNotBlank(projectReportData.getProcessInstanceId())){
+						Act act = getByAct(projectReportData.getProcessInstanceId());
+						projectReportData.setAct(act);
+					}
+				}else if (projectcontentinfo.getProjectReportData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectReportData().getId())) {
+					projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportData().getId());
+				}else {
+					projectReportData.setNumber("");
+				}
 			}else {
 				if (StringUtils.isNotBlank(projectcontentinfo.getInfoId())){
 					projectReportData = projectReportDataService.get(projectcontentinfo.getInfoId());
@@ -1370,4 +1386,43 @@ public class ProjectcontentinfoController extends BaseController {
 		return  ajaxJson;
 	}
 
+	@RequestMapping("form1")
+	public String form1(String id,Model model){
+		ProjectReportData projectReportData = projectReportDataService.get(id);
+		Projectcontentinfo projectcontentinfo = new Projectcontentinfo();
+		projectcontentinfo.setProjectReportData(projectReportData);
+		model.addAttribute("projectcontentinfo", projectcontentinfo);
+		return "modules/projectcontentinfo/reportView";
+	}
+
+	public Act getByAct(String processInstanceId){
+		Act act = new Act();
+		HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+		ProcessInstance processInstance = actTaskService.getProcIns(processInstanceId);
+		if (processInstance!=null) {
+			List<Task> taskList = actTaskService.getCurrentTaskList(processInstance);
+			if(taskList!=null && taskList.size()>1){
+				for (Task taskInfok:taskList) {
+					if (taskInfok.getAssignee().equals(UserUtils.getUser().getId())) {
+						act.setTaskId(taskInfok.getId());
+						act.setTaskName(taskInfok.getName());
+						act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
+						act.setProcDefId(taskInfok.getProcessDefinitionId());
+						act.setProcInsId(taskInfok.getProcessInstanceId());
+						act.setTask(taskInfok);
+					}
+				}
+			}else {
+				Task task = actTaskService.getCurrentTaskInfo(processInstance);
+				act.setTaskId(task.getId());
+				act.setTaskName(task.getName());
+				act.setTaskDefKey(task.getTaskDefinitionKey());
+				act.setProcDefId(task.getProcessDefinitionId());
+				act.setProcInsId(task.getProcessInstanceId());
+				act.setTask(task);
+			}
+		}
+		return  act;
+	}
+
 }

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.projectrecord.entity;
 
 import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.ActEntity;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.sys.entity.Area;
 
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
@@ -38,6 +39,24 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private Double scaleQuantity;		// 规模数量
 	private Area area;		// 项目所在地
 	private String projectSite;		// 建设地点
+	private String province;  //项目所在省
+	private String city;  //项目所在市
+	private String county;//项目所在区
+	private String projectStructure;   //工程结构
+	private String onGroundNum;    //地上层数
+	private String underGroundNum;    //地下层数
+	private String buildingScale;    //建筑规模
+	private String measuringUnit;     //规模单位
+	private String projectUse;        //工程用途
+	private Double installFees;      //安装造价
+	private Double buildingFees;      //土建造价
+	private Double buildingPercent;    //土建百分比
+	private Double installPercent;     //安装百分比
+	private Double unitFees;     //单位造价
+	private Double buildingUnitFees;  //土建单位造价
+	private Double installUnitFees;    //安装单位造价
+	private Double totalFees;        //总合同额
+
 	@NotNull(message = "委托方联系人不能为空")
 	private List<WorkClientLinkman> workClientLinkmanList;		// 委托方联系人
 	private List<WorkClientLinkman> workConstructionLinkmanList;		// 施工方及联系人
@@ -73,6 +92,8 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private int membercount;
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
+	private List<ProjectReportData> projectReportData = Lists.newArrayList();
+
 	public ProjectRecords() {
 		super();
 	}
@@ -394,4 +415,148 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setMembercount(int membercount) {
 		this.membercount = membercount;
 	}
+
+	public String getProvince() {
+		return province;
+	}
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getCounty() {
+		return county;
+	}
+
+	public void setCounty(String county) {
+		this.county = county;
+	}
+
+	public String getProjectStructure() {
+		return projectStructure;
+	}
+
+	public void setProjectStructure(String projectStructure) {
+		this.projectStructure = projectStructure;
+	}
+
+	public String getOnGroundNum() {
+		return onGroundNum;
+	}
+
+	public void setOnGroundNum(String onGroundNum) {
+		this.onGroundNum = onGroundNum;
+	}
+
+	public String getUnderGroundNum() {
+		return underGroundNum;
+	}
+
+	public void setUnderGroundNum(String underGroundNum) {
+		this.underGroundNum = underGroundNum;
+	}
+
+	public String getBuildingScale() {
+		return buildingScale;
+	}
+
+	public void setBuildingScale(String buildingScale) {
+		this.buildingScale = buildingScale;
+	}
+
+	public String getMeasuringUnit() {
+		return measuringUnit;
+	}
+
+	public void setMeasuringUnit(String measuringUnit) {
+		this.measuringUnit = measuringUnit;
+	}
+
+	public String getProjectUse() {
+		return projectUse;
+	}
+
+	public void setProjectUse(String projectUse) {
+		this.projectUse = projectUse;
+	}
+
+	public Double getInstallFees() {
+		return installFees;
+	}
+
+	public void setInstallFees(Double installFees) {
+		this.installFees = installFees;
+	}
+
+	public Double getBuildingFees() {
+		return buildingFees;
+	}
+
+	public void setBuildingFees(Double buildingFees) {
+		this.buildingFees = buildingFees;
+	}
+
+	public Double getBuildingPercent() {
+		return buildingPercent;
+	}
+
+	public void setBuildingPercent(Double buildingPercent) {
+		this.buildingPercent = buildingPercent;
+	}
+
+	public Double getInstallPercent() {
+		return installPercent;
+	}
+
+	public void setInstallPercent(Double installPercent) {
+		this.installPercent = installPercent;
+	}
+
+	public Double getUnitFees() {
+		return unitFees;
+	}
+
+	public void setUnitFees(Double unitFees) {
+		this.unitFees = unitFees;
+	}
+
+	public Double getBuildingUnitFees() {
+		return buildingUnitFees;
+	}
+
+	public void setBuildingUnitFees(Double buildingUnitFees) {
+		this.buildingUnitFees = buildingUnitFees;
+	}
+
+	public Double getInstallUnitFees() {
+		return installUnitFees;
+	}
+
+	public void setInstallUnitFees(Double installUnitFees) {
+		this.installUnitFees = installUnitFees;
+	}
+
+	public Double getTotalFees() {
+		return totalFees;
+	}
+
+	public void setTotalFees(Double totalFees) {
+		this.totalFees = totalFees;
+	}
+
+	public List<ProjectReportData> getProjectReportData() {
+		return projectReportData;
+	}
+
+	public void setProjectReportData(List<ProjectReportData> projectReportData) {
+		this.projectReportData = projectReportData;
+	}
 }

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordsAlter.java

@@ -38,6 +38,24 @@ public class ProjectRecordsAlter extends ActEntity<ProjectRecordsAlter> {
 	private Double scaleQuantity;		// 规模数量
 	private Area area;		// 项目所在地
 	private String projectSite;		// 建设地点
+	private String province;  //项目所在省
+	private String city;  //项目所在市
+	private String county;//项目所在区
+	private String projectStructure;   //工程结构
+	private String onGroundNum;    //地上层数
+	private String underGroundNum;    //地下层数
+	private String buildingScale;    //建筑规模
+	private String measuringUnit;     //规模单位
+	private String projectUse;        //工程用途
+	private Double installFees;      //安装造价
+	private Double buildingFees;      //土建造价
+	private Double buildingPercent;    //土建百分比
+	private Double installPercent;     //安装百分比
+	private Double unitFees;     //单位造价
+	private Double buildingUnitFees;  //土建单位造价
+	private Double installUnitFees;    //安装单位造价
+	private Double totalFees;        //总合同额
+
 	@NotNull(message = "委托方联系人不能为空")
 	private List<WorkClientLinkman> workClientLinkmanList;		// 委托方联系人
 	private List<WorkClientLinkman> workConstructionLinkmanList;		// 施工方及联系人
@@ -360,4 +378,141 @@ public class ProjectRecordsAlter extends ActEntity<ProjectRecordsAlter> {
 			return "";
 		}
 	}
+
+
+	public String getProvince() {
+		return province;
+	}
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getCounty() {
+		return county;
+	}
+
+	public void setCounty(String county) {
+		this.county = county;
+	}
+
+	public String getProjectStructure() {
+		return projectStructure;
+	}
+
+	public void setProjectStructure(String projectStructure) {
+		this.projectStructure = projectStructure;
+	}
+
+	public String getOnGroundNum() {
+		return onGroundNum;
+	}
+
+	public void setOnGroundNum(String onGroundNum) {
+		this.onGroundNum = onGroundNum;
+	}
+
+	public String getUnderGroundNum() {
+		return underGroundNum;
+	}
+
+	public void setUnderGroundNum(String underGroundNum) {
+		this.underGroundNum = underGroundNum;
+	}
+
+	public String getBuildingScale() {
+		return buildingScale;
+	}
+
+	public void setBuildingScale(String buildingScale) {
+		this.buildingScale = buildingScale;
+	}
+
+	public String getMeasuringUnit() {
+		return measuringUnit;
+	}
+
+	public void setMeasuringUnit(String measuringUnit) {
+		this.measuringUnit = measuringUnit;
+	}
+
+	public String getProjectUse() {
+		return projectUse;
+	}
+
+	public void setProjectUse(String projectUse) {
+		this.projectUse = projectUse;
+	}
+
+	public Double getInstallFees() {
+		return installFees;
+	}
+
+	public void setInstallFees(Double installFees) {
+		this.installFees = installFees;
+	}
+
+	public Double getBuildingFees() {
+		return buildingFees;
+	}
+
+	public void setBuildingFees(Double buildingFees) {
+		this.buildingFees = buildingFees;
+	}
+
+	public Double getBuildingPercent() {
+		return buildingPercent;
+	}
+
+	public void setBuildingPercent(Double buildingPercent) {
+		this.buildingPercent = buildingPercent;
+	}
+
+	public Double getInstallPercent() {
+		return installPercent;
+	}
+
+	public void setInstallPercent(Double installPercent) {
+		this.installPercent = installPercent;
+	}
+
+	public Double getUnitFees() {
+		return unitFees;
+	}
+
+	public void setUnitFees(Double unitFees) {
+		this.unitFees = unitFees;
+	}
+
+	public Double getBuildingUnitFees() {
+		return buildingUnitFees;
+	}
+
+	public void setBuildingUnitFees(Double buildingUnitFees) {
+		this.buildingUnitFees = buildingUnitFees;
+	}
+
+	public Double getInstallUnitFees() {
+		return installUnitFees;
+	}
+
+	public void setInstallUnitFees(Double installUnitFees) {
+		this.installUnitFees = installUnitFees;
+	}
+
+	public Double getTotalFees() {
+		return totalFees;
+	}
+
+	public void setTotalFees(Double totalFees) {
+		this.totalFees = totalFees;
+	}
 }

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsAlterService.java

@@ -157,10 +157,19 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
 		    createBy = UserUtils.getUser();
         }
 		Office company= new Office();
-		company.setId(workContractInfo.getCompanyId());
+        Office office =  new Office();
+        if(StringUtils.isNotBlank((projectRecordsAlter.getWorkContractInfo().getId()))){
+            //有合同状态
+            workContractInfo = contractInfoService.get(projectRecordsAlter.getWorkContractInfo().getId());
+            company.setId(workContractInfo.getCompanyId());
+//			office.setId(workContractInfo.getChargeCompany());
+            office.setId(UserUtils.getUser().getOffice().getId());
+        }else{
+            //无合同
+            company.setId(UserUtils.getUser().getCompany().getId());
+            office.setId(UserUtils.getUser().getOffice().getId());
+        }
 		projectRecordsAlter.setCompany(company);
-		Office office =  new Office();
-		office.setId(workContractInfo.getChargeCompany());
 		projectRecordsAlter.setOffice(office);
 		super.save(projectRecordsAlter);
 		//保存项目负责人

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -14,7 +14,9 @@ import com.jeeplus.common.websocket.onchat.ChatServerPool;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ProcessDefCache;
+import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectrecord.dao.ProjectClientLinkmanDao;
 import com.jeeplus.modules.projectrecord.dao.ProjectRecordsDao;
@@ -113,6 +115,8 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 	private ProjectcontentinfoDao projectcontentinfoDao;
     @Autowired
     private WorkActivityProcessDao workActivityProcessDao;
+    @Autowired
+	private ProjectReportDataDao projectReportDataDao;
 
 	public ProjectRecords get(String id) {
 		return super.get(id);
@@ -986,6 +990,13 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		projectRecords.setWorkAttachments(attachments);
 	}
 
+	public void queryReportData(ProjectRecords projectRecords){
+       String projectId = projectRecords.getId();
+       List<ProjectReportData> byProjectId = projectReportDataDao.findByProjectId(projectId);
+       projectRecords.setProjectReportData(byProjectId);
+
+	}
+
 	private void saveAttachments(ProjectRecords projectRecords) {
 		if (projectRecords.getWorkAttachments()!=null && !projectRecords.getWorkAttachments().isEmpty()) {
 			//保存附件信息
@@ -1046,6 +1057,8 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
         this.queryLinkmanInfos(projectRecords);
         //设置附件信息
         this.queryWorkAttachment(projectRecords);
+        //设置报告
+        this.queryReportData(projectRecords);
     }
 
     public Page<ProjectRecords> findPageDetail(Page<ProjectRecords> page, ProjectRecords projectRecords) {

src/main/java/com/jeeplus/modules/sys/dao/AreaDao.java

@@ -20,5 +20,6 @@ public interface AreaDao extends TreeDao<Area> {
 	public String getAreaId(@Param("proName")String proName, @Param("cityName")String cityName);
 	public String getAreaIdByCityName(@Param("cityName")String cityName);
 	public Area findByName(String name);
+	public Area findByPId(String parentId);
 
 }

src/main/java/com/jeeplus/modules/sys/service/AreaService.java

@@ -50,4 +50,8 @@ public class AreaService extends TreeService<AreaDao, Area> {
 
 		return  areaDao.getAreaIdByCityName(cityName);
 	}
+
+	public Area getParent(String parentId){
+		return areaDao.findByPId(parentId);
+	}
 }

src/main/java/com/jeeplus/modules/sys/web/AreaController.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.sys.web;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -137,4 +138,29 @@ public class AreaController extends BaseController {
 		}
 		return mapList;
 	}
+
+	@ResponseBody
+	@RequestMapping(value = "getParent")
+	public Map<String,String> getParent(String areaId){
+		Map<String,String> map = new HashMap<>();
+		Area area = areaService.get(areaId);
+		Area area1 = areaService.get(area.getParent().getId());
+		if(area1.getId().equals("1")){
+			map.put("province",area.getName());
+			map.put("city","");
+			map.put("county","");
+			return map;
+		}
+		Area area2 = areaService.get(area1.getParent().getId());
+		if(area2.getId().equals("1")){
+			map.put("province",area1.getName());
+			map.put("city",area.getName());
+			map.put("county","");
+			return map;
+		}
+		map.put("province",area2.getName());
+		map.put("city",area1.getName());
+		map.put("county",area.getName());
+		return map;
+	}
 }

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportChangeDao.xml

@@ -30,7 +30,15 @@
 		a.before_count AS "beforeCount",
 		a.before_id AS "beforeEntity.id",
 		a.report_type AS "reportType",
-		a.number_path as "numberPath"
+		a.number_path as "numberPath",
+		a.review_fee AS "reviewFee",
+		a.approval_fee AS "approvalFee",
+		a.contract_fee AS "contractFee",
+		a.verify_fee AS "verifyFee",
+		a.verify_rate AS "verifyRate",
+		a.consult_fee AS "consultFee",
+		a.building_fee AS "buildingFee",
+		a.install_fee AS "installFee"
 	</sql>
 	
 	<sql id="projectReportDataJoins">
@@ -157,7 +165,15 @@
 			before_count,
 			before_id,
 			report_type,
-			number_path
+			number_path,
+			review_fee,
+		    approval_fee,
+		    contract_fee,
+		    verify_fee,
+		    verify_rate,
+		    consult_fee,
+		    building_fee,
+		    install_fee
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -184,7 +200,15 @@
 			#{beforeCount},
 			#{beforeEntity.id},
 			#{reportType},
-			#{numberPath}
+			#{numberPath},
+			#{reviewFee},
+			#{approvalFee},
+			#{contractFee},
+			#{verifyFee},
+			#{verifyRate},
+			#{consultFee},
+			#{buildingFee},
+			#{installFee}
 		)
 	</insert>
 	
@@ -206,7 +230,15 @@
 			status = #{status},
 			report_id = #{reportId},
 			report_type = #{reportType},
-			number_path = #{numberPath}
+			number_path = #{numberPath},
+			review_fee = #{reviewFee},
+			approval_fee = #{approvalFee},
+			contract_fee = #{contractFee},
+			verify_fee = #{verifyFee},
+			verify_rate = #{verifyRate},
+			consult_fee = #{consultFee},
+			building_fee = #{buildingFee},
+			install_fee = #{installFee}
 		WHERE id = #{id}
 	</update>
 

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -30,7 +30,15 @@
 		a.invalid_process_instance_id AS "invalidProcessInstanceId",
 		m.name AS "master.name",
 		a.number_path as "numberPath",
-		a.update_process_instance_id as "upId"
+		a.update_process_instance_id as "upId",
+		a.review_fee AS "reviewFee",
+		a.approval_fee AS "approvalFee",
+		a.contract_fee AS "contractFee",
+		a.verify_fee AS "verifyFee",
+		a.verify_rate AS "verifyRate",
+		a.consult_fee AS "consultFee",
+		a.building_fee AS "buildingFee",
+		a.install_fee AS "installFee"
 	</sql>
 	
 	<sql id="projectReportDataJoins">
@@ -71,7 +79,15 @@
 		a.report_type AS "reportType",
 		a.process_instance_id AS "processInstanceId",
 		m.name AS "master.name",
-		a.number_path as "numberPath"
+		a.number_path as "numberPath",
+		a.review_fee AS "reviewFee",
+		a.approval_fee AS "approvalFee",
+		a.contract_fee AS "contractFee",
+		a.verify_fee AS "verifyFee",
+		a.verify_rate AS "verifyRate",
+		a.consult_fee AS "consultFee",
+		a.building_fee AS "buildingFee",
+		a.install_fee AS "installFee"
 		FROM project_report_data a
 		<include refid="projectReportDataJoins"/>
 		WHERE a.id = #{id}
@@ -430,7 +446,15 @@
 			status,
 			invalid_status,
 			report_type,
-			number_path
+			number_path,
+			review_fee,
+		    approval_fee,
+		    contract_fee,
+		    verify_fee,
+		    verify_rate,
+		    consult_fee,
+		    building_fee,
+		    install_fee
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -455,7 +479,15 @@
 			#{status},
 			#{invalidStatus},
 			#{reportType},
-			#{numberPath}
+			#{numberPath},
+			#{reviewFee},
+			#{approvalFee},
+			#{contractFee},
+			#{verifyFee},
+			#{verifyRate},
+			#{consultFee},
+			#{buildingFee},
+			#{installFee}
 		)
 	</insert>
 	
@@ -479,7 +511,15 @@
 			status = #{status},
 			invalid_status = #{invalidStatus},
 			report_type = #{reportType},
-			number_path = #{numberPath}
+			number_path = #{numberPath},
+			review_fee = #{reviewFee},
+			approval_fee = #{approvalFee},
+			contract_fee = #{contractFee},
+			verify_fee = #{verifyFee},
+			verify_rate = #{verifyRate},
+			consult_fee = #{consultFee},
+			building_fee = #{buildingFee},
+			install_fee = #{installFee}
 		WHERE id = #{id}
 	</update>
 
@@ -571,4 +611,14 @@
 		</where>
 	</update>
 
+	<select id="findByProjectId" parameterType="String" resultType="ProjectReportData">
+		SELECT
+		<include refid="projectReportDataColumns"/>
+		FROM project_report_data a
+		<include refid="projectReportDataJoins"/>
+		<where>
+			project_id = #{projectId}
+		</where>
+	</select>
+
 </mapper>

src/main/resources/mappings/modules/projectrecord/ProjectRecordsAlterDao.xml

@@ -25,7 +25,24 @@
 		a.alter_reason AS "alterReason",
 		a.alter_before_id AS "alterBeforeRecords.id",
 		a.alter_project_id AS "alterProjectId",
-		area.name AS "area.name"
+		area.name AS "area.name",
+		a.province,
+		a.city,
+		a.area_name AS "areaName",
+		a.project_structure AS "projectStructure",
+		a.on_ground_num AS "onGroundNum",
+		a.under_ground_num AS "underGroundNum",
+		a.building_scale AS "buildingScale",
+		a.measuring_unit AS "measuringUnit",
+		a.project_use AS "projectUse",
+		a.install_fees AS "installFees",
+		a.building_fees AS "buildingFees",
+		a.building_percent AS "buildingPercent",
+		a.install_percent AS "installPercent",
+		a.unit_fees AS "unitFees",
+		a.building_unit_fees AS "buildingUnitFees",
+		a.install_unit_fees AS "installUnitFees",
+		a.total_fees AS "totalFees"
 	</sql>
 	
 	<sql id="ProjectRecordsAlterJoins">
@@ -133,7 +150,24 @@
 		    office_id,
 		    alter_reason,
 		    alter_before_id,
-		    alter_project_id
+		    alter_project_id,
+		    province,
+		    city,
+		    area_name,
+		    project_structure,
+		    on_ground_num,
+		    under_ground_num,
+		    building_scale,
+		    measuring_unit,
+		    project_use,
+		    install_fees,
+		    building_fees,
+		    building_percent,
+		    install_percent,
+		    unit_fees,
+		    building_unit_fees,
+		    install_unit_fees,
+		    total_fees
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -155,7 +189,24 @@
 			#{office.id},
 			#{alterReason},
 			#{alterBeforeRecords.id},
-			#{alterProjectId}
+			#{alterProjectId},
+			#{province},
+			#{city},
+			#{county},
+			#{projectStructure},
+			#{onGroundNum},
+			#{underGroundNum},
+			#{buildingScale},
+			#{measuringUnit},
+			#{projectUse},
+			#{installFees},
+			#{buildingFees},
+			#{buildingPercent},
+			#{installPercent},
+			#{unitFees},
+			#{buildingUnitFees},
+			#{installUnitFees},
+			#{totalFees}
 		)
 	</insert>
 	
@@ -178,7 +229,24 @@
 			office_id = #{office.id},
 			alter_reason = #{alterReason},
 			alter_before_id = #{alterBeforeRecords.id},
-			alter_project_id = #{alterProjectId}
+			alter_project_id = #{alterProjectId},
+			province = #{province},
+		    city = #{city},
+		    area_name = #{county},
+		    project_structure =  #{projectStructure},
+		    on_ground_num = #{onGroundNum},
+		    under_ground_num = #{underGroundNum},
+		    building_scale = #{buildingScale},
+		    measuring_unit =  #{measuringUnit},
+		    project_use =  #{projectUse},
+		    install_fees =  #{installFees},
+		    building_fees =  #{buildingFees},
+		    building_percent =  #{buildingPercent},
+		    install_percent =  #{installPercent},
+		    unit_fees = #{unitFees},
+		    building_unit_fees = #{buildingUnitFees},
+		    install_unit_fees =  #{installUnitFees},
+		    total_fees =  #{totalFees}
 		WHERE id = #{id}
 	</update>
 	

src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -24,7 +24,24 @@
 		a.company_id AS "company.id",
 		a.office_id AS "office.id",
 		a.alter_process_id AS "alterProcessId",
-		area.name AS "area.name"
+		area.name AS "area.name",
+		a.province,
+		a.city,
+		a.area_name AS "county",
+		a.project_structure AS "projectStructure",
+		a.on_ground_num AS "onGroundNum",
+		a.under_ground_num AS "underGroundNum",
+		a.building_scale AS "buildingScale",
+		a.measuring_unit AS "measuringUnit",
+		a.project_use AS "projectUse",
+		a.install_fees AS "installFees",
+		a.building_fees AS "buildingFees",
+		a.building_percent AS "buildingPercent",
+		a.install_percent AS "installPercent",
+		a.unit_fees AS "unitFees",
+		a.building_unit_fees AS "buildingUnitFees",
+		a.install_unit_fees AS "installUnitFees",
+		a.total_fees AS "totalFees"
 	</sql>
 	
 	<sql id="projectRecordsJoins">
@@ -336,7 +353,24 @@
 			status,
 			company_id,
 		    office_id,
-		    alter_process_id
+		    alter_process_id,
+		    province,
+		    city,
+		    area_name,
+		    project_structure,
+		    on_ground_num,
+		    under_ground_num,
+		    building_scale,
+		    measuring_unit,
+		    project_use,
+		    install_fees,
+		    building_fees,
+		    building_percent,
+		    install_percent,
+		    unit_fees,
+		    building_unit_fees,
+		    install_unit_fees,
+		    total_fees
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -357,7 +391,24 @@
 			#{projectStatus},
 			#{company.id},
 			#{office.id},
-			#{alterProcessId}
+			#{alterProcessId},
+			#{province},
+			#{city},
+			#{county},
+			#{projectStructure},
+			#{onGroundNum},
+			#{underGroundNum},
+			#{buildingScale},
+			#{measuringUnit},
+			#{projectUse},
+			#{installFees},
+			#{buildingFees},
+			#{buildingPercent},
+			#{installPercent},
+			#{unitFees},
+			#{buildingUnitFees},
+			#{installUnitFees},
+			#{totalFees}
 		)
 	</insert>
 	
@@ -378,7 +429,24 @@
 			status = #{projectStatus},
 			company_id = #{company.id},
 			office_id = #{office.id},
-			alter_process_id = #{alterProcessId}
+			alter_process_id = #{alterProcessId},
+			province = #{province},
+		    city = #{city},
+		    area_name = #{county},
+		    project_structure =  #{projectStructure},
+		    on_ground_num = #{onGroundNum},
+		    under_ground_num = #{underGroundNum},
+		    building_scale = #{buildingScale},
+		    measuring_unit =  #{measuringUnit},
+		    project_use =  #{projectUse},
+		    install_fees =  #{installFees},
+		    building_fees =  #{buildingFees},
+		    building_percent =  #{buildingPercent},
+		    install_percent =  #{installPercent},
+		    unit_fees = #{unitFees},
+		    building_unit_fees = #{buildingUnitFees},
+		    install_unit_fees =  #{installUnitFees},
+		    total_fees =  #{totalFees}
 		WHERE id = #{id}
 	</update>
 	

src/main/resources/mappings/modules/sys/AreaDao.xml

@@ -89,6 +89,16 @@
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds}
 		ORDER BY a.code
 	</select>
+
+	<select id="findByPId" parameterType="String" resultType="Area">
+		SELECT
+		<include refid="areaColumns"/>
+		FROM sys_area a
+		<include refid="areaJoins"/>
+		<where>
+			a.parent_id = #{parentId}
+		</where>
+	</select>
 	
 	<insert id="insert">
 		INSERT INTO sys_area(

src/main/webapp/webpage/modules/projectcontentinfo/reportChange.jsp

@@ -149,6 +149,20 @@
             })
             return;
         }
+
+		function getFee() {
+			var rf = $("#reviewFee").val();
+			var af = $("#approvalFee").val();
+			if(rf != ''&& af !=''){
+				var hf = parseInt(rf)-parseInt(af);
+				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				$("#verifyFee").val(hf);
+				$("#verifyRate").val(rate);
+			}
+			if(af !=''){
+				$("#consultFee").val(af)
+			}
+		}
         // 确认对话框
         function reviewAudits(mess, href,obj,remarks){
             // top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
@@ -321,7 +335,57 @@
 					</div>
 				</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">
+					<label class="layui-form-label">送审价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">审定价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减率(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">咨询标的额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number"/>
+					</div>
+				</div>
+			</div>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>依据性资料明细</h2></div>
 				<div class="layui-item nav-btns">

src/main/webapp/webpage/modules/projectcontentinfo/reportChangeModifyApply.jsp

@@ -153,18 +153,32 @@
         }
         // 确认对话框
         function reviewAudits(mess, href,obj,remarks){
-            top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+            // top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
                 console.log(remarks);
                 var remark = $(remarks);
                 remark.val("确认");
                 $("#check1"+obj).attr("style","display:none");
                 $("#check2"+obj).attr("style","display");
                 top.layer.msg("已确认！", {icon: 1});
-                top.layer.close(index);
-            });
+            //     top.layer.close(index);
+            // });
             return false;
         }
 
+		function getFee() {
+			var rf = $("#reviewFee").val();
+			var af = $("#approvalFee").val();
+			if(rf != ''&& af !=''){
+				var hf = parseInt(rf)-parseInt(af);
+				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				$("#verifyFee").val(hf);
+				$("#verifyRate").val(rate);
+			}
+			if(af !=''){
+				$("#consultFee").val(af)
+			}
+		}
+
         function addReview(obj) {
             var infoId = $("#id").val();
             var name = $("#name").val();
@@ -328,6 +342,57 @@
 				</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">
+					<label class="layui-form-label">送审价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">审定价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减率(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">咨询标的额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number"/>
+					</div>
+				</div>
+			</div>
+			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>依据性资料明细</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)" onclick="openDialogre('新增依据性资料', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=basedData&dictType=${projectcontentinfo.dictType}&id=${projectcontentinfo.id}&parentIds=${projectcontentinfo.parentIds}','90%','90%','inputForm')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>

src/main/webapp/webpage/modules/projectcontentinfo/reportChangeView.jsp

@@ -113,6 +113,57 @@
 					</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">
+						<label class="layui-form-label">送审价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.reviewFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.reviewFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">审定价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.approvalFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.approvalFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">合同价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.contractFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.contractFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">核增核减额(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input id="projectReportData.verifyFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">核增核减率(%)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.verifyRate"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyRate}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">咨询标的额(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.consultFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.consultFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">土建造价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.buildingFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.buildingFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">安装造价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.installFee}"/>
+						</div>
+					</div>
+				</div>
+				<div class="form-group layui-row first lw12">
 					<div class="form-group-label"><h2>依据性资料明细</h2></div>
 					<div class="layui-item layui-col-xs12 form-table-container">
 						<table id="contentTableBase" class="table table-bordered table-condensed details">
@@ -389,6 +440,57 @@
 					</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">
+						<label class="layui-form-label">送审价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.reviewFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.reviewFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">审定价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.approvalFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.approvalFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">合同价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.contractFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.contractFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">核增核减额(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input id="projectReportData.verifyFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">核增核减率(%)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.verifyRate"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyRate}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">咨询标的额(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.consultFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.consultFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">土建造价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.buildingFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.buildingFee}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">安装造价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.installFee}"/>
+						</div>
+					</div>
+				</div>
+				<div class="form-group layui-row first lw12">
 					<div class="form-group-label"><h2>依据性资料明细</h2></div>
 					<div class="layui-item layui-col-xs12 form-table-container">
 						<table id="contentTableBase2" class="table table-bordered table-condensed details">

src/main/webapp/webpage/modules/projectcontentinfo/reportForm.jsp

@@ -203,6 +203,20 @@
 			return false;
 		}
 
+		function getFee() {
+			var rf = $("#reviewFee").val();
+			var af = $("#approvalFee").val();
+			if(rf != ''&& af !=''){
+				var hf = parseInt(rf)-parseInt(af);
+				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				$("#verifyFee").val(hf);
+				$("#verifyRate").val(rate);
+			}
+			if(af !=''){
+				$("#consultFee").val(af)
+			}
+		}
+
         function addReview(obj) {
             var infoId = $("#id").val();
             var name = $("#name").val();
@@ -359,6 +373,57 @@
 			</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">
+						<label class="layui-form-label">送审价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">审定价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">合同价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">核增核减额(元)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">核增核减率(%)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">咨询标的额(元)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">土建造价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">安装造价(元)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number"/>
+						</div>
+					</div>
+				</div>
+			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>依据性资料明细</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)" onclick="openDialogre('新增依据性资料', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=basedData&dictType=${projectcontentinfo.dictType}&id=${projectcontentinfo.id}&parentIds=${projectcontentinfo.parentIds}','90%','90%','inputForm')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>

src/main/webapp/webpage/modules/projectcontentinfo/reportInvalid.jsp

@@ -44,6 +44,20 @@
                 $("#attachment_file").click();
             });
         });
+
+		function getFee() {
+			var rf = $("#reviewFee").val();
+			var af = $("#approvalFee").val();
+			if(rf != ''&& af !=''){
+				var hf = parseInt(rf)-parseInt(af);
+				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				$("#verifyFee").val(hf);
+				$("#verifyRate").val(rate);
+			}
+			if(af !=''){
+				$("#consultFee").val(af)
+			}
+		}
 	</script>
 </head>
 <body>
@@ -136,6 +150,57 @@
 			</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">
+					<label class="layui-form-label">送审价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">审定价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减率(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">咨询标的额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+			</div>
+			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>依据性资料明细</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container">
 					<table id="contentTableBase" class="table table-bordered table-condensed details">

src/main/webapp/webpage/modules/projectcontentinfo/reportInvalidAudit.jsp

@@ -134,7 +134,57 @@
 					</div>
 				</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">
+					<label class="layui-form-label">送审价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<input  id="projectReportData.reviewFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.reviewFee}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">审定价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<input  id="projectReportData.approvalFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.approvalFee}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<input  id="projectReportData.contractFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.contractFee}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<input id="projectReportData.verifyFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyFee}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减率(%)：</label>
+					<div class="layui-input-block with-icon">
+						<input  id="projectReportData.verifyRate"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyRate}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">咨询标的额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<input  id="projectReportData.consultFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.consultFee}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<input  id="projectReportData.buildingFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.buildingFee}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.installFee}"/>
+					</div>
+				</div>
+			</div>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>依据性资料明细</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container">

src/main/webapp/webpage/modules/projectcontentinfo/reportInvalidModifyApply.jsp

@@ -107,6 +107,21 @@
                 });
             }
         }
+
+		function getFee() {
+			var rf = $("#reviewFee").val();
+			var af = $("#approvalFee").val();
+			if(rf != ''&& af !=''){
+				var hf = parseInt(rf)-parseInt(af);
+				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				$("#verifyFee").val(hf);
+				$("#verifyRate").val(rate);
+			}
+			if(af !=''){
+				$("#consultFee").val(af)
+			}
+		}
+
         function delRowBaseData(obj, prefix,userId){
             var id = $(prefix+"_id").val();
             /* var createBy = $(prefix+"_userId").val();*/
@@ -234,6 +249,57 @@
 				</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">
+					<label class="layui-form-label">送审价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">审定价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input number" readonly="true" />
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减率(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">咨询标的额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+			</div>
+			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>依据性资料明细</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)" onclick="openDialogre('新增依据性资料', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=basedData&dictType=${projectcontentinfo.dictType}&id=${projectcontentinfo.id}&parentIds=${projectcontentinfo.parentIds}','90%','90%','inputForm')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>

src/main/webapp/webpage/modules/projectcontentinfo/reportModifyApply.jsp

@@ -53,6 +53,20 @@
             });
         });
 
+		function getFee() {
+			var rf = $("#reviewFee").val();
+			var af = $("#approvalFee").val();
+			if(rf != ''&& af !=''){
+				var hf = parseInt(rf)-parseInt(af);
+				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				$("#verifyFee").val(hf);
+				$("#verifyRate").val(rate);
+			}
+			if(af !=''){
+				$("#consultFee").val(af)
+			}
+		}
+
         function insertTitle(tValue){
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var attachmentId = "";
@@ -331,6 +345,57 @@
 				</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">
+					<label class="layui-form-label">送审价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">审定价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input number" onchange="getFee()"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">核增核减率(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">咨询标的额(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装造价(元)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number"/>
+					</div>
+				</div>
+			</div>
+			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>依据性资料明细</h2></div>
 				<div class="layui-item nav-btns">
 					<a href="javascript:void(0)" onclick="openDialogre('新增依据性资料', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=basedData&dictType=${projectcontentinfo.dictType}&id=${projectcontentinfo.id}&parentIds=${projectcontentinfo.parentIds}','90%','90%','inputForm')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>

src/main/webapp/webpage/modules/projectcontentinfo/reportView.jsp

@@ -95,6 +95,57 @@
 			</c:if>
 		</div>
 		<div class="form-group layui-row first lw12">
+			<div class="form-group-label"><h2>项目信息</h2></div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">送审价(元)：</label>
+				<div class="layui-input-block with-icon">
+					<input  id="projectReportData.reviewFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.reviewFee}"/>
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">审定价(元)：</label>
+				<div class="layui-input-block with-icon">
+					<input  id="projectReportData.approvalFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.approvalFee}"/>
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">合同价(元)：</label>
+				<div class="layui-input-block with-icon">
+					<input  id="projectReportData.contractFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.contractFee}"/>
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">核增核减额(元)：</label>
+				<div class="layui-input-block with-icon">
+					<input id="projectReportData.verifyFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyFee}"/>
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">核增核减率(%)：</label>
+				<div class="layui-input-block with-icon">
+					<input  id="projectReportData.verifyRate"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.verifyRate}"/>
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">咨询标的额(元)：</label>
+				<div class="layui-input-block with-icon">
+					<input  id="projectReportData.consultFee" readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.consultFee}"/>
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">土建造价(元)：</label>
+				<div class="layui-input-block with-icon">
+					<input  id="projectReportData.buildingFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.buildingFee}"/>
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">安装造价(元)：</label>
+				<div class="layui-input-block with-icon">
+					<input  id="projectReportData.installFee"  readonly="true" class="form-control layui-input number" value="${projectcontentinfo.projectReportData.installFee}"/>
+				</div>
+			</div>
+		</div>
+		<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>依据性资料明细</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container">
 				<table id="contentTableBase" class="table table-bordered table-condensed details">
@@ -293,6 +344,15 @@
 				</table>
 			</div>
 		</div>
+		<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
+		<div class="form-group layui-row">
+			<div class="form-group-label"><h2>审批流程</h2></div>
+			<div class="layui-item layui-col-xs12 form-table-container" >
+				<act:flowChart procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
+				<act:histoicFlow procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
+			</div>
+		</div>
+		</c:if>
 		<div class="form-group layui-row page-end"></div>
 	</div>
 </div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterAudit.jsp

@@ -129,28 +129,46 @@
                         </div>
                     </div>
                 </div>
+                <%--<div class="layui-item layui-col-sm6 lw6">--%>
+                    <%--<label class="layui-form-label">规模类型：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleType}"/>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw6">--%>
+                    <%--<label class="layui-form-label">规模单位：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleUnit}"/>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw6">--%>
+                    <%--<label class="layui-form-label">规模数量：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleQuantity}"/>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">规模类型：</label>
+                    <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleType}"/>
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.area.name}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">规模单位：</label>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">所在省份：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleUnit}"/>
+                        <form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">规模数量：</label>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">所在地级市：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleQuantity}"/>
+                        <form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">项目所在地：</label>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">所在区县：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.area.name}"/>
+                        <form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
@@ -178,6 +196,90 @@
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecordsAlter.createDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程结构：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">地上层数：</label>
+                    <div class="layui-input-block">
+                        <form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">底下层数：</label>
+                    <div class="layui-input-block">
+                        <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                    </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="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">计量单位：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程用途：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
+                    </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="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中土建造价(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中安装造价(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中土建百分比(%)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中安装百分比(%)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">土建单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">安装单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterForm.jsp

@@ -56,14 +56,42 @@
                 }
             });
 
-            $('#scaleType').editableSelect({
-                effects: 'slide'
-            });
-            $('#scaleType').val("${projectRecordsAlter.scaleType}")
-            $('#scaleUnit').editableSelect({
-                effects: 'slide'
-            });
-            $('#scaleUnit').val("${projectRecordsAlter.scaleUnit}")
+            $('#areaId').on("change", function () {
+                var areaId = $("#areaId").val();
+                $("#province").val('');
+                $("#city").val('');
+                $("#county").val('');
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/sys/area/getParent",
+                    data : {'areaId':areaId},
+                    //请求成功
+                    success : function(result) {
+                        var pro = result.province;
+                        var city = result.city;
+                        var county  = result.county;
+                        if(pro != '') {
+                            $("#province").val(pro);
+                        }
+                        if(city != '') {
+                            $("#city").val(city);
+                        }
+                        if(county != '') {
+                            $("#county").val(county);
+                        }
+                    },
+
+                });
+            })
+
+            <%--$('#scaleType').editableSelect({--%>
+                <%--effects: 'slide'--%>
+            <%--});--%>
+            <%--$('#scaleType').val("${projectRecordsAlter.scaleType}")--%>
+            <%--$('#scaleUnit').editableSelect({--%>
+                <%--effects: 'slide'--%>
+            <%--});--%>
+            <%--$('#scaleUnit').val("${projectRecordsAlter.scaleUnit}")--%>
 
             var contractName = $("#contractName").val();
             if (contractName == null || contractName === "") {
@@ -131,6 +159,48 @@
 
         }
 
+        function getFee() {
+            $("#unitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var count = $("#buildingScale").val();
+            if(count != '' && totalFee != '') {
+                var cFee = Math.round(parseInt(totalFee) / parseInt(count) * 100) / 100 * 10000;
+                $("#unitFees").val(cFee);
+            }
+        }
+
+        function getBudlingFees() {
+            $("#buildingPercent").val('');
+            $("#buildingUnitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var budFee = $("#buildingFees").val();
+            var count = $("#buildingScale").val();
+            if(totalFee != '') {
+                var p = Math.round(parseInt(budFee) / parseInt(totalFee) * 100 * 100) / 100;
+            }
+            if(count != '') {
+                var pp = Math.round(parseInt(budFee) / parseInt(count) * 100) / 100 * 10000;
+            }
+            $("#buildingPercent").val(p);
+            $("#buildingUnitFees").val(pp);
+        }
+
+        function getInstallFees() {
+            $("#installPercent").val('');
+            $("#installUnitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var budFee = $("#installFees").val();
+            var count = $("#buildingScale").val();
+            if(totalFee != '') {
+                var p = Math.round(parseInt(budFee) / parseInt(totalFee) * 100 * 100) / 100;
+            }
+            if(count != '') {
+                var pp = Math.round(parseInt(budFee) / parseInt(count) * 100) / 100 * 10000;
+            }
+            $("#installPercent").val(p);
+            $("#installUnitFees").val(pp);
+        }
+
         function setLinkMan(newClientId) {
             $.ajax({
                 url:"${ctx}/project/projectRecords/getLinkManByClientId",
@@ -388,35 +458,53 @@
                         </div>
                     </div>
                 </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label">规模类型：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:select path="scaleType" class="form-control editable-select layui-input" id="scaleType" value="${scaleType}">--%>
+                            <%--<form:option value=""/>--%>
+                            <%--<form:options items="${fns:getMainDictList('scale_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                        <%--</form:select>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label">规模单位：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:select path="scaleUnit" class="form-control editable-select layui-input" id="scaleUnit" value="${scaleUnit}">--%>
+                            <%--<form:option value=""/>--%>
+                            <%--<form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                        <%--</form:select>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label">规模数量：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:input path="scaleQuantity" htmlEscape="false"  class="form-control number layui-input"/>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">规模类型：</label>
-                    <div class="layui-input-block">
-                        <form:select path="scaleType" class="form-control editable-select layui-input" id="scaleType" value="${scaleType}">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('scale_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                    <label class="layui-form-label">项目所在地：</label>
+                    <div class="layui-input-block  with-icon">
+                        <sys:treeselect id="area" name="area.id" value="${projectRecordsAlter.area.id}" labelName="area.name" labelValue="${projectRecordsAlter.area.name}"
+                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">规模单位：</label>
+                    <label class="layui-form-label">所在省份：</label>
                     <div class="layui-input-block">
-                        <form:select path="scaleUnit" class="form-control editable-select layui-input" id="scaleUnit" value="${scaleUnit}">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                        <form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">规模数量：</label>
+                    <label class="layui-form-label">所在地级市：</label>
                     <div class="layui-input-block">
-                        <form:input path="scaleQuantity" htmlEscape="false"  class="form-control number layui-input"/>
+                        <form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">项目所在地：</label>
-                    <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${projectRecordsAlter.area.id}" labelName="area.name" labelValue="${projectRecordsAlter.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                    <label class="layui-form-label">所在区县：</label>
+                    <div class="layui-input-block">
+                        <form:input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -445,6 +533,99 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecordsAlter.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="laydate-icondate form-control layer-date required layui-input laydate-icon"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程结构：</label>
+                    <div class="layui-input-block">
+                        <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_structure')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">地上层数：</label>
+                    <div class="layui-input-block">
+                        <form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">底下层数：</label>
+                    <div class="layui-input-block">
+                        <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                    </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="buildingScale" htmlEscape="false"  class="form-control layui-input required number" onchange="getFee()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">计量单位：</label>
+                    <div class="layui-input-block">
+                        <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程用途：</label>
+                    <div class="layui-input-block">
+                        <form:select path="projectUse" class="form-control editable-select layui-input" id="projectUse" value="${projectUse}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </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="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number" onchange="getFee()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中土建造价(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中安装造价(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getInstallFees()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中土建百分比(%)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中安装百分比(%)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">土建单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">安装单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
                     <label class="layui-form-label"><span class="require-item">*</span>工程概况：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterModify.jsp

@@ -41,14 +41,41 @@
 				}
 			});
 
-            $('#scaleType').editableSelect({
-                effects: 'slide'
-            });
-            $('#scaleType').val("${projectRecordsAlter.scaleType}")
-            $('#scaleUnit').editableSelect({
-                effects: 'slide'
-            });
-            $('#scaleUnit').val("${projectRecordsAlter.scaleUnit}")
+            <%--$('#scaleType').editableSelect({--%>
+                <%--effects: 'slide'--%>
+            <%--});--%>
+            <%--$('#scaleType').val("${projectRecordsAlter.scaleType}")--%>
+            <%--$('#scaleUnit').editableSelect({--%>
+                <%--effects: 'slide'--%>
+            <%--});--%>
+            <%--$('#scaleUnit').val("${projectRecordsAlter.scaleUnit}")--%>
+            $('#areaId').on("change", function () {
+                var areaId = $("#areaId").val();
+                $("#province").val('');
+                $("#city").val('');
+                $("#county").val('');
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/sys/area/getParent",
+                    data : {'areaId':areaId},
+                    //请求成功
+                    success : function(result) {
+                        var pro = result.province;
+                        var city = result.city;
+                        var county  = result.county;
+                        if(pro != '') {
+                            $("#province").val(pro);
+                        }
+                        if(city != '') {
+                            $("#city").val(city);
+                        }
+                        if(county != '') {
+                            $("#county").val(county);
+                        }
+                    },
+
+                });
+            })
 		});
 
         function setContractValue(obj){
@@ -75,6 +102,48 @@
             }
         }
 
+        function getFee() {
+            $("#unitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var count = $("#buildingScale").val();
+            if(count != '' && totalFee != '') {
+                var cFee = Math.round(parseInt(totalFee) / parseInt(count) * 100) / 100 * 10000;
+                $("#unitFees").val(cFee);
+            }
+        }
+
+        function getBudlingFees() {
+            $("#buildingPercent").val('');
+            $("#buildingUnitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var budFee = $("#buildingFees").val();
+            var count = $("#buildingScale").val();
+            if(totalFee != '') {
+                var p = Math.round(parseInt(budFee) / parseInt(totalFee) * 100 * 100) / 100;
+            }
+            if(count != '') {
+                var pp = Math.round(parseInt(budFee) / parseInt(count) * 100) / 100 * 10000;
+            }
+            $("#buildingPercent").val(p);
+            $("#buildingUnitFees").val(pp);
+        }
+
+        function getInstallFees() {
+            $("#installPercent").val('');
+            $("#installUnitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var budFee = $("#installFees").val();
+            var count = $("#buildingScale").val();
+            if(totalFee != '') {
+                var p = Math.round(parseInt(budFee) / parseInt(totalFee) * 100 * 100) / 100;
+            }
+            if(count != '') {
+                var pp = Math.round(parseInt(budFee) / parseInt(count) * 100) / 100 * 10000;
+            }
+            $("#installPercent").val(p);
+            $("#installUnitFees").val(pp);
+        }
+
         function setValuee(obj){
             for(var i=0;i<obj.length;i++){
                 var idArr = $("#workClientLinkmanList tr:visible .clientId");
@@ -254,35 +323,53 @@
                     </div>
                 </div>
             </div>
+            <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                <%--<label class="layui-form-label">规模类型：</label>--%>
+                <%--<div class="layui-input-block">--%>
+                    <%--<form:select path="scaleType" class="form-control editable-select layui-input" id="scaleType" value="${scaleType}">--%>
+                        <%--<form:option value=""/>--%>
+                        <%--<form:options items="${fns:getMainDictList('scale_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                    <%--</form:select>--%>
+                <%--</div>--%>
+            <%--</div>--%>
+            <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                <%--<label class="layui-form-label">规模单位：</label>--%>
+                <%--<div class="layui-input-block">--%>
+                    <%--<form:select path="scaleUnit" class="form-control editable-select layui-input" id="scaleUnit" value="${scaleUnit}">--%>
+                        <%--<form:option value=""/>--%>
+                        <%--<form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                    <%--</form:select>--%>
+                <%--</div>--%>
+            <%--</div>--%>
+            <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                <%--<label class="layui-form-label">规模数量：</label>--%>
+                <%--<div class="layui-input-block">--%>
+                    <%--<form:input path="scaleQuantity" htmlEscape="false"  class="form-control number layui-input"/>--%>
+                <%--</div>--%>
+            <%--</div>--%>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">规模类型：</label>
-                <div class="layui-input-block">
-                    <form:select path="scaleType" class="form-control editable-select layui-input" id="scaleType" value="${scaleType}">
-                        <form:option value=""/>
-                        <form:options items="${fns:getMainDictList('scale_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                    </form:select>
+                <label class="layui-form-label">项目所在地：</label>
+                <div class="layui-input-block  with-icon">
+                    <sys:treeselect id="area" name="area.id" value="${projectRecordsAlter.area.id}" labelName="area.name" labelValue="${projectRecordsAlter.area.name}"
+                                    title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">规模单位：</label>
+                <label class="layui-form-label">所在省份：</label>
                 <div class="layui-input-block">
-                    <form:select path="scaleUnit" class="form-control editable-select layui-input" id="scaleUnit" value="${scaleUnit}">
-                        <form:option value=""/>
-                        <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                    </form:select>
+                    <form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">规模数量：</label>
+                <label class="layui-form-label">所在地级市：</label>
                 <div class="layui-input-block">
-                    <form:input path="scaleQuantity" htmlEscape="false"  class="form-control number layui-input"/>
+                    <form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">项目所在地：</label>
-                <div class="layui-input-block  with-icon">
-                    <sys:treeselect id="area" name="area.id" value="${projectRecordsAlter.area.id}" labelName="area.name" labelValue="${projectRecordsAlter.area.name}"
-                                    title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                <label class="layui-form-label">所在区县：</label>
+                <div class="layui-input-block">
+                    <form:input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
@@ -311,6 +398,99 @@
                     <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecordsAlter.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="laydate-icondate form-control layer-date required layui-input laydate-icon"/>
                 </div>
             </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label">工程结构：</label>
+                <div class="layui-input-block">
+                    <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
+                        <form:option value=""/>
+                        <form:options items="${fns:getMainDictList('project_structure')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                    </form:select>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label">地上层数：</label>
+                <div class="layui-input-block">
+                    <form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label">底下层数：</label>
+                <div class="layui-input-block">
+                    <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                </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="buildingScale" htmlEscape="false"  class="form-control layui-input required number" onchange="getFee()"/>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label">计量单位：</label>
+                <div class="layui-input-block">
+                    <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
+                        <form:option value=""/>
+                        <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                    </form:select>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label">工程用途：</label>
+                <div class="layui-input-block">
+                    <form:select path="projectUse" class="form-control editable-select layui-input" id="projectUse" value="${projectUse}">
+                        <form:option value=""/>
+                        <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                    </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="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number" onchange="getFee()"/>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label double-line">其中土建造价(万元)：</label>
+                <div class="layui-input-block">
+                    <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label double-line">其中安装造价(万元)：</label>
+                <div class="layui-input-block">
+                    <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getInstallFees()"/>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label double-line">其中土建百分比(%)：</label>
+                <div class="layui-input-block">
+                    <form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label double-line">其中安装百分比(%)：</label>
+                <div class="layui-input-block">
+                    <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label">单位造价(元)：</label>
+                <div class="layui-input-block">
+                    <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label double-line">土建单位造价(元)：</label>
+                <div class="layui-input-block">
+                    <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+                </div>
+            </div>
+            <div class="layui-item layui-col-sm6 lw7">
+                <label class="layui-form-label double-line">安装单位造价(元)：</label>
+                <div class="layui-input-block">
+                    <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+                </div>
+            </div>
             <div class="layui-item layui-col-sm6 lw6 with-textarea">
                 <label class="layui-form-label"><span class="require-item">*</span>工程概况：</label>
                 <div class="layui-input-block">

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterView.jsp

@@ -95,28 +95,46 @@
                                     </div>
                                 </div>
                             </div>
+                            <%--<div class="layui-item layui-col-sm6 lw6">--%>
+                                <%--<label class="layui-form-label">规模类型：</label>--%>
+                                <%--<div class="layui-input-block">--%>
+                                    <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleType}"/>--%>
+                                <%--</div>--%>
+                            <%--</div>--%>
+                            <%--<div class="layui-item layui-col-sm6 lw6">--%>
+                                <%--<label class="layui-form-label">规模单位：</label>--%>
+                                <%--<div class="layui-input-block">--%>
+                                    <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleUnit}"/>--%>
+                                <%--</div>--%>
+                            <%--</div>--%>
+                            <%--<div class="layui-item layui-col-sm6 lw6">--%>
+                                <%--<label class="layui-form-label">规模数量：</label>--%>
+                                <%--<div class="layui-input-block">--%>
+                                    <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleQuantity}"/>--%>
+                                <%--</div>--%>
+                            <%--</div>--%>
                             <div class="layui-item layui-col-sm6 lw6">
-                                <label class="layui-form-label">规模类型：</label>
+                                <label class="layui-form-label">项目所在地：</label>
                                 <div class="layui-input-block">
-                                    <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleType}"/>
+                                    <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.area.name}"/>
                                 </div>
                             </div>
-                            <div class="layui-item layui-col-sm6 lw6">
-                                <label class="layui-form-label">规模单位：</label>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label">所在省份：</label>
                                 <div class="layui-input-block">
-                                    <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleUnit}"/>
+                                    <form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
                                 </div>
                             </div>
-                            <div class="layui-item layui-col-sm6 lw6">
-                                <label class="layui-form-label">规模数量：</label>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label">所在地级市：</label>
                                 <div class="layui-input-block">
-                                    <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.scaleQuantity}"/>
+                                    <form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
                                 </div>
                             </div>
-                            <div class="layui-item layui-col-sm6 lw6">
-                                <label class="layui-form-label">项目所在地：</label>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label">所在区县：</label>
                                 <div class="layui-input-block">
-                                    <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.area.name}"/>
+                                    <form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
                                 </div>
                             </div>
                             <div class="layui-item layui-col-sm6 lw6">
@@ -143,6 +161,90 @@
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecordsAlter.createDate}" pattern="yyyy-MM-dd"/>"/>
                                 </div>
                             </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label">工程结构：</label>
+                                <div class="layui-input-block">
+                                    <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label">地上层数：</label>
+                                <div class="layui-input-block">
+                                    <form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label">底下层数：</label>
+                                <div class="layui-input-block">
+                                    <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                                </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="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label">计量单位：</label>
+                                <div class="layui-input-block">
+                                    <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label">工程用途：</label>
+                                <div class="layui-input-block">
+                                    <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
+                                </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="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label double-line">其中土建造价(万元)：</label>
+                                <div class="layui-input-block">
+                                    <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label double-line">其中安装造价(万元)：</label>
+                                <div class="layui-input-block">
+                                    <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label double-line">其中土建百分比(%)：</label>
+                                <div class="layui-input-block">
+                                    <form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label double-line">其中安装百分比(%)：</label>
+                                <div class="layui-input-block">
+                                    <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label">单位造价(元)：</label>
+                                <div class="layui-input-block">
+                                    <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label double-line">土建单位造价(元)：</label>
+                                <div class="layui-input-block">
+                                    <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+                                </div>
+                            </div>
+                            <div class="layui-item layui-col-sm6 lw7">
+                                <label class="layui-form-label double-line">安装单位造价(元)：</label>
+                                <div class="layui-input-block">
+                                    <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+                                </div>
+                            </div>
                             <div class="layui-item layui-col-sm6 lw6 with-textarea">
                                 <label class="layui-form-label">工程概况：</label>
                                 <div class="layui-input-block">

src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp

@@ -171,28 +171,46 @@
                         </div>
 					</div>
 				</div>
+				<%--<div class="layui-item layui-col-sm6 lw6">--%>
+					<%--<label class="layui-form-label">规模类型：</label>--%>
+					<%--<div class="layui-input-block">--%>
+						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleType}"/>--%>
+					<%--</div>--%>
+				<%--</div>--%>
+				<%--<div class="layui-item layui-col-sm6 lw6">--%>
+					<%--<label class="layui-form-label">规模单位：</label>--%>
+					<%--<div class="layui-input-block">--%>
+						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleUnit}"/>--%>
+					<%--</div>--%>
+				<%--</div>--%>
+				<%--<div class="layui-item layui-col-sm6 lw6">--%>
+					<%--<label class="layui-form-label">规模数量：</label>--%>
+					<%--<div class="layui-input-block">--%>
+						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
+					<%--</div>--%>
+				<%--</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">规模类型：</label>
+					<label class="layui-form-label">项目所在地：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleType}"/>
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">规模单位：</label>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">所在省份：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleUnit}"/>
+						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">规模数量：</label>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">所在地级市：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>
+						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">项目所在地：</label>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">所在区县：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -220,6 +238,90 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">工程结构：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">地上层数：</label>
+					<div class="layui-input-block">
+						<form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">底下层数：</label>
+					<div class="layui-input-block">
+						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</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="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">计量单位：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">工程用途：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
+					</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="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">其中土建造价(万元)：</label>
+					<div class="layui-input-block">
+						<form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">其中安装造价(万元)：</label>
+					<div class="layui-input-block">
+						<form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">其中土建百分比(%)：</label>
+					<div class="layui-input-block">
+						<form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">其中安装百分比(%)：</label>
+					<div class="layui-input-block">
+						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">单位造价(元)：</label>
+					<div class="layui-input-block">
+						<form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">土建单位造价(元)：</label>
+					<div class="layui-input-block">
+						<form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">安装单位造价(元)：</label>
+					<div class="layui-input-block">
+						<form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">工程概况：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -65,14 +65,14 @@
                 }
             });
 
-            $('#scaleType').editableSelect({
-                effects: 'slide'
-            });
-            $('#scaleType').val("${projectRecords.scaleType}")
-            $('#scaleUnit').editableSelect({
-                effects: 'slide'
-            });
-            $('#scaleUnit').val("${projectRecords.scaleUnit}")
+            <%--$('#scaleType').editableSelect({--%>
+                <%--effects: 'slide'--%>
+            <%--});--%>
+            <%--$('#scaleType').val("${projectRecords.scaleType}")--%>
+            <%--$('#scaleUnit').editableSelect({--%>
+                <%--effects: 'slide'--%>
+            <%--});--%>
+            <%--$('#scaleUnit').val("${projectRecords.scaleUnit}")--%>
 
             $("input[name='ext']").on('ifChecked',function(event){
                 radioVal = $(this).val();
@@ -100,6 +100,35 @@
                 }
             }
 
+
+            $('#areaId').on("change", function () {
+                var areaId = $("#areaId").val();
+                $("#province").val('');
+                $("#city").val('');
+                $("#county").val('');
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/sys/area/getParent",
+                    data : {'areaId':areaId},
+                    //请求成功
+                    success : function(result) {
+                        var pro = result.province;
+                        var city = result.city;
+                        var county  = result.county;
+                        if(pro != '') {
+                            $("#province").val(pro);
+                        }
+                        if(city != '') {
+                            $("#city").val(city);
+                        }
+                        if(county != '') {
+                            $("#county").val(county);
+                        }
+                    },
+
+                });
+            })
+
         });
 
 
@@ -135,6 +164,48 @@
             });
         }
 
+        function getFee() {
+            $("#unitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var count = $("#buildingScale").val();
+            if(count != '' && totalFee != '') {
+                var cFee = Math.round(parseInt(totalFee) / parseInt(count) * 100) / 100 * 10000;
+                $("#unitFees").val(cFee);
+            }
+        }
+
+        function getBudlingFees() {
+            $("#buildingPercent").val('');
+            $("#buildingUnitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var budFee = $("#buildingFees").val();
+            var count = $("#buildingScale").val();
+            if(totalFee != '') {
+                var p = Math.round(parseInt(budFee) / parseInt(totalFee) * 100 * 100) / 100;
+            }
+            if(count != '') {
+                var pp = Math.round(parseInt(budFee) / parseInt(count) * 100) / 100 * 10000;
+            }
+            $("#buildingPercent").val(p);
+            $("#buildingUnitFees").val(pp);
+        }
+
+        function getInstallFees() {
+            $("#installPercent").val('');
+            $("#installUnitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var budFee = $("#installFees").val();
+            var count = $("#buildingScale").val();
+            if(totalFee != '') {
+                var p = Math.round(parseInt(budFee) / parseInt(totalFee) * 100 * 100) / 100;
+            }
+            if(count != '') {
+                var pp = Math.round(parseInt(budFee) / parseInt(count) * 100) / 100 * 10000;
+            }
+            $("#installPercent").val(p);
+            $("#installUnitFees").val(pp);
+        }
+
         function setLinkMan(newClientId) {
             $.ajax({
                 url:"${ctx}/project/projectRecords/getLinkManByClientId",
@@ -443,7 +514,7 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目基础信息</h2></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:input path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
@@ -459,35 +530,53 @@
                         </div>
                     </div>
                 </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label">规模类型：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:select path="scaleType" class="form-control editable-select layui-input" id="scaleType" value="${scaleType}">--%>
+                            <%--<form:option value=""/>--%>
+                            <%--<form:options items="${fns:getMainDictList('scale_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                        <%--</form:select>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label">规模单位：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:select path="scaleUnit" class="form-control editable-select layui-input" id="scaleUnit" value="${scaleUnit}">--%>
+                            <%--<form:option value=""/>--%>
+                            <%--<form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                        <%--</form:select>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label">规模数量：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:input path="scaleQuantity" htmlEscape="false"  class="form-control number layui-input"/>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">规模类型：</label>
-                    <div class="layui-input-block">
-                        <form:select path="scaleType" class="form-control editable-select layui-input" id="scaleType" value="${scaleType}">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('scale_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                    <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
+                    <div class="layui-input-block  with-icon">
+                        <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
+                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">规模单位：</label>
+                    <label class="layui-form-label">所在省份：</label>
                     <div class="layui-input-block">
-                        <form:select path="scaleUnit" class="form-control editable-select layui-input" id="scaleUnit" value="${scaleUnit}">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                        <form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">规模数量：</label>
+                    <label class="layui-form-label">所在地级市：</label>
                     <div class="layui-input-block">
-                        <form:input path="scaleQuantity" htmlEscape="false"  class="form-control number layui-input"/>
+                        <form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">项目所在地：</label>
-                    <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                    <label class="layui-form-label">所在区县：</label>
+                    <div class="layui-input-block">
+                        <form:input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -516,6 +605,99 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程结构：</label>
+                    <div class="layui-input-block">
+                        <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_structure')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">地上层数：</label>
+                    <div class="layui-input-block">
+                        <form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">底下层数：</label>
+                    <div class="layui-input-block">
+                        <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                    </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="buildingScale" htmlEscape="false"  class="form-control layui-input required number" onchange="getFee()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">计量单位：</label>
+                    <div class="layui-input-block">
+                        <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程用途：</label>
+                    <div class="layui-input-block">
+                        <form:select path="projectUse" class="form-control editable-select layui-input" id="projectUse" value="${projectUse}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </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="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number" onchange="getFee()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中土建造价(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中安装造价(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getInstallFees()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中土建百分比(%)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中安装百分比(%)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">土建单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">安装单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label"><span class="require-item">*</span>工程概况：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp

@@ -44,14 +44,41 @@
 				}
 			});
 
-            $('#scaleType').editableSelect({
-                effects: 'slide'
-            });
-            $('#scaleType').val("${projectRecords.scaleType}")
-            $('#scaleUnit').editableSelect({
-                effects: 'slide'
-            });
-            $('#scaleUnit').val("${projectRecords.scaleUnit}")
+            <%--$('#scaleType').editableSelect({--%>
+                <%--effects: 'slide'--%>
+            <%--});--%>
+            <%--$('#scaleType').val("${projectRecords.scaleType}")--%>
+            <%--$('#scaleUnit').editableSelect({--%>
+                <%--effects: 'slide'--%>
+            <%--});--%>
+            <%--$('#scaleUnit').val("${projectRecords.scaleUnit}")--%>
+            $('#areaId').on("change", function () {
+                var areaId = $("#areaId").val();
+                $("#province").val('');
+                $("#city").val('');
+                $("#county").val('');
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/sys/area/getParent",
+                    data : {'areaId':areaId},
+                    //请求成功
+                    success : function(result) {
+                        var pro = result.province;
+                        var city = result.city;
+                        var county  = result.county;
+                        if(pro != '') {
+                            $("#province").val(pro);
+                        }
+                        if(city != '') {
+                            $("#city").val(city);
+                        }
+                        if(county != '') {
+                            $("#county").val(county);
+                        }
+                    },
+
+                });
+            })
 		});
 
         function setContractValue(obj){
@@ -87,6 +114,47 @@
                 }
             }
         }
+        function getFee() {
+            $("#unitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var count = $("#buildingScale").val();
+            if(count != '' && totalFee != '') {
+                var cFee = Math.round(parseInt(totalFee) / parseInt(count) * 100) / 100 * 10000;
+                $("#unitFees").val(cFee);
+            }
+        }
+
+        function getBudlingFees() {
+            $("#buildingPercent").val('');
+            $("#buildingUnitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var budFee = $("#buildingFees").val();
+            var count = $("#buildingScale").val();
+            if(totalFee != '') {
+                var p = Math.round(parseInt(budFee) / parseInt(totalFee) * 100 * 100) / 100;
+            }
+            if(count != '') {
+                var pp = Math.round(parseInt(budFee) / parseInt(count) * 100) / 100 * 10000;
+            }
+            $("#buildingPercent").val(p);
+            $("#buildingUnitFees").val(pp);
+        }
+
+        function getInstallFees() {
+            $("#installPercent").val('');
+            $("#installUnitFees").val('');
+            var totalFee = $("#totalFees").val();
+            var budFee = $("#installFees").val();
+            var count = $("#buildingScale").val();
+            if(totalFee != '') {
+                var p = Math.round(parseInt(budFee) / parseInt(totalFee) * 100 * 100) / 100;
+            }
+            if(count != '') {
+                var pp = Math.round(parseInt(budFee) / parseInt(count) * 100) / 100 * 10000;
+            }
+            $("#installPercent").val(p);
+            $("#installUnitFees").val(pp);
+        }
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
                 if(id==$(idArr[i]).val()){
@@ -258,35 +326,53 @@
                         </div>
                     </div>
                 </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label">规模类型：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:select path="scaleType" class="form-control editable-select layui-input" id="scaleType" value="${scaleType}">--%>
+                            <%--<form:option value=""/>--%>
+                            <%--<form:options items="${fns:getMainDictList('scale_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                        <%--</form:select>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label">规模单位：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:select path="scaleUnit" class="form-control editable-select layui-input" id="scaleUnit" value="${scaleUnit}">--%>
+                            <%--<form:option value=""/>--%>
+                            <%--<form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+                        <%--</form:select>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label">规模数量：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:input path="scaleQuantity" htmlEscape="false"  class="form-control number layui-input"/>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">规模类型：</label>
-                    <div class="layui-input-block">
-                        <form:select path="scaleType" class="form-control editable-select layui-input" id="scaleType" value="${scaleType}">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('scale_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                    <label class="layui-form-label">项目所在地：</label>
+                    <div class="layui-input-block  with-icon">
+                        <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
+                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">规模单位：</label>
+                    <label class="layui-form-label">所在省份：</label>
                     <div class="layui-input-block">
-                        <form:select path="scaleUnit" class="form-control editable-select layui-input" id="scaleUnit" value="${scaleUnit}">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                        <form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">规模数量：</label>
+                    <label class="layui-form-label">所在地级市：</label>
                     <div class="layui-input-block">
-                        <form:input path="scaleQuantity" htmlEscape="false"  class="form-control number layui-input"/>
+                        <form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">项目所在地：</label>
-                    <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                    <label class="layui-form-label">所在区县：</label>
+                    <div class="layui-input-block">
+                        <form:input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -315,6 +401,99 @@
                         <input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control required layui-input"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程结构：</label>
+                    <div class="layui-input-block">
+                        <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_structure')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">地上层数：</label>
+                    <div class="layui-input-block">
+                        <form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">底下层数：</label>
+                    <div class="layui-input-block">
+                        <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
+                    </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="buildingScale" htmlEscape="false"  class="form-control layui-input required number" onchange="getFee()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">计量单位：</label>
+                    <div class="layui-input-block">
+                        <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">工程用途：</label>
+                    <div class="layui-input-block">
+                        <form:select path="projectUse" class="form-control editable-select layui-input" id="projectUse" value="${projectUse}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_use')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </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="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number" onchange="getFee()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中土建造价(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" onchange="getBudlingFees()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中安装造价(万元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" onchange="getInstallFees()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中土建百分比(%)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">其中安装百分比(%)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">土建单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">安装单位造价(元)：</label>
+                    <div class="layui-input-block">
+                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label"><span class="require-item">*</span>工程概况：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/projectrecord/projectRecordsView.jsp

@@ -53,6 +53,19 @@
             }
         }
 	</script>
+	<script>
+		function initRecordStatus(index,id,dataid,status)
+		{
+			var elem = document.getElementById("status_td_" + index);
+			var st = getAuditState(status);
+			if(st.action)
+				var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + id + "&projectReportData.id="+ dataid + "&type="+status+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+			else
+				var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+
+			elem.innerHTML = xml;
+		}
+	</script>
 </head>
 <body>
 <div class="single-form">
@@ -115,28 +128,46 @@
                         </div>
 					</div>
 				</div>
+				<%--<div class="layui-item layui-col-sm6 lw6">--%>
+					<%--<label class="layui-form-label">规模类型：</label>--%>
+					<%--<div class="layui-input-block">--%>
+						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleType}"/>--%>
+					<%--</div>--%>
+				<%--</div>--%>
+				<%--<div class="layui-item layui-col-sm6 lw6">--%>
+					<%--<label class="layui-form-label">规模单位：</label>--%>
+					<%--<div class="layui-input-block">--%>
+						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleUnit}"/>--%>
+					<%--</div>--%>
+				<%--</div>--%>
+				<%--<div class="layui-item layui-col-sm6 lw6">--%>
+					<%--<label class="layui-form-label">规模数量：</label>--%>
+					<%--<div class="layui-input-block">--%>
+						<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
+					<%--</div>--%>
+				<%--</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">规模类型：</label>
+					<label class="layui-form-label">项目所在地：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleType}"/>
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">规模单位：</label>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">所在省份：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleUnit}"/>
+						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">规模数量：</label>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">所在地级市：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>
+						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">项目所在地：</label>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">所在区县：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -163,6 +194,90 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">工程结构：</label>
+					<div class="layui-input-block">
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">地上层数：</label>
+					<div class="layui-input-block">
+						<form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">底下层数：</label>
+					<div class="layui-input-block">
+						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</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="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">计量单位：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">工程用途：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
+					</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="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">其中土建造价(万元)：</label>
+					<div class="layui-input-block">
+						<form:input path="buildingFees" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">其中安装造价(万元)：</label>
+					<div class="layui-input-block">
+						<form:input path="installFees" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">其中土建百分比(%)：</label>
+					<div class="layui-input-block">
+						<form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">其中安装百分比(%)：</label>
+					<div class="layui-input-block">
+						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">单位造价(元)：</label>
+					<div class="layui-input-block">
+						<form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">土建单位造价(元)：</label>
+					<div class="layui-input-block">
+						<form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label double-line">安装单位造价(元)：</label>
+					<div class="layui-input-block">
+						<form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">工程概况：</label>
 					<div class="layui-input-block">
@@ -325,41 +440,110 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目组成员列表</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="usersListTable" class="table table-bordered table-condensed no-bottom-margin details">
+				<table id="usersListTable" class="table table-bordered table-condensed no-bottom-margin details">
+					<thead>
+					<tr>
+						<th width="25%">姓名</th>
+						<th width="25%">部门</th>
+						<th width="25%">职级</th>
+						<th width="25%">状态</th>
+					</tr>
+					</thead>
+					<tbody id="usersList">
+					<c:if test="${not empty projectRecords.projectMembers}">
+						<c:forEach items="${projectRecords.projectMembers}" var="user">
+							<tr id="${user.id}">
+								<td>
+										${user.name}
+								</td>
+								<td>
+										${user.office.name}
+								</td>
+								<td>
+										${user.basicInfo.jobGrade.name}
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${user.delFlag == 0}">
+											正常
+										</c:when>
+										<c:otherwise>
+											移除
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
+						</c:forEach>
+					</c:if>
+					</tbody>
+				</table>
+			</div>
+			</div>
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>项目报告</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-							<th width="25%">姓名</th>
-							<th width="25%">部门</th>
-							<th width="25%">职级</th>
-							<th width="25%">状态</th>
+							<th>报告编号</th>
+							<th>报告名称</th>
+							<th width="220">工作内容类型</th>
+							<th width="80">签章类型</th>
+							<th width="90">创建日期</th>
+							<th width="80">状态</th>
 						</tr>
 						</thead>
-						<tbody id="usersList">
-						<c:if test="${not empty projectRecords.projectMembers}">
-							<c:forEach items="${projectRecords.projectMembers}" var="user">
-								<tr id="${user.id}">
-									<td>
-											${user.name}
-									</td>
-									<td>
-											${user.office.name}
-									</td>
-									<td>
-											${user.basicInfo.jobGrade.name}
-									</td>
-									<td>
-										<c:choose>
-											<c:when test="${user.delFlag == 0}">
-												正常
-											</c:when>
-											<c:otherwise>
-												移除
-											</c:otherwise>
-										</c:choose>
+						<tbody>
+						<c:choose>
+							<c:when test="${not empty projectRecords.projectReportData}">
+								<c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
+									<tr>
+										<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
+												${projectReportData.number}
+										</a></td>
+										<td>
+													${projectReportData.name}
+										</td>
+										<td title="${fns:getContentTypeName(projectReportData.type,"")}">
+												${fns:getContentTypeName(projectReportData.type,"")}
+										</td>
+										<td title="${projectReportData.reportType}">
+												${projectReportData.reportType}
+										</td>
+										<td>
+											<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
+										</td>
+										<td class="op-td">
+												<%--<c:choose>--%>
+												<%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
+												<%--<div style="text-align: center">--%>
+												<%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+												<%--</div>--%>
+												<%--</c:when>--%>
+												<%--<c:otherwise>--%>
+												<%--<div style="text-align: center">--%>
+												<%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+												<%--</div>--%>
+												<%--</c:otherwise>--%>
+												<%--</c:choose>--%>
+											<div style="text-align: center" id="status_td_${index.index+1}">
+											</div>
+											<script>
+												initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
+											</script>
+										</td>
+									</tr>
+								</c:forEach>
+							</c:when>
+							<c:otherwise>
+								<tr>
+									<td colspan="7">
+										暂无数据
 									</td>
 								</tr>
-							</c:forEach>
-						</c:if>
+							</c:otherwise>
+						</c:choose>
 						</tbody>
 					</table>
 				</div>

src/main/webapp/webpage/modules/workstaff/workStaffAchiveInfoForm.jsp

@@ -360,26 +360,26 @@
                     </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">职    级：</label>
                     <div class="layui-input-block with-icon">
                         <sys:treeselectJobGrade id="jobGrade" name="jobGrade.id" value="${workStaffBasicInfo.jobGrade.id}" labelName="jobGrade.name" labelValue="${workStaffBasicInfo.jobGrade.name}"
-                                                title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
+                                                title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input " allowClear="true" notAllowSelectParent="true"/>
                     </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">基本工资：</label>
                     <div class="layui-input-block with-icon">
                         <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>
-                    <div class="layui-input-block">
-                        <form:select path="ts" class="form-control simple-select required">
-                            <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
-                    </div>
-                </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:select path="ts" class="form-control simple-select required">--%>
+                            <%--<form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+                        <%--</form:select>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/workstaff/workStaffAchiveInfoForms.jsp

@@ -360,26 +360,26 @@
                     </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">职    级：</label>
                     <div class="layui-input-block with-icon">
                         <sys:treeselectJobGrade id="jobGrade" name="jobGrade.id" value="${workStaffBasicInfo.jobGrade.id}" labelName="jobGrade.name" labelValue="${workStaffBasicInfo.jobGrade.name}"
-                                                title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
+                                                title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </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">基本工资：</label>
                     <div class="layui-input-block with-icon">
                         <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>
-                    <div class="layui-input-block">
-                        <form:select path="ts" class="form-control simple-select required">
-                            <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
-                    </div>
-                </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:select path="ts" class="form-control simple-select required">--%>
+                            <%--<form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+                        <%--</form:select>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailAudit.jsp

@@ -458,16 +458,16 @@
                         </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">职    位：</label>
                         <div class="layui-input-block">
                             <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
                         </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">职    级：</label>
                         <div class="layui-input-block with-icon">
-                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
-                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
+                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
@@ -476,13 +476,13 @@
                             <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>
-                        <div class="layui-input-block">
-                            <input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
-                            <input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
+                    <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                        <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                        <%--<div class="layui-input-block">--%>
+                            <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
+                            <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />--%>
+                        <%--</div>--%>
+                    <%--</div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                         <div class="layui-input-block">

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailForm.jsp

@@ -314,31 +314,31 @@
                         </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">职    位：</label>
                         <div class="layui-input-block">
                             <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
                         </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">职    级：</label>
                         <div class="layui-input-block with-icon">
-                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
-                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
+                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
                         </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">基本工资：</label>
                         <div class="layui-input-block with-icon">
                             <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>
-                        <div class="layui-input-block">
-                            <input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
-                            <input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
+                    <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                        <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                        <%--<div class="layui-input-block">--%>
+                            <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
+                            <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />--%>
+                        <%--</div>--%>
+                    <%--</div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                         <div class="layui-input-block">

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailModify.jsp

@@ -320,31 +320,31 @@
                         </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">职    位：</label>
                         <div class="layui-input-block">
                             <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
                         </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">职    级：</label>
                         <div class="layui-input-block with-icon">
-                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
-                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
+                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
                         </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">基本工资：</label>
                         <div class="layui-input-block with-icon">
                             <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>
-                        <div class="layui-input-block">
-                            <input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
-                            <input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
+                    <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                        <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                        <%--<div class="layui-input-block">--%>
+                            <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
+                            <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />--%>
+                        <%--</div>--%>
+                    <%--</div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                         <div class="layui-input-block">

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailModifyDirectly.jsp

@@ -348,25 +348,25 @@
                     </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">职    级：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
-                        <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
+                        <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
+                        <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input "/>
                     </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">基本工资：</label>
                     <div class="layui-input-block with-icon">
                         <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>
-                    <div class="layui-input-block">
-                        <input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
-                        <input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />
-                    </div>
-                </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
+                        <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />--%>
+                    <%--</div>--%>
+                <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -443,7 +443,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>移动电话：</label>
                     <div class="layui-input-block">
                         <form:input path="mobile" id="mobile" htmlEscape="false" class="form-control layui-input required isPhone"/>
-                        <span id="ph" style="color: red"></span>
+                        <span id="ph" style="color: #CC5965"></span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -468,9 +468,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">职    位：</label>
                     <div class="layui-input-block">
-                        <form:select path="duty" class="form-control simple-select required">
+                        <form:select path="duty" class="form-control simple-select">
                             <form:option value="" label=""/>
                             <form:options items="${fns:getMainDictList('staff_duty')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
@@ -489,14 +489,14 @@
                         <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>
-                    <div class="layui-input-block">
-                        <form:select path="ts" class="form-control simple-select required">
-                            <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
-                    </div>
-                </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                    <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                    <%--<div class="layui-input-block">--%>
+                        <%--<form:select path="ts" class="form-control simple-select required">--%>
+                            <%--<form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+                        <%--</form:select>--%>
+                    <%--</div>--%>
+                <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -159,13 +159,13 @@
                         </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">职    位：</label>
                         <div class="layui-input-block">
                             <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
                         </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">职    级：</label>
                         <div class="layui-input-block with-icon">
                             <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
                             <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
@@ -177,13 +177,13 @@
                             <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
                         </div>
                     </div>
-                    <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>
-                        <div class="layui-input-block">
-                            <input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
-                            <input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />
-                        </div>
-                    </div>
+                    <%--<div class="layui-item layui-col-sm6 lw7">--%>
+                        <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
+                        <%--<div class="layui-input-block">--%>
+                            <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
+                            <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />--%>
+                        <%--</div>--%>
+                    <%--</div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                         <div class="layui-input-block">