项目登记（添加投资性质字段，并且所在地不能选择父节点）

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -93,6 +93,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Integer overDueStatus; //超期状态（0：未超期，1：已超期）
 	private List<String> typeList;
 	private String flagArchive;  //归档员判定
+	private String projectProperties;//投资性质
 
 	@NotNull(message = "委托方联系人不能为空")
 	private List<WorkClientLinkman> workClientLinkmanList;		// 委托方联系人
@@ -1361,4 +1362,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setPlanCount(Integer planCount) {
 		this.planCount = planCount;
 	}
+
+	public String getProjectProperties() {
+		return projectProperties;
+	}
+
+	public void setProjectProperties(String projectProperties) {
+		this.projectProperties = projectProperties;
+	}
 }

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -50,7 +50,8 @@
 		a.project_type as "projectType",
 		a.over_due_status as "overDueStatus",
 		a.attachment_project_sort as "attachmentProjectSort",
-		a.check_remarks as "check_Remarks"
+		a.check_remarks as "checkRemarks",
+		a.project_properties As "projectProperties"
 	</sql>
 
 	<sql id="projectRecordsJoins">
@@ -485,7 +486,8 @@
 			attachment_project_sort,
 			project_master_id,
 			submit_money,
-			engineering_type
+			engineering_type,
+			project_properties
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -533,7 +535,8 @@
 			#{attachmentProjectSort},
 			#{projectMasterId},
 		    #{submitMoney},
-		    #{engineeringType}
+		    #{engineeringType},
+		    #{projectProperties}
 		)
 	</insert>
 
@@ -582,7 +585,8 @@
 				,project_master_id = #{projectMasterId}
 			</if>
 			,submit_money =#{submitMoney},
-			engineering_type =#{engineeringType}
+			engineering_type =#{engineeringType},
+			project_properties =#{projectProperties}
 		WHERE id = #{id}
 	</update>
 	<update id="updateDate">
@@ -634,6 +638,9 @@
 			<if test="submitMoney != null and submitMoney != ''">
 				,submit_money =#{submitMoney}
 			</if>
+			<if test="projectProperties != null and projectProperties != ''">
+				,project_properties =#{projectProperties}
+			</if>
 		WHERE id = #{id}
 	</update>
 

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

@@ -702,30 +702,40 @@
 				<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.area.name}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在省份：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>
-<%--						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在地级市：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>
-<%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在区县：</label>
+				<div class="layui-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.county}"/>
-<%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
+						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+							<c:if test="${v.value==projectRecords.projectProperties}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+							</c:if>
+						</c:forEach>
 					</div>
 				</div>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在省份：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>--%>
+<%--&lt;%&ndash;						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在地级市：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>--%>
+<%--&lt;%&ndash;						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在区县：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>--%>
+<%--&lt;%&ndash;						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">建设地点：</label>
 					<div class="layui-input-block">

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

@@ -600,31 +600,47 @@
 					<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
 					<%--</div>--%>
 					<%--</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">项目所在地：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在省份：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>--%>
+<%--							&lt;%&ndash;						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在地级市：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>--%>
+<%--							&lt;%&ndash;						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在区县：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>--%>
+<%--							&lt;%&ndash;						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目所在地：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在省份：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>
-							<%--						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在地级市：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>
-							<%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在区县：</label>
+				<div class="layui-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.county}"/>
-							<%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
+						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+							<c:if test="${v.value==projectRecords.projectProperties}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+							</c:if>
+						</c:forEach>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">

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

@@ -200,6 +200,8 @@
                         if(county != '') {
                             $("#county").val(county);
                         }
+                        $("#areaShow").html(pro+"-"+city+"-"+county);
+
                     },
 
                 });
@@ -747,26 +749,38 @@
                         <%--<form:input path="scaleQuantity" htmlEscape="false"  class="form-control number layui-input"/>--%>
                     <%--</div>--%>
                 <%--</div>--%>
+
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">项目所在地：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                        cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:treeselectProject id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
+                                               cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input judgment" allowClear="true" notAllowSelectParent="true"/>
+                        <span id="areaShow" style="color: #999"><c:if test="${projectRecords.area.id!=null}">${projectRecords.province}-${projectRecords.city}-${projectRecords.county}</c:if></span>
+
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
+                    <div class="layui-input-block">
+                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <label class="layui-form-label">所在区县：</label>
                     <div class="layui-input-block">
                         <form:input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>

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

