From 3481efebb5033dd35ce6066d030873a892d1db76 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 28 十一月 2023 14:42:43 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/plan/plan.js | 234 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 197 insertions(+), 37 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index cbc6d4b..cd665f2 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -139,10 +139,20 @@
skin: 'line',
cols: [[
{type: 'checkbox'}
- // ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
- ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100}
- ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false}
+ ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100, sort:true}
+ ,{field: 'cstmrId', align: 'left',title: '涓氬姟鍛�',hide: true, width: 100, sort:true}
+ , {
+ field: 'cstmrId$',
+ align: 'center',
+ title: '瀹㈡埛鍚嶇О',
+ style: 'color: #1890ff;cursor:pointer',
+ event: 'moreCstmr',
+ width: 350,
+ hide: false, sort:true
+ }
+ ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false, sort:true}
,{
field: 'name',
align: 'left',
@@ -150,9 +160,10 @@
width: 220,
style: 'color: #1890ff;cursor:pointer',
event: 'more',
- hide: false
+ hide: false,
+ sort:true
}
- ,{field: 'uuid', align: 'left',title: '瑙勫垝鍗曞彿', width: 100,hide: false}
+ ,{field: 'uuid', align: 'left',title: '瑙勫垝鍗曞彿', width: 100,hide: false, sort:true}
,{
field: 'planNeed$',
align: 'left',
@@ -162,8 +173,9 @@
},
hide: false
}
+ , {field: 'settleSize', align: 'center', title: '娴佺▼闀垮害', hide: true}
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true}
- ,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false, width: 100}
+ ,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false, width: 100, sort:true}
// ,{field: 'nowHeadman$', align: 'left',title: '瑙勫垝缁勯暱',hide: true}
,{
field: 'orderId$',
@@ -171,18 +183,11 @@
title: '璺熻釜椤圭洰',
width: 220,
style: 'color: #1890ff;cursor:pointer',
- event: 'orderMore',hide: false
+ event: 'orderMore',
+ hide: false,
+ sort:true
}
- // ,{
- // field: 'cstmrId$',
- // align: 'left',
- // title: '鐢叉柟鍗曚綅',
- // width: 220,
- // style: 'color: #1890ff;cursor:pointer',
- // event: 'cstmrMore',
- // hide: true
- // }
- ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false}
+ ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false, sort:true}
// ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
// ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
// ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
@@ -193,15 +198,20 @@
// ,{field: 'planBonus', align: 'center',title: '瑙勬牸濂栭噾'}
// ,{field: 'planLeaderBonus', align: 'center',title: '瑙勬牸缁勯暱濂栭噾'}
// ,{field: 'files', align: 'center',title: '闄勪欢'}
- ,{field: 'settle$', align: 'center',title: '杩涘害', width: 150}
+ ,{field: 'settle$', align: 'center',title: '杩涘害', width: 150, sort:true}
// ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
// ,{field: 'comment', align: 'center',title: '璇勮'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: true}
- ,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100}
- ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
- ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true}
-
+ ,{field: 'statusAll$', align: 'center',title: '鐘舵��', sort:true, sort:true}
+ ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: true, sort:true}
+ ,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100, sort:true}
+ ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true, sort:true}
+ ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true, sort:true}
+ ,{field: 'center', align: 'left',title: '鍏宠仈娴佺▼', toolbar: '#tbLook', minWidth: 160, hide: false}
+ ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false}
+ ,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
+ ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
+ ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
+ // ,{field: 'assistantPlanIdSignType', align: 'left',title: '闆嗘垚璐ф灦鏍囧織', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
]],
request: {
@@ -246,7 +256,8 @@
var tr = $(['<tr id="upload-">'
,'<td id="upload-filename-id-'+ file.lastModified + '">' + file.name +'</td>'
,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
- ,'<td id="upload-file-id-' + file.lastModified + '">鍑嗗涓婁紶</td>'
+ ,'<td id="upload-filename-userName-'+ '">' +'</td>'
+ ,'<td id="upload-file-id-' + file.lastModified + '"><div class="layui-progress layui-progress-big" lay-showPercent="true" lay-filter="progress-demo-'+ file.lastModified +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
,'<td>'
,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">閲嶄紶</button>'
,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
@@ -262,6 +273,9 @@
});
$('#data-btn-file3').append(tr)
+
+ element.progress('progress-demo-'+ file.lastModified, '0%'); //鎵ц杩涘害鏉°��
+ element.init();
_uploadFile = file
})
@@ -280,16 +294,16 @@
var file = _uploadFile
- var filename = dateToStr2(new Date()) + "_" + file.name
- $("#upload-filename-id-" + file.lastModified).html(filename)
- $("#upload-file-id-" + file.lastModified).html("涓婁紶涓�")
-
- putObject(file, filename).then((result) => {
+ putObject(file,(p) => {
+ element.progress('progress-demo-'+ file.lastModified, (Math.round(p * 100)) + "%"); //鎵ц杩涘害鏉°��
+ }).then((result) => {
+ var filename = result.name
layer.msg('涓婁紶鎴愬姛', {icon: 1});
$("#upload-file-id-" + file.lastModified).html("涓婁紶鎴愬姛")
-
+ $("#upload-filename-id-" + file.lastModified).html(filename)
+ let token = localStorage.getItem("token");
$.ajax({
- url: baseUrl+"/plan/insert/file/auth",
+ url: baseUrl+"/plan/url/insert/file/auth",
headers: {'token': localStorage.getItem('token')},
data: {
'planId': $('.layui-layer-title').text(),
@@ -521,6 +535,18 @@
}
})
break;
+ case 'moreCstmr':
+ top.cstmrByMore = data.cstmrId;
+ admin.popupRight({
+ type: 1,
+ window: "top",
+ area: "1250px",
+ url: "../cstmr/cstmr_more.html",
+ end: function () {
+ // $(".layui-laypage-btn")[0].click();
+ }
+ })
+ break;
case 'approval':
layer.confirm('瀹℃壒閫氳繃锛�', {
skin: 'layui-layer-admin',
@@ -530,7 +556,7 @@
}, function (i) {
layer.close(i);
// 鎸囧畾瑙勫垝鍛�
- if (data.settle === 1) {
+ if (data.settle === 1 && data.settleSize === 4) {
admin.open({
type: 1,
area: '300px',
@@ -595,6 +621,9 @@
approvalEnd(data.id);
});
break;
+ case 'assistantPlan':
+ assistantPlan(data);
+ break;
case 'edit':
showEditModel(data);
break;
@@ -602,18 +631,24 @@
del([data.id]);
break;
case "uploadLink":
+ var planIdSign = data.id;
+ if (data.assistantHostSign==1){
+ planIdSign = data.hostPlanId;
+ }
// 鎵撳紑寮圭獥
// 鏋勫缓甯﹀弬鏁扮殑鍐呭
layer.open({
type: 1,
- title: '涓婁紶鏂囦欢-'+data.id,
+ title: '涓婁紶鏂囦欢-'+planIdSign+'-'+data.id,
content: $('#myModal')
});
// 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶
$.ajax({
- url: '/plan/view/file/auth',
+ url: '/plan/url/view/file/auth',
+ headers: {'token': localStorage.getItem('token')},
data:{
- planId:data.id
+ planId:planIdSign,
+ planIdI:data.id,
},
success: function(response) {
if (response.code==200){
@@ -630,6 +665,7 @@
tr.id = "upload-"+index;
tr.innerHTML = '<td>' + file.name + '</td>'
+ '<td>' + (file.size / 1024).toFixed(1) + 'kb</td>'
+ + '<td>' + file.userName + '</td>'
// + '<td><div class="layui-progress" lay-filter="progress-demo-' + index ,100 + '%'+ '"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
+ '<td>'+'宸插畬鎴�'+'</td>'
+ '<td>'
@@ -649,6 +685,99 @@
}
});
break;
+ case "look":
+ var $a = $(obj.tr).find('a[lay-event="look"]');
+ var offset = $a.offset();
+ var top2 = offset.top;
+ var left = offset.left;
+ layer.open({
+ type: 1,
+ title: false,
+ area: '2100px',
+ offset: [top2 + 'px', (left - 1430 + $a.outerWidth()) + 'px'],
+ shade: .01,
+ shadeClose: true,
+ fixed: false,
+ content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
+ success: function (layero) {
+ table.render({
+ elem: '#lookSSXMTable',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/plan/assistantPlan/view/auth',
+ where: {
+ hostPlanId: data.id
+ },
+ page: true,
+ cellMinWidth: 100,
+ cols: [[
+ {field: 'id', align: 'center',title: 'ID'}
+ ,{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: '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, width: 100}
+ ,{
+ field: 'orderId$',
+ align: 'left',
+ title: '璺熻釜椤圭洰',
+ width: 220,
+ style: 'cursor:pointer',
+ event: 'orderMore',hide: false
+ }
+ ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false}
+ ,{field: 'settle$', align: 'center',title: '杩涘害', width: 150}
+ ,{field: 'statusAll$', align: 'center',title: '鐘舵��'}
+ ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: true}
+ ,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100}
+ ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true}
+ ,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
+ ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
+ ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ console.log(res)
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function () {
+ $(layero).find('.layui-table-view').css('margin', '0');
+ },
+ size: ''
+ });
+ }
+ });
+ break;
}
});
@@ -657,7 +786,8 @@
var downloadUrl = $(this).attr('href');
let url = getObjectUrl(downloadUrl)
layer.msg("鍑嗗涓嬭浇涓�", {icon: 1});
- location.href = url
+ // location.href = url
+ window.open(url)
return false; // 闃绘榛樿鐨勯摼鎺ヨ烦杞涓�
});
@@ -808,6 +938,36 @@
});
}
+ /* 鏂板缓 */
+ function assistantPlan(data) {
+ layer.confirm('纭畾瑕佹柊寤鸿揣鏋惰鍒掑鎵瑰悧锛�', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/plan/assistantPlan/add/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ hostPlanId: data.id
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
/* 鍒犻櫎 */
function del(ids) {
layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
--
Gitblit v1.9.1