From 564bf7ab6a639c2c4557d35b8fd9b51dca60a738 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 13:32:34 +0800
Subject: [PATCH] #规则完善
---
src/main/webapp/static/js/plan/plan.js | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index ae1fe6b..5997956 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -141,13 +141,13 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
- ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false}
+ ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100}
,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false}
,{field: 'name', align: 'left',title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
,{field: 'uuid', align: 'left',title: '瑙勫垝鍗曞彿', width: 100,hide: false}
,{field: 'planNeed$', align: 'left',title: '鎵�闇�', templet:function(d){return emptyShow(d.planNeed$)},hide: false}
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true}
- ,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false}
+ ,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false, width: 100}
// ,{field: 'nowHeadman$', align: 'left',title: '瑙勫垝缁勯暱',hide: true}
,{field: 'orderId$', align: 'left',title: '璺熻釜椤圭洰', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'orderMore',hide: false}
// ,{field: 'cstmrId$', align: 'left',title: '鐢叉柟鍗曚綅', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore',hide: true}
@@ -162,16 +162,16 @@
// ,{field: 'planBonus', align: 'center',title: '瑙勬牸濂栭噾'}
// ,{field: 'planLeaderBonus', align: 'center',title: '瑙勬牸缁勯暱濂栭噾'}
// ,{field: 'files', align: 'center',title: '闄勪欢'}
- ,{field: 'settle$', align: 'center',title: '杩涘害'}
+ ,{field: 'settle$', align: 'center',title: '杩涘害', width: 150}
// ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
// ,{field: 'comment', align: 'center',title: '璇勮'}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: false}
- ,{field: 'updateBy$', align: 'left',title: '淇敼浜�'}
+ ,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100}
,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 180}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 280}
]],
request: {
pageName: 'curr',
@@ -587,26 +587,42 @@
// 鐐瑰嚮涓嬭浇鎸夐挳鏃惰Е鍙戞枃浠朵笅杞�
$('#data-btn-file3').on('click', 'a', function() {
var downloadUrl = $(this).attr('href');
- console.log(downloadUrl)
- // 鍙戣捣 AJAX 璇锋眰锛岃幏鍙栨枃浠�
+ // console.log(downloadUrl)
+ // console.log(baseUrl)
+ // window.open("/\//"+downloadUrl);
+ // return false;
+ // var downloadUrl = $(this).attr('href');
+ // console.log(downloadUrl)
+ // // 鍙戣捣 AJAX 璇锋眰锛岃幏鍙栨枃浠�
$.ajax({
url: '/plan/download/file/auth',
type: 'POST',
data: { downloadUrl: downloadUrl }, // 浼犻�掍笅杞介摼鎺ヤ綔涓哄弬鏁�
success: function(response) {
console.log(response)
- // window.open(baseUrl+response.msg)
- // 鍒涘缓涓�涓狟lob瀵硅薄
- var blob = new Blob([response]);
- // 浣跨敤FileSaver淇濆瓨鏂囦欢
- var fileName = downloadUrl.substring(downloadUrl.lastIndexOf('\\') + 1);
- console.log(fileName)
- saveAs(blob, fileName);
+ layer.msg(response.msg+',宸蹭笅杞借嚦榛樿璺緞锛佽缁嗕笅杞借矾寰勶細'+response.data, {icon: 1});
+ // // window.open(baseUrl+response.msg)
+ // // 鍒涘缓涓�涓狟lob瀵硅薄
+ // var blob = new Blob([response]);
+ // // 浣跨敤FileSaver淇濆瓨鏂囦欢
+ // var fileName = downloadUrl.substring(downloadUrl.lastIndexOf('\\') + 1);
+ // console.log(fileName)
+ // saveAs(blob, fileName);
+ // return false;
},
error: function() {
layer.msg('璇锋眰鏂囦欢涓嬭浇澶辫触');
}
});
+ // var downloadUrl = $(this).attr('href');
+ // console.log(downloadUrl)
+ // if (downloadUrl == "" || downloadUrl == null) {
+ // layer.msg('璇峰厛涓婁紶app鏂囦欢',{time:1000},() => {
+ // parent.location.reload()
+ // })
+ // }else{
+ // window.open(downloadUrl);
+ // }
return false; // 闃绘榛樿鐨勯摼鎺ヨ烦杞涓�
});
--
Gitblit v1.9.1