Kaynağa Gözat

添加部门接口实现

温红权 9 yıl önce
ebeveyn
işleme
7364d68fc9

+ 27 - 3
VisualInspection/js/user/adddept.js

@@ -1,15 +1,39 @@
-function loadData() {
-    var sexInput = new TreeSelect({
+var dept_selectinput;
+
+function loadData(nodedata) {
+
+    $("#dept_name").val("")
+    dept_selectinput = new TreeSelect({
         element: '#dept_select',
         element: '#dept_select',
         data: zdata,
         data: zdata,
         valueKey: "id",
         valueKey: "id",
         placeholder: "选择部门",
         placeholder: "选择部门",
-        selectvalue: 3
+        selectvalue: nodedata.length > 0 ? nodedata[0].id : null
     });
     });
 }
 }
 
 
 
 
 function addDept() {
 function addDept() {
     //获取名称
     //获取名称
+    var name = $("#dept_name").val();
+    var pid = dept_selectinput.value;
+    var data = {
+        "organname": name,
+        "parentid": pid
+    }
+    DeptAdd(data, function(datare) {
+        $('#addModal').modal('hide')
+        var s = swal({
+            title: "添加成功",
+            type: "success",
+            timer: 2000,
+            showConfirmButton: false
+        }, function() {
+            // getDept();
+            this.close();
+        });
+    }, function(error) {
+
+    })
 
 
 }
 }

+ 46 - 39
VisualInspection/js/user/userManager.js

@@ -1,53 +1,23 @@
  var zdata = [];
  var zdata = [];
+ var dept_tree = null;
  $(document).ready(function() {
  $(document).ready(function() {
 
 
      $("#main_content_title").html("用户管理")
      $("#main_content_title").html("用户管理")
 
 
      $('#dashboard').dashboard({ draggable: true });
      $('#dashboard').dashboard({ draggable: true });
      var zTreeObj;
      var zTreeObj;
-     // zTree 的参数配置,深入使用请参考 API 文档(setting 配置详解)
-     var setting = {
-         data: {
-             simpleData: {
-                 enable: true,
-                 idKey: "id",
-                 pIdKey: "pId",
-                 rootPId: null
-             }
-         },
-         view: { //表示tree的显示状态
-             selectMulti: false //表示禁止多选
-         },
-         check: { //表示tree的节点在点击时的相关设置
-             enable: false, //是否显示radio/checkbox
-             chkStyle: "checkbox", //值为checkbox或者radio表示
-             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
-             radioType: "level" //设置tree的分组
-         }
-     };
-     // zTree 的数据属性,深入使用请参考 API 文档(zTreeNode 节点数据详解)
      var zNodes = [];
      var zNodes = [];
-     zTreeObj = $.fn.zTree.init($("#department_tree"), setting, zNodes);
+     dept_tree = $.fn.zTree.init($("#department_tree"), {}, zNodes);
 
 
+     getDept();
 
 
-     DeptGetAll(function(data) {
-         for (var i = 0; i < data.length; i++) {
-             var m = data[i];
-             var zdataItem = {};
-             zdataItem["id"] = m.id;
-             zdataItem["value"] = m.id;
-             zdataItem["pId"] = null;
-             zdataItem["name"] = m.organname;
-             zdataItem["children"] = addobj(m);
-             zdata.push(zdataItem);
-         }
-         $.fn.zTree.init($("#department_tree"), setting, zdata)
+     $("#dept_add").on("click", function() {
+         var nodedata = dept_tree.getSelectedNodes();
+         console.log(nodedata)
+         loadData(nodedata)
 
 
-         loadData()
-
-     }, function(error) {
-
-     });
+         $('#addModal').modal('show')
+     })
 
 
 
 
 
 
@@ -123,6 +93,43 @@
 
 
  });
  });
 
 
