From c9f3bc911ddb0a10768fd73641728a43320e97d1 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期一, 05 六月 2023 17:42:05 +0800
Subject: [PATCH] 1.将收藏荣誉、荣誉证书中的时间字段变成了可选项 2.成长经历阅历主要经历变成长文本框，新增按钮接入蓝湖样式，点击保存之后可以自动刷新
---
ruoyi-ui/src/views/collection/index.vue | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 5ebd0d9..28e4741 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -51,16 +51,20 @@
-->
</el-form-item>
- <el-form-item label="鏃堕棿" style="padding-left:190px">
+ <el-form-item label="鏃堕棿">
<el-date-picker
v-model="dateRange"
- style="width: 240px"
- value-format="yyyy-MM-dd HH-MM"
+ style="width: 197px;
+height: 30px;
+background: #FFFFFF;
+border-radius: 14px 14px 14px 14px;
+opacity: 0.5;
+border: 1px solid rgba(0,0,0,0.25);"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
- @keyup.enter.native="handleQuery"
></el-date-picker>
</el-form-item>
@@ -280,8 +284,11 @@
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
+<!-- <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" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>
+ <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
<el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
@@ -469,7 +476,7 @@
type:undefined,
owner:undefined,
location:undefined,
- happenTime:undefined,
+ // happenTime:undefined,
},
// searchVal:"",
@@ -488,8 +495,8 @@
trigger: 'blur'
}],
happenTime: [{
- // required: true,
- message: '璇疯緭鍏ユ椂闂�',
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
trigger: 'blur'
}],
name: [{
@@ -578,7 +585,10 @@
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
- // console.log(this.queryParams)
+ 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 => {
listCollection(this.queryParams).then(response => {
// alert(123)
--
Gitblit v1.9.1