From 3c0b2d339126e2cb57cb25616a7bc3c9e52c11df Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期六, 27 五月 2023 10:10:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/collection/index.vue | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 520c218..3bba6cc 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -125,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">
@@ -189,16 +189,15 @@
<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-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="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
- <el-table-column label="鑾峰緱鏃堕棿" prop="happenTime" sortable width="160" align="center">
+ <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-form-item label="绫诲埆" prop="type" width="120">
@@ -213,7 +212,9 @@
<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="140" align="center">
+
+ <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="120" align="center">
@@ -222,7 +223,11 @@
<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" width="160" 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"
@@ -241,10 +246,6 @@
v-if="scope.row.url === ','"
>
</template>
- </el-table-column>
-
- <el-table-column label="澶囨敞" prop="remark" sortable width="120" align="center">
- <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</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">
@@ -306,8 +307,8 @@
<el-input v-model="formDat.source" placeholder="璇疯緭鍏ユ潵婧�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鎸佹湁鑰�" prop="owner">
- <el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎷ユ湁鑰�" prop="owner">
+ <el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ嫢鏈夎��" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="浠锋牸" prop="price">
@@ -566,7 +567,10 @@
this.open = false;
this.reset();
},
-
+ getRowId(row)
+ {
+ return row.id
+ },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 0) {
@@ -751,15 +755,23 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
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.downloadModel('zfCollection/model', {
- ...this.queryParams
+
+ this.download('/zfCollection/model', {
}, `zfCollection_model_${new Date().getTime()}.xlsx`)
},
--
Gitblit v1.9.1