From 18e9c3c8c5c05fb14b13d2a30a69af0165496f33 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 31 十月 2024 17:46:10 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/business/relativeMember.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index df14305..676283c 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -71,14 +71,14 @@
icon="el-icon-plus" v-permissions="['business:traintime:create']">鍩硅鏈熷鍏�</el-button></li>
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
- <li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()">涓嬪彂鎺堟潈</el-button>
+ <li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()">涓嬪彂鎺堟潈</el-button></li>
<li style="float: right">
<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1"
@change="search">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
</li>
-<!--
+
<li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
--->
+
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
@@ -119,6 +119,7 @@
<span v-if="row.status == 2" style="color: red">鎷夐粦/鍐荤粨</span>
</template>
</el-table-column>-->
+ <el-table-column prop="trainEndTime" label="鍩硅鏈夋晥鏈�" min-width="100px"> </el-table-column>
<el-table-column label="閮ㄩ棬绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
--
Gitblit v1.9.3