Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/webapp/WEB-INF/page/shop/goods.html

@@ -148,6 +148,7 @@
                 #if($shiro.hasPermission("goods:upload"))
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :on-progress="uploadExcelProgress"
                             :format="['xls','xlsx']"
                             action="../goods/upload">
                         <i-button type="ghost" icon="ios-cloud-upload-outline">商品导入</i-button>
@@ -156,6 +157,7 @@
                 #end
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :on-progress="uploadExcelProgress"
                             :format="['xls','xlsx']"
                             action="../goods/uploadByCover">
                         <i-button type="ghost" icon="ios-cloud-upload-outline">商品导入(修改库存)</i-button>
@@ -164,6 +166,7 @@
                 #if($shiro.hasPermission("goods:generalGoodsUpload"))
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :on-progress="uploadExcelProgress"
                             :format="['xls','xlsx','zip']"
                             action="../goods/generalGoodsUpload">
                         <i-button type="ghost" icon="ios-cloud-upload-outline">普货商品导入</i-button>
@@ -171,6 +174,7 @@
                 </i-col>
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :on-progress="uploadExcelProgress"
                             :format="['xls','xlsx','zip']"
                             action="../goods/generalGoodsImgUpload">
                         <i-button type="ghost" icon="ios-cloud-upload-outline">商品图片批量导入</i-button>
