From a4db210c069cd45448067fffb39f070e9d119bb9 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 26 九月 2023 17:00:32 +0800
Subject: [PATCH] 修改家大事记 的图片文件上传 直调接口
---
ruoyi-ui/src/views/collection/index.vue | 153 ++++++++++++++++++++++++++++-----------------------
1 files changed, 84 insertions(+), 69 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 77dff43..b648a7f 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -1,56 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
- <el-input
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- placeholder="鍦ㄢ�滄敹钘忓拰鑽ｈ獕鈥濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <!-- <el-input
- v-model="searchVal"
- placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @input="inputChange">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <div class="outer-table">
- 姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax
- <tablemax label="myLabel" :tableData="contactList">
- <template v-slot:table>
- <el-table-column label="鎿嶄綔" width="180">
- <template slot-scope="scope">
- <el-button @click="handleCheck(scope.row)" type="text" size="small"
- >璋冪敤</el-button
- >
- </template>
- </el-table-column>
- </template>
- </tablemax>
- </div>-->
-
-
- <!-- v-model="queryParams.id"
-
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- @keyup.enter.native="handleQuery"
- -->
- </el-form-item>
-
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
@@ -58,8 +8,7 @@
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
- opacity: 0.5;
- border: 1px solid rgba(0,0,0,0.25);"
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -70,43 +19,101 @@
<el-form-item label="绫诲埆" prop="type">
<el-select v-model="queryParams.type" placeholder="鎵�鏈夌被鍒�" clearable
- style="width: 240px" @keyup.enter.native="handleQuery">
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery"
+ >
<el-option v-for="item in typeOptions"
:key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
-
- <el-cntainer>
- <el-col :span="9" >
- <el-form-item>
- <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
- border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
- <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
- border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
- </el-form-item>
- </el-col>
- </el-cntainer>
+ <el-form-item label="鍚嶇О" prop="name" >
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ悕绉�"
+ clearable
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鏉ユ簮" prop="source" >
+ <el-input
+ v-model="queryParams.source"
+ placeholder="璇疯緭鍏ユ潵婧�"
+ clearable
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
<el-form-item label="鎸佹湁鑰�" prop="owner" >
<el-input
v-model="queryParams.owner"
placeholder="璇疯緭鍏ユ寔鏈夎��"
clearable
- style="width: 240px"
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
-
+ <el-form-item label="浠峰��" prop="price" >
+ <el-input
+ v-model="queryParams.price"
+ placeholder="璇疯緭鍏ヤ环鍊�"
+ clearable
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
<el-form-item label="瀛樻斁浣嶇疆" prop="location">
<el-input
v-model="queryParams.location"
placeholder="璇疯緭鍏ュ瓨鏀句綅缃�"
clearable
- style="width: 240px"
+ style="width: 233px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input
+ v-model="queryParams.remark"
+ placeholder="璇疯緭鍏ュ娉�"
+ clearable
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
+ <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
+ </el-form-item>
+
</el-form>
<div>
@@ -209,6 +216,9 @@
<el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
<template slot-scope="scope" >
@@ -281,7 +291,9 @@
<!-- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">
- <el-input v-model='formDat.happenTime' type='date' clearable placeholder='閫夋嫨鏃ユ湡'></el-input>
+ <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
<el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
@@ -468,9 +480,12 @@
pageNum: 1,
pageSize: 10,
type:undefined,
+ name:undefined,
+ source:undefined,
owner:undefined,
+ price:undefined,
location:undefined,
- // happenTime:undefined,
+ remark:undefined,
},
// searchVal:"",
--
Gitblit v1.9.1