Explorar el Código

项目登记列表(添加项目等级列,筛选条件项目等级,部门可进行模糊查询)

[user3] hace 3 años
padre
commit
e45f394a2b

+ 33 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -381,7 +381,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
-								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
+								<sys:treeselectMoHu id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
 												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
@@ -430,7 +430,18 @@
 								</form:select>
 							</div>
 						</div>
-
+						<div class="layui-item query athird ">
+							<label class="layui-form-label double-line">项目等级:</label>
+							<div class="layui-input-block">
+								<form:select path="submitMoney" class="form-control simple-select">
+									<form:option value="" label=""/>
+									<form:option value="2" label="A级"/>
+									<form:option value="1" label="B级"/>
+									<%--<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>--%>
+								</form:select>
+							</div>
+						</div>
 
 
 						<div style="clear:both;"></div>
@@ -527,6 +538,9 @@
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
+				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
+						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
+					}}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                         var st = getruralProjectState(d.projectStatus);
                         if(st.action)
@@ -637,6 +651,23 @@
 					,"recordStatus":"0"
                     </c:otherwise>
                     </c:choose>
+					,"submitMoneyStr":
+							<c:choose>
+								<c:when test="${'2'==projectRecords.submitMoney}">
+								"A级"
+								</c:when>
+								<c:otherwise>
+								"B级"
+								<%--<c:choose>
+									<c:when test="${'1'==projectRecords.emergencyProject}">
+										"B级紧急"
+									</c:when>
+									<c:otherwise>
+										"B级非紧急"
+									</c:otherwise>
+								</c:choose>--%>
+								</c:otherwise>
+							</c:choose>
                     <shiro:hasPermission name="ruralProject:ruralCostProjectRecords:edit">,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:accessory">
 						,"recordStatus":

+ 34 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -354,7 +354,7 @@
 						<div class="layui-item query athird">
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
-								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
+								<sys:treeselectMoHu id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
 												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
@@ -403,6 +403,19 @@
 								</form:select>
 							</div>
 						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label double-line">项目等级:</label>
+							<div class="layui-input-block">
+								<form:select path="submitMoney" class="form-control simple-select">
+									<form:option value="" label=""/>
+									<form:option value="2" label="A级"/>
+									<form:option value="1" label="B级"/>
+									<%--<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>--%>
+								</form:select>
+							</div>
+						</div>
+
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -493,6 +506,9 @@
                         return "<span title=\"" + d.client + "\">" + d.client + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
+				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
+						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
+					}}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                         <%--var st = getAuditState(d.projectStatus)--%>
                         <%--var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
@@ -607,6 +623,23 @@
                     ,"recordStatus":"0"
                     </c:otherwise>
                     </c:choose>
+					,"submitMoneyStr":
+							<c:choose>
+							<c:when test="${'2'==projectRecords.submitMoney}">
+							"A级"
+					</c:when>
+					<c:otherwise>
+					"B级"
+					<%--<c:choose>
+                        <c:when test="${'1'==projectRecords.emergencyProject}">
+                            "B级紧急"
+                        </c:when>
+                        <c:otherwise>
+                            "B级非紧急"
+                        </c:otherwise>
+                    </c:choose>--%>
+					</c:otherwise>
+					</c:choose>
                     <shiro:hasPermission name="ruralProject:ruralProjectRecords:edit">,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && fn:contains(projectRecords.leaderIds,fns:getUser().id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralProjectRecords:accessory">
 					,"recordStatus":