From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/visitEvent.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index b3e1216..c01ecdc 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -8,13 +8,20 @@
<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 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="1392513025"></el-option>
- <el-option label="璁垮绛剧" value="1392513026"></el-option>
+ <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">
@@ -52,11 +59,18 @@
<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="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"
@@ -97,6 +111,7 @@
startTime: '',
endTime: '',
eventType: '',
+ inOrOut: null,
visitorWorkUint: '',
radio: '0'
},
--
Gitblit v1.9.3