From a68bab105152b2dd3fcf1bcd59a0191aab74f61d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 24 十一月 2023 17:11:35 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/priOnline2/priOnline.js |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index e460e2e..db28bb4 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -85,7 +85,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 +93,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 +105,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: ''}
             , {
@@ -283,6 +283,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 +328,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(),
@@ -616,12 +617,14 @@
                 }
                 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
                     },
@@ -636,6 +639,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>'

--
Gitblit v1.9.1