From 3a11109642961896bd5ae64ead123cf1a31e5216 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 三月 2025 15:54:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/visits.vue | 73 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index d314a78..0b360f4 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -1,36 +1,39 @@
<template>
<TableLayout :permissions="['business:visits: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>
- <el-form-item label="韬唤璇佸彿" prop="idcardNo">
- <el-input v-model="searchForm.idcardNo" 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-form-item>
- <el-form-item label="瀹℃壒鐘舵��" prop="status">
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
- <el-option label="寰呮彁浜ゅ鎵�" value="0"></el-option>
- <el-option label="瀹℃壒涓�" value="1"></el-option>
- <el-option label="瀹℃牳閫氳繃" value="2"></el-option>
- <el-option label="瀹℃壒椹冲洖" value="3"></el-option>
- <el-option label="鍙栨秷" value="4"></el-option>
- <el-option label="涓嬪彂鎴愬姛" value="5"></el-option>
- <el-option label="涓嬪彂澶辫触" value="6"></el-option>
- <el-option label="鎷滆涓�" value="7"></el-option>
- <el-option label="宸茬绂�" value="8"></el-option>
- <el-option label="宸插け鏁�" value="9"></el-option>
- </el-select>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:visits:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>-->
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ <div slot="search-form" ref="QueryFormRef">
+ <el-form ref="searchForm" :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>
+ <el-form-item label="韬唤璇佸彿" prop="idcardNo">
+ <el-input v-model="searchForm.idcardNo" 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-form-item>
+ <el-form-item label="瀹℃壒鐘舵��" prop="status">
+ <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
+ <el-option label="寰呮彁浜ゅ鎵�" value="0"></el-option>
+ <el-option label="瀹℃壒涓�" value="1"></el-option>
+ <el-option label="瀹℃牳閫氳繃" value="2"></el-option>
+ <el-option label="瀹℃壒椹冲洖" value="3"></el-option>
+ <el-option label="鍙栨秷" value="4"></el-option>
+ <el-option label="涓嬪彂鎴愬姛" value="5"></el-option>
+ <el-option label="涓嬪彂澶辫触" value="6"></el-option>
+ <el-option label="鎷滆涓�" value="7"></el-option>
+ <el-option label="宸茬绂�" value="8"></el-option>
+ <el-option label="宸插け鏁�" value="9"></el-option>
+ </el-select>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:visits:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>-->
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:visits:create', 'business:visits:exportExcel']">
@@ -39,7 +42,8 @@
<li><el-button type="primary" :loading="isWorking.export" @click="exportExcel"
v-permissions="['business:visits:exportExcel']">瀵煎嚭</el-button></li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :max-height="tableHeight" 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="name" label="璁垮濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
@@ -61,7 +65,7 @@
<span v-else>-</span>
</template>
</el-table-column>
- <el-table-column label="鏄惁娑夊強鏂藉伐浣滀笟" min-width="100px">
+ <el-table-column label="鏂藉伐浜哄憳" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.type == 0">鍚�</span>
<span v-if="row.type == 1">鏄�</span>
@@ -145,6 +149,11 @@
})
this.search()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
handleDetail(row) {
this.isShowDetail = true
--
Gitblit v1.9.3