Browse Source

项目登记展示页修改

user5 4 years ago
parent
commit
68721a812c
22 changed files with 178 additions and 118 deletions
  1. 1 1
      src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java
  2. 9 1
      src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordsAlter.java
  3. 9 0
      src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientInfo.java
  4. 9 0
      src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientLinkman.java
  5. 3 1
      src/main/resources/mappings/modules/projectrecord/ProjectRecordsAlterDao.xml
  6. 2 0
      src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml
  7. 5 1
      src/main/resources/mappings/modules/workclientinfo/WorkClientLinkmanDao.xml
  8. 8 8
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterAudit.jsp
  9. 14 14
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterForm.jsp
  10. 7 1
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterList.jsp
  11. 11 11
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterModify.jsp
  12. 7 7
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterView.jsp
  13. 8 8
      src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp
  14. 38 38
      src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp
  15. 7 1
      src/main/webapp/webpage/modules/projectrecord/projectRecordsList.jsp
  16. 14 14
      src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp
  17. 6 6
      src/main/webapp/webpage/modules/projectrecord/projectRecordsView.jsp
  18. 4 2
      src/main/webapp/webpage/modules/sys/gridselect1.jsp
  19. 4 1
      src/main/webapp/webpage/modules/sys/gridselectClientBuild.jsp
  20. 4 1
      src/main/webapp/webpage/modules/sys/gridselectClientDesign.jsp
  21. 4 1
      src/main/webapp/webpage/modules/sys/gridselectClientLink.jsp
  22. 4 1
      src/main/webapp/webpage/modules/sys/gridselectClientSuper.jsp

+ 1 - 1
src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -80,7 +80,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private List<WorkClientLinkman> workBuildLinkmanList;//建设方联系人
 	private List<WorkClientLinkman> workBuildLinkmanList;//建设方联系人
 	private List<WorkClientLinkman> workSuperLinkmanList;		// 监理方及联系人
 	private List<WorkClientLinkman> workSuperLinkmanList;		// 监理方及联系人
 	private List<WorkClientLinkman> workDesignLinkmanList;//设计方联系人
 	private List<WorkClientLinkman> workDesignLinkmanList;//设计方联系人
-	@NotBlank(message = "工程概况不能为空")
+	//@NotBlank(message = "工程概况不能为空")
 	private String projectDesc;		// 工程概况
 	private String projectDesc;		// 工程概况
 	/*@NotNull(message = "项目负责人不能为空")*/
 	/*@NotNull(message = "项目负责人不能为空")*/
 	private List<User> projectLeaders; //项目负责人
 	private List<User> projectLeaders; //项目负责人

+ 9 - 1
src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordsAlter.java

@@ -62,11 +62,11 @@ public class ProjectRecordsAlter extends ActEntity<ProjectRecordsAlter> {
 	private List<WorkClientLinkman> workBuildLinkmanList;//建设方联系人
 	private List<WorkClientLinkman> workBuildLinkmanList;//建设方联系人
 	private List<WorkClientLinkman> workSuperLinkmanList;		// 监理方及联系人
 	private List<WorkClientLinkman> workSuperLinkmanList;		// 监理方及联系人
 	private List<WorkClientLinkman> workDesignLinkmanList;//设计方联系人
 	private List<WorkClientLinkman> workDesignLinkmanList;//设计方联系人
-	@NotBlank(message = "工程概况不能为空")
 	private String projectDesc;		// 工程概况
 	private String projectDesc;		// 工程概况
 	@NotNull(message = "项目负责人不能为空")
 	@NotNull(message = "项目负责人不能为空")
 	private List<User> projectLeaders; //项目负责人
 	private List<User> projectLeaders; //项目负责人
 	private List<User> projectMembers;  //项目组成员
 	private List<User> projectMembers;  //项目组成员
+	private String projectRegistrant;  //项目登记人
 
 
 	private String leaderNameStr;
 	private String leaderNameStr;
 	private String leaderIds;
 	private String leaderIds;
@@ -552,4 +552,12 @@ public class ProjectRecordsAlter extends ActEntity<ProjectRecordsAlter> {
 	public void setWorkDesignLinkmanList(List<WorkClientLinkman> workDesignLinkmanList) {
 	public void setWorkDesignLinkmanList(List<WorkClientLinkman> workDesignLinkmanList) {
 		this.workDesignLinkmanList = workDesignLinkmanList;
 		this.workDesignLinkmanList = workDesignLinkmanList;
 	}
 	}
+
+	public String getProjectRegistrant() {
+		return projectRegistrant;
+	}
+
+	public void setProjectRegistrant(String projectRegistrant) {
+		this.projectRegistrant = projectRegistrant;
+	}
 }
 }

