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

Tcsm

2023-10-08 2ac52508980a33006a1596c43c4fc8daaaa5d19f

 ruoyi-ui/src/views/wish/index.vue

@@ -1,56 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
        <el-input
          v-model:phone="queryParams.phone"
          v-model:wx="queryParams.wx"
          v-model:qq="queryParams.qq"
          v-model:twitter="queryParams.twitter"
          v-model:isAlways="queryParams.isAlways"
          v-model:remark="queryParams.remark"
          placeholder="在“百年心愿”中搜索"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
        <!--        <el-input
                  v-model="searchVal"
                  placeholder="在“通讯录”中搜索"
                  clearable
                  style="width: 240px"
                  @input="inputChange">
                  <i slot="prefix" class="el-input__icon el-icon-search"></i>
                </el-input>
                <div class="outer-table">
                   此父组件引用子组件tablemax
                  <tablemax label="myLabel" :tableData="contactList">
                    <template v-slot:table>
                      <el-table-column label="操作" width="180">
                        <template slot-scope="scope">
                          <el-button @click="handleCheck(scope.row)" type="text" size="small"
                          >调用</el-button
                          >
                        </template>
                      </el-table-column>
                    </template>
                  </tablemax>
                </div>-->


        <!--        v-model="queryParams.id"

                  v-model:phone="queryParams.phone"
                  v-model:wx="queryParams.wx"
                  v-model:qq="queryParams.qq"
                  v-model:twitter="queryParams.twitter"
                  v-model:isAlways="queryParams.isAlways"
                  v-model:remark="queryParams.remark"
                  @keyup.enter.native="handleQuery"
                  -->
      </el-form-item>

      <el-form-item label="时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
@@ -58,8 +8,7 @@
          height: 30px;
          background: #FFFFFF;
          border-radius: 14px 14px 14px 14px;
          opacity: 0.5;
          border: 1px solid rgba(0,0,0,0.25);"
          opacity: 0.5;"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
@@ -73,7 +22,10 @@
          v-model="queryParams.title"
          placeholder="请输入理想标题"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
@@ -83,7 +35,10 @@
          v-model="queryParams.beneficiary"
          placeholder="请输入受惠人"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
@@ -93,7 +48,10 @@
          v-model="queryParams.heir"
          placeholder="请输入继承人"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
@@ -103,14 +61,20 @@
          v-model="queryParams.cause"
          placeholder="请输入原因"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
      </el-form-item>
      <el-form-item label="是否有效" prop="isEffective">
        <el-select v-model="queryParams.isEffective" placeholder="请选择是否有效" clearable
                   style="width: 240px" @keyup.enter.native="handleQuery">
                   style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;" @keyup.enter.native="handleQuery">
          <el-option v-for="item in typeOptions"
                     :key="item.value" :label="item.label" :value="item.value"/>
        </el-select>
@@ -290,8 +254,9 @@
        <!--          <el-input v-model="formDat.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" ></el-input>-->
        <!--        </el-form-item>-->
        <el-form-item label="时间" prop="happenTime">
          <el-input v-model="formDat.happenTime" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
          <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
                          :editable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
          ></el-date-picker></el-form-item>
        <el-form-item label="理想标题/百年心愿" prop="title">
          <el-input v-model="formDat.title" placeholder="请输入理想标题/百年心愿" clearable :style="{width: '100%'}" >
          </el-input>
@@ -323,25 +288,27 @@
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>

        <h4 class="form-header">电子文件 </h4>
        <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"
          :file-list="fileList"
        >
          <div v-if="uploading" class="upload-status">正在上传...</div>
          <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
              :src="file.url"
              alt=""
              style="width: 126px; height: 126px"
              fit="cover"
              :preview-src-list="[file.url]"
            >
          <i  slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{ file }">
            <template v-if="fileList">
              <img
                class="el-upload-list__item-thumbnail"
                :src="file.url"
                alt=""
                style="width: 100%; height: 100%; object-fit: cover;"
                fit="cover"
                :preview-src-list="[file.url]"
              >
            </template>
            <span class="el-upload-list__item-actions">
        <span
          class="el-upload-list__item-preview"
@@ -370,10 +337,11 @@
          multiple

          :on-remove="handleRemoveFile"
          :http-request="requestUpload"
          :http-request="requestUpload1"
          :show-file-list="true"
        >
          <el-button type="primary">点击上传</el-button>
          <div v-if="uploading1" class="upload-status">正在上传...</div>
          <template #tip>
            <div class="el-upload__tip">
            </div>
@@ -444,14 +412,14 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fot:[".jpg",".jif"],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      fit:['fill'],
      uploading: false,
      uploading1: false,
      formDat: {
        //百年心愿记录
        id:undefined,
@@ -547,12 +515,13 @@
    // }
  },
  methods: {

    getSrc1(isEffective) {
      if (isEffective === 1) {
        return '是'
      }else {
      }else if(isEffective === 0){
        return '否'
      }else {
        return '---'
      }
    },

@@ -742,21 +711,21 @@
          addWish(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            // 清空formDat对象的数据
            Object.keys(this.formDat).forEach(key => {
              this.formDat[key] = '';
            });
            for(let i = 0; i <= this.fileList.length; i++)
            {
              this.handleRemove(this.fileList[0]);
            }
            for(let i = 0; i < this.fileListOther.length; i++){
              this.handleRemoveFile(this.fileListOther[0]);
            }
            this.getList();
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
      for(let i = 0; i <= this.fileList.length; i++)
      {
        this.handleRemove(this.fileList[0]);
      }
      for(let i = 0; i < this.fileListOther.length; i++){
        this.handleRemoveFile(this.fileListOther[0]);
      }
    },
    requestUpload(params)
    {
@@ -772,15 +741,25 @@
        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})

        }

        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.fileListOther.push({name:response.data.fileName, url:response.data.url})
        }
      })
    },
    /** 删除按钮操作 */
    handleDelete(row) {