'commit'

FengHuang/WebRoot/html/pages/dep/add.html

@@ -6,7 +6,8 @@
     <title>添加部门</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../static/css/font.css">
     <link rel="stylesheet" href="../../static/css/weadmin.css">
     <link rel="stylesheet" href="../../lib/layui/css/layui.css">
@@ -37,7 +38,8 @@
                 <span class="we-red">*</span>部门名称：
             </label>
             <div class="layui-input-inline textinput">
-            <input type="text" id="name" name="name" lay-verify="required|contentLength" min="2" max="64" autocomplete="off" class="layui-input">
+                <input type="text" id="name" name="name" lay-verify="required|contentLength" min="2" max="64"
+                       autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
@@ -55,7 +57,8 @@
                 <span class="we-red">*</span>排序号：
             </label>
             <div class="layui-input-inline textinput">
-            <input type="text" id="sort_id" name="sort_id" lay-verify="required|number|contentLength" max="6" autocomplete="off" class="layui-input">
+                <input type="text" id="sort_id" name="sort_id" lay-verify="required|number|contentLength" max="6"
+                       autocomplete="off" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
@@ -84,27 +87,39 @@
         var org_type_id = GetQueryString("org_type");
         var school_type_id = GetQueryString("school_type");
 
-        if(school_type_id != "361" && school_type_id != "451")
-        {
-            console.log(school_type_id);
+        if (school_type_id != "361" && school_type_id != "451") {
             $('#orgType').append(`
                     <option value="0">部门</option>
                 `)
             form.render();
         } else {
-            console.log("222222222");
+            console.log("111111");
+            console.log(parent_id);
+            console.log("111111");
+            if (parent_id == "0") {
                 $('#orgType').append(`
                     <option value="0">部门</option>
                     <option value="1">院系</option>
                     <option value="2">专业</option>
                 `)
+            } else {
+                if (org_type_id == "0") {
+                    $('#orgType').append(`
+                        <option value="0">部门</option>
+                    `)
+                } else {
+                    if (org_type_id == "1") {
+                        $('#orgType').append(`
+                            <option value="0">部门</option>
+                            <option value="2">专业</option>
+                        `)
+                    }
+                }
+            }
             form.render();
         }
 
 
-
-
-
         $("#name").focus();
         verifyLength();
 
@@ -141,12 +156,10 @@
             });
 
 
-
             return false;
         });
 
 
-
     });
 
 

FengHuang/WebRoot/html/pages/dep/depList.html

@@ -131,13 +131,12 @@
                 return;
             var addStr = "<span class='button add ' id='addBtn_" + treeNode.tId
                 + "' title='增加' onfocus='this.blur();'></span>";
-            sObj.after(addStr);
+            if(treeNode.department_type_id != "2")
+            {sObj.after(addStr);}
             var btn = $("#addBtn_" + treeNode.tId);
             if (btn)
                 btn.bind("click", function () {
-                    console.log("============");
-                    console.log(treeNode);
-                    console.log("============");
+                    console.log(treeNode)
                     WeAdminShow('添加', '../dep/add.html?org_id=' + treeNode.org_id+'&parent_id='+treeNode.parent_id+'&org_type='+treeNode.department_type_id+'&school_type='+treeNode.school_type_id, 550, 285);
                 });
         }