From 64bd3e7c7ee91e5249d2b03f58700277c328f11d Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 16 五月 2023 02:08:19 +0800
Subject: [PATCH] 修改家庭资产bug
---
ruoyi-ui/src/views/note/index.vue | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 98aa493..0697987 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,7 +46,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- </el-form-item>
+
<el-form-item label="鍙戠敓鏃堕棿">
<el-date-picker
v-model="dateRange"
@@ -142,13 +137,12 @@
<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="happenTime" width="180">
+ <el-table-column label="澶囨敞" prop="remark" sortable width="100" >
+ <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.happenTime) }}</span>
- </template>
+ <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" >
@@ -208,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>
@@ -226,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>
@@ -286,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>
--
Gitblit v1.9.1