+ 9 - 0
src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientInfo.java

@@ -63,6 +63,7 @@ public class WorkClientInfo extends DataEntity<WorkClientInfo> {
 	private String userName;
 	private String userName;
 	private String errInfo;
 	private String errInfo;
 	private String unitIntroduction;
 	private String unitIntroduction;
+	private String createName;   //创建人
 
 
 	private String jobTypeStr;
 	private String jobTypeStr;
 
 
@@ -514,4 +515,12 @@ public class WorkClientInfo extends DataEntity<WorkClientInfo> {
 	public void setJobTypeStr(String jobTypeStr) {
 	public void setJobTypeStr(String jobTypeStr) {
 		this.jobTypeStr = jobTypeStr;
 		this.jobTypeStr = jobTypeStr;
 	}
 	}
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
 }
 }

+ 9 - 0
src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientLinkman.java

@@ -29,6 +29,7 @@ public class WorkClientLinkman extends DataEntity<WorkClientLinkman> {
 	private String projectId;		// 外键关联工程表(资格预审)
 	private String projectId;		// 外键关联工程表(资格预审)
 	private List<String> clientIds;
 	private List<String> clientIds;
 	private String uscCode;
 	private String uscCode;
+	private String createName;   //创建人
 	public WorkClientLinkman() {
 	public WorkClientLinkman() {
 		super();
 		super();
 	}
 	}
@@ -145,4 +146,12 @@ public class WorkClientLinkman extends DataEntity<WorkClientLinkman> {
 	public void setUscCode(String uscCode) {
 	public void setUscCode(String uscCode) {
 		this.uscCode = uscCode;
 		this.uscCode = uscCode;
 	}
 	}
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
 }
 }

+ 3 - 1
src/main/resources/mappings/modules/projectrecord/ProjectRecordsAlterDao.xml

@@ -69,11 +69,13 @@
 		,
 		,
 		wci.name AS "workContractInfo.name",
 		wci.name AS "workContractInfo.name",
 		wct.id AS "workContractInfo.client.id",
 		wct.id AS "workContractInfo.client.id",
-		wct.name AS "workContractInfo.client.name"
+		wct.name AS "workContractInfo.client.name",
+		dsu.name as "projectRegistrant"
 		FROM project_records_alter a
 		FROM project_records_alter a
 		<include refid="ProjectRecordsAlterJoins"/>
 		<include refid="ProjectRecordsAlterJoins"/>
 		LEFT JOIN work_project_user w on a.id = w.project_id
 		LEFT JOIN work_project_user w on a.id = w.project_id
 		LEFT JOIN sys_user u on w.user_id = u.id
 		LEFT JOIN sys_user u on w.user_id = u.id
+		LEFT JOIN sys_user dsu on a.create_by = dsu.id
 		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
 		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
         LEFT JOIN sys_office s ON s.id = a.company_id
         LEFT JOIN sys_office s ON s.id = a.company_id

+ 2 - 0
src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -456,12 +456,14 @@
 	<select id="findList3" resultType="WorkClientInfo" >
 	<select id="findList3" resultType="WorkClientInfo" >
 		SELECT
 		SELECT
 		<include refid="workClientInfoColumns"/>
 		<include refid="workClientInfoColumns"/>
