From 2ac52508980a33006a1596c43c4fc8daaaa5d19f Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 08 十月 2023 18:15:33 +0800
Subject: [PATCH] 新增和详情中的两个上传不会同时显示“正在上传”,详情中对图片和附件的修改直接调用接口,上传图片的地方只能上传图片

---
 ruoyi-ui/src/views/self/memoInfo.vue |  108 ++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 81 insertions(+), 27 deletions(-)

diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
index 0cad954..bec73f1 100644
--- a/ruoyi-ui/src/views/self/memoInfo.vue
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -58,6 +58,7 @@
         <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
         <el-upload
           action="#"
+          accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
           list-type="picture-card"
           multiple
           :http-request="requestUpload"
@@ -72,7 +73,7 @@
               class="el-upload-list__item-thumbnail"
               :src="file.url"
               alt=""
-              style="width: 147px; height: 147px"
+              style="width: 100%; height: 100%; object-fit: cover;"
               fit="cover"
               :preview-src-list="[file.url]"
             >
@@ -113,19 +114,19 @@
           list-type="picture-card"
           :on-preview="handleFileCardPreview"
           :on-remove="handleRemoveFile"
-          :http-request="requestUpload"
+          :http-request="requestUpload1"
           :show-file-list="true"
           :disabled="!btn"
           :class="{ hide: !btn }"
         >
-          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
-          <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+          <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div>
+          <i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
           <div slot="file" slot-scope="{file}">
             <img
               class="el-upload-list__item-thumbnail"
               src="../../assets/401_images/401.gif"
               alt=""
-              style="width: 147px; height: 147px"
+              style="width: 100%; height: 100%; object-fit: cover;"
               fit="cover"
             >
             <span class="el-upload-list__item-actions">
@@ -175,6 +176,7 @@
 import errorCode from "@/utils/errorCode";
 import {Message} from "element-ui";
 import { getNote, updateNote,download,uploadPic} from "@/api/memo/index";
+import {updateCollection} from "@/api/collection";
 
 export default {
   components: {},
@@ -190,6 +192,7 @@
       btn:false,
       isShow:true,
       uploading: false,
+      uploading1: false,
       // 涓浜嬫湰琛ㄦ牸鏁版嵁
       noteList: [],
       formData: {
@@ -288,17 +291,6 @@
   },
   mounted() {},
   methods: {
-    /** 鏌ヨ绫诲埆淇℃伅 */
-    // getCateInfor()
-    // {
-    //   let _this = this
-    //   getCategory().then(response=>{
-    //
-    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
-    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
-    //     })
-    //   })
-    // },
     submitForm() {
       let ul = this.fileList.map(function (elem){
         return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -342,11 +334,23 @@
         saveAs(blob, filename)
       })
     },
-    handleRemoveFile(file) {
+    handleRemoveFile(file,) {
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
           this.$delete(this.fileListOther,i);
+        let ul = this.fileList.map(function (elem){
+          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        }).join(",")
+        let uls = this.fileListOther.map(function (elem){
+          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        }).join(",")
+        this.formData.url = ul+","+uls;
+        updateNote(this.formData).then(response => {
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          // this.open = false;
+          // this.btn=false
+        });
       }
     },
     handleRemove(file) {
@@ -354,6 +358,18 @@
       {
         if(this.fileList[i].url==file.url)
           this.$delete(this.fileList,i);
+        let ul = this.fileList.map(function (elem){
+          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        }).join(",")
+        let uls = this.fileListOther.map(function (elem){
+          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        }).join(",")
+        this.formData.url = ul+","+uls;
+        updateNote(this.formData).then(response => {
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          // this.open = false;
+          // this.btn=false
+        });
       }
     },
     handleFileCardPreview(file){
@@ -398,10 +414,44 @@
       formData.append('uploadFile', file);
       let _this = this
       this.uploading = true;
+
       uploadPic(formData).then(response => {
         let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
         this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
+        if(_this.fot.includes(pth) === true)
+        {
+          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+          let ul = this.fileList.map(function (elem){
+            return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+          }).join(",")
+          let uls = this.fileListOther.map(function (elem){
+            return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+          }).join(",")
+          this.formData.url = ul+","+uls
+          console.log(this.formData.url)
+          updateNote(this.formData).then(response => {
+            this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+            // this.open = false;
+            // this.btn=false
+          });
+        }
+        else{
+          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+        }
+      })
+    },
+    requestUpload1(params)
+    {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('uploadFile', file);
+      let _this = this
+      this.uploading1 = true;
+      uploadPic(formData).then(response => {
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+        this.uploading1 = false;
+        // this.$modal.msgSuccess("涓婁紶鎴愬姛");
         if(_this.fot.includes(pth) === true)
         {
           _this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -410,18 +460,22 @@
 
         else{
           _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+          let ul = this.fileList.map(function (elem){
+            return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+          }).join(",")
+          let uls = this.fileListOther.map(function (elem){
+            return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+          }).join(",")
+          this.formData.url = ul+","+uls
+          console.log(this.formData.url)
+          updateNote(this.formData).then(response => {
+            this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+            // this.open = false;
+            // this.btn=false
+          });
         }
       })
-
     },
-
-    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-    handleExport() {
-      this.download('/zSelfNote/export', {
-        ...this.queryParams
-      }, `zSelfNote${new Date().getTime()}.xlsx`)
-    }
 
   }
 }

--
Gitblit v1.9.1