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/note/index.vue | 86 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index c8e82d5..98aa493 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -52,11 +52,11 @@
/>
</el-form-item>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="鍙戠敓鏃堕棿">
<el-date-picker
v-model="dateRange"
style="width: 240px"
- value-format="yyyy-MM-dd HH-MM"
+ value-format="yyyy-MM-dd HH-MM-SS"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -103,13 +103,40 @@
@click="handleExport"
v-hasPermi="['family:note:export']"
>瀵煎嚭</el-button>
- </el-col>
+ </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>
<el-table v-loading="loading" :data="propertyList" @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="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+
<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="100" />
@@ -117,13 +144,32 @@
<el-table-column label="鍏蜂綋浣嶇疆" prop="address" sortable width="100" />
<el-table-column label="澶囨敞淇℃伅" prop="remark" sortable width="100" />
<el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" sortable prop="createTime" width="180">
+ <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="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
@@ -271,7 +317,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
-import {listProperty, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
+import {listProperty,enload, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
@@ -338,8 +384,8 @@
location:undefined,
holder:undefined,
address:undefined,
- createTime:undefined,
-
+ happenStartTime:undefined,
+ happenEndTime:undefined
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -412,6 +458,9 @@
/** 鏌ヨ瑙掕壊鍒楄〃 */
getList() {
this.loading = true;
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listProperty(this.queryParams).then(response => {
@@ -579,6 +628,23 @@
this.download('family/property/export', {
...this.queryParams
}, `property_${new Date().getTime()}.xlsx`)
+ },
+ /** 瀵煎叆鎿嶄綔*/
+ handleEnport(params){
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('excelImport', file);
+ let _this = this
+ alert(file)
+ enload(formData).then(response => {
+ _this.getList();
+ Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
+
+ }).catch(err)
+ {
+ Message({ message: "瀵煎叆澶辫触", type: 'error' })
+ }
+
}
}
};
--
Gitblit v1.9.1