+		,su.name as createName
 		FROM work_client_info a
 		FROM work_client_info a
 		<include refid="workClientInfoJoinsLink"/>
 		<include refid="workClientInfoJoinsLink"/>
 		<if test="workClientLinkman != null and workClientLinkman.name !=null and workClientLinkman.name !=''">
 		<if test="workClientLinkman != null and workClientLinkman.name !=null and workClientLinkman.name !=''">
 			LEFT JOIN work_client_linkman b ON a.id = b.client_id
 			LEFT JOIN work_client_linkman b ON a.id = b.client_id
 		</if>
 		</if>
 			LEFT join work_client_job_type_info as c on  a.id=c.work_client_id
 			LEFT join work_client_job_type_info as c on  a.id=c.work_client_id
+			LEFT join sys_user as su on  a.create_by=su.id
 		<where>
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<!--<if test="workClientLinkman != null and workClientLinkman.id != '' and workClientLinkman.id != null">-->
 			<!--<if test="workClientLinkman != null and workClientLinkman.id != '' and workClientLinkman.id != null">-->

+ 5 - 1
src/main/resources/mappings/modules/workclientinfo/WorkClientLinkmanDao.xml

@@ -315,10 +315,14 @@
 	</select>-->
 	</select>-->
 
 
 	<select id="queryLinkManByCompany" parameterType="WorkClientLinkman" resultType="WorkClientLinkman">
 	<select id="queryLinkManByCompany" parameterType="WorkClientLinkman" resultType="WorkClientLinkman">
-		select <include refid="workClientLinkmanColumns"/> ,b.usc_code as UscCode
+		select
+			<include refid="workClientLinkmanColumns"/>
+			 ,b.usc_code as UscCode
+			 ,su.name as createName
 		from work_client_linkman a
 		from work_client_linkman a
 		<include refid="workClientLinkmanJoins"/>
 		<include refid="workClientLinkmanJoins"/>
 		left join work_client_job_type_info c on c.work_client_id=b.id
 		left join work_client_job_type_info c on c.work_client_id=b.id
+		left join sys_user su on su.id = a.create_by
 		where
 		where
 		a.del_flag = #{DEL_FLAG_NORMAL}
 		a.del_flag = #{DEL_FLAG_NORMAL}
 		<if test="name != null and name != ''">
 		<if test="name != null and name != ''">

+ 8 - 8
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterAudit.jsp

@@ -207,7 +207,7 @@
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecordsAlter.createDate}" pattern="yyyy-MM-dd"/>"/>
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecordsAlter.createDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<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">
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.projectStructure}"/>
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.projectStructure}"/>
@@ -224,26 +224,26 @@
                     <div class="layui-input-block">
                     <div class="layui-input-block">
                         <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                         <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模:</label>
+                    <label class="layui-form-label double-line">建筑面积或规模:</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
-                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
+                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<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">
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.measuringUnit}"/>
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.measuringUnit}"/>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <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">
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.projectUse}"/>
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.projectUse}"/>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
                         <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
                         <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
@@ -272,7 +272,7 @@
                     <div class="layui-input-block">
                     <div class="layui-input-block">
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <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">
                     <div class="layui-input-block">

+ 14 - 14
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterForm.jsp

@@ -614,7 +614,7 @@
                         <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"/>
                         <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>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<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">
                     <div class="layui-input-block">
                         <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
                         <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
@@ -634,14 +634,14 @@
                     <div class="layui-input-block">
                     <div class="layui-input-block">
                         <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
                         <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <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()"/>
+                    <label class="layui-form-label double-line">建筑面积或规模:</label>
+                    <div class="layui-input-block"><%-- onchange="getFee()"--%>
+                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number"/>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<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">
                     <div class="layui-input-block">
                         <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
                         <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
@@ -649,7 +649,7 @@
                             <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                             <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                         </form:select>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <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">
                     <div class="layui-input-block">
@@ -659,7 +659,7 @@
                         </form:select>
                         </form:select>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
                         <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number" onchange="getFee()"/>
                         <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number" onchange="getFee()"/>
@@ -688,29 +688,29 @@
                     <div class="layui-input-block">
                     <div class="layui-input-block">
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <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">
                     <div class="layui-input-block">
-                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">土建单位造价(元):</label>
                     <label class="layui-form-label double-line">土建单位造价(元):</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
-                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">安装单位造价(元):</label>
                     <label class="layui-form-label double-line">安装单位造价(元):</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
