Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2023-09-10 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1

 ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue

@@ -81,7 +81,7 @@
            </el-cow>
          </el-row>
        </el-container>
        <h4 class="form-header">电子文件 </h4>
        <h4 class="form-header">相关图片 </h4>
        <el-upload
          action="#"
          list-type="picture-card"
@@ -89,7 +89,8 @@
          :http-request="requestUpload"
          :file-list="fileList"
        >
          <i slot="default" class="el-icon-plus"></i>
          <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"
@@ -101,14 +102,14 @@
            >
            <span class="el-upload-list__item-actions" >
            <span
              v-if="isShow"

              class="el-upload-list__item-preview"
              @click="handlePictureCardPreview(file)"
            >
              <i class="el-icon-zoom-in"></i>
            </span>
            <span
              v-if="isShow"

              class="el-upload-list__item-delete"
              @click="handleDownload(file.url)"
            >
@@ -126,27 +127,6 @@

          </div>
        </el-upload>

        <!--<h4 class="form-header">其他附件 </h4>
        <el-upload
          action=""
          :file-list="fileListOther"
          class="upload-demo"
          multiple
          :on-preview="handlePreview"

          :on-remove="handleRemove"
          :http-request="requestUpload"
          :show-file-list="true"
        >
          <el-button v-if="isShow" type="primary" >点击上传</el-button>
          <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>


        </el-upload>-->
        <h4 class="form-header">其他附件 </h4>
        <el-upload
          action=""
@@ -159,8 +139,8 @@
          :http-request="requestUpload"
          :show-file-list="true"
        >

          <i slot="default" class="el-icon-plus"></i>
          <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"
@@ -170,14 +150,14 @@
              fit="cover"
            >
            <span class="el-upload-list__item-actions">
                    <span v-if="isShow"
                    <span
                          class="el-upload-list__item-preview"
                          @click="handleFileCardPreview(file)"
                    >
                      <i class="el-icon-zoom-in"></i>
                    </span>
                    <span
                      v-if="isShow"

                      class="el-upload-list__item-delete"
                      @click="handleDownload(file.url)"
                    >
@@ -235,7 +215,7 @@
      dsb:true,
      btn:false,
      isShow:true,

      uploading: false,
      selfeconomyList: [],

      formData: {
@@ -334,7 +314,7 @@
    else{
      document.title = "个人财产详细信息";
      this.$route.meta.title = "个人财产详细信息";//列表的名称
      this.isShow=true
      this.isShow=false
    }

    let _this = this
@@ -473,10 +453,11 @@
      var formData = new FormData();
      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})