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/visitEvent.vue | 190 ++++++++++++++++++++++------------------------
1 files changed, 91 insertions(+), 99 deletions(-)
diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index 8310e30..4af12b0 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -1,95 +1,83 @@
<template>
- <TableLayout :permissions="['business:visitevent:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <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="carNo">
- <el-input v-model="searchForm.carNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缁勭粐鍚嶇О" prop="visitorWorkUint">
- <el-input v-model="searchForm.visitorWorkUint" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
- <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
- <el-option label="璁垮鐧昏" value="541200006"></el-option>
- <el-option label="璁垮绛剧" value="541200007"></el-option>
- <el-option label="璁垮閫氳" value="541200060"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="杩涘嚭绫诲瀷" prop="inOrOut">
- <el-select v-model="searchForm.inOrOut" placeholder="璇烽�夋嫨">
- <el-option label="杩�" value="0"></el-option>
- <el-option label="鍑�" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="carNo">
- <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-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>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:visitevent:exportExcel']">
- <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:visitevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
- <el-table-column prop="idcardDecode" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="visitorWorkUint" label="缁勭粐" min-width="100px"></el-table-column>
- <el-table-column prop="carNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="beVisitedPersonName" label="琚浜�" min-width="100px"></el-table-column>
- <el-table-column prop="beVisitedPersonOrg" label="琚浜虹粍缁�" min-width="100px"></el-table-column>
- <el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="inOrOut" label="杩涘嚭绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.inOrOut == '0'">杩�</span>
- <span v-else-if="row.inOrOut == '1'">鍑�</span>
- <span v-else>-</span>
- </template>
- </el-table-column>
- <el-table-column label="鎶撴媿鍥�" min-width="100px">
- <template slot-scope="{row}">
- <el-image v-if="row.captureUrlFull!=null"
- style="width: 80px; height: 80px"
- :src="row.captureUrlFull"
- :preview-src-list="[row.captureUrlFull]">
- </el-image>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ <TableLayout :permissions="['business:visitevent:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <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="carNo">
+ <el-input v-model="searchForm.carNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" prop="visitorWorkUint">
+ <el-input v-model="searchForm.visitorWorkUint" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
+ <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮鐧昏" value="541200006"></el-option>
+ <el-option label="璁垮绛剧" value="541200007"></el-option>
+ <el-option label="璁垮閫氳" value="541200060"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩涘嚭绫诲瀷" prop="inOrOut">
+ <el-select v-model="searchForm.inOrOut" placeholder="璇烽�夋嫨">
+ <el-option label="杩�" value="0"></el-option>
+ <el-option label="鍑�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧峰鏃堕棿" prop="carNo">
+ <!-- <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 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>
+ <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>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:visitevent:exportExcel']">
+ <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:visitevent:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button></li>
+ </ul>
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="phone" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
+ <el-table-column prop="idcardDecode" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="visitorWorkUint" label="缁勭粐" min-width="100px"></el-table-column>
+ <el-table-column prop="carNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="beVisitedPersonName" label="琚浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="beVisitedPersonOrg" label="琚浜虹粍缁�" min-width="100px"></el-table-column>
+ <el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
+ <el-table-column prop="inOrOut" label="杩涘嚭绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.inOrOut == '0'">杩�</span>
+ <span v-else-if="row.inOrOut == '1'">鍑�</span>
+ <span v-else>-</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶撴媿鍥�" min-width="100px">
+ <template slot-scope="{row}">
+ <el-image v-if="row.captureUrlFull != null" style="width: 80px; height: 80px" :src="row.captureUrlFull"
+ :preview-src-list="[row.captureUrlFull]">
+ </el-image>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -101,7 +89,7 @@
name: 'VisitEvent',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -118,7 +106,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '璁垮浜嬩欢鎺ㄩ�佽褰曡〃',
api: '/business/visitEvent',
@@ -130,29 +118,33 @@
this.search()
},
methods: {
- seleTime (e) {
+ seleTime(e) {
this.searchForm.startTime = e[0]
this.searchForm.endTime = e[1]
this.searchForm.radio = null
this.search()
},
- changeRadio (e) {
+ 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()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.time = []
this.searchForm = {}
--
Gitblit v1.9.3