-                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
-                    <label class="layui-form-label"><span class="require-item">*</span>工程概况:</label>
+                    <label class="layui-form-label">工程概况:</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">

+ 7 - 1
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterList.jsp

@@ -212,7 +212,11 @@
                             return "<a class=\"attention-info\" title=\"" +d.projId+ "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecordsAlter/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
                             return "<a class=\"attention-info\" title=\"" +d.projId+ "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecordsAlter/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
                         }}
                         }}
                     ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
                     ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
-                        	return "<span title=\"" + d.contract + "\">" + d.contract + "</span>";
+							if(null == d.contract || '' == d.contract){
+								return "<span style=\"color:red\" title='无合同'>无合同</span>";
+							}else{
+								return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							}
 						}}
 						}}
                     ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                     ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                             return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                             return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
@@ -220,6 +224,7 @@
                     ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                     ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
                             return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                             return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                         }}
                         }}
+					,{field:'createName',align:'center', title: '变更人',  width:80}
                     ,{field:'createDate',align:'center', title: '变更时间',  width:80}
                     ,{field:'createDate',align:'center', title: '变更时间',  width:80}
                     ,{align:'center', title: '状态',  width:70,templet:function(d){
                     ,{align:'center', title: '状态',  width:70,templet:function(d){
                             <%--var st = getAuditChangeState(d.projectStatus)--%>
                             <%--var st = getAuditChangeState(d.projectStatus)--%>
@@ -274,6 +279,7 @@
                         ,"createDate":"<fmt:formatDate value="${projectRecordsAlter.createDate}" pattern="yyyy-MM-dd"/>"
                         ,"createDate":"<fmt:formatDate value="${projectRecordsAlter.createDate}" pattern="yyyy-MM-dd"/>"
                         ,"projectStatus":"${projectRecordsAlter.projectStatus}"
                         ,"projectStatus":"${projectRecordsAlter.projectStatus}"
                         ,"procId":"${projectRecordsAlter.processInstanceId}"
                         ,"procId":"${projectRecordsAlter.processInstanceId}"
+						,"createName":"${projectRecordsAlter.projectRegistrant}"
                         <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecordsAlter.createBy.id}">
                         <c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecordsAlter.createBy.id}">
                         <shiro:hasPermission name="project:projectRecords:del">,"candel":	<c:choose><c:when test="${projectRecordsAlter.projectStatus == 1 or projectRecordsAlter.projectStatus == 3 or projectRecordsAlter.projectStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                         <shiro:hasPermission name="project:projectRecords:del">,"candel":	<c:choose><c:when test="${projectRecordsAlter.projectStatus == 1 or projectRecordsAlter.projectStatus == 3 or projectRecordsAlter.projectStatus == 4}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                         <shiro:hasPermission name="project:projectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecordsAlter.projectStatus == 1 }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                         <shiro:hasPermission name="project:projectRecords:edit">,"canedit1":	<c:choose><c:when test="${projectRecordsAlter.projectStatus == 1 }">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>

+ 11 - 11
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterModify.jsp

@@ -469,7 +469,7 @@
                     <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"/>
                     <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>
             </div>
-            <div class="layui-item layui-col-sm6 lw7">
+            <%--<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">
                 <div class="layui-input-block">
                     <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
                     <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
@@ -489,14 +489,14 @@
                 <div class="layui-input-block">
                 <div class="layui-input-block">
                     <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
                     <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
                 </div>
                 </div>
-            </div>
+            </div>--%>
             <div class="layui-item layui-col-sm6 lw7">
             <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()"/>
+                <label class="layui-form-label double-line">建筑面积或规模:</label>
+                <div class="layui-input-block"><%--onchange="getFee()"--%>
+                    <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" />
                 </div>
                 </div>
             </div>
             </div>
-            <div class="layui-item layui-col-sm6 lw7">
+            <%--<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">
                 <div class="layui-input-block">
                     <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
                     <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
@@ -504,7 +504,7 @@
                         <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                     </form:select>
                     </form:select>
                 </div>
                 </div>
-            </div>
+            </div>--%>
             <div class="layui-item layui-col-sm6 lw7">
             <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">
                 <div class="layui-input-block">
@@ -514,7 +514,7 @@
                     </form:select>
                     </form:select>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="layui-item layui-col-sm6 lw7">
+            <%--<div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
                 <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
                 <div class="layui-input-block">
                 <div class="layui-input-block">
                     <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number" onchange="getFee()"/>
                     <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number" onchange="getFee()"/>
@@ -543,7 +543,7 @@
                 <div class="layui-input-block">
                 <div class="layui-input-block">
                     <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                 </div>
                 </div>
-            </div>
+            </div>--%>
             <div class="layui-item layui-col-sm6 lw7">
             <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">
                 <div class="layui-input-block">
@@ -563,9 +563,9 @@
                 </div>
                 </div>
             </div>
             </div>
             <div class="layui-item layui-col-sm6 lw6 with-textarea">
             <div class="layui-item layui-col-sm6 lw6 with-textarea">
-                <label class="layui-form-label"><span class="require-item">*</span>工程概况:</label>
+                <label class="layui-form-label">工程概况:</label>
                 <div class="layui-input-block">
                 <div class="layui-input-block">
-                    <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                    <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                 </div>
                 </div>
             </div>
             </div>
             <div class="layui-item layui-col-sm6 lw6 with-textarea">
             <div class="layui-item layui-col-sm6 lw6 with-textarea">

+ 7 - 7
src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterView.jsp

@@ -171,7 +171,7 @@
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecordsAlter.createDate}" pattern="yyyy-MM-dd"/>"/>
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecordsAlter.createDate}" pattern="yyyy-MM-dd"/>"/>
                                 </div>
                                 </div>
                             </div>
                             </div>
