From 1f0744146e1e6bc714b820447137578a9c1c0d59 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 24 四月 2023 20:59:55 +0800
Subject: [PATCH] 吧家庭大事记，资产管理家庭设备，家庭小医生，通讯录的导入功能，电子文件，序号以及详情页面上传附件的预览功能，删除已经全部完成
---
ruoyi-ui/src/views/bignote/index.vue | 84 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index f47dade..7c75fde 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -114,17 +114,43 @@
v-hasPermi="['family:note:export']"
>瀵煎嚭</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['family:note:export']"
+ >瀵煎叆妯℃澘涓嬭浇</el-button>
+ </el-col>
+ <el-col :span="1.2">
+
+ <el-upload
+ action=""
+
+ class="upload-demo"
+ :show-file-list="false"
+ :http-request="handleEnport"
+ >
+ <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>
<!-- 搴忓彿銆佹椂闂淬�佷汉鐗┿�佸湴鐐广�佸ぇ浜嬫爣棰樸�佺數瀛愭枃浠躲�佸娉� -->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
<el-table v-loading="loading" :data="familyList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" prop="id" sortable width="120" />
- <el-table-column label="鏃堕棿" align="center" sortable prop="createTime" width="180">
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+ <el-table-column label="鍙戠敓鏃堕棿" align="center" sortable prop="happenTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ parseTime(scope.row.happenTime) }}</span>
</template>
</el-table-column>
<el-table-column label="浜虹墿" prop="people" sortable width="100" />
@@ -132,8 +158,28 @@
<el-table-column label="澶т簨鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="150" />
<el-table-column label="澶囨敞" prop="remark" sortable width="100" />
- <!-- <el-table-colum label="鐢靛瓙鏂囦欢" prop="url" sortable width="100"/> -->
+
<el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" />
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
+ <template slot-scope="scope" >
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="scope.row.url !== null"
+ >
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="scope.row.url === null"
+ >
+ </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">
<el-button
@@ -252,7 +298,7 @@
<h4 class="form-header"> </h4>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
+ <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -272,9 +318,10 @@
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
-import {listFamilyevent , getFamilyeventInfo , delFamilyevent , addFamilyevent , uploadPic} from "@/api/bignote/index";
+import {listFamilyevent,enload, getFamilyeventInfo , delFamilyevent , addFamilyevent , uploadPic} from "@/api/bignote/index";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
@@ -339,7 +386,8 @@
title:undefined,
people:undefined,
address:undefined,
- createTime:undefined
+ happenStartTime:undefined,
+ happenEndTime:undefined
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -407,10 +455,14 @@
getList() {
this.loading = true;
console.log(this.queryParams)
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listFamilyevent(this.queryParams).then(response => {
// alert(123)
- // console.log(response.data)
+ // console.log(response.data.data)
+ // alert(response.data.data[1].url)
this.familyList = response.data.data;
this.total = response.data.total;
@@ -561,6 +613,22 @@
this.download('/family/zfEvent/export', {
...this.queryParams
}, `zfEvent_${new Date().getTime()}.xlsx`)
+ },
+ /** 瀵煎叆鎿嶄綔*/
+ handleEnport(params){
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('excelImport', file);
+ let _this = this
+ enload(formData).then(response => {
+ _this.getList();
+ Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
+
+ }).catch(err)
+ {
+ Message({ message: "瀵煎叆澶辫触", type: 'error' })
+ }
+
}
}
};
--
Gitblit v1.9.1