From c88fe3ea9fd8bd1ea556b4769a1a0cd6c9b5661d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 11:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/smsEmail.vue | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/business/smsEmail.vue b/admin/src/views/business/smsEmail.vue
index abfca39..ac668f6 100644
--- a/admin/src/views/business/smsEmail.vue
+++ b/admin/src/views/business/smsEmail.vue
@@ -5,7 +5,7 @@
<el-form-item label="" prop="phone">
<el-input v-model="searchForm.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿/閭鍦板潃" @keypress.enter.native="search"></el-input>
</el-form-item>
-<!-- <el-form-item label="" prop="type">
+ <!-- <el-form-item label="" prop="type">
<el-select v-model="searchForm.type" @keypress.enter.native="search" clearable placeholder="绫诲瀷">
<el-option label="鐭俊" value="0"></el-option>
<el-option label="閭" value="1"></el-option>
@@ -25,9 +25,13 @@
</el-select>
</el-form-item>
<el-form-item label="璧峰鏃堕棿" prop="eventType">
- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+ <!-- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
+ </el-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -43,10 +47,10 @@
<template v-slot:table-wrap>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe>
<el-table-column prop="phone" label="鎵嬫満鍙�/閭" min-width="150px">
- <template slot-scope="{ row }">
- <span v-if="row.type == 0">{{ row.phone }}</span>
- <span v-if="row.type == 1">{{ row.email }}</span>
- </template>
+ <template slot-scope="{ row }">
+ <span v-if="row.type == 0">{{ row.phone }}</span>
+ <span v-if="row.type == 1">{{ row.email }}</span>
+ </template>
</el-table-column>
<el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
<el-table-column prop="content" label="鍐呭" min-width="300px"></el-table-column>
@@ -120,25 +124,29 @@
methods: {
reset() {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = ''
- // this.changeRadio('0')
+ // this.searchForm.radio = ''
+ this.changeRadio('0')
this.searchForm = {}
this.time = []
- this.search()
+ // this.search()
},
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)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.startTime = ''
+ return
}
this.search()
},
--
Gitblit v1.9.3