Pre Merge pull request !239 from 疯狂的狮子Li/N/A

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

@@ -151,13 +151,19 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res) {
-      this.uploadList.push({ name: res.data.url, url: res.data.url });
+      if (res.code === 200) {
-      if (this.uploadList.length === this.number) {
+        this.uploadList.push({ name: res.data.url, url: res.data.url });
-        this.fileList = this.fileList.concat(this.uploadList);
+        if (this.uploadList.length === this.number) {
-        this.uploadList = [];
+          this.fileList = this.fileList.concat(this.uploadList);
-        this.number = 0;
+          this.uploadList = [];
-        this.$emit("input", this.listToString(this.fileList));
+          this.number = 0;
+          this.$emit("input", this.listToString(this.fileList));
+          this.$modal.closeLoading();
+        }
+      } else {
+        this.$modal.msgError(res.msg);
         this.$modal.closeLoading();
+        this.number--;
       }
     },
     // 删除文件

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

@@ -122,13 +122,19 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res) {
-      this.uploadList.push({ name: res.data.url, url: res.data.url });
+      if (res.code === 200) {
-      if (this.uploadList.length === this.number) {
+        this.uploadList.push({ name: res.data.url, url: res.data.url });
-        this.fileList = this.fileList.concat(this.uploadList);
+        if (this.uploadList.length === this.number) {
-        this.uploadList = [];
+          this.fileList = this.fileList.concat(this.uploadList);
-        this.number = 0;
+          this.uploadList = [];
-        this.$emit("input", this.listToString(this.fileList));
+          this.number = 0;
+          this.$emit("input", this.listToString(this.fileList));
+          this.$modal.closeLoading();
+        }
+      } else {
+        this.$modal.msgError(res.msg);
         this.$modal.closeLoading();
+        this.number--;
       }
     },
     // 上传前loading加载