1、文件上传功能重构

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

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

@@ -44,7 +44,6 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-import { listByIds, delOss } from "@/api/system/oss";
 
 export default {
   props: {
@@ -56,7 +55,7 @@ export default {
     },
     // 大小限制(MB)
     fileSize: {
-       type: Number,
+      type: Number,
       default: 5,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
@@ -78,7 +77,7 @@ export default {
       dialogVisible: false,
       hideUpload: false,
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传的图片服务器地址
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -87,21 +86,19 @@ export default {
   },
   watch: {
     value: {
-      async handler(val) {
+      handler(val) {
         if (val) {
           // 首先将值转为数组
-          let list;
-          if (Array.isArray(val)) {
-            list = val;
-          } else {
-            await listByIds(val).then(res => {
-              list = res.data;
-            })
-          }
+          const list = Array.isArray(val) ? val : this.value.split(',');
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
-            // 此处name使用ossId 防止删除出现重名
-            item = { name: item.ossId, url: item.url, ossId: item.ossId };
+            if (typeof item === "string") {
+              if (item.indexOf(this.baseUrl) === -1) {
+                item = { name: this.baseUrl + item, url: this.baseUrl + item };
+              } else {
+                item = { name: item, url: item };
+              }
+            }
             return item;
           });
         } else {
@@ -128,7 +125,7 @@ export default {
         if (file.name.lastIndexOf(".") > -1) {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
         }
-        isImg = this.fileType.some((type) => {
+        isImg = this.fileType.some(type => {
           if (file.type.indexOf(type) > -1) return true;
           if (fileExtension && fileExtension.indexOf(type) > -1) return true;
           return false;
@@ -158,7 +155,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--;
@@ -171,15 +168,13 @@ export default {
     // 删除图片
     handleDelete(file) {
       const findex = this.fileList.map(f => f.name).indexOf(file.name);
-      if(findex > -1) {
-        let ossId = this.fileList[findex].ossId;
-        delOss(ossId);
+      if (findex > -1) {
         this.fileList.splice(findex, 1);
         this.$emit("input", this.listToString(this.fileList));
       }
     },
     // 上传失败
-    handleUploadError(res) {
+    handleUploadError() {
       this.$modal.msgError("上传图片失败，请重试");
       this.$modal.closeLoading();
     },
@@ -203,11 +198,11 @@ export default {
       let strs = "";
       separator = separator || ",";
       for (let i in list) {
-        if (list[i].ossId) {
-          strs += list[i].ossId + separator;
+        if (list[i].url) {
+          strs += list[i].url.replace(this.baseUrl, "") + separator;
         }
       }
-      return strs != "" ? strs.substr(0, strs.length - 1) : "";
+      return strs != '' ? strs.substr(0, strs.length - 1) : '';
     }
   }
 };
@@ -215,12 +210,13 @@ export default {
 <style scoped lang="scss">
 // .el-upload--picture-card 控制加号部分
 ::v-deep.hide .el-upload--picture-card {
-    display: none;
+  display: none;
 }
+
 // 去掉动画效果
 ::v-deep .el-list-enter-active,
 ::v-deep .el-list-leave-active {
-    transition: all 0s;
+  transition: all 0s;
 }
 
 ::v-deep .el-list-enter, .el-list-leave-active {