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/priQuote/priQuote.js | 73 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/static/js/priQuote/priQuote.js b/src/main/webapp/static/js/priQuote/priQuote.js
index 5ef585b..2e3a6e4 100644
--- a/src/main/webapp/static/js/priQuote/priQuote.js
+++ b/src/main/webapp/static/js/priQuote/priQuote.js
@@ -1,5 +1,19 @@
var pageCurr;
var admin;
+let nowUserId2 = 0;
+fPriQuote();
+function fPriQuote() {
+ 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({
@@ -88,7 +102,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',
@@ -96,19 +110,19 @@
style: 'color: #1890ff;cursor:pointer',
event: 'moreCstmr',
width: 350,
- hide: false
+ hide: false, sort:true
}
,{field: 'cstmrId$', align: 'center',title: '瀹㈡埛id',hide: true}
- ,{field: 'inOrderNum', align: 'center',title: '鎶ヤ环缂栧彿',hide: false}
+ ,{field: 'inOrderNum', align: 'center',title: '鎶ヤ环缂栧彿',hide: false, sort:true}
// ,{field: 'orderNum', align: 'center',title: '鎶ヤ环棰勭畻鍗曞彿',hide: false}
,{
field: 'planId$',
align: 'center',
title: '瑙勫垝鍗曞彿',
style: 'color: #1890ff;cursor:pointer',
- event: 'morePlan'}
- ,{field: 'itemId', align: 'center',title: '瑙勫垝鍗曞彿', hide: true}
- ,{field: 'planName$', align: 'center',title: '瑙勫垝鍗曞悕绉�',hide: false}
+ event: 'morePlan',hide: false,width: 80}
+ ,{field: 'itemId', align: 'center',title: '瑙勫垝鍗旾D', hide: true, sort:true}
+ ,{field: 'planName$', align: 'center',title: '瑙勫垝鍗曞悕绉�',hide: false,width: 120}
,{
field: 'settle$',
align: 'center',
@@ -118,11 +132,14 @@
width: 150,
hide: false
}
- ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
- ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false,width: 120}
+ ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false,width: 120}
// ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�',hide: false}
,{field: 'userId$', align: 'center',title: '涓氬姟鍛�',hide: true}
- ,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳',hide: false}
+ ,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳',hide: false,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:280}
]],
request: {
@@ -130,6 +147,9 @@
pageSize: 'limit'
},
parseData: function (res) {
+ res.data.records.forEach((item,index) => {
+ item.nowUserId = nowUserId2
+ })
return {
'code': res.code,
'msg': res.msg,
@@ -167,7 +187,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>'
@@ -183,6 +204,9 @@
});
$('#data-btn-file3').append(tr)
+
+ element.progress('progress-demo-'+ file.lastModified, '0%'); //鎵ц杩涘害鏉°��
+ element.init();
_uploadFile = file
})
@@ -200,16 +224,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+"/pri/quote/url/insert/file/auth",
headers: {'token': localStorage.getItem('token')},
data: {
'planId': $('.layui-layer-title').text(),
@@ -220,7 +245,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 {
@@ -229,7 +254,7 @@
}
});
}).catch((e) => {
- console.log(e)
+ // console.log(e)
layer.msg('涓婁紶澶辫触', {icon: 2});
$("#upload-file-id-" + file.lastModified).html("涓婁紶澶辫触")
})
@@ -265,7 +290,7 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(priQuote)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
- console.log(checkStatus)
+ // console.log(checkStatus)
switch(obj.event) {
case 'addBlank':
showEditModel();
@@ -401,7 +426,7 @@
break;
case 'more':
top.priQuoteByMore = data.id;
- console.log(top.priQuoteByMore)
+ // console.log(top.priQuoteByMore)
admin.popupRight({
type: 1,
@@ -414,7 +439,7 @@
})
break;
case "quote":
- console.log(data)
+ // console.log(data)
layer.open({
type: 2,
title: '鎶ヤ环鍗曠紪杈�',
@@ -455,15 +480,16 @@
case "uploadLink":
// 鎵撳紑寮圭獥
// 鏋勫缓甯﹀弬鏁扮殑鍐呭
- console.log(data)
+ // console.log(data)
layer.open({
type: 1,
- title: '涓婁紶鏂囦欢-'+data.itemId,
+ title: '涓婁紶鏂囦欢-'+data.itemId+'-'+data.id,
content: $('#myModal')
});
// 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶
$.ajax({
- url: '/plan/view/file/auth',
+ url: '/pri/quote/url/view/file/auth',
+ headers: {'token': localStorage.getItem('token')},
data:{
planId:data.itemId
},
@@ -478,6 +504,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>'
@@ -502,7 +529,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