添加报告 加入土建和安装字段以及计算

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

@@ -93,6 +93,8 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private Double contractFee;   //合同价
 	private Double verifyFee;    //核增核减额
 	private Double verifyRate;    //核增核减率
+	private Double buildingRate;    //土建比例
+	private Double installRate;    //安装比例
 	private Double consultFee;    //咨询标的额
 	private Double buildingFee;   //土建额
 	private Double installFee;    //安装额
@@ -598,4 +600,20 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setTempType(String tempType) {
 		this.tempType = tempType;
 	}
+
+	public Double getBuildingRate() {
+		return buildingRate;
+	}
+
+	public void setBuildingRate(Double buildingRate) {
+		this.buildingRate = buildingRate;
+	}
+
+	public Double getInstallRate() {
+		return installRate;
+	}
+
+	public void setInstallRate(Double installRate) {
+		this.installRate = installRate;
+	}
 }

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

@@ -38,7 +38,9 @@
 		a.verify_rate AS "verifyRate",
 		a.consult_fee AS "consultFee",
 		a.building_fee AS "buildingFee",
-		a.install_fee AS "installFee"
+		a.install_fee AS "installFee",
+		a.building_rate as "buildingRate",
+		a.install_rate as "installRate"
 	</sql>
 	
 	<sql id="projectReportDataJoins">
@@ -525,7 +527,9 @@
 		    verify_rate,
 		    consult_fee,
 		    building_fee,
-		    install_fee
+		    install_fee,
+		    building_rate,
+		    install_rate
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -558,7 +562,9 @@
 			#{verifyRate},
 			#{consultFee},
 			#{buildingFee},
-			#{installFee}
+			#{installFee},
+			#{buildingRate},
+			#{installRate}
 		)
 	</insert>
 	
@@ -590,7 +596,9 @@
 			verify_rate = #{verifyRate},
 			consult_fee = #{consultFee},
 			building_fee = #{buildingFee},
-			install_fee = #{installFee}
+			install_fee = #{installFee},
+			building_rate = #{buildingRate},
+			install_rate = #{installRate}
 		WHERE id = #{id}
 	</update>
 

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

@@ -270,16 +270,16 @@
             ,page: false
             ,cols: [[
                 // {checkbox: true, fixed: true},
-                {field:'index',align:'center', title: '序号',width:40}
-                ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
+                {field:'index',align:'center', fixed: 'left', title: '序号',width:40}
+				,{field:'projectReportNumber',align:'center', fixed: 'left', title: '报告号',minWidth:180,templet:function(d){
+						return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view','95%', '95%')\">" + d.projectReportNumber + "</a>";
+					}}
+                ,{field:'projName',align:'center', title: '项目名称', fixed: 'left',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){
                         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:'projectReportNumber',align:'center', title: '报告号',minWidth:200,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view','95%', '95%')\">" + d.projectReportNumber + "</a>";
-					}}
                 ,{field:'recodeNum', align:'center',title: '案卷号',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.contract + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id + "&view=view','95%', '95%')\">" + d.recodeNum + "</a>";
 
@@ -311,7 +311,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",width:230,templet:function(d){
+                ,{field:'op',align:'center',title:"操作", fixed: 'right',width:230,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
                         if(d.canAdd != undefined && d.canAdd =="1")

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

@@ -181,6 +181,18 @@
 						<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
 			</div>
 
 			<div class="form-group layui-row">

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

@@ -55,6 +55,77 @@
                 },100);
             }
         });
