Merge remote-tracking branch 'origin/master'

Tcsm

2023-08-15 cdb9af95c54f21aafe3c554e5a9938421d9b1311

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

@@ -51,7 +51,7 @@
                  -->
      </el-form-item>

      <el-form-item label="时间">
      <el-form-item label="时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width:  197px;
@@ -65,9 +65,9 @@
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          @keyup.enter.native="handleQuery"
        ></el-date-picker>
      </el-form-item>

      <el-form-item label="理想标题" prop="title">
        <el-input
          v-model="queryParams.title"
@@ -78,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"
@@ -89,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"
@@ -100,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>
            <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-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-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">
@@ -182,21 +189,21 @@
      </el-row>
    </div>
    <el-table v-loading="loading" :data="wishList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" :reserve-selection="true" width="25"  align="center" />
      <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
      <el-table-column label="时间" prop="happenTime" sortable width="100" align="center">
      <el-table-column label="时间" prop="happenTime" sortable width="150" align="center">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="理想标题/百年心愿" prop="title" sortable width="150" align="center">
      <el-table-column label="理想标题/百年心愿" prop="title" sortable width="160" align="center">
        <template slot-scope="scope">{{scope.row.title? scope.row.title: '————'}}</template>
      </el-table-column>
      <el-table-column label="始于何因" prop="cause" sortable :show-overflow-tooltip="true" width="120" align="center" >
      <el-table-column label="始于何因" prop="cause" sortable :show-overflow-tooltip="true" width="140" align="center" >
        <template slot-scope="scope">{{scope.row.cause? scope.row.cause: '————'}}</template>
      </el-table-column>
      <el-table-column label="受惠人" prop="beneficiary" sortable width="120" align="center" >
      <el-table-column label="受惠人" prop="beneficiary" sortable width="140" align="center" >
        <template slot-scope="scope">{{scope.row.beneficiary? scope.row.beneficiary: '————'}}</template>
      </el-table-column>
      <el-table-column label="继承人" prop="heir" sortable width="110" align="center">
      <el-table-column label="继承人" prop="heir" sortable width="140" align="center">
        <template slot-scope="scope">{{scope.row.heir? scope.row.heir: '————'}}</template>
      </el-table-column>
      <el-table-column label="实现难度" prop="difficulty" sortable width="120" align="center">
@@ -211,22 +218,24 @@
      <el-table-column label="电子文件" prop="url" width="180" align="center">

        <template slot-scope="scope" >
          <img
            class="el-upload-list__item-thumbnail"
            src="../../assets/images/deviceLis.png"
            alt=""
            style="width: 35px; height: 35px;"
            fit="cover"
            v-if="scope.row.url !== ',' "
          >
          <img
            class="el-upload-list__item-thumbnail"
            src="../../assets/images/deviceA.png"
            alt=""
            style="width: 35px; height: 35px;"
            fit="cover"
            v-if="scope.row.url === ','"
          >
          <div  @click="handleCheck(scope.row)">
            <img
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceLis.png"
              alt=""
              style="width: 35px; height: 35px;"
              fit="cover"
              v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
            >
            <img
              v-else
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceA.png"
              alt=""
              style="width: 35px; height: 35px;"
              fit="cover"

            ></div>
        </template>
      </el-table-column>
      <el-table-column label="备注" prop="remark" sortable width="90" align="center">
@@ -281,7 +290,7 @@
        <!--          <el-input v-model="formDat.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" ></el-input>-->
        <!--        </el-form-item>-->
        <el-form-item label="时间" prop="happenTime">
          <el-date-picker v-model='formDat.happenTime' type='date' placeholder='选择日期'></el-date-picker>
          <el-input v-model="formDat.happenTime" type='date' placeholder='选择日期' clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="理想标题/百年心愿" prop="title">
          <el-input v-model="formDat.title" placeholder="请输入理想标题/百年心愿" clearable :style="{width: '100%'}" >
@@ -322,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"
@@ -359,7 +369,7 @@
          class="upload-demo"
          multiple

          :on-remove="handleRemove"
          :on-remove="handleRemoveFile"
          :http-request="requestUpload"
          :show-file-list="true"
        >
@@ -394,8 +404,8 @@


//导入接口函数
import {listWish, getWish, addWish,updateWish, delWish,uploadPic,downloadModel} from "@/api/wish/index";
import {enload} from "@/api/doctor";
import {listWish, getWish, addWish,updateWish, delWish,uploadPic,downloadModel,enload} from "@/api/wish/index";

import {Message} from "element-ui";


@@ -434,16 +444,14 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[

      ],
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      fit:['fill'],

      uploading: false,
      formDat: {
        //百年心愿记录
        id:undefined,
@@ -469,6 +477,8 @@
        title:undefined,
        heir:undefined,
        beneficiary:undefined,
        cause:undefined,
        isEffective:undefined
        // happenTime:undefined,
      },
      // searchVal:"",
@@ -531,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];
    // }
@@ -566,7 +576,7 @@
    /** 查询记录列表 */
    getList() {
      this.loading = true;
      console.log(this.queryParams)
      // console.log(this.queryParams)
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

@@ -613,7 +623,18 @@
    //   }
    // },
    handleRemove(file) {
      alert(323)
      for(let i = 0; i < this.fileList.length; i++)
      {
        if(this.fileList[i].url==file.url)
          this.$delete(this.fileList,i);
      }
    },
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
          this.$delete(this.fileListOther,i);
      }
    },
    // 取消按钮
    cancel() {
@@ -725,6 +746,17 @@
          });
        }
      });
      // 清空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)
    {
@@ -732,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})
@@ -765,11 +798,11 @@

      if(Ids.length==0)
      {
        this.download('zIdea/export', {
        this.download('/zIdea/export', {
          ...this.queryParams
        }, `zIdea_${new Date().getTime()}.xlsx`)
      }else{
        this.download('zIdea/export1/'+Ids, {
        this.download('/zIdea/export1/'+Ids, {
        }, `zIdea_${new Date().getTime()}.xlsx`)
      }
    },