From 9a9be2ddb3edf4b45d8874901b42004256b8be85 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期一, 25 九月 2023 13:51:58 +0800
Subject: [PATCH] 9.25提交
---
ruoyi-ui/src/views/note/index.vue | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 71e2dac..f4fefc4 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -131,18 +131,21 @@
<el-table v-loading="loading" :data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100"/>
<el-table-column label="绫诲瀷" prop="type" sortable :show-overflow-tooltip="true" width="150" />
<el-table-column label="鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="150" />
- <el-table-column label="瀛樺偍鍦板潃" prop="location" sortable width="120" />
- <el-table-column label="鎸佹湁浜�" prop="holder" sortable width="120" />
- <el-table-column label="鍏蜂綋浣嶇疆" prop="address" sortable width="120" />
+ <el-table-column label="瀛樺偍鍦板潃" prop="location" sortable width="150" />
+ <el-table-column label="鎸佹湁浜�" prop="holder" sortable width="150" />
+ <el-table-column label="鍏蜂綋浣嶇疆" prop="address" sortable width="150" />
<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="130" align="center">
+ <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center">
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="130" >
@@ -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