From 00f774f72e2f607b4da23d7183ff4db3bc8c6cb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 十月 2024 18:21:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/retention.vue | 127 ++++++++++--------------------------------
1 files changed, 31 insertions(+), 96 deletions(-)
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 1868708..d9fa1da 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -1,52 +1,26 @@
<template>
<TableLayout :permissions="['business:retention:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form
- ref="searchForm"
- slot="search-form"
- :model="searchForm"
- label-width="100px"
- inline
- >
+ <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-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-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="璇烽�夋嫨">
- <el-option label="鍔冲姟璁垮" value="0"></el-option>
- <el-option label="鏅�氳瀹�" value="1"></el-option>
+ <el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
+ <el-select v-model="searchForm.queryUserType" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮" value="0"></el-option>
+ <el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
<el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璧锋鏃堕棿" prop="startTime">
- <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 @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-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>
@@ -60,91 +34,52 @@
<template v-slot:table-wrap>
<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
- >
+ <el-button type="primary" :loading="isWorking.export" v-permissions="['business:retention:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button>
</li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="companyName" label="缁勭粐" min-width="100px">
<template slot-scope="{ row }">
<span v-if="row.type === 2 || row.type === 0">{{
row.companyName
- }}</span>
+ }}</span>
<span v-else>{{ row.visitCompanyName }}</span>
</template>
</el-table-column>
<el-table-column prop="type" label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{ row }">
- <span v-if="row.type === 0">鍔冲姟璁垮</span>
- <span v-if="row.type === 1">鏅�氳瀹�</span>
- <span v-if="row.type === 2">鍐呴儴鍛樺伐</span>
+ <span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
+ <span v-else-if="row.companyType == 1">鍐呴儴鍛樺伐</span>
+ <span v-else>璁垮</span>
</template>
</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="idcardDecode"
- label="韬唤璇佸彿"
- min-width="130px"
- ></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="idcardDecode" label="韬唤璇佸彿" min-width="130px"></el-table-column>
<el-table-column label="杩涘満闂ㄧ" min-width="100px">
<template slot-scope="{ row }">
<span v-if="row.type === 1">-</span>
<span v-else>{{ row.deviceName }}</span>
</template>
</el-table-column>
- <el-table-column
- prop="eventDate"
- label="杩涘満鏃堕棿"
- min-width="100px"
- ></el-table-column>
+ <el-table-column prop="eventDate" label="杩涘満鏃堕棿" min-width="100px"></el-table-column>
<el-table-column label="浜鸿劯鐓х墖" min-width="100px">
<template slot-scope="{ row }">
- <el-image
- v-if="row.faceImgFull != null"
- style="width: 80px; height: 80px"
- :src="row.faceImgFull"
- :preview-src-list="[row.faceImgFull]"
- >
+ <el-image v-if="row.faceImgFull != null" style="width: 80px; height: 80px" :src="row.faceImgFull"
+ :preview-src-list="[row.faceImgFull]">
</el-image>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="120" fixed="right">
<template slot-scope="{ row }">
- <el-button
- type="text"
- @click="deleteById(row)"
- icon="el-icon-delete"
- v-permissions="['business:retention:delete']"
- >鏍囪绂诲満</el-button
- >
+ <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+ v-permissions="['business:retention:delete']">鏍囪绂诲満</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
</TableLayout>
@@ -159,7 +94,7 @@
name: 'Retention',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -173,7 +108,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '鍦ㄥ洯浜哄憳淇℃伅 琛紙婊炵暀锛�',
api: '/business/retention',
@@ -183,7 +118,7 @@
this.changeRadio('0')
},
methods: {
- changeRadio (e) {
+ changeRadio(e) {
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
@@ -199,7 +134,7 @@
}
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.searchForm.startTime = ''
this.searchForm.radio = '0'
@@ -207,7 +142,7 @@
this.time = []
this.search()
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.startTime = e[0]
this.searchForm.endTime = e[1]
this.searchForm.radio = null
--
Gitblit v1.9.3