From f62345115d02710c23772cc345bf1ecfa89faeeb Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 17 三月 2024 10:35:01 +0800
Subject: [PATCH] ERP接口

---
 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 f1c9acd..ef8133b 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -60,13 +60,23 @@
                 <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">
                     <template slot-scope="{row}">
-                        <span>璧凤細{{row.startTime}}</span><br />
-                        <span>姝細{{row.endTime}}</span>
+                        <span v-if="!row.startTime || !row.endTime">闀挎湡</span>
+                        <div v-else>
+                            <span>璧凤細{{row.startTime}}</span><br />
+                            <span>姝細{{row.endTime}}</span>
+                        </div>
                     </template>
                 </el-table-column>
                 <el-table-column prop="sendDate" 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}">
@@ -86,7 +96,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="sendDate" label="涓嬪彂鏃堕棿" min-width="150px"></el-table-column>
-                <el-table-column prop="sendInfo" label="涓嬪彂澶辫触鍘熷洜" min-width="150px"></el-table-column>
+                <el-table-column prop="sendInfo" label="涓嬪彂澶囨敞" min-width="150px"></el-table-column>
             </el-table>
             <pagination
                 @size-change="handleSizeChange"
@@ -159,11 +169,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