+ function getDept() {
+     var setting = {
+         data: {
+             simpleData: {
+                 enable: true,
+                 idKey: "id",
+                 pIdKey: "pId",
+                 rootPId: null
+             }
+         },
+         view: { //表示tree的显示状态
+             selectMulti: false //表示禁止多选
+         },
+         check: { //表示tree的节点在点击时的相关设置
+             enable: false, //是否显示radio/checkbox
+             chkStyle: "checkbox", //值为checkbox或者radio表示
+             checkboxType: { p: "", s: "" }, //表示父子节点的联动效果
+             radioType: "level" //设置tree的分组
+         }
+     };
+     DeptGetAll(function(data) {
+         for (var i = 0; i < data.length; i++) {
+             var m = data[i];
+             var zdataItem = {};
+             zdataItem["id"] = m.id;
+             zdataItem["value"] = m.id;
+             zdataItem["pId"] = null;
+             zdataItem["name"] = m.organname;
+             zdataItem["children"] = addobj(m);
+             zdata.push(zdataItem);
+         }
+         dept_tree = $.fn.zTree.init($("#department_tree"), setting, zdata)
+     }, function(error) {
+
+     });
+ }
+
 
 
  function addobj(data) {
  function addobj(data) {
      var zdata = [];
      var zdata = [];

+ 0 - 1
VisualInspection/js/util/util.js

@@ -79,7 +79,6 @@ function HandleError(error) {
                     timer: 3000,
                     timer: 3000,
                     showConfirmButton: false
                     showConfirmButton: false
                 }, function() {
                 }, function() {
-
                     self.location = base_ui_url + UI_USER_LOGIN
                     self.location = base_ui_url + UI_USER_LOGIN
                 });
                 });
                 return true;
                 return true;

+ 2 - 2
VisualInspection/view/user/addDept.html

@@ -13,7 +13,7 @@
         <div class="form-group">
         <div class="form-group">
             <label for="exampleInputAccount4" class="col-sm-2">名称:</label>
             <label for="exampleInputAccount4" class="col-sm-2">名称:</label>
             <div class="col-md-6 col-sm-10">
             <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="code_flag" placeholder="名称">
+                <input type="text" id="dept_name" class="form-control" id="code_flag" placeholder="名称">
             </div>
             </div>
         </div>
         </div>
         <div class="form-group">
         <div class="form-group">
@@ -26,7 +26,7 @@
 
 
         <div class="form-group">
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
             <div class="col-sm-offset-2 col-sm-10">
-                <button type="button" class="btn btn-default" onclick="addDept()">保存</button>
+                <button type="button" class="btn btn-default" onclick="addDept()">添加</button>
             </div>
             </div>
         </div>
         </div>
     </form>
     </form>

+ 1 - 1
VisualInspection/view/user/userManager.html

@@ -10,7 +10,7 @@
                     <div class="panel-heading">
                     <div class="panel-heading">
                         <span class="title">部门列表</span>
                         <span class="title">部门列表</span>
                         <div class="panel-actions">
                         <div class="panel-actions">
-                            <button type="button" class="btn" id="dept_add" data-position="center" data-toggle="modal" data-target="#addModal" data-toggle="tooltip" title="添加"><i class="icon-plus"></i></button>
+                            <button type="button" class="btn" id="dept_add" data-position="center" data-toggle="tooltip" title="添加"><i class="icon-plus"></i></button>
                             <button type="button" class="btn" id="dept_edit" data-toggle="tooltip" title="编辑"><i class="icon-pencil"></i></button>
                             <button type="button" class="btn" id="dept_edit" data-toggle="tooltip" title="编辑"><i class="icon-pencil"></i></button>
                             <button type="button" class="btn" id="dept_delete" data-toggle="tooltip" title="删除"><i class="icon-trash"></i></button>
                             <button type="button" class="btn" id="dept_delete" data-toggle="tooltip" title="删除"><i class="icon-trash"></i></button>
                         </div>
                         </div>

+ 0 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/DepartmentController.java

@@ -38,7 +38,6 @@ public class DepartmentController extends BaseController {
      * @exception
      * @exception
      * @since  1.0.0
      * @since  1.0.0
      */
      */
-    @PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/addDept",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
     @RequestMapping(value = "/addDept",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
     public String addDept(@RequestBody Organ organ) throws Exception{
     public String addDept(@RequestBody Organ organ) throws Exception{
         
         

+ 2 - 2
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -46,9 +46,9 @@
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.Organ" >
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.Organ" >
         INSERT INTO
         INSERT INTO
         t_sys_organ
         t_sys_organ
-        (organname,remark,parentid,classtype,organcode,isshow,deptype)
+        (organname,parentid)
         VALUES
         VALUES
-        (#{organname},#{remark},#{parentid},#{classtype},#{organcode},#{isshow},#{deptype})
+        (#{organname},#{parentid})
     </insert>
     </insert>
 
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.Organ" >
     <update id="update" parameterType="com.xintong.visualinspection.bean.Organ" >