代码及页面样式修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageAllController.java

@@ -305,32 +305,34 @@ public class RuralProjectMessageAllController extends BaseController {
                 consultant.setRole("咨询员");
                 consultant.setZixunyuanName(user.getName());
                 if(consultant.getZixunyuan().equals(projectReportData.getBzshbUserId())){
-                    User chenHongXing=UserUtils.getByLoginName("陈红星");
+                    User chenHongXing=UserUtils.get(projectReportData.getBzshbUserId());
                     List<WorkStaffCertificate> chenHongXingCertificateList = ruralProjectMessageService.getCertificateByUser(chenHongXing.getId());
-                    //获取陈红星的造价师信息
-                    WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+                    if(chenHongXingCertificateList.size()>0){
 
-                    //根据用户查询技能信息
-                    List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
-                    for (WorkStaffCertificate certificateInfo: certificateBList) {
-                        for (MainDictDetail type : certificateMajor) {
-                            if(certificateInfo.getMajor().equals(type.getValue())){
-                                bzshbConsultant.setMajor(type.getLabel());
+                        //获取陈红星的造价师信息
+                        WorkStaffCertificate chenHongXingStaffCertificate = chenHongXingCertificateList.get(0);
+
+                        //根据用户查询技能信息
+                        List<WorkStaffCertificate> certificateBList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+                        for (WorkStaffCertificate certificateInfo: certificateBList) {
+                            for (MainDictDetail type : certificateMajor) {
+                                if(certificateInfo.getMajor().equals(type.getValue())){
+                                    consultant.setMajor(type.getLabel());
+                                }
                             }
                         }
-                    }
 
-                    bzshbConsultant = consultant;
-                    bzshbConsultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
-                    bzshbConsultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
-                    bzshbConsultant.setRole("技术负责人");
-                    it.remove();
+                        consultant.setZhucezigezhID(chenHongXingStaffCertificate.getNum());
+                    }
+                    consultant.setZixunyuanName(""+consultant.getZixunyuanName()+"");
+                    consultant.setRole("技术负责人");
+                    //it.remove();
                 }
             }
         }
         consultants.addAll(consultantList);
 
-        if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
+        /*if(StringUtils.isNotBlank(bzshbConsultant.getZixunyuan())){
             consultants.add(bzshbConsultant);
         }else{
             //查询总审人员信息
@@ -388,7 +390,7 @@ public class RuralProjectMessageAllController extends BaseController {
                 bzshbConsultant.setRole("技术负责人");
                 consultants.add(bzshbConsultant);
             }
-        }
+        }*/
 
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());

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

@@ -334,7 +334,7 @@ END) as projectScale*/
 		sub.name as "projectMasterName",
 		sob.name as "projectMasterOffice",
 		wct.id AS "workContractInfo.client.id",
-		wct.name AS "workContractInfo.client.name",
+		wci.clientName AS "workContractInfo.clientName",
 		o.top_company AS "office.name",
 		o.name AS "createByOffice",
 		ifnull(prd.number ,"") as "projectReportNumber"

src/main/webapp/static/common/css/appBlue.css

@@ -9306,10 +9306,10 @@ table.white tbody {
 	}
 */
 }
