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/priOnline2/priOnline.js |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index 4ce3371..c60c45e 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -5,7 +5,7 @@
     base: baseUrl + "/static/layui/lay/modules/"
 }).extend({
     cascader: 'cascader/cascader',
-}).use(['table', 'laydate', 'form', 'admin', 'xmSelect', 'element', 'cascader', 'tree', 'dropdown'], function () {
+}).use(['table', 'laydate', 'form', 'admin', 'xmSelect', 'element', 'cascader', 'tree', 'dropdown','element'], function () {
     var table = layui.table;
     var $ = layui.jquery;
     var layer = layui.layer;
@@ -13,6 +13,7 @@
     var tree = layui.tree;
     var form = layui.form;
     var dropdown = layui.dropdown;
+    var element = layui.element;
     admin = layui.admin;
 
     $('#organization').html(localStorage.getItem('nickname') + ' <i class="layui-icon">&#xe61a;</i>');
@@ -84,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',
@@ -92,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',
@@ -104,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: ''}
             , {
@@ -282,7 +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-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>'
@@ -298,6 +299,9 @@
         });
 
         $('#data-btn-file3').append(tr)
+
+        element.progress('progress-demo-'+ file.lastModified, '0%'); //鎵ц杩涘害鏉°��
+        element.init();
 
         _uploadFile = file
     })
@@ -315,10 +319,9 @@
         });
 
         var file = _uploadFile
-        $("#upload-file-id-" + file.lastModified).html("涓婁紶涓�")
 
         putObject(file,(p) => {
-            $("#upload-file-id-" + file.lastModified).html("涓婁紶涓細" + (Math.round(p * 100)) + "%")
+            element.progress('progress-demo-'+ file.lastModified, (Math.round(p * 100)) + "%"); //鎵ц杩涘害鏉°��
         }).then((result) => {
             var filename = result.name
             layer.msg('涓婁紶鎴愬姛', {icon: 1});

--
Gitblit v1.9.1