From da1f13fac6dda0b4168d70bc9f7d68b03b1cc117 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 16 五月 2023 03:40:28 +0800
Subject: [PATCH] 1.修改了网站名以及在首页加上了备案号 2.各模块删除时不显示数据序号 3.各模块删除单条数据时不会再同时打开详情页 4.各模块新增重复数据可被检测并且提示不要输入重复数据 5.家根网页面更换了第三代的大图 6.收藏与荣誉模块显示和新增统一为“持有者”
---
ruoyi-ui/src/views/collection/index.vue | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 71 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 13760c7..fe7572f 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -74,6 +74,23 @@
</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>
@@ -85,10 +102,10 @@
</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">
@@ -157,7 +174,7 @@
plain
icon="el-icon-download"
size="mini"
- @click="handleExport"
+ @click="handleExportModel"
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
@@ -179,22 +196,25 @@
<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 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="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-form-item label="绫诲埆" prop="type">
+ <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="90" 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" >
<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">
+ <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">
@@ -211,7 +231,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"
@@ -287,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">
@@ -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];
// }
@@ -555,16 +592,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 +743,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();
@@ -719,6 +756,14 @@
...this.queryParams
}, `zfCollection_${new Date().getTime()}.xlsx`)
},
+
+ /** 瀵煎叆妯℃澘涓嬭浇鎸夐挳鎿嶄綔 */
+ handleExportModel() {
+ this.downloadModel('zfCollection/model', {
+ ...this.queryParams
+ }, `zfCollection_model_${new Date().getTime()}.xlsx`)
+ },
+
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
var file = params.file;
--
Gitblit v1.9.1