From ef2e97be5b5303ba62212cecbaa811796c38210d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 十月 2024 15:03:15 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/relativeMember.vue | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 9e0e35e..881dc01 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -98,13 +98,14 @@
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
- <el-table-column prop="postionName" 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="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px">
- <span v-if="row.status == 0" style="color: green">鏄�</span>
- <span v-else >鍚�</span>
+ <template slot-scope="{row}">
+ <span v-if="row.isDangyuan ==1 " style="color: green">鍏氬憳</span>
+ <span v-else >闈炲厷鍛�</span>
+ </template>
</el-table-column>
- <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px">
+ <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}">
<span v-if="row.status == 0" style="color: green">姝ｅ父</span>
@@ -185,8 +186,8 @@
v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
<el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row, 1)"
v-if="row.headStatus == 0" v-permissions="['business:member:head']">璁句负涓荤</el-button>
- <el-button type="text" icon="el-icon-delete" style="color: red" @click="empower(row.id)"
- v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
+ v-permissions="['business:member:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -213,7 +214,7 @@
import OperaTrainTimeImportWindow from '@/components/business/OperaTrainTimeImportWindow'
import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
import { fetchList } from '@/api/business/company'
-import { fetchList as positionList } from '@/api/business/position'
+import { allList as positionList } from '@/api/business/position'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
name: 'internalMember',
@@ -227,7 +228,7 @@
name: '',
status: '',
hkStatus: '',
- includeChild: false,
+ includeChild: true,
canVisit: '',
keyword: '',
type: 2,
@@ -243,6 +244,7 @@
working: false,
canvisiting: false,
companyTree: [],
+ positionList: [],
department: []
}
},
--
Gitblit v1.9.3