From 98250a7cff913563152ae8b313c7f45cc27545ba Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 27 二月 2025 09:13:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 admin/src/views/business/visitEvent.vue |  168 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 99 insertions(+), 69 deletions(-)

diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index cd8535b..c01ecdc 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -1,66 +1,95 @@
 <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="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 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-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>
@@ -72,7 +101,7 @@
   name: 'VisitEvent',
   extends: BaseTable,
   components: { TableLayout, Pagination },
-  data() {
+  data () {
     return {
       // 鎼滅储
       searchForm: {
@@ -82,13 +111,14 @@
         startTime: '',
         endTime: '',
         eventType: '',
+        inOrOut: null,
         visitorWorkUint: '',
         radio: '0'
       },
       time: []
     }
   },
-  created() {
+  created () {
     this.config({
       module: '璁垮浜嬩欢鎺ㄩ�佽褰曡〃',
       api: '/business/visitEvent',
@@ -100,13 +130,13 @@
     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]
@@ -122,11 +152,11 @@
       }
       this.search()
     },
-    reset() {
+    reset () {
       this.$refs.searchForm.resetFields()
       this.time = []
-      this.searchForm.radio = ''
-      // this.changeRadio('0')
+      this.searchForm.radio = '0'
+      this.changeRadio('0')
       this.search()
     }
   }

--
Gitblit v1.9.3