新增和详情中的两个上传不会同时显示“正在上传”，详情中对图片和附件的修改直接调用接口，上传图片的地方只能上传图片

Tcsm

2023-10-08 2ac52508980a33006a1596c43c4fc8daaaa5d19f

 ruoyi-ui/src/views/collection/collectionInfo.vue

@@ -75,17 +75,13 @@
              <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
            </el-form-item>
             </el-cow>
             <el-cow >
               <el-form-item label="是否是本家庭记录" prop="ownData">
                 <el-input  v-model="formData.ownData=== 1 ? '是':'否'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
               </el-form-item>
             </el-cow>

           </el-row>
         </el-container>
          <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"
@@ -100,7 +96,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]"
              >
@@ -141,20 +137,20 @@
            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">正在上传...</div>
            <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
            <div v-if="uploading1" class="upload-status">正在上传...</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">
@@ -208,7 +204,6 @@
import {addRole, updateRole} from "@/api/system/role";
import {getCollection, updateCollection,download,uploadPic,listType} from "@/api/collection/index";


export default {
  components: {},
  props: [],
@@ -217,15 +212,13 @@
      cdi:"收藏与荣誉详细信息",
      udi:"收藏与荣誉信息详情",
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[

      ],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      isShow:true,
      uploading: false,
      uploading1: false,
      // 收藏与荣誉表格数据
     collectionList: [],
      typeList:[],
@@ -432,6 +425,18 @@
      {
        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;
        updateCollection(this.formData).then(response => {
          this.$modal.msgSuccess("删除成功");
          // this.open = false;
          // this.btn=false
        });
      }
    },
    handleRemove(file) {
@@ -439,6 +444,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;
        updateCollection(this.formData).then(response => {
          this.$modal.msgSuccess("删除成功");
          // this.open = false;
          // this.btn=false
        });
      }
    },
    handleFileCardPreview(file){
@@ -477,10 +494,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)
          updateCollection(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})
@@ -489,18 +540,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)
          updateCollection(this.formData).then(response => {
            this.$modal.msgSuccess("文档上传成功");
            // this.open = false;
            // this.btn=false
          });
        }
      })

    },

    /** 导出按钮操作 */
    handleExport() {
      this.download('/zfCollection/export', {
        ...this.queryParams
      }, `zfCollection_${new Date().getTime()}.xlsx`)
    }

  }
}