From 46723f74c8152fae880917d273b960900bd8508a Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期六, 27 五月 2023 10:09:47 +0800
Subject: [PATCH] 新增婚姻、隐私模块api
---
ruoyi-ui/src/views/note/index.vue | 144 +++++++++++++++++++++++++++++++++++------------
1 files changed, 107 insertions(+), 37 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index c8e82d5..a8eab94 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -2,19 +2,14 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="绫诲瀷" prop="type">
- <el-select
+ <el-input
v-model="queryParams.type"
- placeholder="鎵�鏈夌被鍨�"
+ placeholder="璇疯緭鍏ョ被鍨�"
clearable
style="width: 240px"
- >
- <el-option
- v-for="dict in typeOptions"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="鏍囬" prop="title">
<el-input
v-model="queryParams.title"
@@ -51,12 +46,12 @@
@keyup.enter.native="handleQuery"
/>
</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,27 +98,72 @@
@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="handleExportTemplate"
+ 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 v-loading="loading" :data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+ <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
+
+ <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" />
<el-table-column label="鎸佹湁浜�" prop="holder" sortable width="100" />
<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">
-
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
+ <el-table-column label="澶囨敞" prop="remark" sortable width="100" >
+ <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
+ <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="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
@@ -162,10 +202,7 @@
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<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-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="鏍囬" prop="title">
<el-input v-model="formDat.title" placeholder="璇疯緭鍏ユ爣棰�" clearable :style="{width: '100%'}" ></el-input>
@@ -180,10 +217,6 @@
</el-form-item>
<el-form-item label="鍏蜂綋浣嶇疆" prop="address">
<el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ叿浣撲綅缃�" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
- <el-form-item label="瀹跺涵鍙�" prop="familyId">
- <el-input v-model="formDat.familyId" placeholder="璇疯緭鍏ュ搴彿" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
@@ -240,7 +273,7 @@
:http-request="requestUpload"
:show-file-list="true"
>
- <el-button type="primary">Click to upload</el-button>
+ <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -271,7 +304,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 +371,8 @@
location:undefined,
holder:undefined,
address:undefined,
- createTime:undefined,
-
+ happenStartTime:undefined,
+ happenEndTime:undefined
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -399,7 +432,10 @@
this.open = false;
this.reset();
},
-
+ getRowId(row)
+ {
+ return row.id
+ },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 0) {
@@ -412,6 +448,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 => {
@@ -576,9 +615,40 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
+ 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, {
+ ...this.queryParams
+ }, `property_${new Date().getTime()}.xlsx`)
+ }
+ },
+ handleExportTemplate(){
+ this.download('family/property/model', {
+
+ }, `property_${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