From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/retention.vue | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 965b213..1868708 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -29,7 +29,7 @@
<el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="startTime">
+ <el-form-item label="璧锋鏃堕棿" prop="startTime">
<el-date-picker
@change="seleTime"
v-model="time"
@@ -37,11 +37,20 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
+ start-placeholder="寮�濮嬫椂闂�"
+ end-placeholder="缁撴潫鏃堕棿"
>
</el-date-picker>
</el-form-item>
+ <el-radio-group
+ v-model="searchForm.radio"
+ size="small"
+ @input="changeRadio"
+ >
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -145,11 +154,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import { timeForMat } from '@/utils/util'
export default {
name: 'Retention',
extends: BaseTable,
components: { TableLayout, Pagination },
- data() {
+ data () {
return {
// 鎼滅储
searchForm: {
@@ -157,31 +167,50 @@
type: '',
keyWords: '',
startTime: '',
- endTime: ''
+ endTime: '',
+ radio: 0
},
time: []
}
},
- created() {
+ created () {
this.config({
module: '鍦ㄥ洯浜哄憳淇℃伅 琛紙婊炵暀锛�',
api: '/business/retention',
'field.id': 'id',
'field.main': 'id'
})
- this.search()
+ this.changeRadio('0')
},
methods: {
- reset() {
+ changeRadio (e) {
+ if (e === '0') {
+ this.searchForm.startTime = timeForMat(0)[0]
+ this.searchForm.endTime = timeForMat(0)[1]
+ this.time = timeForMat(0)
+ } else if (e === '1') {
+ this.searchForm.startTime = timeForMat(6)[0]
+ this.searchForm.endTime = timeForMat(6)[1]
+ this.time = timeForMat(6)
+ } else if (e === '2') {
+ this.searchForm.startTime = timeForMat(29)[0]
+ this.searchForm.endTime = timeForMat(29)[1]
+ this.time = timeForMat(29)
+ }
+ this.search()
+ },
+ reset () {
this.$refs.searchForm.resetFields()
this.searchForm.startTime = ''
+ this.searchForm.radio = '0'
this.searchForm.endTime = ''
this.time = []
this.search()
},
- seleTime(e) {
+ seleTime (e) {
this.searchForm.startTime = e[0]
this.searchForm.endTime = e[1]
+ this.searchForm.radio = null
}
}
}
--
Gitblit v1.9.3