Merge remote-tracking branch 'origin/master'

Tcsm

2023-05-26 fe37beed44df3d9f98aad764f3977b18ef557784

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

@@ -74,14 +74,30 @@
        </el-input>

      </el-form-item>
<!--      <el-form-item label="类别" prop="type">-->
<!--        <el-select-->
<!--          v-model="queryParams.type"-->
<!--          placeholder="所有类别"-->
<!--          clearable-->
<!--          style="width: 240px"-->
<!--          @keyup.enter.native="handleQuery"-->
<!--        >-->
<!--          <el-option-->
<!--            v-for="dict in typeOptions"-->
<!--            :key="dict.value"-->
<!--            :label="dict.label"-->
<!--            :value="dict.value"-->

<!--          />-->
<!--        </el-select>-->
<!--      </el-form-item>-->
      <el-cntainer>
        <el-col :span="9" >
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " @click="resetQuery">重置</el-button>

            <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>
@@ -109,14 +125,14 @@

    </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>
<!--      <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">
@@ -151,42 +167,85 @@
            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="handleExportModel"
            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>
    </div>
    <el-table v-loading="loading" :data="collectionList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" width="25"  align="center" />
<!--      <el-table-column label="序号" prop="id" sortable width="80" />-->
    <el-table v-loading="loading" :data="collectionList" :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 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">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="类别" prop="type" sortable :show-overflow-tooltip="true" width="90" align="center">
        <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>
      </el-table-column>
      <el-table-column label="名称" prop="name" sortable :show-overflow-tooltip="true" width="90" align="center" >
      <el-form-item label="类别" prop="type" width="120">
        <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
          ></el-option>
        </el-select>
      </el-form-item>
      <el-table-column label="名称" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
        <template slot-scope="scope">{{scope.row.name? scope.row.name: '————'}}</template>
      </el-table-column>
      <el-table-column label="来源" prop="source" sortable width="90" align="center" >
      <el-table-column label="来源" prop="source" sortable width="120" align="center" >
        <template slot-scope="scope">{{scope.row.source? scope.row.source: '————'}}</template>
      </el-table-column>

      <el-table-column label="拥有者" prop="owner" sortable width="110" align="center">

        <template slot-scope="scope">{{scope.row.owner? scope.row.owner: '————'}}</template>
      </el-table-column>
      <el-table-column label="价值" prop="price" sortable width="90" align="center">
      <el-table-column label="价值" prop="price" sortable width="120" align="center">
        <template slot-scope="scope">{{scope.row.price? scope.row.price: '————'}}</template>
      </el-table-column>
      <el-table-column label="存放位置" prop="location" sortable width="130" align="center">
      <el-table-column label="存放位置" prop="location" sortable width="160" align="center">
        <template slot-scope="scope">{{scope.row.location? scope.row.location: '————'}}</template>
      </el-table-column>
      <el-table-column label="电子文件" prop="url" align="center" sortable  width="110" >
        <template slot-scope="scope">
          <span v-if= "scope.row.url == ','" ><img src="../../assets/images/文件夹-0.png" /></span>
          <span v-else><img src="../../assets/images/文件夹-1.png" /></span>
        </template>
      </el-table-column>

      <el-table-column label="备注" prop="remark" sortable width="140" align="center">
      <el-table-column label="备注" prop="remark" sortable width="90" align="center">
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>
      <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 === ','"
          >
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
@@ -208,12 +267,13 @@
            size="mini"
            @command="(command) => handleCommand(command, scope.row)"
            v-hasPermi="['system:role:edit']">
<!--            <el-button-->
<!--              size="mini"-->
<!--              type="text"-->
<!--              icon="el-icon-d-arrow-right"-->
<!--              @click="handleCheck(scope.row)"-->
<!--            >查看详情</el-button>-->
            <el-button
              size="mini"
              type="text"
              icon="el-icon-d-arrow-right"
              @click="handleCheck(scope.row)"

            >查看详情</el-button>

          </el-dropdown>
        </template>
@@ -225,6 +285,7 @@
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      style="background: #FEF7FC;"
      @pagination="getList"
    />

@@ -343,7 +404,9 @@


//导入接口函数
import {listCollection, getCollection, addCollection,updateCollection, delCollection,uploadPic} from "@/api/collection/index";
import {listCollection, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel} from "@/api/collection/index";
import {enload} from "@/api/doctor";
import {Message} from "element-ui";


export default {
@@ -451,7 +514,7 @@
        }],
        owner: [{
          required: true,
          message: '请输入拥有者',
          message: '请输入持有者',
          trigger: 'blur'
        }],
        price: [{
@@ -471,12 +534,29 @@
          trigger: 'blur'
        }],
      },
      typeOptions: [],
      typeOptions: [
        {
          value: '选项1',
          label: '邮票'
        }, {
          value: '选项2',
          label: '日本军刀'
        }, {
          value: '选项3',
          label: '茅台酒'
        }, {
          value: '选项4',
          label: '红木'
        }, {
          value: '选项5',
          label: '纪念品'
        }
      ],
    };
  },
  created() {
    this.getList();
    // this.getCateInfor()
    this.getCateInfor()
    // for (let i = 0; i < this.contactList.length; i++) {
    //   this.formDat[i] = this.contactList[i];
    // }
@@ -487,7 +567,10 @@
      this.open = false;
      this.reset();
    },

    getRowId(row)
    {
      return row.id
    },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
@@ -512,16 +595,16 @@
      );
    },
    /** 查询类别信息 */
    // getCateInfor()
    // {
    //   let _this = this
    //   getCategory().then(response=>{
    //
    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
    //     })
    //   })
    // },
    getCateInfor()
    {
      let _this = this
      getCategory().then(response=>{

        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        })
      })
    },

    handleRemove(file) {
      alert(323)
@@ -596,6 +679,7 @@
    handleCheck(row){
      const id = row.id;
      this.$router.push("/familymodel/collection/collectionInfo/" + id);

    },
    /** 修改按钮操作 */
    handleUpdate(row) {
@@ -662,7 +746,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delCollection(Ids);
      }).then(() => {
        this.getList();
@@ -671,9 +755,39 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      const Ids = this.ids;

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

    /** 导入模板下载按钮操作 */
    handleExportModel() {

      this.download('/zfCollection/model', {
      }, `zfCollection_model_${new Date().getTime()}.xlsx`)
    },

    /** 导入操作*/
    handleEnport(params){
      var file = params.file;
      var formData = new FormData();
      formData.append('excelImport', file);
      let _this = this

      enload(formData).then(response => {
        _this.getList();
        Message({ message: "导入成功", type: 'warning' })

      }).catch(() => { Message({ message: "导入失败", type: 'error' })});

    }
  }
};