From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/carEvent.vue | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index 1837fe2..b18baf6 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -8,8 +8,8 @@
<el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
<el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍏徃/閮ㄩ棬鍚嶇О" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ュ叕鍙�/閮ㄩ棬鍚嶇О" @keypress.enter.native="search"></el-input>
+ <el-form-item label="缁勭粐" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浜哄憳绫诲瀷" prop="memberType">
<el-select v-model="searchForm.memberType" placeholder="璇烽�夋嫨">
@@ -51,7 +51,8 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:carevent:exportExcel']">
- <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:carevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:carevent:sync']" @click="$refs.OperaCarEventHkWindow.open('鍚屾杩囪溅璁板綍')">鍚屾</el-button></li>
+ <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:carevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -70,14 +71,14 @@
</el-table-column>
<el-table-column label="褰掑睘鐢ㄦ埛绫诲瀷" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.personType === '0'">鍔冲姟璁垮</span>
- <span v-if="row.personType === '1'">鏅�氳瀹�</span>
- <span v-if="row.personType === '2'">鍐呴儴浜哄憳</span>
+ <span v-if="row.personType == 0">鍔冲姟璁垮</span>
+ <span v-if="row.personType == 1">鏅�氳瀹�</span>
+ <span v-if="row.personType == 2">鍐呴儴浜哄憳</span>
</template>
</el-table-column>
<el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="personCompanyName" label="鍏徃/閮ㄩ棬" min-width="100px"></el-table-column>
+ <el-table-column prop="personCompanyName" label="缁勭粐" min-width="100px"></el-table-column>
<el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
<template slot-scope="{row}">
<div v-if="row.platePicUrl!=null">
@@ -108,6 +109,8 @@
:pagination="tableData.pagination"
>
</pagination>
+
+ <OperaCarEventHkWindow ref="OperaCarEventHkWindow" @success="search()" />
</template>
</TableLayout>
</template>
@@ -116,11 +119,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import OperaCarEventHkWindow from '@/components/business/OperaCarEventHkWindow'
import { timeForMat } from '@/utils/util'
export default {
name: 'CarEvent',
extends: BaseTable,
- components: { TableLayout, Pagination },
+ components: { TableLayout, Pagination ,OperaCarEventHkWindow},
data () {
return {
// 鎼滅储
@@ -132,7 +136,7 @@
companyName: '',
startTime: '',
endTime: '',
- radio: null
+ radio: '0'
},
time: []
}
@@ -144,30 +148,30 @@
'field.id': 'id',
'field.main': 'id'
})
+ this.changeRadio('0')
this.search()
},
methods: {
reset () {
this.$refs.searchForm.resetFields()
- this.searchForm.startTime = ''
- this.searchForm.endTime = ''
+ this.searchForm.radio = '0'
+ this.changeRadio('0')
this.time = []
- this.searchForm.radio = null
this.search()
},
changeRadio (e) {
if (e === '0') {
- this.searchForm.startTime = timeForMat(1)[0]
- this.searchForm.endTime = timeForMat(1)[1]
- this.time = timeForMat(1)
+ this.searchForm.startTime = timeForMat(0)[0]
+ this.searchForm.endTime = timeForMat(0)[1]
+ this.time = timeForMat(0)
} else if (e === '1') {
- this.searchForm.startTime = timeForMat(7)[0]
- this.searchForm.endTime = timeForMat(7)[1]
- this.time = timeForMat(7)
+ this.searchForm.startTime = timeForMat(6)[0]
+ this.searchForm.endTime = timeForMat(6)[1]
+ this.time = timeForMat(6)
} else if (e === '2') {
- this.searchForm.startTime = timeForMat(30)[0]
- this.searchForm.endTime = timeForMat(30)[1]
- this.time = timeForMat(30)
+ this.searchForm.startTime = timeForMat(29)[0]
+ this.searchForm.endTime = timeForMat(29)[1]
+ this.time = timeForMat(29)
}
this.search()
},
--
Gitblit v1.9.3