-                            <div class="layui-item layui-col-sm6 lw7">
+                            <%--<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">
                                 <div class="layui-input-block">
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.projectStructure}"/>
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.projectStructure}"/>
@@ -188,26 +188,26 @@
                                 <div class="layui-input-block">
                                 <div class="layui-input-block">
                                     <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                                     <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                                 </div>
                                 </div>
-                            </div>
+                            </div>--%>
                             <div class="layui-item layui-col-sm6 lw7">
                             <div class="layui-item layui-col-sm6 lw7">
-                                <label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模:</label>
+                                <label class="layui-form-label double-line">建筑面积或规模:</label>
                                 <div class="layui-input-block">
                                 <div class="layui-input-block">
                                     <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
                                     <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
                                 </div>
                                 </div>
                             </div>
                             </div>
-                            <div class="layui-item layui-col-sm6 lw7">
+                           <%-- <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">
                                 <div class="layui-input-block">
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.measuringUnit}"/>
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.measuringUnit}"/>
                                 </div>
                                 </div>
-                            </div>
+                            </div>--%>
                             <div class="layui-item layui-col-sm6 lw7">
                             <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">
                                 <div class="layui-input-block">
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.projectUse}"/>
                                     <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecordsAlter.projectUse}"/>
                                 </div>
                                 </div>
                             </div>
                             </div>
-                            <div class="layui-item layui-col-sm6 lw7">
+                            <%--<div class="layui-item layui-col-sm6 lw7">
                                 <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
                                 <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
                                 <div class="layui-input-block">
                                 <div class="layui-input-block">
                                     <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
                                     <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
@@ -236,7 +236,7 @@
                                 <div class="layui-input-block">
                                 <div class="layui-input-block">
                                     <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                                     <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                                 </div>
                                 </div>
-                            </div>
+                            </div>--%>
                             <div class="layui-item layui-col-sm6 lw7">
                             <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">
                                 <div class="layui-input-block">

+ 8 - 8
src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp

@@ -255,7 +255,7 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 					</div>
 				</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<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">
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
@@ -272,26 +272,26 @@
 					<div class="layui-input-block">
 					<div class="layui-input-block">
 						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 					</div>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw7">
 				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模:</label>
+					<label class="layui-form-label double-line">建筑面积或规模:</label>
 					<div class="layui-input-block">
 					<div class="layui-input-block">
