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 | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js
index 9dbef1a..d53d7a0 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,12 +64,14 @@
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
+ layer.msg("鏉ヤ笉鍙婂仛锛岀瓑绛�", {icon: 6});
break
default:
break
@@ -125,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],
@@ -137,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)}}
@@ -232,7 +234,7 @@
area: "1250px",
url: "cstmr_more.html",
end: function () {
- $(".layui-laypage-btn")[0].click();
+ // $(".layui-laypage-btn")[0].click();
}
})
break;
@@ -383,10 +385,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";
@@ -413,12 +416,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