修改

linwenling

2023-08-15 6b9c521de6d552fe00e7e31076a5e06b7b7b0767

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

@@ -1,10 +1,10 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="类型" prop="type">
      <el-form-item label="性别" prop="sex">
        <el-select
          v-model="queryParams.type"
          placeholder="所有类型"
          v-model="queryParams.sex"
          placeholder="请选择性别"
          clearable
          style="width: 240px"
        >
@@ -33,24 +33,8 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="持有人" prop="holder">
          <el-input
            v-model="queryParams.holder"
            placeholder="请输入持有人"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <!-- <el-form-item label="具体位置" prop="address">
          <el-input
            v-model="queryParams.address"
            placeholder="请输入具体位置"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item> -->


      </el-form-item>
      <!-- <el-form-item label="发生时间">
        <el-date-picker
@@ -94,40 +78,7 @@
          v-hasPermi="['system:role:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['family:note:export']"
        >导出</el-button>
      </el-col>

      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
      <el-col :span="1.2">
        <el-upload
          action=""
          class="upload-demo"
          :show-file-list="false"
          :http-request="handleEnport"
        >
          <el-button size="mini"   type="primary"
                     plain
                     icon="el-icon-plus" >导入</el-button>

        </el-upload>
      </el-col>

      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
@@ -153,6 +104,7 @@

      </el-table-column>
      <el-table-column label="宠物id" prop="id" sortable width="100" />
      <el-table-column label="主人姓名" prop="masterName" sortable width="100" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
@@ -205,11 +157,11 @@
          <el-input v-model="formDat.name" placeholder="请输入名字" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="出生日期" prop="birth">
          <el-date-picker
          <el-input
            v-model='formDat.birth'
            type='date'
            placeholder='选择日期'
          ></el-date-picker>
          ></el-input>
        </el-form-item>
        <el-form-item label="性别" prop="sex">
          <el-select v-model="formDat.sex" placeholder="请选择性别" clearable :style="{width: '100%'}"  >
@@ -275,7 +227,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"
@@ -311,9 +264,10 @@
          list-type="picture-card"
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
          :file-list="fileListOther"
        >
          <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"
@@ -334,7 +288,7 @@
        <span
          v-if="!disabled"
          class="el-upload-list__item-delete"
          @click="handleRemove(file)"
          @click="handleRemoveFile(file)"
        >
          <i class="el-icon-delete"></i>
        </span>
@@ -412,6 +366,7 @@
      ],
      dsb:true,
      btn:false,
      uploading: false,
      formDat: {
        type: undefined,
        name: undefined,
@@ -614,8 +569,14 @@
      );
    },


    handleRemove(file) {
      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)
@@ -724,6 +685,12 @@
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
      this.handleRemove(this.fileList[0]);
      this.handleRemoveFile(this.fileListOther[0]);
    },
    requestUpload(params)
    {
@@ -731,10 +698,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})