+        function getFee() {
+            var rf = $("#reviewFee").val();
+            var af = $("#approvalFee").val();
+            if(rf != ''&& af !=''){
+                var hf = parseInt(rf)-parseInt(af);
+                var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+                $("#verifyFee").val(hf);
+                $("#verifyRate").val(rate);
+            }
+            if(af !=''){
+                $("#consultFee").val(af)
+            }
+        }
+
+        function getApprovalFee() {
+            var rf = $("#reviewFee").val();
+            var af = $("#approvalFee").val();
+            //土建
+            var bf = $("#buildingFee").val();
+            //安装
+            var inf = $("#installFee").val();
+            if(rf != ''&& af !=''){
+                var hf = parseInt(rf)-parseInt(af);
+                var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+                $("#verifyFee").val(hf);
+                $("#verifyRate").val(rate);
+            }
+            if(af !=''){
+                $("#consultFee").val(af)
+            }
+            $("#buildingFee").val("");
+            $("#installFee").val("");
+            $("#buildingRate").val("");
+            $("#installRate").val("");
+        }
+
+        function getInstallFee() {
+            var af = $("#approvalFee").val();
+            //安装
+            var inf = $("#installFee").val();
+            if(inf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(inf);
+                var rate = Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100
+                $("#installRate").val(rate);
+                $("#buildingFee").val(hf);
+                bf = hf;
+                var bRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+                $("#buildingRate").val(bRate);
+            }
+            if(inf == ''|| af ==''){
+                $("#installRate").val("");
+            }
+        }
+
+        function getBuildingFee() {
+            var af = $("#approvalFee").val();
+            //土建
+            var bf = $("#buildingFee").val();
+            if(bf != ''&& af !=''){
+                var hf = parseInt(af)-parseInt(bf);
+                var rate = Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100
+                $("#buildingRate").val(rate);
+                $("#installFee").val(hf);
+                inf = hf;
+                var inRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+                $("#installRate").val(inRate);
+            }
+            if(bf == ''|| af ==''){
+                $("#buildingRate").val("");
+            }
+        }
 
         function insertTitle(tValue){
             var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
@@ -136,13 +207,13 @@
                 <div class="layui-item layui-col-sm6">
                     <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 required layui-input" readonly="true"/>
+                        <form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input" readonly="true" onchange="getFee()"/>
                     </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 with-icon">
-                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" readonly="true"/>
+                        <form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input" readonly="true" onchange="getApprovalFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -172,13 +243,25 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">土建造价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true" onchange="getBuildingFee()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">安装造价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+                        <form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true" onchange="getInstallFee()"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">土建比例(%)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">安装比例(%)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
             </div>

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

@@ -78,6 +78,18 @@
 						<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">土建比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">安装比例(%)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+					</div>
+				</div>
 			</div>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>报告文件</h2></div>

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

@@ -258,6 +258,64 @@
 			}
 		}
 
+		function getApprovalFee() {
+			var rf = $("#reviewFee").val();
+			var af = $("#approvalFee").val();
+			//土建
+			var bf = $("#buildingFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if(rf != ''&& af !=''){
+				var hf = parseInt(rf)-parseInt(af);
+				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				$("#verifyFee").val(hf);
+				$("#verifyRate").val(rate);
+			}
+			if(af !=''){
+				$("#consultFee").val(af)
+			}
+			$("#buildingFee").val("");
+			$("#installFee").val("");
+			$("#buildingRate").val("");
+			$("#installRate").val("");
+		}
+
+		function getInstallFee() {
+			var af = $("#approvalFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if(inf != ''&& af !=''){
+				var hf = parseInt(af)-parseInt(inf);
+				var rate = Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100
+				$("#installRate").val(rate);
+				$("#buildingFee").val(hf);
+				bf = hf;
+				var bRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+				$("#buildingRate").val(bRate);
+			}
+			if(inf == ''|| af ==''){
+				$("#installRate").val("");
+			}
+		}
+
+		function getBuildingFee() {
+			var af = $("#approvalFee").val();
+			//土建
+			var bf = $("#buildingFee").val();
+			if(bf != ''&& af !=''){
+				var hf = parseInt(af)-parseInt(bf);
+				var rate = Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100
+				$("#buildingRate").val(rate);
+				$("#installFee").val(hf);
+				inf = hf;
+				var inRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+				$("#installRate").val(inRate);
+			}
+			if(bf == ''|| af ==''){
+				$("#buildingRate").val("");
+			}
+		}
+
         function addReview(obj) {
             var infoId = $("#id").val();
             var name = $("#name").val();
@@ -337,7 +395,6 @@
 				<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
 				<div class="layui-input-block">
 					<form:select  path="projectReportData.achievementType" class="form-control simple-select required">
-						<form:option value="" label=""/>
 						<form:options items="${fns:getMainDictList('achievement_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 					</form:select>
 				</div>
@@ -364,7 +421,7 @@
 					<div class="layui-item layui-col-sm6">
 						<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 required layui-input number" onchange="getFee()"/>
+							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -394,13 +451,25 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">土建造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number"/>
+							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">安装造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number"/>
+							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">土建比例(%)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">安装比例(%)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 						</div>
 					</div>
 				</div>

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

@@ -257,6 +257,64 @@
 			}
 		}
 
