From 510510acc4215ac4b43eb7e31b3450ab9fa3f9fe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 六月 2020 17:06:40 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/matCode/matCode.js |   58 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 3208ba7..ee89ed4 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -116,27 +116,6 @@
         });
     });
 
-    // 瀵煎叆excel
-    upload.render({
-        elem: '#uploadEx'
-        , url: baseUrl + '/matCode/import/auth'
-        , headers: {token: localStorage.getItem('token')}
-        , accept: 'file'
-        , exts: 'xls|excel|xlsx'
-        , auto: false
-        , bindAction: '#uploadDo'
-        , choose: function(obj){
-            layui.$('#uploadDemoView').removeClass('layui-hide');
-            obj.preview(function(index, file, result){
-                console.log(file.name); //寰楀埌鏂囦欢鍚嶇О
-            });
-        }
-        , done: function (res) {
-            layer.msg('涓婁紶鎴愬姛');
-            limit();
-        }
-    })
-
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
     table.on('toolbar(matCode)', function (obj) {
         var checkStatus = table.checkStatus(obj.config.id);
@@ -232,18 +211,49 @@
                 layer.open({
                     type: 1,
                     title: '鏁版嵁瀵煎叆',
-                    maxmin: true,
-                    area: [top.detailWidth, top.detailHeight],
                     shadeClose: true,
                     content: $('#importDataDiv'),
                     success: function(layero, index){
-
+                        uploader.reload();
                     }
                 });
                 break;
         }
     });
 
+    // 瀵煎叆excel
+    var uploader = upload.render({
+        elem: '#uploadEx'
+        , url: baseUrl + '/matCode/import/auth'
+        , headers: {token: localStorage.getItem('token')}
+        , accept: 'file'
+        , exts: 'xls|excel|xlsx'
+        , auto: false
+        , bindAction: '#uploadDo'
+        , before: function(obj){
+            layer.closeAll();
+            layer.load(1, {shade: [0.1,'#fff']});
+        }
+        , choose: function(obj){
+            $('#uploadDesc').hide();
+            $('#uploadDemoView').show();
+            obj.preview(function(index, file, result){
+                $('#fileMame').html(file.name);
+            });
+        }
+        , done: function (res) {
+            limit();
+            $('#uploadDesc').show();
+            $('#uploadDemoView').hide();
+            $('#fileMame').html("");
+            layer.closeAll('loading');
+            layer.msg(res.msg);
+        }
+        , error: function(index, upload){
+            layer.closeAll('loading');
+        }
+    })
+
     // 鐩戝惉琛屽伐鍏蜂簨浠�
     table.on('tool(matCode)', function(obj){
         var data = obj.data;

--
Gitblit v1.9.1