From 00f774f72e2f607b4da23d7183ff4db3bc8c6cb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 十月 2024 18:21:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/internalMember.vue | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index f0568a1..b48da4e 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -5,6 +5,12 @@
<el-form-item label="" prop="keyword">
<el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
</el-form-item>
+ <el-form-item label="" prop="positionId" >
+ <el-select v-model="searchForm.positionId" clearable filterable placeholder="宀椾綅">
+ <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="" prop="hasFace">
<el-select v-model="searchForm.hasFace" @keypress.enter.native="search" clearable placeholder="鏄惁鏈変汉鑴�">
<el-option label="鏃�" value="0"></el-option>
@@ -17,11 +23,10 @@
<el-option label="鍚�" value="0"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="" prop="status">
- <el-select v-model="searchForm.status" @keypress.enter.native="search" clearable placeholder="鐘舵��">
- <el-option label="姝ｅ父" value="0"></el-option>
- <el-option label="绂佺敤" value="1"></el-option>
- <el-option label="鎷夐粦/鍐荤粨" value="2"></el-option>
+ <el-form-item label="" prop="workStatus">
+ <el-select v-model="searchForm.workStatus" @keypress.enter.native="search" clearable placeholder="鍦ㄨ亴鐘舵��">
+ <el-option label="鍦ㄨ亴" value="0"></el-option>
+ <el-option label="绂昏亴" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="hkStatus">
@@ -58,7 +63,7 @@
<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()"
- icon="el-icon-plus">涓嬪彂鎺堟潈</el-button></li>
+ >涓嬪彂鎺堟潈</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>
@@ -66,10 +71,17 @@
</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 prop="name" label="濮撳悕" min-width="110px">
+ <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="110px">
<template slot-scope="{row}">
<span>{{ row.name }}</span>
<span class="zhuguan" v-if="row.headStatus == 1">涓荤</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="浜鸿劯淇℃伅" min-width="100px">
+ <template slot-scope="{row}">
+ <el-image v-if="row.faceImgFull" style="width: 60px; height: 60px" :src="row.faceImgFull"
+ :preview-src-list="[row.faceImgFull]">
+ </el-image>
</template>
</el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
@@ -81,13 +93,20 @@
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="鐘舵��" min-width="100px">
+ <el-table-column prop="postionName" label="宀椾綅" min-width="100px"></el-table-column>
+ <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
+ <span v-if="row.status == 0" style="color: green">鏄�</span>
+ <span v-else >鍚�</span>
+ </el-table-column>
+
+ <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px">
+<!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.status == 0" style="color: green">姝ｅ父</span>
<span v-if="row.status == 1" style="color: red">绂佺敤</span>
<span v-if="row.status == 2" style="color: red">鎷夐粦/鍐荤粨</span>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column label="閮ㄩ棬绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
@@ -148,13 +167,6 @@
</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 fixed="right" label="浜鸿劯淇℃伅" min-width="100px">
- <template slot-scope="{row}">
- <el-image v-if="row.faceImgFull" style="width: 60px; height: 60px" :src="row.faceImgFull"
- :preview-src-list="[row.faceImgFull]">
- </el-image>
- </template>
- </el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
label="鎿嶄綔" min-width="280" fixed="right">
@@ -194,6 +206,7 @@
import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
import { fetchList } from '@/api/business/company'
+import { fetchList as postionList } from '@/api/business/position'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
name: 'internalMember',
@@ -207,12 +220,14 @@
name: '',
status: '',
hkStatus: '',
- includeChild: false,
+ includeChild: true,
canVisit: '',
keyword: '',
type: 2,
companyType: 1,
erpOrgId: '',
+ workStatus: '',
+ positionId: '',
companyId: '',
hasFace: ''
},
@@ -221,6 +236,7 @@
working: false,
canvisiting: false,
companyTree: [],
+ positionList: [],
department: []
}
},
@@ -233,6 +249,7 @@
})
// this.search()
this.getfindCompanyTreePage()
+ this.getPositionList()
},
methods: {
startEmpowerBatch() {
@@ -248,6 +265,12 @@
})
this.$refs.OperaMemberRoleWindow.open('鍐呴儴鍛樺伐涓嬪彂鏉冮檺', ids, names, this.searchForm.companyType)
},
+ getPositionList() {
+ positionList({})
+ .then(res => {
+ this.positionList = res
+ })
+ },
empower(id) {
var that = this
this.$confirm('纭畾閲嶆柊鎺堟潈鍚�?', '鎻愮ず', {
--
Gitblit v1.9.3