From 9397fb3d448561ff6ed78b632439696c95b61345 Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Fri, 19 Jul 2024 15:47:42 +0800
Subject: [PATCH] 'commit'

---
 WebRoot/view/ywgl/rywh/tree.html      | 52 ++++++++++++++-------------
 WebRoot/view/ywgl/xswh/index.html     | 13 ++++---
 WebRoot/view/ywgl/xswh/turn.html      | 10 ++++--
 WebRoot/view/ywgl/xswh/turnClass.html |  4 ++-
 4 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/WebRoot/view/ywgl/rywh/tree.html b/WebRoot/view/ywgl/rywh/tree.html
index cdae0589..ee495b95 100644
--- a/WebRoot/view/ywgl/rywh/tree.html
+++ b/WebRoot/view/ywgl/rywh/tree.html
@@ -102,31 +102,35 @@
                     });
                     return false;
                 }
-
-                $.ajax({
-                    url: "/QingLong/teacherYd/changeTransferPersonByAdmin",
-                    data: {
-                        "org_id": orgId,
-                        "person_id": personId
-                    },
-                    type: 'post',
-                    success: function (result) {
-                        if (result.success) {
-                            layer.msg("调转成功！", {
-                                icon: 1,
-                                time: 1300
-                            }, function () {
-                                parent.layer.close(parent.layer.getFrameIndex(window.name));
-                                // parent.layui.table.reload("data-table");
-                                parent.closeLayer();
-                            });
-                        } else {
-                            layer.msg(result.message, {
-                                icon: 2,
-                                time: 2000
-                            });
+                layer.confirm('确定要调转部门吗？', {
+                    icon: 3,
+                    title: '提示'
+                }, function (index) {
+                    $.ajax({
+                        url: "/QingLong/teacherYd/changeTransferPersonByAdmin",
+                        data: {
+                            "org_id": orgId,
+                            "person_id": personId
+                        },
+                        type: 'post',
+                        success: function (result) {
+                            if (result.success) {
+                                layer.msg("调转成功！", {
+                                    icon: 1,
+                                    time: 1300
+                                }, function () {
+                                    parent.layer.close(parent.layer.getFrameIndex(window.name));
+                                    // parent.layui.table.reload("data-table");
+                                    parent.closeLayer();
+                                });
+                            } else {
+                                layer.msg(result.message, {
+                                    icon: 2,
+                                    time: 2000
+                                });
+                            }
                         }
-                    }
+                    });
                 });
                 return false;
             });
diff --git a/WebRoot/view/ywgl/xswh/index.html b/WebRoot/view/ywgl/xswh/index.html
index b68f79d3..053c85f5 100644
--- a/WebRoot/view/ywgl/xswh/index.html
+++ b/WebRoot/view/ywgl/xswh/index.html
@@ -223,7 +223,7 @@
           success: function (res) {
             if (res.data.length > 0) {
               $('#add').prop('disabled', true);
-            } else {              
+            } else {
               $('#add').prop('disabled', false);
             }
             var classTpl = classScript.innerHTML;
@@ -247,7 +247,7 @@
         tableRender();
       });
 
-      form.on('select(class)', function (data) {        
+      form.on('select(class)', function (data) {
         tableRender();
       });
 
@@ -262,7 +262,7 @@
         tableRender();
       });
 
-      function tableRender() {        
+      function tableRender() {
         table.render({
           elem: '#data-table',
           url: '/QingLong/student/getStudentList',
@@ -351,7 +351,7 @@
 
                     break;
                   case 'downTemplate':
-                    window.location.href = '/QingLong/student/getImportTemplate?school_id='+bureauId;
+                    window.location.href = '/QingLong/student/getImportTemplate?school_id=' + bureauId;
                     break;
                   case 'importExcel':
                     layer.open({
@@ -474,7 +474,10 @@
           area: ['690px', '100%'],
           shade: 0.1,
           shadeClose: true,
-          content: './turn.html?person_id=' + obj.data.person_id
+          content: './turn.html?person_id=' + obj.data.person_id,
+          end: function () {
+            table.reload("data-table");
+          }
         });
       }
 
diff --git a/WebRoot/view/ywgl/xswh/turn.html b/WebRoot/view/ywgl/xswh/turn.html
index e51fae14..85016a8c 100644
--- a/WebRoot/view/ywgl/xswh/turn.html
+++ b/WebRoot/view/ywgl/xswh/turn.html
@@ -35,7 +35,7 @@
         <div class="layui-form-item layui-inline" id="selectTreeDiv"
           style="display: none;margin-right: -5px !important;">
           <label class="layui-form-label" style="width: 30px;padding: 9px 7px 9px 1px !important;">地区</label>
-          <div class="layui-input-inline" style="width: 135px !important;">
+          <div class="layui-input-inline" style="width: 145px !important;">
             <ul id="selectTree" class="dtree" data-id="0"></ul>
           </div>
         </div>
@@ -144,7 +144,7 @@
           cols: [[
             { title: '序号', align: 'center', width: "5%", type: 'numbers', },
             { title: '单位名称', field: 'org_name', align: 'center' },
-            { title: '单位编码', field: 'org_code', align: 'center', width: "20%" },
+            { title: '统一社会信用代码', field: 'org_code', align: 'center', width: "30%" },
             { title: '操作', toolbar: '#table-bar', align: 'center', width: "20%" }
           ]],
           skin: 'line'
@@ -189,6 +189,12 @@
         return null;
       }
 
+      window.closeLayer = function () {        
+        setTimeout(function () {
+          parent.layer.close(parent.layer.getFrameIndex(window.name));
+        }, 500);
+      }
+
       //点击任何地方关闭下拉树
       $("body").on("click", function (event) {
         $("div[dtree-id][dtree-select]").removeClass("layui-form-selected");
diff --git a/WebRoot/view/ywgl/xswh/turnClass.html b/WebRoot/view/ywgl/xswh/turnClass.html
index 46715568..0f383cdf 100644
--- a/WebRoot/view/ywgl/xswh/turnClass.html
+++ b/WebRoot/view/ywgl/xswh/turnClass.html
@@ -231,7 +231,9 @@
                   time: 1300
                 }, function () {
                   parent.layer.close(parent.layer.getFrameIndex(window.name));
-                  parent.parentClose();
+                  //parent.parentClose();
+
+                  parent.closeLayer();
                 });
               } else {
                 layer.msg(res.message, {