1、文件上传功能重构

2、实现签到删除
3、实现签到表格处弹性布局
4、库存删除问题修正

ruoyi-ui/src/components/FileUpload/index.vue

@@ -28,7 +28,7 @@
     <!-- 文件列表 -->
     <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
       <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
-        <el-link :href="`${file.url}`" :underline="false" target="_blank">
+        <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
           <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
         </el-link>
         <div class="ele-upload-list__item-content-action">
@@ -41,7 +41,6 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-import { listByIds, delOss } from "@/api/system/oss";
 
 export default {
   name: "FileUpload",
@@ -56,12 +55,12 @@ export default {
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 100,
+      default: 5,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "docx", "xls","pdf","xlsx"],
+      default: () => ["doc", "xls", "ppt", "txt", "pdf","docx", "xlsx"],
     },
     // 是否显示提示
     isShowTip: {
@@ -74,7 +73,7 @@ export default {
       number: 0,
       uploadList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传文件服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -83,24 +82,16 @@ export default {
   },
   watch: {
     value: {
-      async handler(val) {
+      handler(val) {
         if (val) {
           let temp = 1;
           // 首先将值转为数组
-          let list;
-          if (Array.isArray(val)) {
-            list = val;
-          } else {
-            await listByIds(val).then(res => {
-              list = res.data.map(oss => {
-                oss = { name: oss.originalName, url: oss.url, ossId: oss.ossId };
-                return oss;
-              });
-            })
-          }
+          const list = Array.isArray(val) ? val : this.value.split(',');
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
-            item = { name: item.name, url: item.url, ossId: item.ossId };
+            if (typeof item === "string") {
+              item = { name: item, url: item };
+            }
             item.uid = item.uid || new Date().getTime() + temp++;
             return item;
           });
@@ -156,7 +147,7 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 200) {
-        this.uploadList.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId });
+        this.uploadList.push({ name: res.fileName, url: res.fileName });
         this.uploadedSuccessfully();
       } else {
         this.number--;
@@ -168,8 +159,6 @@ export default {
     },
     // 删除文件
     handleDelete(index) {
-      let ossId = this.fileList[index].ossId;
-      delOss(ossId);
       this.fileList.splice(index, 1);
       this.$emit("input", this.listToString(this.fileList));
     },
@@ -197,11 +186,11 @@ export default {
       let strs = "";
       separator = separator || ",";
       for (let i in list) {
-        strs += list[i].ossId + separator;
+        strs += list[i].url + separator;
       }
-      return strs != "" ? strs.substr(0, strs.length - 1) : "";
-    },
-  },
+      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+    }
+  }
 };
 </script>