-/* Have to set height explicity on ui-view 
+/* Have to set height explicity on ui-view
 to prevent collapsing during animation*/
 /*.well[ui-view]{
- height: 65px; 
+ height: 65px;
 }*/
 [ui-view] {
   position: absolute;
@@ -9419,7 +9419,7 @@ body {
 .sidebar-menu{
 	border-right: 1px solid #c4c8cb;
 }
-		
+
 .side-widgets {
   top: 0;
   bottom: 0;
@@ -9446,12 +9446,12 @@ body {
 }
 
 .menu-body> .nav > li >ul.collapse{
-	  border-left: 0px;    
+	  border-left: 0px;
 	 -webkit-transition: all .5s;
 	 transition: all .5s;
 }
 
-/*锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷呖锟斤拷锟斤拷锟� 锟竭匡拷直锟斤拷应锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟侥尺达拷*/  
+/*锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷呖锟斤拷锟斤拷锟� 锟竭匡拷直锟斤拷应锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟侥尺达拷*/
 .menu::-webkit-scrollbar-track {
 	   width: 0px;
 	   text-decoration: none;

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -1563,7 +1563,7 @@
 			<ul class="list-tabs">
 				<li class="active"><a>质量复核信息</a><span style="display: none">info</span></li>
 				<li><a>档案信息</a><span style="display: none">archives</span></li>
-				<li><a>上报信息</a><span style="display: none">recordsReported</span></li>
+				<%--<li><a>上报信息</a><span style="display: none">recordsReported</span></li>--%>
 			</ul>
 		</div>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -591,23 +591,23 @@
 		}
 		function projectUpgrade(id,projectReportRecordStatus,filingProjectStatus,projectReportStatus,projectReportStatusTwo) {
 			if (projectReportRecordStatus == '2' || projectReportRecordStatus == '4'){
-				top.layer.msg("电子归档流程正在运行当中,请撤回流程！", {icon: 0});
+				top.layer.msg("归档流程正在运行当中,请撤回流程！", {icon: 0});
 				return ;
 			}
-			if (filingProjectStatus == '2' || filingProjectStatus == '4' || filingProjectStatus == '5'){
+			/*if (filingProjectStatus == '2' || filingProjectStatus == '4' || filingProjectStatus == '5'){
 				top.layer.msg("纸质归档(批量归档)流程已发起！", {icon: 0});
 				return ;
-			}
+			}*/
 			//质量复核状态
 			if (projectReportStatus == '2' || projectReportStatus == '4'){
 				top.layer.msg("质量复核流程正在运行当中,请撤回流程！", {icon: 0});
 				return ;
 			}
-			//报告签发状态
+			/*//报告签发状态
 			if (projectReportStatusTwo == '2' || projectReportStatusTwo == '4'){
 				top.layer.msg("报告签发流程正在运行当中,请撤回流程！", {icon: 0});
 				return ;
-			}
+			}*/
 			$.ajax({
 				url: "${ctx}/ruralProject/ruralCostProjectMessage/projectUpgrade",
 				data:{
@@ -686,10 +686,10 @@
 							</div>
 						</div>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">项目责任人：</label>
+							<label class="layui-form-label">项目负责人：</label>
 							<div class="layui-input-block with-icon">
 								<sys:inquireselectUserNotReadolnyTow id="leader" name="leaderId" value="${ruralProjectRecords.leaderId}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}" cssStyle="background-color: #fff"
-																	 title="项目责任人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+																	 title="项目负责人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
 						<div class="layui-item query athird">
@@ -759,7 +759,7 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">签发状态：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatusTwo" class="form-control  simple-select">
@@ -767,9 +767,9 @@
 									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">电子归档：</label>
+							<label class="layui-form-label">归档：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select id="projectReportRecordStatus" path="projectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
@@ -777,7 +777,7 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label">线下归档：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
@@ -785,11 +785,11 @@
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>
 									<form:option value="5" label="已归档"/>
-									<%--									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+									&lt;%&ndash;									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>&ndash;%&gt;
 								</form:select>
 							</div>
-						</div>
-						<div class="layui-item query athird ">
+						</div>--%>
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label">上报状态：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="reportedState" class="form-control simple-select">
@@ -797,7 +797,7 @@
 									<form:options items="${fns:getDictList('reported_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">总审人员：</label>
 							<div class="layui-input-block readOnlyFFF">
@@ -809,18 +809,18 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">项目等级：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<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级非紧急"/>--%>
+									&lt;%&ndash;<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>&ndash;%&gt;
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -837,19 +837,19 @@
 						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:recordDownload">
 							<a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('归档信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadRecordForm','40%', '70%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 归档信息导出</a>
 						</shiro:hasPermission>
-						<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:reportedDownload">
+						<%--<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:reportedDownload">
 							<a href="javascript:void(0)" style='background-color: #FFB800' onclick="downloadDialogre('上报信息导出', '${ctx}/ruralProject/ruralProjectMessageAll/skipDownloadReportedForm','40%', '70%','','下载,关闭')" class="layui-btn layui-btn-sm layui-bg-blue" > 上报信息导出</a>
-						</shiro:hasPermission>
+						</shiro:hasPermission>--%>
 						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 						<div class=" layui-btn-sm" style="float: right;width: 300px">
 							<span style="color: red">咨询营业收入：${moneyAll}(万元)</span>
 						</div>
 					</div>
-					<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportSwitch">
+					<%--<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportSwitch">
 						<div style="float: right;margin-right: 30px;">
 							<input type="checkbox" id="reportSwitch" <c:if test="${reportSwitch}">checked</c:if> lay-filter="reportSwitch" lay-skin="switch" lay-text="开启|关闭">
 						</div>
-					</shiro:hasPermission>
+					</shiro:hasPermission>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable1"></table>
@@ -872,7 +872,7 @@
             ,cols: [[
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center',  title: '序号',width:40}
-				,{field: 'projId',align:'center', title: '项目编号/项目定义号',width:160}
+				,{field: 'projId',align:'center', title: '项目编号',width:160}
 				,{field:'projName',align:'center', title: '项目名称', minWidth:200,templet:function(d){
 						var xml="";
 						<shiro:hasPermission name="ruralProject:ruralProjectView:listAllView">
@@ -885,7 +885,7 @@
 						return xml;
 						<%--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:'projectReportNumber',align:'center', title: '报告号',minWidth:180,templet:function(d){
+				,{field:'projectReportNumber',align:'center', title: '报告号',width:180,templet:function(d){
 						if(""!= d.projectReportNumber){
 							<%--return "<a class=\"attention-info pid\" title=\"" + d.projectReportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogReportView('查看报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=view&reportedId="+d.id+"','"+ d.id +"','95%', '95%')\">" + d.projectReportNumber + "</a>";--%>
 							return d.projectReportNumber;
@@ -903,22 +903,22 @@
 						}
 					<%--return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";--%>
 					}}
-				,{field: 'projMaster', align:'center', title: '责任人',width:100,templet: function(d){
+				,{field: 'projMaster', align:'center', title: '负责人',width:100,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.projMaster+"</font>";
 					}}
-				,{field: 'client', align:'center', title: '委托方',width:200,templet: function(d){
+				,{field: 'client', align:'center', title: '委托方',width:250,templet: function(d){
 						return "<font style = 'font-size:14px;font-weight:500;'>"+d.client+"</font>";
 					}}
                 ,{field:'money',align:'center', title: '咨询营业收入(万元)',  width:140}
                 ,{field:'createName',align:'center', title: '登记人',  width:80}
-                ,{field: 'createDate', align:'center', title: '创建日期/打包时间',width:100,templet: function(d){
+                ,{field: 'createDate', align:'center', title: '创建日期',width:120,templet: function(d){
 					var date=d.createDate;
 					return "<font style = 'font-size:14px;font-weight:500;'>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 				}}
-				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
+				/*,{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){
+				}}*/
+                ,{align:'center', title: '质量复核',  width:90,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         if(st.action)
                             var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+ d.id +"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -926,15 +926,15 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '报告签发',  width:90,templet:function(d){
+				/*,{align:'center', title: '报告签发',  width:90,templet:function(d){
 						var st = getAuditState(""+d.projectReportStatusTwo);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
-					}}
-                ,{align:'center', title: '电子',  width:140,templet:function(d){
+					}}*/
+                ,{align:'center', title: '归档',  width:140,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
                         if(st.action){
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -955,7 +955,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{align:'center', title: '线下',  width:70,templet:function(d){
+				/*,{align:'center', title: '线下',  width:70,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -971,16 +971,16 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						return xml;
-					}}
-				,{align:'center', title: '上报',  width:90,templet:function(d){
+					}}*/
+				/*,{align:'center', title: '上报',  width:90,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
-					}}
-				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
+					}}*/
+				/*,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
 						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
@@ -990,7 +990,7 @@
 							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.caseProcessId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">是</span>";
 						}
 						return xml;
-					}}
+					}}*/
                 ,{field:'op',align:'center',title:"操作",width:330,templet:function(d) {
 						////对操作进行初始化
 						var xml = '<div class=\"layui-btn-group\">';
@@ -1003,10 +1003,10 @@
 						{
 							xml+="<a href=\"#\" onclick=\"notifyDialogre('电子归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=record','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
-						if(d.reportedAuditNotifyFlag != undefined && d.reportedAuditNotifyFlag !=null && "" != d.reportedAuditNotifyFlag && d.reportedAuditNotifyFlag == 1)
+						/*if(d.reportedAuditNotifyFlag != undefined && d.reportedAuditNotifyFlag !=null && "" != d.reportedAuditNotifyFlag && d.reportedAuditNotifyFlag == 1)
 						{
 							xml+="<a href=\"#\" onclick=\"notifyDialogre('上报审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=reported','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
-						}
+						}*/
 						if(d.newReportAuditNotifyFlag != undefined && d.newReportAuditNotifyFlag !=null && "" != d.newReportAuditNotifyFlag && d.newReportAuditNotifyFlag == 1)
 						{
 							xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=report','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
@@ -1099,7 +1099,7 @@
                     ,"projMaster":"${projectRecords.leaderNameStr}"
                     ,"contract":"${projectRecords.workContractInfo.name}"
                     ,"contractId":"${projectRecords.workContractInfo.id}"
-                    ,"client":"${projectRecords.workContractInfo.client.name}"
+                    ,"client":"${projectRecords.workContractInfo.clientName}"
                     ,"createName":"${projectRecords.createBy.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectReportStatus":"${projectRecords.projectReportStatus}"

src/main/webapp/webpage/modules/sealApplyFor/sealApplyForList.jsp

@@ -220,7 +220,7 @@
 							<div class="layui-input-block">
 								<form:select path="status" class=" form-control  simple-select">
 									<form:option value="" label=""/>
-									<form:options items="${fns:getRuralDictList('rural_project_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+									<form:options items="${fns:getRuralDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
 						</div>

src/main/webapp/webpage/modules/sys/sysIndex.jsp

@@ -344,20 +344,20 @@
                             <%--</li>--%>
                         <%--</ul>--%>
                     </li>
-                    <li class="dropdown">
+                    <%--<li class="dropdown">
                         <a class="dropdown-toggle count-info" data-toggle="dropdown" href="javascript:void(0)" onclick='top.openTab("${ctx }/workOrder/workOrder/list","工单管理", false)' >
-                            <%--<i class="fa fa-bell"></i>--%>
+                            &lt;%&ndash;<i class="fa fa-bell"></i>&ndash;%&gt;
                             <i class="fa fa-list-ul"></i>
                             <span class="label label-danger labelInfo" id="totalCount2">0</span>&nbsp;工单管理
                         </a>
                     </li>
                     <li class="dropdown">
                         <a class="dropdown-toggle count-info" data-toggle="dropdown" href="javascript:void(0)" onclick='top.openTab("${ctx }/feedback/questionFeedback/list","反馈列表", false)' >
-                            <%--<i class="fa fa-bell"></i>--%>
+                            &lt;%&ndash;<i class="fa fa-bell"></i>&ndash;%&gt;
                             <i class="fa fa-list-ul"></i>
                             <span class="label label-danger labelInfo" id="totalCount1">0</span>&nbsp;意见反馈
                         </a>
-                    </li>
+                    </li>--%>
                     <li class="dropdown">
                         <a class="dropdown-toggle count-info" data-toggle="dropdown" href="javascript:void(0)" >
                             <%--<i class="fa fa-bell"></i>--%>