项目列表信息修改

src/main/webapp/WEB-INF/tags/table/addRow.tag

@@ -10,6 +10,6 @@
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
 <script type="text/javascript">
 	function add(){
-		openDialog("新增"+'${title}',encodeURI("${url}"),"${width==null?'95%':width}", "${height==null?'95%':height}","${target}");
+		openDialog('${title}'+"登记",encodeURI("${url}"),"${width==null?'95%':width}", "${height==null?'95%':height}","${target}");
 	}
 </script>

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

@@ -284,9 +284,10 @@
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralCostProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
-                ,{field:'projId',align:'center', title: '项目编号',minWidth:150,templet:function(d){
+				,{field:'projId',align:'center', title: '项目编号',  width:150}
+                /*,{field:'projId',align:'center', title: '项目编号',minWidth:150,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralCostProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
-                    }}
+                    }}*/
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
                     	return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 					}}

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

@@ -152,19 +152,19 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在省份：</label>
 					<div class="layui-input-block">
 						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在地级市：</label>
 					<div class="layui-input-block">
 						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在区县：</label>
 					<div class="layui-input-block">
 						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
@@ -188,13 +188,13 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所属部门：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
 						<input readonly="true" placeholder="开始时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
@@ -212,85 +212,85 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程结构：</label>
 					<div class="layui-input-block">
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">地上层数：</label>
 					<div class="layui-input-block">
 						<form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">底下层数：</label>
 					<div class="layui-input-block">
 						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">建筑面积或规模：</label>
 					<div class="layui-input-block">
 						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">计量单位：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程用途：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<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.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<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.buildingFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<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.installFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">其中土建百分比(%)：</label>
 					<div class="layui-input-block">
 						<form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<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 lw6">
 					<label class="layui-form-label">单位造价(元)：</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"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<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.buildingUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<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.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>

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

@@ -1058,7 +1058,7 @@
                 </div>
             </div>
 
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目组成员列表</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container">
                     <table id="usersListTable" class="table table-bordered table-condensed details">
@@ -1067,7 +1067,7 @@
                             <th width="25%">姓名</th>
                             <th width="25%">部门</th>
                             <th width="25%">职级</th>
-                            <th width="80px;">状态</th>
+                            <th width="150px;">状态</th>
                         </tr>
                         </thead>
                         <tbody id="usersList">
@@ -1099,7 +1099,7 @@
                         </tbody>
                     </table>
                 </div>
-            </div>
+            </div>--%>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

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

@@ -312,9 +312,10 @@
                 ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
                     }}
-                ,{field:'projId',align:'center', title: '项目编号',minWidth:150,templet:function(d){
+				,{field:'projId',align:'center', title: '项目编号',  width:150}
+                /*,{field:'projId',align:'center', title: '项目编号',minWidth:150,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
-                    }}
+                    }}*/
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
                     	return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 					}}

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

@@ -152,19 +152,19 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在省份：</label>
 					<div class="layui-input-block">
 						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在地级市：</label>
 					<div class="layui-input-block">
 						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在区县：</label>
 					<div class="layui-input-block">
 						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
@@ -188,13 +188,13 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所属部门：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
 						<input readonly="true" placeholder="开始时间" type="text" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
@@ -212,85 +212,85 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程结构：</label>
 					<div class="layui-input-block">
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectStructure}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">地上层数：</label>
 					<div class="layui-input-block">
 						<form:input path="onGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">底下层数：</label>
 					<div class="layui-input-block">
 						<form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">建筑面积或规模：</label>
 					<div class="layui-input-block">
 						<form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">计量单位：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程用途：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<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.totalFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="totalFees" class="form-control layui-input required number"  readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<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.buildingFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingFees" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<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.installFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installFees" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">其中土建百分比(%)：</label>
 					<div class="layui-input-block">
 						<form:input path="buildingPercent" htmlEscape="false" id="buildingPercent" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<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 lw6">
 					<label class="layui-form-label">单位造价(元)：</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"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<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.buildingUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<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.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>