基础界面优化

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -771,7 +771,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.invalidateUser = invalidateUser;
 
 	}
-	@ExcelField(title="导入时间", align=2, sort=16)
+	//@ExcelField(title="导入时间", align=2, sort=16)
 	public String getNowDate() {
 		return nowDate;
 	}
@@ -780,7 +780,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.nowDate = nowDate;
 	}
 
-	@ExcelField(title="导入用户", align=2, sort=17)
+	//@ExcelField(title="导入用户", align=2, sort=17)
 	public String getUserName() {
 		return userName;
 	}
@@ -789,7 +789,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.userName = userName;
 	}
 
-	@ExcelField(title="失败原因", align=2, sort=18)
+	//@ExcelField(title="失败原因", align=2, sort=18)
 	public String getErrInfo() {
 		return errInfo;
 	}
@@ -846,7 +846,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 		this.signatureStatus = signatureStatus;
 	}
 
-	@ExcelField(title="归档状态", dictType="audit_state", align=2, sort=10)
+	@ExcelField(title="归档状态", dictType="archive_state", align=2, sort=10)
 	public String getContrractRecordStatus() {
 		return contrractRecordStatus;
 	}

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractListInfo.java

@@ -58,6 +58,11 @@ public class WorkContractListInfo extends ActEntity<WorkContractListInfo> {
 	private String contractSpecial;		// 合同特别条款
 	private String contractTypeDoc;		//合同类型说明
 	private String remarks;
+	private WorkClientInfo client;		// 客户ID(主委托方)
+	private String contrractRecordStatus;   //归档状态
+	private String recordNum;   //归档编号
+	private String contrractRecordId;   //归档合同id
+	private String createName;   //登记人
 	@Override
 	public String getId() {
 		return id;
@@ -256,6 +261,43 @@ public class WorkContractListInfo extends ActEntity<WorkContractListInfo> {
 		this.remarks = remarks;
 	}
 
+	public WorkClientInfo getClient() {
+		return client;
+	}
 
+	public void setClient(WorkClientInfo client) {
+		this.client = client;
+	}
 
+	public String getContrractRecordStatus() {
+		return contrractRecordStatus;
+	}
+
+	public void setContrractRecordStatus(String contrractRecordStatus) {
+		this.contrractRecordStatus = contrractRecordStatus;
+	}
+
+	public String getRecordNum() {
+		return recordNum;
+	}
+
+	public void setRecordNum(String recordNum) {
+		this.recordNum = recordNum;
+	}
+
+	public String getContrractRecordId() {
+		return contrractRecordId;
+	}
+
+	public void setContrractRecordId(String contrractRecordId) {
+		this.contrractRecordId = contrractRecordId;
+	}
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
 }

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -28,6 +28,7 @@ import com.jeeplus.modules.alterinfo.entity.AlterInfo;
 import com.jeeplus.modules.alterinfo.service.AlterInfoService;
 import com.jeeplus.modules.contractclient.entity.WorkContractClient;
 import com.jeeplus.modules.contractclient.service.WorkContractClientService;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
@@ -1206,7 +1207,8 @@ public class WorkContractInfoController extends BaseController {
             User user = UserUtils.getUser();
             workContractInfo.setCurrentUser(user);
             Page<WorkContractInfo> page = workContractInfoService.findPage(new Page<WorkContractInfo>(request, response, -1), workContractInfo);
-            new ExportExcel(true,"合同管理", WorkContractInfo.class,1).setDataList(page.getList()).write(response, fileName,request.getHeader("USER-AGENT")).dispose();
+            //new ExportExcel(true,"合同管理", WorkContractInfo.class,1).setDataList(page.getList()).write(response, fileName,request.getHeader("USER-AGENT")).dispose();
+            new ExportExcel("合同管理", WorkContractInfo.class).setDataList(page.getList()).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导出合同管理记录失败！失败信息：" + e.getMessage());

src/main/resources/jeeplus.properties

@@ -248,7 +248,7 @@ bos_buck_name=newxgccpm
 
 
 #serverDomain=http://192.168.2.4:18080/total_process
-serverDomain=http://192.168.137.1:8090/a
+serverDomain=http://192.168.5.74:8090/a
 
 #\u8BA2\u9910\u56DE\u8C03
 backUrl = http://yf.xgccpm.cn/weXin/theOrder/orderFrom

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -298,6 +298,16 @@
 			<if test="isTotal != null and isTotal != ''">
 				AND a.is_total = #{isTotal}
 			</if>
+			<if test="contrractRecordStatus != null and contrractRecordStatus != ''">
+				<choose>
+					<when test="contrractRecordStatus == 0">
+						AND wcr.status is null
+					</when>
+					<otherwise>
+						AND wcr.status = #{contrractRecordStatus}
+					</otherwise>
+				</choose>
+			</if>
 			${sqlMap.dsf}
 		</where>
 		<choose>

src/main/resources/mappings/modules/workcontractinfo/WorkContractListInfoDao.xml

@@ -5,6 +5,8 @@
 	<sql id="workContractListInfoColumns">
 		a.id AS "id",
 		a.create_by AS "createBy.id",
+		(select name from sys_user user where user.id=a.create_by) AS "createBy.name",
+		(select name from sys_user user where user.id=a.create_by) AS "createName",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
@@ -54,8 +56,14 @@
 	<select id="findList" resultType="WorkContractListInfo" >
 		SELECT
 		<include refid="workContractListInfoColumns"/>
+		,a.client_id AS "client.id"
+		,client.name AS "client.name"
+		,ifnull(wcr.status,0) as "contrractRecordStatus"
+		,ifnull(wcr.record_num,"") as "recordNum"
+		,wcr.id as "contrractRecordId"
 		FROM work_contract_info a
 		<include refid="workContractListInfoJoins"/>
+		left join work_contract_record wcr on wcr.contract_info_id = a.id
 		<where>
 			a.del_flag = '0' and (a.alter_state is null or a.alter_state ="")
 			<if test="id != null and id != ''">
@@ -79,6 +87,9 @@
 			<if test="contractNum != null and contractNum!= ''">
 				AND a.contract_num like  concat('%',#{contractNum},'%')
 			</if>
+			<if test="clientName != null and clientName!= ''">
+				AND client.name like  concat('%',#{clientName},'%')
+			</if>
 			${sqlMap.dsf}
 		</where>
 		<choose>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -134,21 +134,21 @@
             <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>
+                    <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">审定价(元)：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">合同价(元)：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

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

@@ -356,21 +356,21 @@
 			<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>
+						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</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()"/>
+							<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">审定价(元)：</label>
+						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</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()"/>
+							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">合同价(元)：</label>
+						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
+							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportModify.jsp

@@ -339,21 +339,21 @@
 			<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>
+						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</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()"/>
+							<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">审定价(元)：</label>
+						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</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()"/>
+							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">合同价(元)：</label>
+						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
+							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

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

@@ -846,7 +846,7 @@
                         <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 double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
                         <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
@@ -863,7 +863,7 @@
                     <div class="layui-input-block">
                         <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">

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

@@ -604,7 +604,7 @@
                         <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 double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
                         <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
@@ -621,7 +621,7 @@
                     <div class="layui-input-block">
                         <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">

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

@@ -284,7 +284,7 @@
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">单位造价(元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
@@ -301,7 +301,7 @@
 					<div class="layui-input-block">
 						<input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
 					</div>
-				</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/ruralprojectrecords/ruralProjectRecordsAudit.jsp

@@ -328,7 +328,7 @@
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">单位造价(元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
@@ -345,7 +345,7 @@
 					<div class="layui-input-block">
 						<input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
 					</div>
-				</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/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -856,7 +856,7 @@
                         <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 double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
                         <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
@@ -873,7 +873,7 @@
                     <div class="layui-input-block">
                         <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">

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

@@ -604,7 +604,7 @@
                         <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 double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
                         <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
@@ -621,7 +621,7 @@
                     <div class="layui-input-block">
                         <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">

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

@@ -284,7 +284,7 @@
 						<form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<%--<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">单位造价(元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
@@ -301,7 +301,7 @@
 					<div class="layui-input-block">
 						<input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
 					</div>
-				</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/ruralprojectrecords/ruralProjectReport/cost/ruralCostProjectReportList.jsp

@@ -152,7 +152,7 @@
                 {field:'index',align:'center', title: '序号',width:40}
                 ,{field:'year',align:'center', sort:true,title: '年份'}
                 ,{field:'month',align:'center', sort:true,title: '月份'}
-				,{field:'clientName',align:'center', title: '委托单位'}
+				,{field:'clientName',align:'center', title: '委托单位',width:220}
                 ,{field:'projectName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\""+d.projectName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projectName + "</a>";
                     }}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/ruralProjectReportList.jsp

@@ -152,7 +152,7 @@
                 {field:'index',align:'center', title: '序号',width:40}
                 ,{field:'year',align:'center', sort:true,title: '年份'}
                 ,{field:'month',align:'center', sort:true,title: '月份'}
-				,{field:'clientName',align:'center', title: '委托单位'}
+				,{field:'clientName',align:'center', title: '委托单位',width:220}
                 ,{field:'projectName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\""+d.projectName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projectName + "</a>";
                     }}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/downloadType/downloadProjectView.jsp

@@ -4,6 +4,9 @@
 <head>
 	<title>造价审核项目</title>
 	<meta name="decorator" content="ani"/>
+	<link href="${ctxStatic}/common/css/appBlue.css" rel="stylesheet" />
+	<link href="${ctxStatic}/common/css/vendors.css.css" rel="stylesheet" />
+	<meta name="viewport"  content="width=device-width,minimum-scale=1.0, maximum-scale=2.0; charset=UTF-8">
 	<!-- SUMMERNOTE -->
 	<%--<%@include file="/webpage/include/summernote.jsp" %>--%>
 	<script type="text/javascript">
@@ -32,100 +35,100 @@
 				<img class="logo_img w_100"  src="${ctxStatic}/common/images/xg_logo.png" />
 				<h3 class="panel-title ta_c">兴光工程咨询报告查询</h3>
 			</div>
-		<div class="panel-body">
-		<form:form id="inputForm" modelAttribute="ruralProjectRecords" class="form-horizontal">
-			<div class="form-group">
-				<label class="col-sm-2 control-label">项目名称：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="${ruralProjectRecords.projectName}" class="form-control "/>
-				</div>
+			<div class="panel-body">
+				<form:form id="inputForm" modelAttribute="ruralProjectRecords" class="form-horizontal">
+					<div class="form-group">
+						<label class="col-sm-2 control-label">项目名称：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.projectName}" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">咨询项目类型：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">工程编号：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.projectId}" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">项目所在地：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.area.name}" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">委托单位：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.workContractInfo.client.name}" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">报告号：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.projectReportData[0].number}" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">合同金额（元）：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.projectReportData[0].contractFee}" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">送审金额（元）：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.projectReportData[0].reviewFee}" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">审定金额（元）：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.projectReportData[0].approvalFee}" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">核增核减金额（元）：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.projectReportData[0].verifyFee}" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">核增核减率%：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="${ruralProjectRecords.projectReportData[0].verifyRate}" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">工作开始日期：</label>
+						<div class="col-sm-10">
+							<input class="form-control layui-input layer-date " readonly="true" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">工作结束日期：</label>
+						<div class="col-sm-10">
+							<input class="form-control layui-input layer-date " readonly="true" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">项目负责人：</label>
+						<div class="col-sm-10">
+							<input value="${ruralProjectRecords.leaderNameStr}" readonly="true" htmlEscape="false" class="form-control "/>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="col-sm-2 control-label">咨询人：</label>
+						<div class="col-sm-10">
+							<input htmlEscape="false" readonly="true" value="" class="form-control "/>
+						</div>
+					</div>
+				</form:form>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">咨询项目类型：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">工程编号：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="${ruralProjectRecords.projectId}" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">项目所在地：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="${ruralProjectRecords.area.name}" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">委托单位：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="${ruralProjectRecords.workContractInfo.client.name}" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">报告号：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="${ruralProjectRecords.projectReportData[0].number}" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">合同金额（元）：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="${ruralProjectRecords.projectReportData[0].contractFee}" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">送审金额（元）：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="${ruralProjectRecords.projectReportData[0].reviewFee}" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">审定金额（元）：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="${ruralProjectRecords.projectReportData[0].approvalFee}" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">核增核减金额（元）：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="${ruralProjectRecords.projectReportData[0].verifyFee}" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">核增核减率%：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="${ruralProjectRecords.projectReportData[0].verifyRate}" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">工作开始日期：</label>
-				<div class="col-sm-10">
-					<input class="form-control layui-input layer-date " readonly="true" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">工作结束日期：</label>
-				<div class="col-sm-10">
-					<input class="form-control layui-input layer-date " readonly="true" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">项目负责人：</label>
-				<div class="col-sm-10">
-					<input value="${ruralProjectRecords.leaderNameStr}" htmlEscape="false" class="form-control "/>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">咨询人：</label>
-				<div class="col-sm-10">
-					<input htmlEscape="false" value="" class="form-control "/>
-				</div>
-			</div>
-	</form:form>
-		</div>
 		</div>
 	</div>
 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -134,21 +134,21 @@
             <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>
+                    <label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">审定价(元)：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label">合同价(元)：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

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

@@ -356,21 +356,21 @@
 			<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>
+						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</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()"/>
+							<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">审定价(元)：</label>
+						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</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()"/>
+							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">合同价(元)：</label>
+						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
+							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportModify.jsp

@@ -339,21 +339,21 @@
 			<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>
+						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</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()"/>
+							<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">审定价(元)：</label>
+						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</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()"/>
+							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label">合同价(元)：</label>
+						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
+							<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp

@@ -67,7 +67,7 @@
 						<div id="tab-11" class="tab-pane active">
 							<div class="form-group layui-row first lw9">
 								<div class="form-group-label"><h2>项目合同信息</h2></div>
-								<c:if test="${workContractInfo.ext == 0}">
+								<%--<c:if test="${workContractInfo.ext == 0}">
 									<div class="layui-item layui-col-sm6">
 										<label class="layui-form-label">合同来源：</label>
 										<div class="layui-input-block">
@@ -91,14 +91,14 @@
 											<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.project.projectName}"/>
 										</div>
 									</div>
