帮助功能提交

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

@@ -370,18 +370,21 @@ public class RuralProjectViewController extends BaseController {
         //获取专业类型
         List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
         for (WorkStaffCertificate certificateInfo: userCertificateList) {
-            currentConsultant.setZhucezigezhID(certificateInfo.getNum());
-            currentConsultant.setZhucezigezhKey(certificateInfo.getName());
-            for (MainDictDetail type : certificateMajor) {
-                if(certificateInfo.getMajor().equals(type.getValue())){
-                    currentConsultant.setMajor(type.getLabel());
+            if("161".equals(certificateInfo.getName()) || "171".equals(certificateInfo.getName())){
+                currentConsultant.setZhucezigezhID(certificateInfo.getNum());
+                currentConsultant.setZhucezigezhKey(certificateInfo.getName());
+                for (MainDictDetail type : certificateMajor) {
+                    if(certificateInfo.getMajor().equals(type.getValue())){
+                        currentConsultant.setMajor(type.getLabel());
+                    }
                 }
+                User currentUser=userService.get(ruralProjectRecords.getProjectMasterId());
+                currentConsultant.setZixunyuanName(currentUser.getName());
+                currentConsultant.setZixunyuan(currentUser.getId());
+                currentConsultant.setRole("负责人");
+                consultants.add(currentConsultant);
+                break;
             }
-            User currentUser=userService.get(ruralProjectRecords.getProjectMasterId());
-            currentConsultant.setZixunyuanName(currentUser.getName());
-            currentConsultant.setZixunyuan(currentUser.getId());
-            currentConsultant.setRole("负责人");
-            consultants.add(currentConsultant);
         }
         //查询总审人员信息
         RuralReportConsultant bzshbConsultant = new RuralReportConsultant();

src/main/java/com/jeeplus/modules/sys/dao/HelpDao.java

@@ -16,4 +16,6 @@ public interface HelpDao extends CrudDao<Help> {
     List<String> getByParentMenuId(@Param("menuId") String menuId);
 
     Help getByNumber(@Param("number") String number);
+
+    int updateEnable(Help number);
 }

src/main/java/com/jeeplus/modules/sys/entity/Help.java

@@ -42,6 +42,11 @@ public class Help extends DataEntity<Help> {
     private String menuName;
 
     /**
+     * 是否启用
+     */
+    private Integer enable;
+
+    /**
      * 菜单id集合
      */
     private List<String> menuIdList;
@@ -118,6 +123,14 @@ public class Help extends DataEntity<Help> {
      */
     public void setMenuName(String menuName) { this.menuName = menuName; }
 
+    public Integer getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Integer enable) {
+        this.enable = enable;
+    }
+
     /**
      * 菜单id集合
      */

src/main/java/com/jeeplus/modules/sys/service/HelpService.java

@@ -36,6 +36,9 @@ public class HelpService extends CrudService<HelpDao, Help> {
      */
     @Transactional(readOnly = false, rollbackFor = Exception.class)
     public void saveHelp(Help help) {
+        if(null == help.getEnable()){
+            help.setEnable(1);
+        }
         if (StringUtils.isBlank(help.getId())){
             help.setNumber(serialNumTplService.genSerialNum(UserUtils.getUser().getCompany(), help.SERIAL_BIZ));
             help.setId(IdGen.uuid());
@@ -48,6 +51,16 @@ public class HelpService extends CrudService<HelpDao, Help> {
     }
 
     /**
+     * 新增或修改
+     * @param help
+     */
+    @Transactional(readOnly = false)
+    public void updateEnable(Help help) {
+        help.preUpdate();
+        dao.updateEnable(help);
+    }
+
+    /**
      * 删除
      * @param help
      */

src/main/java/com/jeeplus/modules/sys/web/HelpController.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
@@ -82,6 +83,8 @@ public class HelpController extends BaseController {
                     h.setMenuName(menu.getName());
                     model.addAttribute("help", h);
                 }
+            }else{
+                help.setEnable(1);
             }
         }
         return "modules/sys/helpForm";
@@ -126,5 +129,34 @@ public class HelpController extends BaseController {
         return map;
     }
 
+    @ResponseBody
+    @RequestMapping(value = "getEnableByNumber")
+    public Map<String,Object> getEnableByNumber(String number) {
+        Map<String,Object> map = new HashMap<>();
+        if (StringUtils.isBlank(number)) {
+            return new HashMap<>();
+        }
+        Integer enable = 0;
+        Help byNumber = helpService.getByNumber(number);
+        if(null != byNumber.getEnable()) {
+            enable = byNumber.getEnable();
+        }
+        map.put("enable", enable);
+        return map;
+    }
+
+    @RequestMapping(value = "updateEnable", method= RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateEnable(Help help) {
+        Map<String,Object> map = new HashMap<>();
+        helpService.updateEnable(help);
+        if(null != help.getEnable() && 1 == help.getEnable()){
+            map.put("message","启用成功");
+        }else{
+            map.put("message","禁用成功");
+        }
+        return map;
+    }
+
 
 }

src/main/resources/jeeplus.properties

@@ -7,7 +7,7 @@ jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
 #jdbc.url=jdbc:mysql://192.168.2.4:3306/simple_xg_total_process?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://127.0.0.1:3306/new_ccpm_2?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://127.0.0.1:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=root
 #jdbc.password=root

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

@@ -623,7 +623,7 @@
 	<select id="getCertificateByUser" resultType="com.jeeplus.modules.workstaff.entity.WorkStaffCertificate">
 		select a.name,a.num,a.major from work_staff_certificate a
 		left join work_staff_achives wsa on a.staff_id = wsa.id
-		where wsa.user_id = #{userId} and a.del_flag=0
+		where wsa.user_id = #{userId} and a.del_flag=0 order by a.name
 	</select>
 
 	<insert id="insertContentBasedInfo">

src/main/resources/mappings/modules/sys/HelpMapper.xml

@@ -14,6 +14,7 @@
             <result property="menuId" column="menu_id" jdbcType="VARCHAR"/>
             <result property="features" column="features" jdbcType="VARCHAR"/>
             <result property="description" column="description" jdbcType="VARCHAR"/>
+            <result property="enable" column="enable" jdbcType="VARCHAR"/>
             <result property="menuName" column="menu_name" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -28,7 +29,8 @@
         sh.number,
         sh.menu_id,
         sh.features,
-        sh.description
+        sh.description,
+        sh.enable
     </sql>
 
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jeeplus.modules.sys.entity.Help" useGeneratedKeys="true">
@@ -43,7 +45,8 @@
         number,
         menu_id,
         features,
-        description)
+        description,
+        enable)
         values
         (#{id,jdbcType=VARCHAR},
         #{createBy.id,jdbcType=VARCHAR},
@@ -55,7 +58,8 @@
         #{number,jdbcType=VARCHAR},
         #{menuId,jdbcType=VARCHAR},
         #{features,jdbcType=VARCHAR},
-        #{description,jdbcType=VARCHAR})
+        #{description,jdbcType=VARCHAR},
+        #{enable})
     </insert>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jeeplus.modules.sys.entity.Help" useGeneratedKeys="true">
         insert into sys_help
@@ -71,6 +75,7 @@
                 <if test="menuId != null">menu_id,</if>
                 <if test="features != null">features,</if>
                 <if test="description != null">description,</if>
+                <if test="enable != null">enable,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="id != null"> #{id,jdbcType=VARCHAR},</if>
@@ -84,6 +89,7 @@
                 <if test="menuId != null"> #{menuId,jdbcType=VARCHAR},</if>
                 <if test="features != null"> #{features,jdbcType=VARCHAR},</if>
                 <if test="description != null"> #{description,jdbcType=VARCHAR},</if>
+                <if test="enable != null"> #{enable},</if>
         </trim>
     </insert>
     <update id="update" parameterType="com.jeeplus.modules.sys.entity.Help">
@@ -119,6 +125,9 @@
                 <if test="description != null">
                     description = #{description,jdbcType=VARCHAR},
                 </if>
+                <if test="enable != null">
+                    enable = #{enable},
+                </if>
         </set>
         where
             id = #{id,jdbcType=VARCHAR}
@@ -136,7 +145,8 @@
             number =  #{number,jdbcType=VARCHAR},
             menu_id =  #{menuId,jdbcType=VARCHAR},
             features =  #{features,jdbcType=VARCHAR},
-            description =  #{description,jdbcType=VARCHAR}
+            description =  #{description,jdbcType=VARCHAR},
+            enable =  #{enable}
         where
             id = #{id,jdbcType=VARCHAR}
     </update>
@@ -170,6 +180,9 @@
             <if test="description != null and description != ''">
                 AND sh.description LIKE concat('%',#{description},'%')
             </if>
+            <if test="enable != null and enable != ''">
+                AND sh.enable = #{enable}
+            </if>
             <if test="menuIdList != null and menuIdList.size > 0">
                 and sh.menu_id in
                 <foreach collection="menuIdList" index="index" item="item" open="(" separator="," close=")">
@@ -201,4 +214,14 @@
         from sys_help sh
         where sh.del_flag = '0' and sh.number = #{number}
     </select>
+
+    <update id="updateEnable" >
+        update sys_help
+        set
+            update_by =  #{updateBy.id,jdbcType=VARCHAR},
+            update_date =  #{updateDate,jdbcType=TIMESTAMP},
+            enable =  #{enable}
+        where
+            id = #{id,jdbcType=VARCHAR}
+    </update>
 </mapper>

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -1261,7 +1261,7 @@
 		a.id,a.name,a.photo,a.login_name AS "loginName"
 		FROM sys_user a
 		JOIN sys_user_role ur ON ur.user_id = a.id
-		JOIN project_audit_user_info pau ON pau.user_id = a.id
+		JOIN project_audit_user_info pau ON pau.user_id = a.id and pau.del_flag = 0
 		JOIN sys_role r ON ur.role_id = r.id
 		WHERE a.office_id is not null and pau.real_flag=1
 		order by a.name = '郑炎基' desc

src/main/webapp/static/common/inspinia.js

@@ -5,8 +5,7 @@ var expandNavWidth = 220;
 var navDiffer = 150;
 //公共配置
 layer.config({
-    extend: ['skin/moon/style.css'],
-    skin: 'layer-ext-moon'
+    extend: ['skin/moon/style.css']
 });
 
 function changeLeftNavImg(){

src/main/webapp/static/common/openShow.js

@@ -0,0 +1,31 @@
+function helpShowDetail(number) {
+    var xml = "";
+    $.ajax({
+        async: false,
+        url: "/a/sys/help/getEnableByNumber?number=" + number,
+        type:"post",
+        dataType: "json",
+        success:function(data){
+            if(1 === data.enable){
+                xml += "<a href=\"#\" style='margin-left: 5px;background-color:rgba(255,255,255,0);color: #FFB800;' class=\"layui-icon layui-icon-tips\" onclick=\"helpDetails(\'" + number + "\')\"></a>"
+            }
+        }
+    });
+    return xml;
+}
+//打开对话框(查看)
+function helpDetails(number){
+    $.ajax({
+        url: "/a/sys/help/getByNumber?number=" + number,
+        type:"post",
+        dataType: "json",
+        success:function(data){
+            if(data.content){
+                top.layer.open({
+                    title: data.title + "<span style='color: #9e9e9e;font-weight:normal;'>   " + number + "</span>",
+                    content: data.content
+                });
+            }
+        }
+    });
+}

src/main/webapp/static/jquery-ztree/3.5.12/css/zTreeStyle/metro.css

@@ -24,7 +24,7 @@ website:    http://code.google.com/p/jquerytree/
 .ztree li a.tmpTargetNode_next {}
 .ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
     font-size:12px; border:1px #7EC4CC solid; *border:0px}
-.ztree li span {line-height:21px; margin-right:2px}
+
 .ztree li span.button {line-height:0; margin:0; width:21px; height:21px; display: inline-block; vertical-align:middle;
     border:0 none; cursor: pointer;outline:none;
     background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;

src/main/webapp/webpage/include/head.jsp

@@ -37,6 +37,7 @@
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
 <script src="${ctxStatic}/common/jeeplus.js?9" type="text/javascript"></script>
+<script type="text/javascript" src="${ctxStatic}/common/openShow.js"></script>
 
 <!-- jquery ui -->
 <script src="${ctxStatic}/jquery-ui/jquery-ui.min.js"></script>

src/main/webapp/webpage/include/taglib.jsp

@@ -15,30 +15,3 @@
 <c:set var="ctxStatic" value="${pageContext.request.contextPath}/static"/>
 <%--<c:set var="ctxStatic" value="${fns:getOSSUrl()}"/>--%>
 <c:set var="ctxp" value="${pageContext.request.contextPath}" />
-
-<style>
-    .details{
-        margin-left: 5px;
-        font-size:10px;
-        background-color:rgba(255,255,255,0);
-        color: red;
-    }
-
-</style>
-<script>
-
-    //打开对话框(查看)
-    function details(number){
-        $.ajax({
-            url: "${ctx}/sys/help/getByNumber?number=" + number,
-            type:"post",
-            dataType: "json",
-            success:function(data){
-                top.layer.open({
-                    title: data.title,
-                    content: data.content
-                });
-            }
-        });
-    }
-</script>

src/main/webapp/webpage/modules/projectAccessory/projectEngineering/projectEngineeringList.jsp

@@ -14,7 +14,6 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}

src/main/webapp/webpage/modules/projectAccessory/projectTemplate/projectTemplateList.jsp

@@ -14,7 +14,6 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}

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

@@ -1406,7 +1406,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'left', title: '电子',  width:150,templet:function(d){
+                ,{align:'left', title: '电子/超期天数',  width:150,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						var noArchivedDays=d.noArchivedDays;
@@ -1442,7 +1442,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{align:'left', title: '纸质',  width:140,templet:function(d){
+				,{align:'left', title: '纸质/超期天数',  width:140,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){

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

@@ -1018,7 +1018,7 @@
 				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:80,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
 				}}
-                ,{align:'center', title: '质量复核',  width:85,templet:function(d){
+                ,{align:'center', title: '质量复核'+ helpShowDetail('bz-0003'),  width:105,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         if(st.action){
 							if (d.submitMoney=="1"){
@@ -1031,7 +1031,7 @@
 						}
                         return xml;
                     }}
-				,{align:'center', title: '报告签发',  width:85,templet:function(d){
+				,{align:'center', title: '报告签发'+ helpShowDetail('bz-0004'),  width:105,templet:function(d){
 						var st = getReportIssueState(""+d.projectReportStatusTwo);
 
 						if(st.action){
@@ -1045,7 +1045,7 @@
 						}
 						return xml;
 					}}
-                ,{field:'projectReportRecordStatus',align:'left', title: '电子/超期天数',  width:170,templet:function(d){
+                ,{field:'projectReportRecordStatus',align:'left', title: '电子/超期天数'+ helpShowDetail('bz-0001'),  width:170,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var noArchivedDays=d.noArchivedDays;
                         if(st.action){
@@ -1072,7 +1072,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-				,{field:'downProjectReportRecordStatus', align:'left', title: '纸质/超期天数',  width:140,templet:function(d){
+				,{field:'downProjectReportRecordStatus', align:'left', title: '纸质/超期天数'+ helpShowDetail('bz-0002'), width:140,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -1102,7 +1102,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-				,{align:'center', title: '上报',  width:105,templet:function(d){
+				,{align:'center', title: '上报'+ helpShowDetail('bz-0005'),  width:105,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						if(st.action)
 							var xml = "<span title='上报时间："+ d.projectRecordsReportedAuditPassDate +"' onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -1110,7 +1110,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-				,{align:'center', title: '案例项目申报',  width:105,templet:function(d){
+				,{align:'center', title: '案例项目申报'+ helpShowDetail('bz-0006'),  width:125,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>";
@@ -1231,11 +1231,6 @@
 						return[xml].join('');
 					}}
             ]]
-			, done: function (data, curr, count) {  //回调函数
-				//添加图片到表格中所有的第二个单元格里面
-				$('.layui-table thead tr th[data-field="projectReportRecordStatus"] .layui-table-cell').append('<a href="#" class="details layui-icon layui-icon-help" id="projectReportRecordStatus-i" onclick="details('+ "'bz-0001'" +')"></a>');
-				$('.layui-table thead tr th[data-field="downProjectReportRecordStatus"] .layui-table-cell').append('<a href="#" class="details layui-icon layui-icon-help" id="downProjectReportRecordStatus-i" onclick="details()"></a>');
-			}
             ,data: [
                 <c:if test="${ not empty page.list}">
                 <c:forEach items="${page.list}" var="projectRecords" varStatus="index">

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

@@ -974,7 +974,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'left', title: '电子',  width:150,templet:function(d){
+                ,{align:'left', title: '电子/超期天数',  width:150,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						var noArchivedDays=d.noArchivedDays;
@@ -1002,7 +1002,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-                ,{align:'left', title: '纸质',  width:140,templet:function(d){
+                ,{align:'left', title: '纸质/超期天数',  width:140,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){

src/main/webapp/webpage/modules/serialnum/serialNumTplList.jsp

@@ -57,7 +57,6 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}

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

@@ -16,7 +16,6 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}

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

@@ -57,6 +57,13 @@
             });
         });
     </script>
+    <style>
+        .layui-form-radio{
+            padding-right: 0px;
+            margin-right: 0px;
+            height: 40px;
+        }
+    </style>
 </head>
 <body>
 <div class="single-form">
@@ -87,6 +94,16 @@
                         <form:input placeholder="请输入功能" path="features" htmlEscape="false" maxlength="200" class="form-control required layui-input"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label"><span class="require-item">*</span>是否启用：</label>
+                    <div class="layui-input-block">&nbsp;&nbsp;
+                        <form:radiobutton id="enable" class="usccClass" name="usccClass" path="enable" lay-filter="enable" value="1" label="启用" checked="true" />
+                        &nbsp;&nbsp;
+                        <form:radiobutton id="enable" class="usccClass" name="usccClass" path="enable" lay-filter="enable" value="0" label="禁用" />
+                    </div>
+                </div>
+
+
                 <div class="layui-item layui-col-sm12 with-textarea">
                     <label class="layui-form-label">描述：</label>
                     <div class="layui-input-block">

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

@@ -12,7 +12,9 @@
             background-color:rgba(255,255,255,0);
             height:100%;
         }
+        .ztree li span{
 
+        }
     </style>
     <script type="text/javascript">
         // 确认对话框
@@ -59,26 +61,26 @@
                     <table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 
                     <div class="commonQuery">
-                        <div class="layui-item query athird">
+                        <div class="layui-item query athird" style="width: 25%">
                             <label class="layui-form-label">编号：</label>
                             <div class="layui-input-block with-icon">
                                 <form:input path="number" value="${help.number}"  htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
                             </div>
                         </div>
-                        <div class="layui-item query athird">
+                        <div class="layui-item query athird" style="width: 25%">
                             <label class="layui-form-label">功能：</label>
                             <div class="layui-input-block with-icon">
                                 <form:input path="features" value="${help.features}"  htmlEscape="false" maxlength="64"  class=" form-control layui-input"/>
                             </div>
                         </div>
-                        <div class="layui-item query athird">
+                        <div class="layui-item query athird" style="width: 25%">
                             <label class="layui-form-label">描述：</label>
                             <div class="layui-input-block with-icon">
                                 <form:input path="description" value="${help.description}"  htmlEscape="false" maxlength="128"  class=" form-control layui-input"/>
                             </div>
                         </div>
 
-                        <div class="layui-item athird fr">
+                        <div class="layui-item athird" style="width: 25%">
                             <div class="input-group">
                                 <div class="layui-btn-group search-spacing">
                                     <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
@@ -113,7 +115,7 @@
 </div>
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script>
-    layui.use('table', function(){
+    layui.use(['table','form'], function(){
         layui.table.render({
             limit:${ page.pageSize }
             ,elem: '#contentTable'
@@ -135,6 +137,18 @@
                 ,{field:'description', align:'center',title: '描述', minWidth :200,templet:function(d){
                         return "<span title='"+ d.description +"'>" + d.description + "</span>";
                     }}
+                ,{field: 'enable', title: '状态', width: 85, templet: function (data) {
+                        if (data.enable == 1) {
+                            return '<div> <input type="checkbox" checked="" name="enable" lay-skin="switch" id="enable" lay-filter="switchTest" switchId=' + data.id + '' +
+                                ' lay-text="启用|已禁用"  value=' + data.enable + '></div>';
+                        }
+                        return '<div> <input type="checkbox" lay-skin="switch" name="enable"  switchId=' + data.id + ' lay-filter="switchTest"' +
+                            'lay-text="启用|已禁用" value=' + data.enable + '></div>';
+
+
+
+                    }
+                }
                 ,{field:'op',align:'center',title:"操作",width:100,templet:function(d){
                         ////对操作进行初始化
                         var xml = "<div class=\"layui-btn-group\">";
@@ -157,12 +171,16 @@
                     ,"menuName":"${help.menuName}"
                     ,"features":"${help.features}"
                     ,"description":"${help.description}"
+                    ,"enable":"${help.enable}"
                     <shiro:hasPermission name="sys:role:edit">
                     ,"candelete1":"1"
                     </shiro:hasPermission>
                     <shiro:hasPermission name="sys:role:del">
                     ,"candelete2":"1"
                     </shiro:hasPermission>
+                    <shiro:hasPermission name="sys:help:enable">
+                    ,"canEnable":"1"
+                    </shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>
@@ -170,6 +188,60 @@
             // ,even: true
             // ,height: 315
         });
+
+        /**
+         * 监听开关 状态 操作
+         */
+        layui.form.on('switch(switchTest)', function (data) {
+            console.log(data)
+
+            /**
+             * 禁用标签
+             * 状态 赋值为 0
+             */
+            var layerIndex = layer.load(3);
+
+            if ((this.checked ? 'true' : 'false') == 'false') {
+                $.ajax({
+                    url: '${ctx}/sys/help/updateEnable',
+                    data: {
+                        enable: 0,
+                        id: data.elem.getAttribute("switchId")
+                    },
+                    type: 'post', //HTTP请求类型
+                    success: function (data) {
+                        parent.layer.msg("禁用成功!", {icon: 1});
+
+                    }, error: function () {
+                        parent.layer.msg("禁用失败!", {icon: 5});
+                    }
+
+                })
+            } else {
+                /**
+                 * 启动标签
+                 * 状态 赋值为 1
+                 */
+                $.ajax({
+                    url: '${ctx}/sys/help/updateEnable',
+                    data: {
+                        enable: 1,
+                        id: data.elem.getAttribute("switchId")
+                    },
+                    type: 'post',
+                    success: function (data) {
+                        parent.layer.msg("启用成功!", {icon: 1});
+
+                    }, error: function () {
+                        parent.layer.msg("启用失败!", {icon: 5});
+                    }
+
+                })
+            }
+            layer.close(layerIndex);
+
+        });
+
     })
     resizeListTable();
 </script>

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

@@ -63,7 +63,6 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}

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

@@ -99,7 +99,6 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}

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

@@ -12,7 +12,6 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}

src/main/webapp/webpage/modules/workReimbursementType/reimbursementTypeList.jsp

@@ -14,7 +14,6 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}

src/main/webapp/webpage/modules/workreview/workReviewStandardList.jsp

@@ -16,7 +16,6 @@
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
-			color:#ffffff;
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}