统一“被举报项目/部门”

src/main/java/com/ejweb/modules/report/entity/ReportEntity.java

@@ -69,7 +69,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
 
     private String[] types;//新业务类型
 
-    @ExcelField(title="被举报项目/被举报部门", align=2, sort=24)
+    @ExcelField(title="被举报项目/部门", align=2, sort=24)
     public String getReportProject() {
         return reportProject;
     }

src/main/java/com/ejweb/modules/report/web/ReportToWordController.java

@@ -93,7 +93,7 @@ public class ReportToWordController {
 
         //表格第一行
         XWPFTableRow reportProject = basicInfoTable.getRow(0);
-        reportProject.getCell(0).setText("被举报项目：");
+        reportProject.getCell(0).setText("被举报项目/部门：");
         reportProject.addNewTableCell().setText(reportEntity.getReportProject()==null?"":reportEntity.getReportProject());
 
         XWPFTableRow supplementTitle = basicInfoTable.createRow();

src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp

@@ -116,7 +116,7 @@
         <th>ID</th>
         <th>标题</th>
         <th>业务类型</th>
-        <th>被举报项目/被举报部门</th>
+        <th>被举报项目/部门</th>
         <th>举报人</th>
         <th>举报人电话</th>
         <th>区域</th>

src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp

@@ -88,7 +88,7 @@
     <sys:message content="${message}"/>
     <span class="title">举报内容</span>
     <div class="control-group">
-        <label class="control-label">被举报项目:</label>
+        <label class="control-label">被举报项目/部门:</label>
         <div class="controls">
             <form:input path="reportProject" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
         </div>

src/main/webapp/WEB-INF/views/modules/report/reportList.jsp

@@ -130,7 +130,7 @@
                 <th>ID</th>
                 <th>标题</th>
                 <th>业务类型</th>
-                <th>被举报项目/被举报部门</th>
+                <th>被举报项目/部门</th>
                 <th>OA账号</th>
                 <th>举报人</th>
                 <th>举报人电话</th>

src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp

@@ -64,6 +64,11 @@
                     ck[number[i] - 1].checked = true;
                 }
             }
+            //管理员权限可选择处理结论
+            <%--var isAdmin = ${isAdmin};--%>
+            <%--if (isAdmin == false) {--%>
+                <%--$("#dealResult").attr("disabled", true);--%>
+            <%--}--%>
 //            $("#reportDetail input[type='text']").each(function(){
 //                $(this).attr("disabled",true);
 //            });
@@ -261,7 +266,7 @@
 
             path1 += "&body=Dear,%0D%0A附件是举报核查-"+supplementType+"-"+supplementInformant+"违规操作，请核实是否属实。%0D%0A谢谢！";
             path1 += "%0D%0A%0D%0A举报内容%0D%0A";
-            path1 += "被举报项目:${report.reportProject}%0D%0A";
+            path1 += "被举报项目/部门:${report.reportProject}%0D%0A";
             path1 += "标题:${report.supplementTitle}%0D%0A";
             path1 += "被举报人:${report.supplementInformant}%0D%0A";
             path1 += "举报时间:${report.reportTime}%0D%0A";
@@ -435,7 +440,7 @@
     <div id="reportDetail">
     <span class="title">举报内容</span>
     <div class="control-group">
-        <label class="control-label">被举报项目:</label>
+        <label class="control-label">被举报项目/部门:</label>
         <div class="controls">
             <form:input path="reportProject" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
         </div>
@@ -589,7 +594,7 @@
     <br>
     <label class="control-label">处理结论:</label>
     <div class="controls">
-        <form:select path="dealResult" class="input-small required">
+        <form:select path="dealResult" id="dealResult" class="input-small required">
             <form:option value=" ">请选择</form:option>
             <form:options  items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
         </form:select>