From 83c7cfa4ecd5d59106b09efff26be43141e38386 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十二月 2023 09:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/retention.vue | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 3609c9b..297ea95 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -1,15 +1,12 @@
<template>
- <TableLayout :permissions="['business:member:query']">
+ <TableLayout :permissions="['business:retention:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鍚�" @keypress.enter.native="search"></el-input>
+ <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="phone">
- <el-input v-model="searchForm.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍏徃/閮ㄩ棬鍚嶇О" prop="companyId">
- <el-input v-model="searchForm.companyId" 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="type">
<el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
@@ -18,10 +15,13 @@
<el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="companyId">
+ <el-form-item label="璧峰鏃堕棿" prop="startTime">
<el-date-picker
- v-model="searchForm.companyId"
- type="daterange"
+ @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="缁撴潫鏃ユ湡">
@@ -34,8 +34,8 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
- <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+ <ul class="toolbar" v-permissions="['business:retention:exportExcel']">
+ <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:retention:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -44,7 +44,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="companyId" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
<el-table-column prop="type" label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.type === 0">鍔冲姟璁垮</span>
@@ -54,10 +54,14 @@
</el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="idcardNo" label="韬唤璇佸彿" min-width="100px"></el-table-column>
- <el-table-column prop="eventDate" label="杩涘満闂ㄧ" min-width="100px"></el-table-column>
+ <el-table-column prop="idcardNo" label="韬唤璇佸彿" min-width="130px"></el-table-column>
+ <el-table-column prop="deviceName" label="杩涘満闂ㄧ" min-width="100px"></el-table-column>
<el-table-column prop="eventDate" label="杩涘満鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="faceImg" label="杩涘満鎶撴媿鐓х墖" min-width="100px"></el-table-column>
+ <el-table-column label="杩涘満鎶撴媿鐓х墖" min-width="100px">
+ <template slot-scope="{row}">
+ <el-image style="width: 80px; height: 80px;" :src="row.faceImg"></el-image>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -81,11 +85,13 @@
return {
// 鎼滅储
searchForm: {
- companyId: '',
+ companyName: '',
type: '',
- name: '',
- phone: ''
- }
+ keyWords: '',
+ startTime: '',
+ endTime: ''
+ },
+ time: []
}
},
created () {
@@ -96,6 +102,19 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startTime = ''
+ this.searchForm.endTime = ''
+ this.time = []
+ this.search()
+ },
+ seleTime (e) {
+ this.searchForm.startTime = e[0]
+ this.searchForm.endTime = e[1]
+ }
}
}
</script>
--
Gitblit v1.9.3