+		function getApprovalFee() {
+			var rf = $("#reviewFee").val();
+			var af = $("#approvalFee").val();
+			//土建
+			var bf = $("#buildingFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if(rf != ''&& af !=''){
+				var hf = parseInt(rf)-parseInt(af);
+				var rate = Math.round(parseInt(hf) / parseInt(rf) * 100) / 100 * 100
+				$("#verifyFee").val(hf);
+				$("#verifyRate").val(rate);
+			}
+			if(af !=''){
+				$("#consultFee").val(af)
+			}
+			$("#buildingFee").val("");
+			$("#installFee").val("");
+			$("#buildingRate").val("");
+			$("#installRate").val("");
+		}
+
+		function getInstallFee() {
+			var af = $("#approvalFee").val();
+			//安装
+			var inf = $("#installFee").val();
+			if(inf != ''&& af !=''){
+				var hf = parseInt(af)-parseInt(inf);
+				var rate = Math.round(parseInt(inf) / parseInt(af) * 100) / 100 * 100
+				$("#installRate").val(rate);
+				$("#buildingFee").val(hf);
+				bf = hf;
+				var bRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+				$("#buildingRate").val(bRate);
+			}
+			if(inf == ''|| af ==''){
+				$("#installRate").val("");
+			}
+		}
+
+		function getBuildingFee() {
+			var af = $("#approvalFee").val();
+			//土建
+			var bf = $("#buildingFee").val();
+			if(bf != ''&& af !=''){
+				var hf = parseInt(af)-parseInt(bf);
+				var rate = Math.round(parseInt(bf) / parseInt(af) * 100) / 100 * 100
+				$("#buildingRate").val(rate);
+				$("#installFee").val(hf);
+				inf = hf;
+				var inRate = Math.round(parseInt(hf) / parseInt(af) * 100) / 100 * 100
+				$("#installRate").val(inRate);
+			}
+			if(bf == ''|| af ==''){
+				$("#buildingRate").val("");
+			}
+		}
+
         function addReview(obj) {
             var infoId = $("#id").val();
             var name = $("#name").val();
@@ -320,7 +378,6 @@
 				<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
 				<div class="layui-input-block">
 					<form:select  path="projectReportData.achievementType" class="form-control simple-select required">
-						<form:option value="" label=""/>
 						<form:options items="${fns:getMainDictList('achievement_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 					</form:select>
 				</div>
@@ -347,7 +404,7 @@
 					<div class="layui-item layui-col-sm6">
 						<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 required layui-input number" onchange="getFee()"/>
+							<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -377,13 +434,25 @@
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">土建造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number"/>
+							<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input number" onchange="getBuildingFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">安装造价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number"/>
+							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number" onchange="getInstallFee()"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">土建比例(%)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">安装比例(%)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
 						</div>
 					</div>
 				</div>

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

@@ -78,6 +78,18 @@
 					<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 				</div>
 			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">土建比例(%)：</label>
+				<div class="layui-input-block with-icon">
+					<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">安装比例(%)：</label>
+				<div class="layui-input-block with-icon">
+					<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+				</div>
+			</div>
 		</div>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>报告文件</h2></div>

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

@@ -226,7 +226,7 @@
 							<div class="layui-input-block">
 								<form:select path="projectReportStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
-									<form:options items="${fns:getDictList('audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
 						</div>
@@ -271,16 +271,16 @@
             ,page: false
             ,cols: [[
                 // {checkbox: true, fixed: true},
-                {field:'index',align:'center', title: '序号',width:40}
-                ,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
+                {field:'index',align:'center', fixed: 'left', title: '序号',width:40}
+				,{field:'projectReportNumber',align:'center', fixed: 'left', title: '报告号',minWidth:180,templet:function(d){
+						return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view','95%', '95%')\">" + d.projectReportNumber + "</a>";
+					}}
+                ,{field:'projName',align:'center',fixed: 'left', 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){
                         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:'projectReportNumber',align:'center', title: '报告号',minWidth:200,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=view','95%', '95%')\">" + d.projectReportNumber + "</a>";
-					}}
                 ,{field:'recodeNum', align:'center',title: '案卷号',minWidth:200,templet:function(d){
                         return "<a class=\"attention-info\" title=\"" + d.recodeNum + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id + "&view=view','95%', '95%')\">" + d.recodeNum + "</a>";
 
@@ -312,7 +312,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",width:230,templet:function(d){
+                ,{field:'op',align:'center',title:"操作", fixed: 'right',width:230,templet:function(d){
                         ////对操作进行初始化
                         var xml="";
                         if(d.canAdd != undefined && d.canAdd =="1")