-						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
+						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 					</div>
 					</div>
 				</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<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">
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
 					</div>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw7">
 				<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">
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
 					</div>
 				</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
 					<label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
 					<div class="layui-input-block">
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
 						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
@@ -320,7 +320,7 @@
 					<div class="layui-input-block">
 					<div class="layui-input-block">
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 					</div>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw7">
 				<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">
 					<div class="layui-input-block">

+ 38 - 38
src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -1202,7 +1202,7 @@
                         <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"/>
                         <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>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<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">
                     <div class="layui-input-block">
                         <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
                         <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
@@ -1222,14 +1222,14 @@
                     <div class="layui-input-block">
                     <div class="layui-input-block">
                         <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
                         <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <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()"/>
+                    <label class="layui-form-label double-line">建筑面积或规模:</label>
+                    <div class="layui-input-block"><%--onchange="getFee()"--%>
+                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" />
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+               <%-- <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">
                     <div class="layui-input-block">
                         <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
                         <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
@@ -1237,7 +1237,7 @@
                             <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                             <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                         </form:select>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <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">
                     <div class="layui-input-block">
@@ -1247,58 +1247,58 @@
                         </form:select>
                         </form:select>
                     </div>
                     </div>
                 </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 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>
-                </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 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>
-                </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 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>
-                </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 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>
-                </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">
                 <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">
                     <div class="layui-input-block">
-                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">土建单位造价(元):</label>
                     <label class="layui-form-label double-line">土建单位造价(元):</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
-                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">安装单位造价(元):</label>
                     <label class="layui-form-label double-line">安装单位造价(元):</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
-                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
-                    <label class="layui-form-label"><span class="require-item">*</span>工程概况:</label>
+                    <label class="layui-form-label">工程概况:</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">

+ 7 - 1
src/main/webapp/webpage/modules/projectrecord/projectRecordsList.jsp

@@ -331,7 +331,11 @@
                         return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
                         return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
                     }}
                     }}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
-                    	return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+                	if(null == d.contract || '' == d.contract){
+						return "<span style=\"color:red\" title='无合同'>无合同</span>";
+					}else{
+						return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+					}
 					}}
 					}}
                 ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                 ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
@@ -339,6 +343,7 @@
                 ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
                 ,{field:'client',align:'center', title: '主委托方',  width:150,templet:function(d){
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                     }}
+                ,{field:'createName',align:'center', title: '创建人',  width:80}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                         <%--var st = getAuditState(d.projectStatus)--%>
                         <%--var st = getAuditState(d.projectStatus)--%>
@@ -394,6 +399,7 @@
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
                     ,"contract":"${projectRecords.workContractInfo.name}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
+                    ,"createName":"${projectRecords.projectRegistrant}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectStatus":"${projectRecords.projectStatus}"
                     ,"projectStatus":"${projectRecords.projectStatus}"
                     ,"procId":"${projectRecords.processInstanceId}"
                     ,"procId":"${projectRecords.processInstanceId}"

+ 14 - 14
src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp

@@ -482,7 +482,7 @@
                         <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"/>
                         <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>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<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">
                     <div class="layui-input-block">
                         <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
                         <form:select path="projectStructure" class="form-control editable-select layui-input" id="projectStructure" value="${projectStructure}">
@@ -502,14 +502,14 @@
                     <div class="layui-input-block">
                     <div class="layui-input-block">
                         <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
                         <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <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()"/>
+                    <label class="layui-form-label double-line">建筑面积或规模:</label>
+                    <div class="layui-input-block"><%--onchange="getFee()"--%>
+                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" />
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<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">
                     <div class="layui-input-block">
                         <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
                         <form:select path="measuringUnit" class="form-control editable-select layui-input" id="measuringUnit" value="${measuringUnit}">
@@ -517,7 +517,7 @@
                             <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                             <form:options items="${fns:getMainDictList('scale_unit')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                         </form:select>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <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">
                     <div class="layui-input-block">
@@ -527,7 +527,7 @@
                         </form:select>
                         </form:select>
                     </div>
                     </div>
                 </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <%--<div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
                     <label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
                         <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number" onchange="getFee()"/>
                         <form:input path="totalFees" htmlEscape="false" id="totalFees" class="form-control layui-input required number" onchange="getFee()"/>
