From b62578f8b43f15be89b3d14f463f11aed03e6fb9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 09 五月 2024 18:57:25 +0800
Subject: [PATCH] 最新版本

---
 admin/src/views/business/empower.vue |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index b0e7e3d..8933cd6 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -19,6 +19,9 @@
             <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="deviceName">
+                <el-input v-model="searchForm.deviceName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+            </el-form-item>
             <el-form-item label="涓嬪彂璧峰鏃堕棿" prop="startTime">
                 <el-date-picker
                     @change="seleTime"
@@ -45,7 +48,7 @@
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
             <ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
-                <li><el-button type="primary" v-permissions="['business:empower:create']">瀵煎嚭</el-button></li>
+                <li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
 <!--                <li><el-button type="primary" v-permissions="['business:empower:create']">绔嬪嵆涓嬪彂</el-button></li>-->
 <!--                <li><el-button type="primary" v-permissions="['business:empower:create']">鍙栨秷涓嬪彂</el-button></li>-->
             </ul>
@@ -70,7 +73,13 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="sendDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
+                <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
+                <el-table-column label="鏄惁鍒犻櫎" min-width="100px">
+                    <template slot-scope="{row}">
+                        <span style="color: green;" v-if="row.isdeleted === 0">鍚�</span>
+                        <span style="color: red;" v-if="row.isdeleted === 1">鏄�</span>
+                    </template>
+                </el-table-column>
 <!--                <el-table-column prop="createrName" label="鎿嶄綔浜哄憳" min-width="100px"></el-table-column>-->
                 <el-table-column label="涓嬪彂鐘舵��" min-width="100px">
                     <template slot-scope="{row}">
@@ -122,7 +131,8 @@
         startTime: '',
         endTime: '',
         sendStatus: '',
-        radio: null
+        radio: null,
+        deviceName: ''
       },
       time: []
     }
@@ -163,11 +173,9 @@
     },
     reset () {
       this.$refs.searchForm.resetFields()
-      this.searchForm.startTime = ''
-      this.searchForm.endTime = ''
-      this.time = []
-      this.searchForm.radio = null
-      this.search()
+      this.searchForm.radio = '0'
+      this.changeRadio('0')
+      // this.search()
     }
   }
 }

--
Gitblit v1.9.3