From 34e7e0732b5accf8220c4cd140d698569b14ad32 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 九月 2022 13:51:26 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/cstmr/cstmr.js |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index c2cac53..73b0d1e 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -1,5 +1,6 @@
 var pageCurr;
 var pageCount = 0;
+var treeCond;
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
 }).extend({
@@ -17,7 +18,7 @@
     var dropdown = layui.dropdown;
 
     dropdown.render({
-        elem: '#slrassa'
+        elem: '#organization'
         ,content: ['<div id="organizationTree" style="height: calc(100vh - 525px);border: none"></div>'].join('')
         ,style: 'width: 370px; height: 500px; padding: 0 15px; box-shadow: 1px 1px 30px rgb(0 0 0 / 12%);'
         ,ready: function(){
@@ -27,8 +28,8 @@
 
     // 鏍戝舰鍥�
     var organizationTree;
-    var selObj;
     window.loadTree = function(condition){
+        var loadIndex = layer.load(2);
         $.ajax({
             url: baseUrl+"/dept/user/tree/auth",
             headers: {'token': localStorage.getItem('token')},
@@ -37,6 +38,7 @@
             },
             method: 'POST',
             success: function (res) {
+                layer.close(loadIndex);
                 if (res.code === 200){
                     organizationTree = tree.render({
                         elem: '#organizationTree',
@@ -44,11 +46,14 @@
                         onlyIconControl: true,
                         data: res.data,
                         click: function (obj) {
-                            selObj = obj;
+                            treeCond = {
+                                key: obj.data.key,
+                                val: obj.data.id
+                            }
                             $('#organizationTree').find('.ew-tree-click').removeClass('ew-tree-click');
                             $(obj.elem).children('.layui-tree-entry').addClass('ew-tree-click');
                             tableIns.reload({
-                                where: {dept_id: obj.data.id},
+                                where: {[obj.data.key]: obj.data.id},
                                 page: {curr: 1}
                             });
                         }
@@ -71,7 +76,7 @@
         page: true,
         limit: 15,
         limits: [15, 30, 50, 100, 200, 500],
-        cellMinWidth: 100,
+        // cellMinWidth: 100,
         height: 'full-148',
         // size: 'sm',
         skin: 'line',
@@ -84,9 +89,9 @@
             ,{field: 'addr', align: 'left',title: '璇︾粏鍦板潃', templet:function(d){return emptyShow(d.addr)}}
             ,{field: 'tel', align: 'left',title: '鐢佃瘽', templet:function(d){return emptyShow(d.tel)}}
             ,{field: 'remarks', align: 'left',title: '澶囨敞', templet:function(d){return emptyShow(d.remarks)}}
-            ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿'}
-            ,{field: 'userId$', align: 'left',title: '娣诲姞浜哄憳'}
             ,{field: 'cstmrType$', align: 'left',title: '瀹㈡埛绫诲埆'}
+            ,{field: 'userId$', align: 'left',title: '娣诲姞浜哄憳'}
+            ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃堕棿'}
             ,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�', hide: true}
             ,{field: 'simple', align: 'left',title: '瀹㈡埛绠�绉�', hide: true}
             ,{field: 'rela', align: 'left',title: '瀹㈡埛鍏崇郴', hide: true}
@@ -260,6 +265,7 @@
     // 鎼滅储
     form.on('submit(search)', function (data) {
         pageCurr = 1;
+        pageCount = 0;
         tableReload();
     });
 
@@ -294,8 +300,7 @@
             itemHeight: '250px',
             filterable: true,
             onChange: function (values, data) {
-                // console.log(values);
-                // console.log(data);
+                // console.log(values);console.log(data);
             }
         });
     }
@@ -313,6 +318,9 @@
         $.each($('#search-box [name]').serializeArray(), function() {
             searchData[this.name] = this.value;
         });
+        if (treeCond) {
+            searchData[treeCond.key] = treeCond.val;
+        }
         tableIns.reload({
             where: searchData,
             page: {curr: pageCurr}

--
Gitblit v1.9.1