@@ -556,29 +556,29 @@
                     <div class="layui-input-block">
                     <div class="layui-input-block">
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                         <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                     </div>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
                 <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">
                     <div class="layui-input-block">
-                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
+                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">土建单位造价(元):</label>
                     <label class="layui-form-label double-line">土建单位造价(元):</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
-                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
+                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">安装单位造价(元):</label>
                     <label class="layui-form-label double-line">安装单位造价(元):</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
-                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
+                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
-                    <label class="layui-form-label"><span class="require-item">*</span>工程概况:</label>
+                    <label class="layui-form-label">工程概况:</label>
                     <div class="layui-input-block">
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">

+ 6 - 6
src/main/webapp/webpage/modules/projectrecord/projectRecordsView.jsp

@@ -210,7 +210,7 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 					</div>
 				</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<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">
 					<div class="layui-input-block">
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
@@ -227,26 +227,26 @@
 					<div class="layui-input-block">
 					<div class="layui-input-block">
 						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 					</div>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw7">
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模:</label>
 					<label class="layui-form-label double-line"><span class="require-item">*</span>建筑面积或规模:</label>
 					<div class="layui-input-block">
 					<div class="layui-input-block">
 						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
 						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
 					</div>
 					</div>
 				</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<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">
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
 					</div>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw7">
 				<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">
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
 					</div>
 				</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<%--<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
 					<label class="layui-form-label double-line"><span class="require-item">*</span>咨询标的额(万元):</label>
 					<div class="layui-input-block">
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
 						<input value="<fmt:formatNumber value="${projectRecords.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
@@ -275,7 +275,7 @@
 					<div class="layui-input-block">
 					<div class="layui-input-block">
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 					</div>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6 lw7">
 				<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">
 					<div class="layui-input-block">

+ 4 - 2
src/main/webapp/webpage/modules/sys/gridselect1.jsp

@@ -34,7 +34,8 @@
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
-                var data= {'id':id,'name':label,'linkPhone':label1,'linkMobile':label2,'uscCode':label5,'clientId':{'id':label4,'name':label3}};
+                var label6 = $(this).parent().parent().parent().find(".codelabel6").html();
+                var data= {'id':id,'name':label,'linkPhone':label1,'linkMobile':label2,'uscCode':label5,'createName':label6,'clientId':{'id':label4,'name':label3}};
                 arr.push(data);
                 arr.push(data);
 			})
 			})
             return arr;
             return arr;
@@ -94,6 +95,7 @@
 								<th width="25%">联系人</th>
 								<th width="25%">联系人</th>
 								<th width="25%">联系电话</th>
 								<th width="25%">联系电话</th>
 								<th width="25%">手机号</th>
 								<th width="25%">手机号</th>
+								<th width="25%">创建者</th>
 						</tr>
 						</tr>
 					</thead>
 					</thead>
 					<tbody>
 					<tbody>
@@ -116,7 +118,7 @@
 								<td class="codelabel1">${fns:getValue(obj, 'linkPhone')}</td>
 								<td class="codelabel1">${fns:getValue(obj, 'linkPhone')}</td>
 								<td class="codelabel2">${fns:getValue(obj, 'linkMobile')}</td>
 								<td class="codelabel2">${fns:getValue(obj, 'linkMobile')}</td>
 							</c:forEach>
 							</c:forEach>
-
+							<td title="${obj.createName}" class="codelabel6">${obj.createName}</td>
 						</tr>
 						</tr>
 					</c:forEach>
 					</c:forEach>
 					</c:when>
 					</c:when>

+ 4 - 1
src/main/webapp/webpage/modules/sys/gridselectClientBuild.jsp

@@ -32,7 +32,8 @@
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
-                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3};
+                var label6 = $(this).parent().parent().parent().find(".codelabel6").html();
+                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3,'createName':label6};
                 arr.push(data);
                 arr.push(data);
 			})
 			})
             return arr;
             return arr;
@@ -92,6 +93,7 @@
 						<th width="25%">联系人</th>
 						<th width="25%">联系人</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">手机号</th>
 						<th width="25%">手机号</th>
