'commit'

WebRoot/view/ywgl/dwwh/index.html

@@ -104,10 +104,12 @@
       var areaId = "0";
       var levelId = "0";
       var selectAreaId = "0";
+      var editH = "385px";
 
       //获取登录人员信息
       var loginPersonInfo = getPersonLoginInfo($);
       if (loginPersonInfo.identity_id == "1") {
+        editH = "435px";
         $("#selectTreeDiv").show();
         var globalInfo = getGlobalInfo($, Base64.encode("install_area"));
         areaId = globalInfo.data[0].global_value;
@@ -249,7 +251,7 @@
           type: 2,
           title: '编辑',
           shade: 0.1,
-          area: ['650px', '385px'],
+          area: ['650px', editH],
           content: './update.html?org_id=' + obj.data.org_id + '&level_id=' + levelId + '&area_id=' + areaId
         });
       }

WebRoot/view/ywgl/dwwh/update.html

@@ -30,7 +30,7 @@
     <form class="layui-form" action="">
         <div class="mainBox">
             <div class="main-container">
-                <div class="layui-form-item">
+                <div class="layui-form-item" id="selectTreeDiv" style="display: none">
                     <label class="layui-form-label" style="width: 115px !important;"><span
                             class="require-star"></span>地区</label>
                     <div class="layui-input-block" style="margin-left: 145px !important;">
@@ -99,6 +99,8 @@
     </form>
     <script src="../../../component/layui/layui.js"></script>
     <script src="../../../component/pear/pear.js"></script>
+    <script src="../../../component/pear/base64.js"></script>
+
     <script>
         layui.use(['form', 'jquery', 'laytpl', 'dtree'], function () {
             var form = layui.form;
@@ -111,25 +113,15 @@
                 sort: [/^\d{1,5}$/, '只能输入1-5位的数字']
             });
 
-
             var levelId = GetQueryString("level_id");
             var areaId = GetQueryString("area_id");
+            var selectAreaId = areaId;
             var orgId = GetQueryString("org_id");
 
-            dtree.render({
-                elem: "#selectTree",
-                selectInitVal: areaId,
-                initLevel: "2",
-                method: 'get',
-                url: "/QingLong/dm/getAreaNew?parent_id=337B0250-841C-4350-AB92-E5783611C934",
-                select: true,
-                icon: "-1",
-                selectInputName: {
-                    recordData: "recordData"
-
-                }
-            });
-
+            var loginPersonInfo = getPersonLoginInfo($);
+            if (loginPersonInfo.identity_id == "1") {
+                $("#selectTreeDiv").show();
+            }
 
             $.ajax({
                 type: "GET",
@@ -158,17 +150,40 @@
                     var is_virtual = parseInt(res.data[0].is_virtual);
                     $('#virtual').prop('checked', is_virtual == 1);
 
+                    if (loginPersonInfo.identity_id == "1") {
+                        var globalInfo = getGlobalInfo($, Base64.encode("install_area"));
+                        var parentId = globalInfo.data[0].global_value;
+                        dtree.render({
+                            elem: "#selectTree",
+                            selectInitVal: areaId,
+                            initLevel: "2",
+                            method: 'get',
+                            url: "/QingLong/dm/getAreaNew?parent_id=" + parentId,
+                            select: true,
+                            icon: "-1",
+                            selectInputName: {
+                                recordData: "recordData"
+                            }
+                        });
+                    }
                     form.render();
                 }
             });
 
+            dtree.on('node("selectTree")', function (obj) {
+                selectAreaId = obj.param.nodeId;
+
+            });
+
             form.on('submit(save)', function (data) {
+                
                 data.field['bureau_id'] = orgId;
-                data.field['parent_org_id'] = areaId;
+                data.field['parent_org_id'] = selectAreaId;
                 data.field['property_id'] = 1;
                 data.field['main_school_id'] = -1;
                 data.field['school_type_id'] = -1;
-                data.field['master_id'] = -1;
+                data.field['master_id'] = -1;                
+                
                 if ($('#virtual').prop('checked')) {
                     data.field['is_virtual'] = 1;
                 } else {
@@ -195,7 +210,7 @@
                             });
                         }
                     }
-                })
+                });
                 return false;
             });
 

WebRoot/view/ywgl/xxwh/index.html

