From 21c986ab8042c7bc6ba2a40ecf839fb6cf521d15 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 07 十一月 2022 15:09:15 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/cstmr/cstmr.js |   46 +++++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index dc0405e..b72ce78 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -24,7 +24,7 @@
     dropdown.render({
         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%);'
+        ,style: 'width: 370px; height: 350px; padding: 0 15px; box-shadow: 1px 1px 30px rgb(0 0 0 / 12%);'
         ,ready: function(){
             loadTree();
         }
@@ -64,9 +64,10 @@
                     break
                 case 2:
                     // 瀵煎叆 Excel
-                    let arrFileHandle = await window.showOpenFilePicker()
-                    let file = await arrFileHandle[0].getFile();
-                    upload(file);
+                    $("#importExcel").trigger("click");
+                    // let arrFileHandle = await window.showOpenFilePicker()
+                    // let file = await arrFileHandle[0].getFile();
+                    // upload(file);
                     break
                 case 3:
                     // 瀵煎嚭 Excel
@@ -138,7 +139,7 @@
             {type: 'checkbox'}
             // ,{field: 'id', align: 'center',title: 'ID'}
             // ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
-            ,{field: 'name', align: 'left',title: '瀹㈡埛鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more'}
+            ,{field: 'name', align: 'left',title: '瀹㈡埛鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 350}
             ,{field: 'uuid', align: 'left',title: '瀹㈡埛浠e彿'}
             ,{field: 'addr', align: 'left',title: '璇︾粏鍦板潃', templet:function(d){return emptyShow(d.addr)}}
             ,{field: 'tel', align: 'left',title: '鐢佃瘽', templet:function(d){return emptyShow(d.tel)}}
@@ -226,17 +227,17 @@
         var data = obj.data;
         switch (obj.event) {
             case 'more':
-                layer.msg("鏉ヤ笉鍙婂仛锛岀瓑绛�", {icon: 6});
-                // top.cstmrByMore = data.id;
-                // admin.popupRight({
-                //     type: 1,
-                //     window: "top","
-                //     area: "1250px",
-                //     url: "cstmr_more.html",
-                //     end: function () {
-                //         $(".layui-laypage-btn")[0].click();
-                //     }
-                // })
+                // layer.msg("鏉ヤ笉鍙婂仛锛岀瓑绛�", {icon: 6});
+                top.cstmrByMore = data.id;
+                admin.popupRight({
+                    type: 1,
+                    window: "top",
+                    area: "1250px",
+                    url: "cstmr_more.html",
+                    end: function () {
+                        $(".layui-laypage-btn")[0].click();
+                    }
+                })
                 break;
             case 'edit':
                 showEditModel(data);
@@ -385,10 +386,11 @@
     }
 }
 
-function upload(file){
-    if(!file) {
+function upload(obj){
+    if(!obj.files) {
         return;
     }
+    var file = obj.files[0];
     admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
         layer.load(1, {shade: [0.1,'#fff']});
         var url = baseUrl + "/cstmr/excel/import/auth";
@@ -415,12 +417,14 @@
     let res = JSON.parse(evt.target.responseText);
     if(res.code === 200) {
         layer.msg(res.msg, {icon: 1});
-        tableIns.refresh();
+        tableReload();
     } else {
-        layer.msg(res.msg, {icon: 2});
+        alert(res.msg);
+        // layer.msg(res.msg, {icon: 2});
     }
 }
 function uploadFailed(evt) {
     let res = JSON.parse(evt.target.responseText);
-    layer.msg(res.msg, {icon: 2});
+    alert(res.msg);
+    // layer.msg(res.msg, {icon: 2});
 }

--
Gitblit v1.9.1