@@ -252,6 +252,7 @@
                         if(county != '') {
                             $("#county").val(county);
                         }
+                        $("#areaShow").html(pro+"-"+city+"-"+county);
                     },
 
                 });
@@ -878,23 +879,33 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
+                        <sys:treeselectProject id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
                                        cssStyle="background-color: #fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                        <span id="areaShow" style="color: #999"><c:if test="${ruralProjectRecords.area.id!=null}">${ruralProjectRecords.province}-${ruralProjectRecords.city}-${ruralProjectRecords.county}</c:if></span>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
+                    <div class="layui-input-block">
+                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <label class="layui-form-label">所在区县：</label>
                     <div class="layui-input-block">
                         <form:input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>

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

@@ -242,6 +242,7 @@
                         if(county != '') {
                             $("#county").val(county);
                         }
+                        $("#areaShow").html(pro+"-"+city+"-"+county);
                     },
 
                 });
@@ -887,23 +888,34 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                       cssStyle="background-color: #fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:treeselectProject id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
+                                               cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <span id="areaShow" style="color: #999"><c:if test="${projectRecords.area.id!=null}">${projectRecords.province}-${projectRecords.city}-${projectRecords.county}</c:if></span>
+
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
+                    <div class="layui-input-block">
+                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <label class="layui-form-label">所在区县：</label>
                     <div class="layui-input-block">
                         <form:input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>

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

@@ -200,6 +200,7 @@
                         if(county != '') {
                             $("#county").val(county);
                         }
+                        $("#areaShow").html(pro+"-"+city+"-"+county);
                     },
 
                 });
@@ -742,23 +743,34 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <sys:treeselectProject id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
+                                               cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <span id="areaShow" style="color: #999"><c:if test="${projectRecords.area.id!=null}">${projectRecords.province}-${projectRecords.city}-${projectRecords.county}</c:if></span>
+
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
+                    <div class="layui-input-block">
+                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <label class="layui-form-label">所在区县：</label>
                     <div class="layui-input-block">
                         <form:input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>

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

@@ -238,27 +238,37 @@
 				<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.area.name}"/>
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
-				<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 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 lw6">
-					<label class="layui-form-label">所在区县：</label>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
 					<div class="layui-input-block">
-						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
+						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+							<c:if test="${v.value==projectRecords.projectProperties}">
+								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${v.label}"/>
+							</c:if>
+						</c:forEach>
 					</div>
 				</div>
+<%--				<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 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 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"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">建设地点：</label>
 					<div class="layui-input-block">

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

@@ -276,6 +276,7 @@
                         if(county != '') {
                             $("#county").val(county);
                         }
+                        $("#areaShow").html(pro+"-"+city+"-"+county);
                     },
 
                 });
@@ -897,23 +898,34 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectArae id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
-                                       cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
+                        <sys:treeselectProject id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
+                                               cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input judgment" allowClear="true" notAllowSelectParent="true"/>
+                        <span id="areaShow" style="color: #999"><c:if test="${ruralProjectRecords.area.id!=null}">${ruralProjectRecords.province}-${ruralProjectRecords.city}-${ruralProjectRecords.county}</c:if></span>
+
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
+                    <div class="layui-input-block">
+                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <label class="layui-form-label">所在区县：</label>
                     <div class="layui-input-block">
                         <form:input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>

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

@@ -246,6 +246,7 @@
                         if(county != '') {
                             $("#county").val(county);
                         }
+                        $("#areaShow").html(pro+"-"+city+"-"+county);
                     },
 
                 });
@@ -878,23 +879,34 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
+                        <sys:treeselectProject id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
                                        cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <span id="areaShow" style="color: #999"><c:if test="${projectRecords.area.id!=null}">${projectRecords.province}-${projectRecords.city}-${projectRecords.county}</c:if></span>
+
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
+                    <div class="layui-input-block">
+                        <form:select placeholder="请选择" path="projectProperties" class="form-control required editable-select layui-input" id="projectProperties" value="${ruralProjectRecords.projectProperties}">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('project_properties')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <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 lw7" style="display: none">
                     <label class="layui-form-label">所在区县：</label>
                     <div class="layui-input-block">
                         <form:input path="county" htmlEscape="false" id="county" class="form-control layui-input" readonly="true"/>

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

