ruoyi-ui/src/views/wish/index.vue
@@ -68,7 +68,6 @@
          @keyup.enter.native="handleQuery"
        ></el-date-picker>
      </el-form-item>
      <el-form-item label="理想标题" prop="title">
        <el-input
          v-model="queryParams.title"
@@ -79,7 +78,6 @@
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
      </el-form-item>
      <el-form-item label="受惠人" prop="beneficiary" >
        <el-input
          v-model="queryParams.beneficiary"
@@ -90,7 +88,6 @@
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
      </el-form-item>
      <el-form-item label="继承人" prop="heir">
        <el-input
          v-model="queryParams.heir"
@@ -101,26 +98,35 @@
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
      </el-form-item>
      <el-cntainer>
        <el-col :span="9" >
      <el-form-item label="始于何因" prop="cause">
        <el-input
          v-model="queryParams.cause"
          placeholder="请输入原因"
          clearable
          style="width: 240px"
          @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">
          <el-option v-for="item in typeOptions"
                     :key="item.value" :label="item.label" :value="item.value"/>
        </el-select>
      </el-form-item>
          <el-form-item>
            <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
            border-radius: 7px 7px 7px 7px;opacity: 1; " >搜索</el-button>
            <el-button  size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
            border-radius: 7px 7px 7px 7px;opacity: 1; ">重置</el-button>
          </el-form-item>
        </el-col>
      </el-cntainer>
    </el-form>
    <div>
      <!--      <div style="width: 100px;-->
      <!--      height: 24px;-->
      <!--      font-size: 18px;-->
      <!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
      <!--      font-weight: 400;-->
      <!--      color: #000000;-->
      <!--      line-height: 21px;-->
      <!--      ">收藏和荣誉</div>-->
      <el-row :gutter="10" class="mb8">
        <el-col :span="1.5">
@@ -325,7 +331,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"
@@ -444,7 +451,7 @@
      dsb:true,
      btn:false,
      fit:['fill'],
      uploading: false,
      formDat: {
        //百年心愿记录
        id:undefined,
@@ -470,6 +477,8 @@
        title:undefined,
        heir:undefined,
        beneficiary:undefined,
        cause:undefined,
        isEffective:undefined
        // happenTime:undefined,
      },
      // searchVal:"",
@@ -532,7 +541,7 @@
  },
  created() {
    this.getList();
    this.getCateInfor()
    // this.getCateInfor()
    // for (let i = 0; i < this.contactList.length; i++) {
    //   this.formDat[i] = this.contactList[i];
    // }
@@ -755,10 +764,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})