@@ -118,9 +118,12 @@
       var levelId = "0";
       var selectAreaId = "0";
 
+      var editH = "385px";
+
       //获取登录人员信息
       var loginPersonInfo = getPersonLoginInfo($);
       if (loginPersonInfo.identity_id == "1") {
+        editH = "435px";
         $("#selectTreeDiv").show();
         var globalInfo = getGlobalInfo($, Base64.encode("install_area"));
         areaId = globalInfo.data[0].global_value;
@@ -267,7 +270,7 @@
           type: 2,
           title: '编辑',
           shade: 0.1,
-          area: ['650px', '385px'],
+          area: ['650px', editH],
           content: './update.html?org_id=' + obj.data.org_id + '&level_id=' + levelId + '&area_id=' + areaId
         });
       }

WebRoot/view/ywgl/xxwh/update.html

@@ -30,6 +30,13 @@
     <form class="layui-form" action="">
         <div class="mainBox">
             <div class="main-container">
+                <div class="layui-form-item" id="selectTreeDiv" style="display: none">
+                    <label class="layui-form-label" style="width: 115px !important;"><span
+                            class="require-star"></span>地区</label>
+                    <div class="layui-input-block" style="margin-left: 145px !important;">
+                        <ul id="selectTree" class="dtree" data-id="0"></ul>
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label" style="width: 115px !important;"><span
                             class="require-star"></span>办学类型</label>
@@ -99,11 +106,14 @@
     </form>
     <script src="../../../component/layui/layui.js"></script>
     <script src="../../../component/pear/pear.js"></script>
+    <script src="../../../component/pear/base64.js"></script>
+
     <script>
-        layui.use(['form', 'jquery', 'laytpl'], function () {
+        layui.use(['form', 'jquery', 'laytpl', 'dtree'], function () {
             var form = layui.form;
             var $ = layui.jquery;
-            var laytpl = layui.laytpl
+            var laytpl = layui.laytpl;
+            var dtree = layui.dtree;
 
             // 自定义验证
             form.verify({
@@ -113,8 +123,14 @@
 
             var levelId = GetQueryString("level_id");
             var areaId = GetQueryString("area_id");
+            var selectAreaId = areaId;
             var orgId = GetQueryString("org_id");
 
+            var loginPersonInfo = getPersonLoginInfo($);
+            if (loginPersonInfo.identity_id == "1") {
+                $("#selectTreeDiv").show();
+            }
+
 
             //学校类型
             $.ajax({
@@ -154,21 +170,43 @@
                 url: "/QingLong/organization/getOrgInfoById?org_id=" + orgId,
                 success: function (res) {
                     $("#school_type_id").val(res.data[0].school_type_id);
-                    $('#property_id').val(res.data[0].property_id); 
+                    $('#property_id').val(res.data[0].property_id);
                     $("#org_name").val(res.data[0].org_name);
                     $("#org_code").val(res.data[0].org_code);
                     $("#sort_id").val(res.data[0].sort_id);
-                                       
+
+                    if (loginPersonInfo.identity_id == "1") {
+                        var globalInfo = getGlobalInfo($, Base64.encode("install_area"));
+                        var parentId = globalInfo.data[0].global_value;
+                        dtree.render({
+                            elem: "#selectTree",
+                            selectInitVal: areaId,
+                            initLevel: "2",
+                            method: 'get',
+                            url: "/QingLong/dm/getAreaNew?parent_id=" + parentId,
+                            select: true,
+                            icon: "-1",
+                            selectInputName: {
+                                recordData: "recordData"
+                            }
+                        });
+                    }
+
                     form.render();
                 }
             });
 
+            dtree.on('node("selectTree")', function (obj) {
+                selectAreaId = obj.param.nodeId;
+
+            });
+
 
-            form.on('submit(save)', function (data) {  
-                data.field['bureau_id'] = orgId;            
+            form.on('submit(save)', function (data) {
+                data.field['bureau_id'] = orgId;
                 data.field['org_type_id'] = 2;
                 data.field['level_id'] = 1;
-                data.field['parent_org_id'] = areaId;
+                data.field['parent_org_id'] = selectAreaId;
                 data.field['main_school_id'] = -1;
                 $.ajax({
                     url: '/QingLong/organization/updateBureau',