@@ -183,27 +183,37 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目所在地：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">所在省份：</label>
+					<label class="layui-form-label">投资性质：</label>
 					<div class="layui-input-block">
-						<form:input path="province" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">所在地级市：</label>
-					<div class="layui-input-block">
-						<form:input path="city" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">所在区县：</label>
-					<div class="layui-input-block">
-						<form:input path="county" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
+						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+							<c:if test="${v.value==projectRecords.projectProperties}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+							</c:if>
+						</c:forEach>
 					</div>
 				</div>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">所在省份：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<form:input path="province" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">所在地级市：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<form:input path="city" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">所在区县：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<form:input path="county" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">建设地点：</label>
 					<div class="layui-input-block">
@@ -238,10 +248,10 @@
 					<label class="layui-form-label">工程类型：</label>
 					<div class="layui-input-block">
 						<c:if test="${projectRecords.engineeringType==''}">
-							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="engineeringType" class="form-control layui-input"/>
+							<input htmlEscape="false" style="background-color: #f1f1f1" style="background-color: #f1f1f1" readonly="true" id="engineeringType" class="form-control layui-input"/>
 						</c:if>
 						<c:forEach items="${engineeringInfo}" varStatus="index" var="info">
-							<c:if test="${info.id == projectRecords.engineeringType}"><input htmlEscape="false" readonly="true" id="engineeringType" class="form-control layui-input"  value="${info.engineeringName}"/></c:if>
+							<c:if test="${info.id == projectRecords.engineeringType}"><input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="engineeringType" class="form-control layui-input"  value="${info.engineeringName}"/></c:if>
 						</c:forEach>
 					</div>
 				</div>

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

@@ -232,30 +232,40 @@
 					<div class="layui-item layui-col-sm6 lw8">
 						<label class="layui-form-label">项目所在地：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw8">
-						<label class="layui-form-label">所在省份：</label>
+						<label class="layui-form-label">投资性质：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>
-								<%--						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm6 lw8">
-						<label class="layui-form-label">所在地级市：</label>
-						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>
-								<%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm6 lw8">
-						<label class="layui-form-label">所在区县：</label>
-						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>
-								<%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
+							<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+								<c:if test="${v.value==projectRecords.projectProperties}">
+									<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+								</c:if>
+							</c:forEach>
 						</div>
 					</div>
+<%--					<div class="layui-item layui-col-sm6 lw8">--%>
+<%--						<label class="layui-form-label">所在省份：</label>--%>
+<%--						<div class="layui-input-block">--%>
+<%--							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>--%>
+<%--								&lt;%&ndash;						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--						</div>--%>
+<%--					</div>--%>
+<%--					<div class="layui-item layui-col-sm6 lw8">--%>
+<%--						<label class="layui-form-label">所在地级市：</label>--%>
+<%--						<div class="layui-input-block">--%>
+<%--							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>--%>
+<%--								&lt;%&ndash;						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--						</div>--%>
+<%--					</div>--%>
+<%--					<div class="layui-item layui-col-sm6 lw8">--%>
+<%--						<label class="layui-form-label">所在区县：</label>--%>
+<%--						<div class="layui-input-block">--%>
+<%--							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>--%>
+<%--								&lt;%&ndash;						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--						</div>--%>
+<%--					</div>--%>
 					<div class="layui-item layui-col-sm6 lw8">
 						<label class="layui-form-label">建设地点：</label>
 						<div class="layui-input-block">

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

@@ -333,30 +333,46 @@
                 <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw8">
-                    <label class="layui-form-label">所在省份：</label>
+                    <label class="layui-form-label">投资性质：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>
-                            <%--						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw8">
-                    <label class="layui-form-label">所在地级市：</label>
-                    <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>
-                            <%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw8">
-                    <label class="layui-form-label">所在区县：</label>
-                    <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>
-                            <%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
+                        <c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+                            <c:if test="${v.value==projectRecords.projectProperties}">
+                                <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+                            </c:if>
+                        </c:forEach>
                     </div>
                 </div>
