Merge branch 'master' of http://111.229.35.227:3000/gitadmin/wms-naivevue

src/views/system/level/userUpload.vue

@@ -83,13 +83,13 @@
   /**
    * 上传文件之前验证
    */
-  const beforeUpload = (file) => {
-    const isLt2M = file.size / 1024 / 1024 < 200;
+  const beforeUpload = (rawFile) => {
+    const isLt2M = rawFile.file.file.size / 1024 / 1024 < 200;
     if (!isLt2M) {
       message.warning('大小不能超过200MB!');
       return false;
     }
-    if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+    if (!/\.(xlsx|xls|XLSX|XLS)$/.test(rawFile.file.name)) {
       message.warning('请上传.xlsx .xls');
       return false;
     }

src/views/system/user/userUpload.vue

@@ -84,13 +84,13 @@
   /**
    * 上传文件之前验证
    */
-  const beforeUpload = (file) => {
-    const isLt2M = file.size / 1024 / 1024 < 200;
+  const beforeUpload = (rawFile) => {
+    const isLt2M = rawFile.file.file.size / 1024 / 1024 < 200;
     if (!isLt2M) {
       message.warning('大小不能超过200MB!');
       return false;
     }
-    if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+    if (!/\.(xlsx|xls|XLSX|XLS)$/.test(rawFile.file.name)) {
       message.warning('请上传.xlsx .xls');
       return false;
     }