-								</c:if>
+								</c:if>--%>
 								<c:if test="${workContractInfo.ext != 0}">
-									<div class="layui-item layui-col-sm6">
+									<%--<div class="layui-item layui-col-sm6">
 										<label class="layui-form-label">合同来源：</label>
 										<div class="layui-input-block">
 											<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="非投标项目"/>
 										</div>
-									</div>
+									</div>--%>
                                     <div class="layui-item layui-col-sm6">
                                         <label class="layui-form-label lw9">合同编号：</label>
                                         <div class="layui-input-block">
@@ -112,15 +112,15 @@
                                     </div>
 								</c:if>
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">总合同名称：</label>
+                                    <label class="layui-form-label lw9">合同名称：</label>
                                     <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.totalContractName}"/>
+                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label lw9">合同名称：</label>
+                                    <label class="layui-form-label lw9">总合同名称：</label>
                                     <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
+                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.totalContractName}"/>
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -144,7 +144,7 @@
             var clientId = $("#clientId").val();
             console.log(id.val()+"-----------"+clientId);
             if(id.val() == clientId){
-                parent.layer.msg('主委托方不允许删除');
+				top.layer.msg("主委托方不允许删除",{icon:2});
                 return;
             }
             if (id.val() == "") {

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -162,7 +162,7 @@
             var clientId = $("#clientId").val();
             console.log(id.val()+"-----------"+clientId);
             if(id.val() == clientId){
-                parent.layer.msg('主委托方不允许删除');
+				top.layer.msg("主委托方不允许删除",{icon:2});
                 return;
             }
             if (id.val() == "") {
@@ -567,6 +567,7 @@
 			<form:hidden path="id"/>
 			<%--创建人--%>
 			<form:hidden path="createBy.name" htmlEscape="false"  readonly="true" value="${fns:getUser().name}" class="form-control "/>
+			<input type="hidden" id="ext" name="ext" value="1">
 			<div class="tabs-container">
 <%--				<div class="layui-tab" id="tabDiv">--%>
 <%--					<ul class="layui-tab-title" >--%>
@@ -578,7 +579,7 @@
 					<div id="tab-11" class="tab-pane active">
 						<div class="form-group layui-row first lw9">
 							<div class="form-group-label"><h2>合同基础信息</h2></div>
-							<div class="layui-item layui-col-sm6">
+							<%--<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同来源：</label>
 								<div class="layui-input-block">
 									<input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
@@ -586,7 +587,7 @@
 									<input type="radio" class="i-checks" name="ext" id="ext1" value="1">
 									<label for="ext1">非投标项目</label>
 								</div>
-							</div>
+							</div>--%>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同编号：</label>
 								<div class="layui-input-block">
@@ -598,7 +599,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6" id="tr1">
+							<%--<div class="layui-item layui-col-sm6" id="tr1">
 								<label class="layui-form-label"><span class="require-item">*</span>投标项目：</label>
 								<div class="layui-input-block with-icon">
 									<input type="hidden" value="" id ="ids">
@@ -612,7 +613,7 @@
 								<div class="layui-input-block">
 									<form:input id ="pNumber" path="project.projectNumber" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 								</div>
-							</div>
+							</div>--%>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 								<div class="layui-input-block">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -522,6 +522,7 @@
 		<form:hidden path="act.procInsId"/>
 		<form:hidden path="act.procDefId"/>
 		<form:hidden id="flag" path="act.flag"/>
+		<form:hidden id="ext" path="ext"/>
 	<form:hidden path="createBy.name" htmlEscape="false"  readonly="true" value="${fns:getUser().name}" class="form-control "/>
 
 		<c:set var="status" value="${workContractInfo.act.status}" />
@@ -536,7 +537,7 @@
 				<div id="tab-1" class="tab-pane active">
 					<div class="form-group layui-row first lw9">
 						<div class="form-group-label"><h2>合同基础信息</h2></div>
-						<div class="layui-item layui-col-sm6">
+						<%--<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label"><span class="require-item">*</span>合同来源：</label>
 							<div class="layui-input-block">
 								<input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
@@ -544,7 +545,7 @@
 								<input type="radio" class="i-checks" name="ext" id="ext1" value="1">
 								<label for="ext1">非投标项目</label>
 							</div>
-						</div>
+						</div>--%>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label">合同编号：</label>
                             <div class="layui-input-block">
@@ -556,7 +557,7 @@
                                 </div>
                             </div>
 						</div>
-						<div class="layui-item layui-col-sm6" id="tr1">
+						<%--<div class="layui-item layui-col-sm6" id="tr1">
 							<label class="layui-form-label"><span class="require-item">*</span>投标项目：</label>
 							<div class="layui-input-block with-icon">
 								<input type="hidden" value="" id ="ids">
@@ -570,7 +571,7 @@
 							<div class="layui-input-block">
 								<form:input id ="pNumber" path="project.projectNumber" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
 							</div>
-						</div>
+						</div>--%>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 							<div class="layui-input-block">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -528,6 +528,24 @@
 						</div>
 					</div>
 					<div class="layui-item query athird">
+						<label class="layui-form-label">合同状态：</label>
+						<div class="layui-input-block with-icon">
+							<form:select path="contractState"  class="form-control simple-select">
+								<form:option value="" label=""/>
+								<form:options items="${fns:getDictList('audit_contract_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+					<div class="layui-item query athird">
+						<label class="layui-form-label">归档状态：</label>
+						<div class="layui-input-block with-icon">
+							<form:select path="contrractRecordStatus"  class="form-control simple-select">
+								<form:option value="" label=""/>
+								<form:options items="${fns:getDictList('archive_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+					<div class="layui-item query athird">
 						<label class="layui-form-label  double-line">合同金额(元)预计金额：</label>
 						<div class="layui-input-block with-icon">
 							<form:input path="contractPrice" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
@@ -545,15 +563,6 @@
 							</input>
 						</div>
 					</div>
-					<div class="layui-item query athird">
-						<label class="layui-form-label">合同状态：</label>
-						<div class="layui-input-block with-icon">
-							<form:select path="contractState"  class="form-control simple-select">
-								<form:option value="" label=""/>
-								<form:options items="${fns:getDictList('audit_contract_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-							</form:select>
-						</div>
-					</div>
 				</div>
 				</form:form>
 			</div>
@@ -562,7 +571,7 @@
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
 					<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
-						<button class="nav-btn nav-btn-add" title="合同管理" onclick="openDialogre('合同管理','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>
+						<button class="nav-btn nav-btn-add" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="workcontractinfo:workContractInfo:import">
 						<table:importExcel url="${ctx}/workcontractinfo/workContractInfo/import"></table:importExcel><!-- 导入按钮 -->

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -120,7 +120,7 @@
 				<div id="tab-11" class="tab-pane active">
 					<div class="form-group layui-row first lw9">
 						<div class="form-group-label"><h2>项目合同信息</h2></div>
-						<c:if test="${workContractInfo.ext == 0}">
+						<%--<c:if test="${workContractInfo.ext == 0}">
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同来源：</label>
 								<div class="layui-input-block">
@@ -144,14 +144,14 @@
 									<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.project.projectName}"/>
 								</div>
 							</div>
-						</c:if>
+						</c:if>--%>
 						<c:if test="${workContractInfo.ext != 0}">
-							<div class="layui-item layui-col-sm6">
+							<%--<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">合同来源：</label>
 								<div class="layui-input-block">
 									<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="非投标项目"/>
 								</div>
-							</div>
+							</div>--%>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label ">合同编号：</label>
 								<div class="layui-input-block">
@@ -350,7 +350,7 @@
 							</table>
 						</div>
 					</div>
-					<c:if test="${workContractInfo.contractState eq '5'}">
+					<%--<c:if test="${workContractInfo.contractState eq '5'}">
 						<div class="form-group layui-row">
 							<div class="form-group-label"><h2>收款明细</h2></div>
 							<div class="layui-item layui-col-xs12 form-table-container">
@@ -364,7 +364,7 @@
 										<th><span class="require-item">*</span>金额</th>
 										<th><span class="require-item">*</span>税额</th>
 										<th><span class="require-item">*</span>累计登记金额</th>
-										<th><span class="require-item">*</span>发票状态</th><%--正常--%>
+										<th><span class="require-item">*</span>发票状态</th>&lt;%&ndash;正常&ndash;%&gt;
 										<th><span class="require-item">*</span>被退标记</th>
 										<th><span class="require-item">*</span>被退票号</th>
 										<th><span class="require-item">*</span>开票日期</th>
@@ -415,7 +415,7 @@
 								</table>
 							</div>
 						</div>
-					</c:if>
+					</c:if>--%>
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>合同附件表</h2></div>
 						<div class="layui-item layui-col-xs12 form-table-container" >

src/main/webapp/webpage/modules/workcontractinfo/workContractListInfoList.jsp

@@ -98,9 +98,9 @@
                         </div>
                     </div>
 					<div class="layui-item query athird">
-						<label class="layui-form-label">合同金额(元)：</label>
+						<label class="layui-form-label">客户名称：</label>
 						<div class="layui-input-block with-icon">
-							<form:input path="contractPrice" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+							<form:input path="clientName" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 						</div>
 					</div>
 					<div class="layui-item query athird">
@@ -143,13 +143,45 @@
             ,cols: [[
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center',fixed: 'left', title: '序号',width:40}
-                ,{field:'contractNum',align:'center',fixed: true, sort:true,title: '合同编号',minWidth:200,templet:function(d){
+                /*,{field:'contractNum',align:'center',fixed: true, sort:true,title: '合同编号',minWidth:200,templet:function(d){
                         return "<span title='"+ d.contractNum +"'>" + d.contractNum + "</span>";
-                    }}
-                ,{field:'name',align:'center', title: '合同名称',minWidth:200,templet:function(d){
+                    }}*/
+				,{field:'clientName',align:'center', title: '客户名称',minWidth:200,templet:function(d){
+					return "<a class=\"attention-info\" title=\""+d.clientName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看客户管理', '${ctx}/workclientinfo/workClientInfo/detail?id=" + d.clientId +"','95%', '95%')\">" + d.clientName + "</a>";
+				}}
+				,{field:'name',align:'center', title: '合同名称',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\""+d.name+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.id + "','95%', '95%')\">" + d.name + "</a>";
                     }}
-                ,{field:'ext',align:'center', title: '合同来源',minWidth:160,templet:function(d){
+				,{field:'contractType', align:'center',title: '合同类型', width:120,templet:function(d){
+						return "<span title='"+ d.contractType +"'>" + d.contractType + "</span>";
+					}}
+				,{field:'contractDate',align:'center', title: '签订日期',minWidth:160,templet:function(d){
+						return "<span title='"+ d.contractDate +"'>" + d.contractDate + "</span>";
+					}}
+				,{field:'createBy',align:'center', title: '登记人',  width:80,templet:function(d){
+						return "<span title='"+ d.createBy +"'>" + d.createBy + "</span>";
+					}}
+				,{field:'createDate',align:'center', title: '登记日期',  width:80,templet:function(d){
+						return "<span title='"+ d.createDate +"'>" + d.createDate + "</span>";
+					}}
+				,{field:'officeName',align:'center', title: '登记部门',minWidth:160,templet:function(d){
+						return "<span title='"+ d.officeName +"'>" + d.officeName + "</span>";
+					}}
+				,{field:'recordNum',align:'center', title: '归档编号',minWidth:200,templet:function(d){
+						return "<a class=\"attention-info\" title=\""+d.recordNum+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id=" + d.contrractRecordId + "&tabId=1','95%', '95%')\">" + d.recordNum + "</a>";
+					}}
+				,{field:'investmentAmount',align:'center', title: '投资额（万元）',minWidth:160,templet:function(d){
+						return "<span title='"+ d.investmentAmount +"'>" + d.investmentAmount + "</span>";
+					}}
+				,{align:'center', title: '归档状态',  width:70,templet:function(d){
+						var st = getRuralProjectArchiveState(d.contrractRecordStatus);
+						if(st.action)
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/workcontractrecord/workContractRecord/getProcessOne?id=" + d.contrractRecordId + "','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>";
+						return xml;
+					}}
+				/*,{field:'ext',align:'center', title: '合同来源',minWidth:160,templet:function(d){
                         return "<span title='"+ d.ext +"'>" + d.ext + "</span>";
                     }}
                 ,{field:'projectName',align:'center', title: '投标名称',minWidth:160,templet:function(d){
@@ -161,21 +193,12 @@
                 ,{field:'totalContractName',align:'center', title: '总合同名称',minWidth:160,templet:function(d){
                         return "<span title='"+ d.totalContractName +"'>" + d.totalContractName + "</span>";
                     }}
-                ,{field:'officeName',align:'center', title: '所属部门',minWidth:160,templet:function(d){
-                        return "<span title='"+ d.officeName +"'>" + d.officeName + "</span>";
-                    }}
                 ,{field:'contractPrice',align:'center', title: '合同金额（元）',minWidth:160,templet:function(d){
                         return "<span title='"+ d.contractPrice +"'>" + d.contractPrice + "</span>";
                     }}
-                ,{field:'contractState',align:'center', title: '合同状态',minWidth:160,templet:function(d){
-                        return "<span title='"+ d.contractState +"'>" + d.contractState + "</span>";
-                    }}
                 ,{field:'clientName',align:'center', title: '委托方',minWidth:160,templet:function(d){
                         return "<span title='"+ d.clientName +"'>" + d.clientName + "</span>";
                     }}
-                ,{field:'contractDate',align:'center', title: '签订日期',minWidth:160,templet:function(d){
-                        return "<span title='"+ d.contractDate +"'>" + d.contractDate + "</span>";
-                    }}
                 ,{field:'effectiveDate',align:'center', title: '合同生效日期',minWidth:160,templet:function(d){
                         return "<span title='"+ d.effectiveDate +"'>" + d.effectiveDate + "</span>";
                     }}
@@ -185,12 +208,6 @@
                 ,{field:'anotherContractNum',align:'center', title: '对方合同编号',minWidth:160,templet:function(d){
                         return "<span title='"+ d.anotherContractNum +"'>" + d.anotherContractNum + "</span>";
                     }}
-                ,{field:'investmentAmount',align:'center', title: '投资额（万元）',minWidth:160,templet:function(d){
-                        return "<span title='"+ d.investmentAmount +"'>" + d.investmentAmount + "</span>";
-                    }}
-                ,{field:'contractType', align:'center',title: '工程分类', width:120,templet:function(d){
-                        return "<span title='"+ d.contractType +"'>" + d.contractType + "</span>";
-                    }}
                 ,{field:'recordState', align:'center',sort:true,title: '归档状态',width:100,templet:function(d){
                         return "<span title='"+ d.recordState +"'>" + d.recordState + "</span>";
                     }}
@@ -205,7 +222,7 @@
                     }}
                 ,{field:'remarks',align:'center', title: '备注信息',  width:180,templet:function(d){
                         return "<span title='"+ d.remarks +"'>" + d.remarks + "</span>";
-                    }}
+                    }}*/
             ]]
             ,data: [
                 <c:if test="${ not empty page.list}">
@@ -223,7 +240,13 @@
                     ,"officeName":"${workContractListInfo.officeName}"
                     ,"contractPrice":"<fmt:formatNumber value="${workContractListInfo.contractPrice}" pattern="#,#00.00"/>"
                     ,"contractState":"${fns:getDictLabel(workContractListInfo.contractState, 'audit_completion_state', '')}"
-                    ,"clientName":"${workContractListInfo.clientName}"
+                    ,"clientName":"${workContractListInfo.client.name}"
+					,"clientId":"${workContractListInfo.client.id}"
+					,"createBy":"${workContractListInfo.createName}"
+					,"contrractRecordStatus":"${workContractListInfo.contrractRecordStatus}"
+					,"contrractRecordId":"${workContractListInfo.contrractRecordId}"
+					,"recordNum":"${workContractListInfo.recordNum}"
+					,"createDate":"<fmt:formatDate value="${workContractListInfo.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"contractDate":"<fmt:formatDate value="${workContractListInfo.contractDate}" pattern="yyyy-MM-dd"/>"
                     ,"effectiveDate":"<fmt:formatDate value="${workContractListInfo.effectiveDate}" pattern="yyyy-MM-dd"/>"
                     ,"closingDate":"<fmt:formatDate value="${workContractListInfo.closingDate}" pattern="yyyy-MM-dd"/>"