From a4aa79c7f7832669aee04e315c303531e782c521 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 26 七月 2023 13:30:54 +0800 Subject: [PATCH] #甲方单位页面优化 --- src/main/webapp/static/js/cstmr/cstmr.js | 71 +++++++++++++++++++++++------------ 1 files changed, 46 insertions(+), 25 deletions(-) diff --git a/src/main/webapp/static/js/cstmr/cstmr.js b/src/main/webapp/static/js/cstmr/cstmr.js index dc0405e..6b98850 100644 --- a/src/main/webapp/static/js/cstmr/cstmr.js +++ b/src/main/webapp/static/js/cstmr/cstmr.js @@ -23,8 +23,8 @@ // 閮ㄩ棬浜哄憳 绛涢�� 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%);' + ,content: ['<div id="organizationTree" style="height: calc(330px);border: none"></div>'].join('') + ,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 @@ -80,13 +81,15 @@ // 鏍戝舰鍥� var organizationTree; - window.loadTree = function(condition){ + window.loadTree = function(followerName,conditionName,condition){ var loadIndex = layer.load(2); $.ajax({ url: baseUrl+"/dept/user/tree/auth", headers: {'token': localStorage.getItem('token')}, data: { - 'condition': condition + 'followerName' : followerName, + 'conditionName' : conditionName, + 'condition' : condition }, method: 'POST', success: function (res) { @@ -126,7 +129,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], @@ -138,7 +141,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)}} @@ -192,6 +195,14 @@ // 娣诲姞 $("#cstmrAddBtn").click(function () { + form.verify({ + account: function(value, item){ + var min = item.getAttribute('lay-min'); + if(value.length < min){ + return '瀹㈡埛鍚嶇О涓嶈兘灏忎簬'+min+'涓瓧绗︾殑闀垮害'; + } + } + }); showEditModel(); }); @@ -226,17 +237,16 @@ 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(); - // } - // }) + 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); @@ -255,6 +265,14 @@ title: (mData ? '淇敼' : '娣诲姞') + '鐢叉柟鍗曚綅', content: $('#editDialog').html(), success: function (layero, dIndex) { + form.verify({ + name: function(value, item){ + var min = item.getAttribute('lay-min'); + if(value.length < min){ + return '瀹㈡埛鍚嶇О涓嶈兘灏忎簬'+min+'涓瓧绗︾殑闀垮害'; + } + } + }); if (mData) { $('#cascaderVal').val(mData.pcd); } @@ -385,10 +403,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 +434,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