From 66db80bd6679d011c67ae289e4ded4fa4a76e5d4 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 12 九月 2023 09:48:27 +0800
Subject: [PATCH] 修改个人中心
---
ruoyi-ui/src/views/note/index.vue | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index fc616ec..f4fefc4 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -141,6 +141,9 @@
<el-table-column label="澶囨敞" prop="remark" sortable width="130" >
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
<!-- <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" /> -->
<el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center">
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
@@ -246,8 +249,7 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
- <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+ <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -289,6 +291,7 @@
:show-file-list="true"
>
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -649,11 +652,21 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('family/property/export', {
- ...this.queryParams
- }, `property_${new Date().getTime()}.xlsx`)
+ const Ids = this.ids;
+
+ if(Ids.length==0)
+ {
+ this.download('family/property/export', {
+ ...this.queryParams
+ }, `property_${new Date().getTime()}.xlsx`)
+ }
+ else{
+ this.download('family/property/export1/'+Ids, {
+ }, `property_${new Date().getTime()}.xlsx`)
+ }
},
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
--
Gitblit v1.9.1