From fe37beed44df3d9f98aad764f3977b18ef557784 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期五, 26 五月 2023 20:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/collection/index.vue | 154 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 105 insertions(+), 49 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 13760c7..3bba6cc 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -74,21 +74,37 @@
</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>
- <el-form-item label="鎷ユ湁鑰�" prop="owner" >
+ <el-form-item label="鎸佹湁鑰�" prop="owner" >
<el-input
v-model="queryParams.owner"
- placeholder="璇疯緭鍏ユ嫢鏈夎��"
+ placeholder="璇疯緭鍏ユ寔鏈夎��"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery">
@@ -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">
@@ -157,7 +173,7 @@
plain
icon="el-icon-download"
size="mini"
- @click="handleExport"
+ @click="handleExportModel"
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
@@ -173,37 +189,45 @@
<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="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
+ <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" width="80" >
+ <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"
@@ -211,7 +235,7 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url !== ','"
+ v-if="scope.row.url !== ',' "
>
<img
class="el-upload-list__item-thumbnail"
@@ -222,10 +246,6 @@
v-if="scope.row.url === ','"
>
</template>
- </el-table-column>
-
- <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="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
@@ -384,7 +404,7 @@
//瀵煎叆鎺ュ彛鍑芥暟
-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";
@@ -494,7 +514,7 @@
}],
owner: [{
required: true,
- message: '璇疯緭鍏ユ嫢鏈夎��',
+ message: '璇疯緭鍏ユ寔鏈夎��',
trigger: 'blur'
}],
price: [{
@@ -514,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];
// }
@@ -530,7 +567,10 @@
this.open = false;
this.reset();
},
-
+ getRowId(row)
+ {
+ return row.id
+ },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 0) {
@@ -555,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)
@@ -706,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();
@@ -715,10 +755,26 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
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;
--
Gitblit v1.9.1