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/priOnline2/priOnline.js | 71 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index e460e2e..8c1411d 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -1,6 +1,20 @@
var pageCurr;
var admin;
var treeCond;
+let nowUserId2 = 0;
+fPriOnline();
+function fPriOnline() {
+ 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({
@@ -85,7 +99,7 @@
cellMinWidth: 150,
cols: [[
{type: 'checkbox', fixed: 'left'}
- , {field: 'id', title: 'ID', sort: true, align: 'center', fixed: 'left', width: 80, hide: true}
+ , {field: 'id', title: 'ID', sort: true, align: 'center', fixed: 'left', width: 80, hide: true, sort:true}
, {
field: 'templateName',
align: 'center',
@@ -93,10 +107,10 @@
style: 'color: #1890ff;cursor:pointer',
event: 'moreCstmr',
width: 350,
- hide: false
+ hide: false, sort:true
}
, {field: 'cstmrId$', align: 'center', title: '瀹㈡埛id', hide: true}
- , {field: 'orderNum', align: 'center', title: '鏍镐环鍗曞彿', hide: false}
+ , {field: 'orderNum', align: 'center', title: '鏍镐环鍗曞彿', hide: false, sort:true}
, {
field: 'planId$',
align: 'center',
@@ -105,7 +119,7 @@
event: 'morePlan',
hide: false
}
- , {field: 'itemId', align: 'center', title: '瑙勫垝鍗曞彿', hide: true}
+ , {field: 'itemId', align: 'center', title: '瑙勫垝鍗旾D', hide: true, sort:true}
, {field: 'statusAll$', align: 'center',title: '鐘舵��'}
// ,{field: 'memberId$', align: 'center',title: ''}
, {
@@ -119,14 +133,17 @@
, {field: 'settleSize', align: 'center', title: '娴佺▼闀垮害', hide: true}
, {field: 'user$', align: 'center', title: '涓氬姟鍛�', hide: false}
, {field: 'deptId$', align: 'center', title: '閮ㄩ棬', hide: true}
- , {field: 'checkDataStatus$', align: 'center', title: '鎶ヤ环鏁版嵁', hide: false}
- , {field: 'createTime$', align: 'center', title: '鍒涘缓鏃堕棿', hide: true}
- , {field: 'updateUserId$', align: 'center', title: '鏇存柊浜哄憳', hide: false}
- , {field: 'updateTime$', align: 'center', title: '鏇存柊鏃堕棿', 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: 'checkDataStatus$', align: 'center', title: '鎶ヤ环鏁版嵁', hide: false,width: 80}
+ , {field: 'createTime$', align: 'center', title: '鍒涘缓鏃堕棿', hide: true,width: 120}
+ , {field: 'updateUserId$', align: 'center', title: '鏇存柊浜哄憳', hide: false,width: 80}
+ , {field: 'updateTime$', align: 'center', title: '鏇存柊鏃堕棿', hide: false,width: 120}
+ ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false,width: 80}
+ ,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true,width: 80}
+ ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true,width: 80}
+ ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true,width: 80}
+ ,{field: 'nowUserId', title: 'nowUserId', hide: true, templet:function(){return nowUserId2}}
+ ,{field: 'userId',title: 'userId', hide: true}
+ ,{field: 'memberId',title: 'memberId', hide: true}
, {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 350}
]],
request: {
@@ -134,6 +151,9 @@
pageSize: 'limit'
},
parseData: function (res) {
+ res.data.records.forEach((item,index) => {
+ item.nowUserId = nowUserId2
+ })
return {
'code': res.code,
'msg': res.msg,
@@ -283,6 +303,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-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>'
@@ -327,9 +348,9 @@
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+"/pri/online/url/insert/file/auth",
headers: {'token': localStorage.getItem('token')},
data: {
'planId': $('.layui-layer-title').text(),
@@ -340,7 +361,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 {
@@ -349,7 +370,7 @@
}
});
}).catch((e) => {
- console.log(e)
+ // console.log(e)
layer.msg('涓婁紶澶辫触', {icon: 2});
$("#upload-file-id-" + file.lastModified).html("涓婁紶澶辫触")
})
@@ -371,7 +392,7 @@
title: data.name
}, function (i) {
layer.close(i);
- console.log(data)
+ // console.log(data)
approvalEnd(data.id);
});
break;
@@ -382,7 +403,7 @@
offset: '200px',
title: data.name
}, function (i) {
- console.log(data)
+ // console.log(data)
layer.close(i);
// 鎸囧畾妯℃澘
if (((data.settle === 1 && data.settleSize===3) || (data.settle===2 && data.settleSize===4)) && data.assistantHostSign==0) {
@@ -616,14 +637,17 @@
}
layer.open({
type: 1,
- title: '涓婁紶鏂囦欢-'+planIdSign,
- content: $('#myModal')
+ title: '涓婁紶鏂囦欢-'+planIdSign+'-'+data.id,
+ content: $('#myModal'),
+
});
// 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶
$.ajax({
- url: '/plan/view/file/auth',
+ url: '/pri/online/url/view/file/auth',
+ headers: {'token': localStorage.getItem('token')},
data:{
- planId:planIdSign
+ planId:planIdSign,
+ planIdI:data.itemId
},
success: function(response) {
if (response.code==200){
@@ -636,6 +660,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>'
@@ -660,7 +685,7 @@
// 鐐瑰嚮涓嬭浇鎸夐挳鏃惰Е鍙戞枃浠朵笅杞�
$('#data-btn-file3').on('click', 'a', function() {
- console.log(this)
+ // console.log(this)
var downloadUrl = $(this).attr('href');
let url = getObjectUrl(downloadUrl)
layer.msg("鍑嗗涓嬭浇涓�", {icon: 1});
--
Gitblit v1.9.1