+<%--                <div class="layui-item layui-col-sm6 lw8">--%>
+<%--                    <label class="layui-form-label">项目所在地：</label>--%>
+<%--                    <div class="layui-input-block">--%>
+<%--                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--                <div class="layui-item layui-col-sm6 lw8">--%>
+<%--                    <label class="layui-form-label">所在省份：</label>--%>
+<%--                    <div class="layui-input-block">--%>
+<%--                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>--%>
+<%--                            &lt;%&ndash;						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--                <div class="layui-item layui-col-sm6 lw8">--%>
+<%--                    <label class="layui-form-label">所在地级市：</label>--%>
+<%--                    <div class="layui-input-block">--%>
+<%--                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>--%>
+<%--                            &lt;%&ndash;						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--                <div class="layui-item layui-col-sm6 lw8">--%>
+<%--                    <label class="layui-form-label">所在区县：</label>--%>
+<%--                    <div class="layui-input-block">--%>
+<%--                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>--%>
+<%--                            &lt;%&ndash;						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--                    </div>--%>
+<%--                </div>--%>
                 <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">建设地点：</label>
                     <div class="layui-input-block">

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

@@ -620,31 +620,47 @@
 					<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
 					<%--</div>--%>
 					<%--</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">项目所在地：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在省份：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>--%>
+<%--							&lt;%&ndash;						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在地级市：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>--%>
+<%--							&lt;%&ndash;						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在区县：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>--%>
+<%--							&lt;%&ndash;						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目所在地：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在省份：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>
-							<%--						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在地级市：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>
-							<%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在区县：</label>
+				<div class="layui-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.county}"/>
-							<%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
+						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+							<c:if test="${v.value==projectRecords.projectProperties}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+							</c:if>
+						</c:forEach>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">

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

@@ -117,31 +117,47 @@
 					<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
 					<%--</div>--%>
 					<%--</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">项目所在地：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在省份：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>--%>
+<%--							&lt;%&ndash;						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在地级市：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>--%>
+<%--							&lt;%&ndash;						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw7">--%>
+<%--					<label class="layui-form-label">所在区县：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>--%>
+<%--							&lt;%&ndash;						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目所在地：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在省份：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>
-							<%--						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在地级市：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>
-							<%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">所在区县：</label>
+				<div class="layui-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.county}"/>
-							<%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
+						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+							<c:if test="${v.value==projectRecords.projectProperties}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+							</c:if>
+						</c:forEach>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">

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

@@ -161,31 +161,47 @@
 					<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
 					<%--</div>--%>
 					<%--</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">项目所在地：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">所在省份：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>--%>
+<%--&lt;%&ndash;						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">所在地级市：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>--%>
+<%--&lt;%&ndash;						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">所在区县：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>--%>
+<%--&lt;%&ndash;						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>&ndash;%&gt;--%>
+<%--					</div>--%>
+<%--				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目所在地：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">所在省份：</label>
+					<label class="layui-form-label">投资性质：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>
-<%--						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">所在地级市：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>
-<%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">所在区县：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>
-<%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
+						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+							<c:if test="${v.value==projectRecords.projectProperties}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+							</c:if>
+						</c:forEach>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">

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

@@ -1468,9 +1468,13 @@
                                                     <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                 </c:otherwise>
                                             </c:choose>
+                                            <c:if test="${fileAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                            </c:if>
                                             <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
                                                 <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
                                             </c:if>
+
                                         </div>
                                     </td>
                                 </tr>

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

@@ -128,27 +128,37 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目所在地：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">所在省份：</label>
+					<label class="layui-form-label">投资性质：</label>
 					<div class="layui-input-block">
-						<form:input path="province" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">所在地级市：</label>
-					<div class="layui-input-block">
-						<form:input path="city" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6 lw6">
-					<label class="layui-form-label">所在区县：</label>
-					<div class="layui-input-block">
-						<form:input path="county" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
+						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+							<c:if test="${v.value==projectRecords.projectProperties}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+							</c:if>
+						</c:forEach>
 					</div>
 				</div>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">所在省份：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<form:input path="province" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">所在地级市：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<form:input path="city" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+<%--					<label class="layui-form-label">所在区县：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<form:input path="county" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
+<%--					</div>--%>
+<%--				</div>--%>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">建设地点：</label>
 					<div class="layui-input-block">