From f6316c7663903ef495bb1dfa8f8395f75fcf7f04 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期四, 25 五月 2023 17:10:04 +0800
Subject: [PATCH] 修改家庭收支
---
ruoyi-ui/src/views/bignote/index.vue | 149 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 122 insertions(+), 27 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index f47dade..113f9dd 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -57,19 +57,19 @@
border-radius: 14px 14px 14px 14px;
opacity: 0.5;
border: 1px solid rgba(0,0,0,0.25);"
- value-format="yyyy-MM-dd HH-MM"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
+ </el-form-item><el-form-item>
+ <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
border-radius: 6px 6px 6px 6px;opacity:1; " >鎼滅储</el-button>
- <el-button size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
+ <el-button size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
border-radius: 6px 6px 6px 6px;opacity:1; " >閲嶇疆</el-button>
- </el-form-item>
+ </el-form-item>
+
</el-form>
<div style="width: 72px;
@@ -114,26 +114,72 @@
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="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>
<!-- 搴忓彿銆佹椂闂淬�佷汉鐗┿�佸湴鐐广�佸ぇ浜嬫爣棰樸�佺數瀛愭枃浠躲�佸娉� -->
<!-- 杩欓噷鏈変釜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 v-loading="loading" :data="familyList" :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="鏃堕棿" align="center" sortable prop="createTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
+ <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="people" sortable width="100" />
<el-table-column label="鍦扮偣" prop="address" sortable width="100" />
<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="remark" sortable width="100" >
+ <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+
+ <!-- <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
@@ -184,9 +230,13 @@
<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 label="鍙戠敓鏃堕棿" prop="happenTime">
+ <el-date-picker
+ v-model='formDat.happenTime'
+ type='date'
+ placeholder='閫夋嫨鏃ユ湡'
+ ></el-date-picker>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
@@ -252,7 +302,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 +322,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, delFamilyevent , addFamilyevent , uploadPic} from "@/api/bignote/index";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
@@ -326,6 +377,7 @@
address: undefined,
remark: undefined,
familyId:undefined,
+ happenTime:undefined,
url: undefined,
},
// 鑿滃崟鍒楄〃
@@ -339,7 +391,8 @@
title:undefined,
people:undefined,
address:undefined,
- createTime:undefined
+ happenStartTime:undefined,
+ happenEndTime:undefined
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -370,7 +423,7 @@
message: '璇疯緭鍏ュ搴彿',
trigger: 'blur'
}],
- createTime: [{
+ happenTime: [{
required: true,
message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
trigger: 'change'
@@ -390,7 +443,10 @@
this.open = false;
this.reset();
},
-
+ getRowId(row)
+ {
+ return row.id
+ },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 0) {
@@ -407,10 +463,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;
@@ -466,7 +526,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- console.log(this.ids)
+ // alert(this.ids)
this.single = selection.length!=1
this.multiple = !selection.length
},
@@ -549,19 +609,54 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+
+ this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫変腑鏁版嵁椤癸紵').then(function() {
return delFamilyevent(Ids);
}).then(() => {
this.getList();
+ this.ids = []
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
+ const Ids = this.ids;
+
+ if(Ids.length==0)
+ {
this.download('/family/zfEvent/export', {
...this.queryParams
}, `zfEvent_${new Date().getTime()}.xlsx`)
+ }
+ else{
+ this.download('/family/zfEvent/export1/'+Ids, {
+ }, `zfEvent_${new Date().getTime()}.xlsx`)
+ }
+ },
+ /** 瀵煎叆妯℃澘涓嬭浇鎿嶄綔*/
+ handleExportTemplate()
+ {
+ this.download('/family/zfEvent/model', {
+
+ }, `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' })
+ }
+
}
+
}
};
</script>
--
Gitblit v1.9.1