From 4fd3a2736011c69c8729f2b28902a5cd9d09fd2b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 21 七月 2023 09:19:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/webapp/static/js/cstmr/cstmr.js |   64 ++++++++++++++++++++++++++++---
 1 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index f23b5e0..d53d7a0 100644
--- a/src/main/webapp/static/js/cstmr/cstmr.js
+++ b/src/main/webapp/static/js/cstmr/cstmr.js
@@ -1,6 +1,7 @@
 var pageCurr;
 var pageCount = 0;
 var treeCond;
+var admin;
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
 }).extend({
@@ -11,7 +12,7 @@
     var layer = layui.layer;
     var layDate = layui.laydate;
     var form = layui.form;
-    var admin = layui.admin;
+    admin = layui.admin;
     var xmSelect = layui.xmSelect;
     var cascader = layui.cascader;
     var tree = layui.tree;
@@ -23,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();
         }
@@ -53,18 +54,24 @@
                 ,id: 3
             }
         ]
-        ,click: function(item){
+        ,click: async function(item){
             switch (item.id) {
                 case 1:
                     // 妯℃澘涓嬭浇
                     layer.load(1, {shade: [0.1,'#fff']});
-                    location.href = baseUrl + "/mould/鐫夸簯椤圭洰璺緞琛�.xlsx";
+                    location.href = baseUrl + "/mould/鐢叉柟鍗曚綅瀵煎叆妯℃澘.xls";
                     layer.closeAll('loading');
                     break
                 case 2:
                     // 瀵煎叆 Excel
+                    $("#importExcel").trigger("click");
+                    // let arrFileHandle = await window.showOpenFilePicker()
+                    // let file = await arrFileHandle[0].getFile();
+                    // upload(file);
                     break
                 case 3:
+                    // 瀵煎嚭 Excel
+                    layer.msg("鏉ヤ笉鍙婂仛锛岀瓑绛�", {icon: 6});
                     break
                 default:
                     break
@@ -120,7 +127,7 @@
     tableIns = table.render({
         elem: '#cstmr',
         headers: {token: localStorage.getItem('token')},
-        url: baseUrl+'/cstmr/list/auth',
+        url: baseUrl+'/cstmr/page/auth',
         page: true,
         limit: 15,
         limits: [15, 30, 50, 100, 200, 500],
@@ -132,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: '瀹㈡埛浠ｅ彿'}
             ,{field: 'addr', align: 'left',title: '璇︾粏鍦板潃', templet:function(d){return emptyShow(d.addr)}}
             ,{field: 'tel', align: 'left',title: '鐢佃瘽', templet:function(d){return emptyShow(d.tel)}}
@@ -227,7 +234,7 @@
                     area: "1250px",
                     url: "cstmr_more.html",
                     end: function () {
-                        $(".layui-laypage-btn")[0].click();
+                        // $(".layui-laypage-btn")[0].click();
                     }
                 })
                 break;
@@ -377,3 +384,46 @@
         $(".layui-laypage-btn")[0].click();
     }
 }
+
+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";
+        var form = new FormData();
+        form.append("file", file);
+        let xhr = new XMLHttpRequest();
+        xhr.open("post", url, true);
+        xhr.setRequestHeader('token', localStorage.getItem('token'));
+        xhr.onload = uploadComplete;
+        xhr.onerror =  uploadFailed;
+        xhr.onloadend = function () {
+            layer.closeAll('loading');
+        };
+        // xhr.upload.onprogress = progressFunction;
+        xhr.upload.onloadstart = function(){
+            ot = new Date().getTime();
+            oloaded = 0;
+        };
+        xhr.send(form);
+    }, function(index){
+    });
+}
+function uploadComplete(evt) {
+    let res = JSON.parse(evt.target.responseText);
+    if(res.code === 200) {
+        layer.msg(res.msg, {icon: 1});
+        tableReload();
+    } else {
+        alert(res.msg);
+        // layer.msg(res.msg, {icon: 2});
+    }
+}
+function uploadFailed(evt) {
+    let res = JSON.parse(evt.target.responseText);
+    alert(res.msg);
+    // layer.msg(res.msg, {icon: 2});
+}

--
Gitblit v1.9.1