From e824b3d00dd5de3ccf770d4d94adc0b44a94d374 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 22 十一月 2023 11:19:57 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/plan/plan.js | 141 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 122 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 372ba08..1b3a547 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -141,8 +141,8 @@
{type: 'checkbox'}
,{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: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false, sort:true}
,{
field: 'name',
align: 'left',
@@ -150,9 +150,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',
@@ -163,7 +164,7 @@
hide: false
}
,{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,7 +172,9 @@
title: '璺熻釜椤圭洰',
width: 220,
style: 'color: #1890ff;cursor:pointer',
- event: 'orderMore',hide: false
+ event: 'orderMore',
+ hide: false,
+ sort:true
}
// ,{
// field: 'cstmrId$',
@@ -182,7 +185,7 @@
// 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,17 +196,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: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: false}
- ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: false}
- ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: false}
+ ,{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: {
@@ -248,7 +254,7 @@
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-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>'
@@ -264,6 +270,9 @@
});
$('#data-btn-file3').append(tr)
+
+ element.progress('progress-demo-'+ file.lastModified, '0%'); //鎵ц杩涘害鏉°��
+ element.init();
_uploadFile = file
})
@@ -281,9 +290,10 @@
});
var file = _uploadFile
- $("#upload-file-id-" + file.lastModified).html("涓婁紶涓�")
- putObject(file).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("涓婁紶鎴愬姛")
@@ -657,6 +667,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;
}
});
--
Gitblit v1.9.1