+						<th width="25%">创建者</th>
 					</tr>
 					</tr>
 				</thead>
 				</thead>
 				<tbody>
 				<tbody>
@@ -107,6 +109,7 @@
 								<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 								<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>
+							<td title="${obj.createName}" class="codelabel6">${obj.createName}</td>
 						</tr>
 						</tr>
 					</c:forEach>
 					</c:forEach>
 				</c:forEach>
 				</c:forEach>

+ 4 - 1
src/main/webapp/webpage/modules/sys/gridselectClientDesign.jsp

@@ -32,7 +32,8 @@
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
-                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3};
+				var label6 = $(this).parent().parent().parent().find(".codelabel6").html();
+                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3,'createName':label6};
                 arr.push(data);
                 arr.push(data);
 			})
 			})
             return arr;
             return arr;
@@ -93,6 +94,7 @@
 						<th width="25%">联系人</th>
 						<th width="25%">联系人</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">手机号</th>
 						<th width="25%">手机号</th>
+						<th width="25%">创建者</th>
 					</tr>
 					</tr>
 				</thead>
 				</thead>
 				<tbody>
 				<tbody>
@@ -108,6 +110,7 @@
 							<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 							<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>
+							<td title="${obj.createName}" class="codelabel6">${obj.createName}</td>
 						</tr>
 						</tr>
 					</c:forEach>
 					</c:forEach>
 				</c:forEach>
 				</c:forEach>

+ 4 - 1
src/main/webapp/webpage/modules/sys/gridselectClientLink.jsp

@@ -32,7 +32,8 @@
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
-                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3};
+				var label6 = $(this).parent().parent().parent().find(".codelabel6").html();
+                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3,'createName':label6};
                 arr.push(data);
                 arr.push(data);
 			})
 			})
             return arr;
             return arr;
@@ -92,6 +93,7 @@
 						<th width="25%">联系人</th>
 						<th width="25%">联系人</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">手机号</th>
 						<th width="25%">手机号</th>
+						<th width="25%">创建者</th>
 					</tr>
 					</tr>
 				</thead>
 				</thead>
 				<tbody>
 				<tbody>
@@ -107,6 +109,7 @@
 								<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 								<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>
+							<td title="${obj.createName}" class="codelabel6">${obj.createName}</td>
 
 
 						</tr>
 						</tr>
 					</c:forEach>
 					</c:forEach>

+ 4 - 1
src/main/webapp/webpage/modules/sys/gridselectClientSuper.jsp

@@ -32,7 +32,8 @@
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label3 = $(this).parent().parent().parent().find(".codelabel3").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label4 = $(this).parent().parent().parent().find(".codelabel4").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
                 var label5 = $(this).parent().parent().parent().find(".codelabel5").html();
-                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3};
+				var label6 = $(this).parent().parent().parent().find(".codelabel6").html();
+                var data=  {'clientId':{'id':label,'name':label4,'uscCode':label5},'id':id,'name':label1,'linkPhone':label2,'linkMobile':label3,'createName':label6};
                 arr.push(data);
                 arr.push(data);
 			})
 			})
             return arr;
             return arr;
@@ -92,6 +93,7 @@
 						<th width="25%">联系人</th>
 						<th width="25%">联系人</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">联系电话</th>
 						<th width="25%">手机号</th>
 						<th width="25%">手机号</th>
+						<th width="25%">创建者</th>
 					</tr>
 					</tr>
 				</thead>
 				</thead>
 				<tbody>
 				<tbody>
@@ -107,6 +109,7 @@
 								<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 								<td title="${fns:getValue(linkman, 'name')}" class="codelabel1">${fns:getValue(linkman, 'name')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel2">${fns:getValue(linkman, 'linkPhone')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>
 								<td class="codelabel3">${fns:getValue(linkman, 'linkMobile')}</td>
+							<td title="${obj.createName}" class="codelabel6">${obj.createName}</td>
 						</tr>
 						</tr>
 					</c:forEach>
 					</c:forEach>
 				</c:forEach>
 				</c:forEach>