From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/plan/plan.js | 127 +++++++++++++++++++++++++++++-------------
1 files changed, 87 insertions(+), 40 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 18873cf..28807e1 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -3,6 +3,21 @@
var treeCond;
var admin;
var planNeedXmlSelData;
+let nowUserId2 = 0;
+fPlan();
+function fPlan() {
+ layui.jquery.ajax({
+ url: baseUrl + "/dashboard/user/id/popup/auth",
+ data:{token : localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ nowUserId2 = res.data;
+ }
+ }
+ })
+}
+
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -141,8 +156,18 @@
{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: 'cstmrId', align: 'left',title: 'cstmrId',hide: 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: 130,hide: false, sort:true}
,{
field: 'name',
align: 'left',
@@ -150,9 +175,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',
@@ -160,29 +186,23 @@
templet:function(d){
return emptyShow(d.planNeed$)
},
- hide: false
+ hide: false,
+ width: 200
}
+ , {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$',
align: 'left',
title: '璺熻釜椤圭洰',
- width: 220,
+ width: 120,
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: 'beItem$', align: 'center',title: '绔嬮」'}
// ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
// ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
@@ -193,19 +213,23 @@
// ,{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: '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: 'statusAll$', align: 'center',title: '鐘舵��', hide:true, sort:true,width: 100}
+ ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', hide: true, sort:true,width: 120}
+ ,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100, sort:true}
+ ,{field: 'updateTime$', align: 'left',title: '鏇存柊鏃堕棿', hide: false, sort:true,width: 120}
+ ,{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: false,width: 80}
,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
+ ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false, sort:true,width: 120}
+ ,{field: 'nowUserId', title: 'nowUserId', hide: true, templet:function(){return nowUserId2}}
+ ,{field: 'userId',title: 'userId', hide: true}
+ ,{field: 'director',title: 'director', hide: true}
// ,{field: 'assistantPlanIdSignType', align: 'left',title: '闆嗘垚璐ф灦鏍囧織', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
]],
@@ -214,6 +238,9 @@
pageSize: 'limit'
},
parseData: function (res) {
+ res.data.records.forEach((item,index) => {
+ item.nowUserId = nowUserId2
+ })
return {
'code': res.code,
'msg': res.msg,
@@ -251,7 +278,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>'
@@ -267,6 +295,9 @@
});
$('#data-btn-file3').append(tr)
+
+ element.progress('progress-demo-'+ file.lastModified, '0%'); //鎵ц杩涘害鏉°��
+ element.init();
_uploadFile = file
})
@@ -284,16 +315,17 @@
});
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("涓婁紶鎴愬姛")
$("#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(),
@@ -304,7 +336,7 @@
success: function (res) {
if (res.code === 200){
layer.close(index)
- console.log(res)
+ // console.log(res)
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
@@ -313,7 +345,7 @@
}
});
}).catch((e) => {
- console.log(e)
+ // console.log(e)
layer.msg('涓婁紶澶辫触', {icon: 2});
$("#upload-file-id-" + file.lastModified).html("涓婁紶澶辫触")
})
@@ -360,7 +392,7 @@
method: 'GET',
success: function (res0) {
let planType = res0.data.planType;
- console.log(planType.html)
+ // console.log(planType.html)
if (res0.code === 200) {
admin.open({
type: 1,
@@ -385,7 +417,7 @@
});
layDateRender();
form.on('submit(editSubmit)', function (data) {
- console.log(data)
+ // console.log(data)
data.field.planType = planType.id;
data.field.orderId = orderSel.getValue()[0] ? orderSel.getValue()[0].value : null;
data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null;
@@ -525,6 +557,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',
@@ -534,7 +578,7 @@
}, function (i) {
layer.close(i);
// 鎸囧畾瑙勫垝鍛�
- if (data.settle === 1) {
+ if (data.settle === 1 && data.settleSize === 4) {
admin.open({
type: 1,
area: '300px',
@@ -617,14 +661,16 @@
// 鏋勫缓甯﹀弬鏁扮殑鍐呭
layer.open({
type: 1,
- title: '涓婁紶鏂囦欢-'+planIdSign,
+ 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:planIdSign
+ planId:planIdSign,
+ planIdI:data.id,
},
success: function(response) {
if (response.code==200){
@@ -641,6 +687,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>'
@@ -727,14 +774,14 @@
,{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}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
]],
request: {
pageName: 'curr',
pageSize: 'limit'
},
parseData: function (res) {
- console.log(res)
+ // console.log(res)
return {
'code': res.code,
'msg': res.msg,
--
Gitblit v1.9.1