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/empower.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index bab44d4..358967b 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -61,10 +61,10 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="memberName" label="濮撳悕" min-width="80px"></el-table-column>
<el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="120px"></el-table-column>
- <el-table-column prop="memberidCard" label="韬唤璇佸彿鐮�" min-width="130px"></el-table-column>
- <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
- <el-table-column prop="deviceName" label="璁惧鍚嶇О" min-width="150px"></el-table-column>
- <el-table-column label="闂ㄧ鏈夋晥鏈�" min-width="170px">
+ <el-table-column prop="memberidCard" show-overflow-tooltip label="韬唤璇佸彿鐮�" min-width="160px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="240px"></el-table-column>
+ <el-table-column prop="deviceName" show-overflow-tooltip label="璁惧鍚嶇О" min-width="150px"></el-table-column>
+ <el-table-column label="闂ㄧ鏈夋晥鏈�" show-overflow-tooltip min-width="170px">
<template slot-scope="{row}">
<span v-if="!row.startTime || !row.endTime">闀挎湡</span>
<div v-else>
@@ -173,7 +173,8 @@
},
reset () {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = ''
+ this.searchForm = {}
+ this.time = []
// this.changeRadio('0')
this.search()
}
--
Gitblit v1.9.3