From 10c28ce3d0b384584c77ce9111a66a0641250752 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 二月 2025 18:30:32 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/relativeMember.vue | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index aa872cc..db2e235 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -37,9 +37,9 @@
<el-option label="鍚屾澶辫触" value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="">
+<!-- <el-form-item label="">
<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
- </el-form-item>
+ </el-form-item>-->
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -72,11 +72,17 @@
<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>
+ <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>
- <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="110px">
+ <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
<template slot-scope="{row}">
<span>{{ row.name }}</span>
<span class="zhuguan" v-if="row.headStatus == 1">涓荤</span>
@@ -99,12 +105,12 @@
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="positionName" label="宀椾綅" min-width="100px"></el-table-column>
- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
+<!-- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isDangyuan ==1 " style="color: green">鍏氬憳</span>
- <span v-else >闈炲厷鍛�</span>
+ <span v-if="row.isDangyuan ==0">闈炲厷鍛�</span>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"> </el-table-column>
<!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
@@ -113,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>
@@ -164,20 +171,20 @@
<div v-else>-</div>
</template>
</el-table-column>
- <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
+<!-- <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
<el-table-column label="鍗＄墖" min-width="80px">
<template slot-scope="{row}">
<el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{ row.memberCardCount ||
'0' }}</el-button>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
- label="鎿嶄綔" min-width="280" fixed="right">
+ label="鎿嶄綔" min-width="280" >
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, department)"
+ <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, department,searchForm.companyType)"
v-permissions="['business:empower:update']">缂栬緫</el-button>
<el-button type="text" icon="el-icon-plus" @click="empower(row.id)"
v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
@@ -228,7 +235,7 @@
name: '',
status: '',
hkStatus: '',
- includeChild: false,
+ includeChild: true,
canVisit: '',
keyword: '',
type: 2,
@@ -244,8 +251,8 @@
working: false,
canvisiting: false,
companyTree: [],
- department: [],
positionList: [],
+ department: []
}
},
created () {
--
Gitblit v1.9.3