From 5841a771d4455d25adb185b8a0637c9ba498aab2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 21 十月 2025 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/relativeMember.vue | 189 +++++++++++++++++++++++++++++++----------------
1 files changed, 125 insertions(+), 64 deletions(-)
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 5452250..83a2d66 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -1,44 +1,60 @@
<template>
<TableLayout1 :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <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="hasFace">
- <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" 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="canVisit">
- <el-select v-model="searchForm.canVisit" @keypress.enter.native="search" placeholder="鍙嫓璁�">
- <el-option label="鏄�" value="1"></el-option>
- <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" placeholder="鐘舵��">
- <el-option label="姝ｅ父" value="0"></el-option>
- <el-option label="绂佺敤" value="1"></el-option>
- <el-option label="鎷夐粦/鍐荤粨" value="2"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="hkStatus">
- <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="娴峰悍鍚屾鐘舵��">
- <el-option label="寰呭悓姝�" value="0"></el-option>
- <el-option label="鍚屾鎴愬姛" value="1"></el-option>
- <el-option label="鍚屾澶辫触" value="2"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="">
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <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" 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="authStatus">
+ <el-select v-model="searchForm.authStatus" @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="canVisit">
+ <el-select v-model="searchForm.canVisit" @keypress.enter.native="search" placeholder="鍙嫓璁�">
+ <el-option label="鏄�" value="1"></el-option>
+ <el-option label="鍚�" value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ <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">
+ <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="娴峰悍鍚屾鐘舵��">
+ <el-option label="寰呭悓姝�" value="0"></el-option>
+ <el-option label="鍚屾鎴愬姛" value="1"></el-option>
+ <el-option label="鍚屾澶辫触" value="2"></el-option>
+ </el-select>
+ <el-form-item label="" prop="idcardNo">
+ <el-input v-model="searchForm.idcardNo" placeholder="韬唤璇佸彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ </el-form-item>
+ <!-- <el-form-item label="">
<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ </el-form-item>-->
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
<template v-slot:menu>
<div
style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
@@ -53,10 +69,10 @@
<ul class="toolbar"
v-permissions="['business:member:delete', 'business:member:create,business:empower:create', 'business:traintime:create']">
<!--
- <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
--->
+ <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
+ -->
<li><el-button type="primary"
- @click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐', null, department, searchForm.companyType)" icon="el-icon-plus"
+ @click="add" icon="el-icon-plus"
v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
<li><el-button type="primary" @click="$refs.OperaMemberImportWindow.open('浜哄憳瀵煎叆', searchForm.companyType)"
icon="el-icon-plus" v-permissions="['business:member:create']">浜哄憳瀵煎叆</el-button></li>
@@ -65,15 +81,31 @@
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()"
- icon="el-icon-plus">涓嬪彂鎺堟潈</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 :height="tableHeightNew" 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="80px">
<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>
@@ -85,13 +117,22 @@
</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="positionName" label="宀椾綅" min-width="100px"></el-table-column>
+ <!-- <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-if="row.isDangyuan ==0">闈炲厷鍛�</span>
+ </template>
+ </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}">
<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 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>
@@ -143,27 +184,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>
+ '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 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">
+ 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="edit(row)"
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>
@@ -172,8 +206,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>
@@ -200,6 +234,7 @@
import OperaTrainTimeImportWindow from '@/components/business/OperaTrainTimeImportWindow'
import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
import { fetchList } from '@/api/business/company'
+import { allList as positionList } from '@/api/business/position'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
name: 'internalMember',
@@ -213,20 +248,24 @@
name: '',
status: '',
hkStatus: '',
- includeChild: false,
+ includeChild: true,
canVisit: '',
keyword: '',
type: 2,
companyType: 0,
erpOrgId: '',
+ workStatus: '',
+ positionId: '',
companyId: '',
- hasFace: ''
+ hasFace: '',
+ idcardNo:''
},
loading: false,
heading: false,
working: false,
canvisiting: false,
companyTree: [],
+ positionList: [],
department: []
}
},
@@ -239,8 +278,22 @@
})
// this.search()
this.getfindCompanyTreePage()
+ this.getPositionList()
+ },
+ mounted() {
+ /* this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 276
+ })*/
},
methods: {
+ edit(row) {
+ this.$refs.OperaMemberWindow.treeData = this.companyTree
+ this.$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, this.department, this.searchForm.companyType)
+ },
+ add() {
+ this.$refs.OperaMemberWindow.treeData = this.companyTree
+ this.$refs.OperaMemberWindow.open('鏂板缓鍛樺伐', null, this.department, this.searchForm.companyType)
+ },
startEmpowerBatch() {
if (this.tableData.selectedRows.length === 0) {
this.$tip.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
@@ -253,6 +306,12 @@
names.push(item.name)
})
this.$refs.OperaMemberRoleWindow.open('鍐呴儴鍛樺伐涓嬪彂鏉冮檺', ids, names, this.searchForm.companyType)
+ },
+ getPositionList() {
+ positionList({})
+ .then(res => {
+ this.positionList = res
+ })
},
empower(id) {
var that = this
@@ -272,7 +331,7 @@
},
// 鑾峰彇缁勭粐鏍�
getfindCompanyTreePage() {
- fetchList()
+ fetchList(0)
.then(res => {
if (res && res.length > 0) {
res[0].fsStatus = 1
@@ -298,7 +357,7 @@
newItem.children = this.getDepartmentTree(newItem.children)
}
if (newItem.type === this.searchForm.companyType) {
- //newItem.disabled =false
+ // newItem.disabled =false
} else {
newItem.disabled = true
}
@@ -383,6 +442,7 @@
<style lang="scss" scoped>
@import '@/assets/style/variables.scss';
+
.box {
width: 100%;
display: flex;
@@ -399,6 +459,7 @@
height: 100%;
}
}
+
.zhuguan {
color: $primary-color;
border: 1px solid $primary-color;
--
Gitblit v1.9.3