@@ -178,6 +182,7 @@
                 </i-col>
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-error="uploadExcelError" :on-format-error="uploadExcelFormatError"
+                            :on-progress="uploadExcelProgress"
                             :format="['xls','xlsx','zip']"
                             action="../goods/generalGoodsImgUploadByZip">
                         <i-button type="ghost" icon="ios-cloud-upload-outline">商品图片(文件夹）批量导入</i-button>

kmall-admin/src/main/webapp/WEB-INF/page/shop/storeProductStock.html

@@ -132,6 +132,7 @@
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-format-error="uploadExcelFormatError"
                             :format="['xls','xlsx']"
+                            :on-progress="uploadExcelProgress"
                             action="../productstorerela/productStoreRelaUpload">
                         <i-button type="ghost" icon="ios-cloud-upload-outline">门店商品导入</i-button>
                     </Upload>
@@ -139,6 +140,7 @@
                 #end
                 <i-col style="display: inline-grid;">
                     <Upload :show-upload-list="false" :on-success="uploadExcelSuccess" :on-format-error="uploadExcelFormatError"
+                            :on-progress="uploadExcelProgress"
                             :format="['xls','xlsx']"
                             action="../productstorerela/productStoreRelaUploadByCover">
                         <i-button type="ghost" icon="ios-cloud-upload-outline">门店商品导入(修改库存)</i-button>

kmall-admin/src/main/webapp/js/shop/goods.js

@@ -123,7 +123,7 @@ $(function () {
 });
 
 var ztree;
-
+var exportMsg;
 var setting = {
     data: {
         simpleData: {
@@ -623,15 +623,30 @@ var vm = new Vue({
             }else{
                 alert(data.msg);
             }
+            setTimeout(exportMsg, 100);
         },
         uploadExcelError: function () {
             alert('上传出现异常，请重试！');
+            setTimeout(exportMsg, 100);
+        },
+        uploadExcelProgress:function(event, file, fileList){
+            console.log("上传中")
+            console.log(event)
+            console.log(file)
+            console.log(fileList)
+            console.log("上传中")
+            exportMsg = this.$Message.loading({
+                content: 'Loading...',
+                duration: 0
+            });
+            // setTimeout(msg, 3000);
         },
         uploadExcelFormatError: function (file) {
             this.$Notice.warning({
                 title: '文件格式不正确',
                 desc: '文件 ' + file.name + ' 格式不正确，请上传 xls 或 xlsx 格式的文件。'
             });
+            setTimeout(exportMsg, 100);
         },
         handleRemove(file) {
             // 从 upload 实例删除数据
@@ -749,12 +764,18 @@ var vm = new Vue({
         //     });
         // }
         exportGoods :function () {
+            const msg = this.$Message.loading({
+                content: 'Loading...',
+                duration: 0
+            });
+
             var params = {};
             params.name = vm.q.name, params.englishName = vm.q.englishName, params.plu = vm.q.plu,
                 params.goodsSn = vm.q.goodsSn, params.prodBarcode = vm.q.prodBarcode,
                 params.goodsBizType = vm.q.goodsBizType,params.merchSn = vm.q.merchSn,
                 params.thirdPartyMerchCode = vm.q.thirdPartyMerchCode,params.lastSaleTime = vm.q.lastSaleTime;
             exportFile('#rrapp', '../goods/export', params);
+            setTimeout(msg, 1000);
 
         }
     },

kmall-admin/src/main/webapp/js/shop/offilineOrderList.js

@@ -484,6 +484,8 @@ let vm = new Vue({
             });
         },
         exportOffilineOrder : function () {
+
+
             var params = {};
             params.orderSn=vm.q.orderSn,
             params.orderStatus=vm.q.orderStatus;
@@ -511,20 +513,35 @@ let vm = new Vue({
                 return ;
             }
 
+            const msg = this.$Message.loading({
+                content: 'Loading...',
+                duration: 0
+            });
             exportFile('#rrapp', '../order/exportOffilineOrder', params);
+            setTimeout(msg, 1000);
         },
         exportSystemFormat : function () {
+            const msg = this.$Message.loading({
+                content: 'Loading...',
+                duration: 0
+            });
             var params = {};
             params.orderSn=vm.q.orderSn,
             params.orderStatus=vm.q.orderStatus;
             params.startTime=vm.q.startTime;
             params.endTime=vm.q.endTime;
             exportFile('#rrapp', '../order/exportSystemFormat', params);
+            setTimeout(msg, 1000);
         },
         exportSaleReportExcel:function(){
+            const msg = this.$Message.loading({
+                content: 'Loading...',
+                duration: 0
+            });
             var params = {};
             params.billDate = vm.q.billDate;
             exportFile('#rrapp', '../exportExcel/exportSalesExcel', params);
+            setTimeout(msg, 1000);
 
         }
     },

kmall-admin/src/main/webapp/js/shop/storeProductStock.js

@@ -144,7 +144,7 @@ $(function () {
 });
 
 var ztree;
-
+var exportMsg;
 var setting = {
     data: {
         simpleData: {
@@ -682,9 +682,23 @@ var vm = new Vue({
             alert('上传成功', function (index) {
                 $("#jqGrid").trigger("reloadGrid");
             });
+            setTimeout(exportMsg, 100);
         },
         uploadExcelError: function () {
             alert('上传出现异常');
+            setTimeout(exportMsg, 100);
+        },
+        uploadExcelProgress:function(event, file, fileList){
+            console.log("上传中")
+            console.log(event)
+            console.log(file)
+            console.log(fileList)
+            console.log("上传中")
+            exportMsg = this.$Message.loading({
+                content: 'Loading...',
+                duration: 0
+            });
+            // setTimeout(msg, 3000);
         },
         handleSubmit: function (name) {
             handleSubmitValidate(this, name, function () {
@@ -773,19 +787,26 @@ var vm = new Vue({
         uploadExcelError: function (data) {
             console.log(data);
             alert('上传出现异常，请重试！');
+            setTimeout(exportMsg, 100);
         },
         uploadExcelFormatError: function (file) {
             this.$Notice.warning({
                 title: '文件格式不正确',
                 desc: '文件 ' + file.name + ' 格式不正确，请上传 xls 或 xlsx 格式的文件。'
             });
+            setTimeout(exportMsg, 100);
         },
         exportStoreProductStock :function () {
+            const msg = this.$Message.loading({
+                content: 'Loading...',
+                duration: 0
+            });
             var params = {};
             params.storeId = vm.q.storeId, params.goodsName = vm.q.goodsName, params.goodsSn = vm.q.goodsSn,
                 params.category = vm.q.category, params.categoryTwo = vm.q.categoryTwo,
                 params.goodsBizType = vm.q.goodsBizType,params.thirdPartyMerchCode = vm.q.thirdPartyMerchCode,lastSaleTime=vm.q.lastSaleTime;
             exportFile('#rrapp', '../productstorerela/export', params);
+            setTimeout(msg, 1000);
         }
     },
     mounted() {