From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 28 八月 2024 09:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/business/internalMember.vue | 116 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 43 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 0777433..12dce90 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -6,34 +6,31 @@
<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-select v-model="searchForm.hasFace" @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-select v-model="searchForm.canVisit" clearable @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-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-select>
</el-form-item>
<el-form-item label="" prop="hkStatus">
- <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="娴峰悍鍚屾鐘舵��">
+ <el-select v-model="searchForm.hkStatus" @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-select>
</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>
@@ -47,13 +44,15 @@
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:delete','business:member:create']">
-<!-- <li><el-button type="primary">闂ㄧ鎺堟潈</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)" icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
- <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
+ <ul class="toolbar" v-permissions="['business:member:delete','business:member:create,business:empower:create']">
+ <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" 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>
+ <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 style="float: right">
+ <el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1" @change="search" >鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
+ </li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -109,12 +108,6 @@
</el-switch>
</template>
</el-table-column>
- <el-table-column label="鍙嫓璁�" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.canVisit != 1">鍚�</span>
- <span v-if="row.canVisit == 1">鏄�</span>
- </template>
- </el-table-column>
<el-table-column label="娴峰悍鍚屾鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.hkStatus == 0" style="color: #435EBE">寰呭悓姝�</span>
@@ -134,6 +127,18 @@
<span>{{(row.roleNames && row.roleNames.length) ?row.roleNames.join(','): '-'}}</span>
</template>
</el-table-column>
+ <el-table-column label="闂ㄧ鏈夋晥鏈�" min-width="170px">
+ <template slot-scope="{row}">
+ <div v-if="row.roleId !=null && row.roleId != ''">
+ <div v-if="!row.startTime || !row.endTime">闀挎湡鏈夋晥</div>
+ <div v-else>
+ <span>璧凤細{{row.startTime}}</span><br />
+ <span>姝細{{row.endTime}}</span>
+ </div>
+ </div>
+ <div v-else >-</div>
+ </template>
+ </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}">
@@ -160,10 +165,10 @@
>
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅',row,department)" v-permissions="['business:empower:update']">缂栬緫</el-button>
- <el-button type="text" :loading="heading" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " 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-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
- <el-button type="text" icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
+ <el-button type="text" icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
+ <el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " 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" @click="deleteById(row)" style="color: red" v-permissions="['business:member:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -176,6 +181,8 @@
<!-- 鏌ョ湅浜哄憳寮�鍗¤褰� -->
<cardOpeningRecord ref="cardOpeningRecord" @success="handlePageChange" />
<OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
+ <OperaMemberImportWindow ref="OperaMemberImportWindow" @success="handlePageChange" />
+ <OperaMemberRoleWindow ref="OperaMemberRoleWindow" @success="handlePageChange" />
</template>
</TableLayout1>
</template>
@@ -187,12 +194,14 @@
import cardOpeningRecord from '@/components/business/cardOpeningRecord'
import Tree from '@/components/common/Tree'
import OperaMemberWindow from '@/components/business/OperaMemberWindow'
+import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
+import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
import { fetchList } from '@/api/business/company'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
name: 'internalMember',
extends: BaseTable,
- components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow },
+ components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow, OperaMemberRoleWindow ,OperaMemberImportWindow},
data () {
return {
TreeList: [],
@@ -205,6 +214,7 @@
canVisit: '',
keyword: '',
type: 2,
+ companyType:1,
erpOrgId: '',
companyId: '',
hasFace: ''
@@ -228,6 +238,19 @@
this.getfindCompanyTreePage()
},
methods: {
+ startEmpowerBatch () {
+ if (this.tableData.selectedRows.length === 0) {
+ this.$tip.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ var ids = []
+ var names = []
+ this.tableData.selectedRows.forEach(item => {
+ ids.push(item.id)
+ names.push(item.name)
+ })
+ this.$refs.OperaMemberRoleWindow.open('鍐呴儴鍛樺伐涓嬪彂鏉冮檺', ids, names,this.searchForm.companyType)
+ },
empower (id) {
var that = this
this.$confirm('纭畾閲嶆柊鎺堟潈鍚�?', '鎻愮ず', {
@@ -241,12 +264,12 @@
that.search()
})
}).catch(() => {
- this.$tip.apiSuccess( '鎿嶄綔澶辫触')
+ this.$tip.apiSuccess('鎿嶄綔澶辫触')
})
},
// 鑾峰彇缁勭粐鏍�
getfindCompanyTreePage () {
- fetchList(1)
+ fetchList()
.then(res => {
if (res && res.length > 0) {
res[0].fsStatus = 1
@@ -270,6 +293,12 @@
this.$delete(newItem, 'children')
} else {
newItem.children = this.getDepartmentTree(newItem.children)
+ }
+
+ if(newItem.type === this.searchForm.companyType){
+ //newItem.disabled =false
+ }else{
+ newItem.disabled = true
}
return newItem
})
@@ -295,21 +324,21 @@
},
async updateHead (row, type) {
this.$dialog.actionConfirm('鎮ㄧ‘璁よ繘琛屽綋鍓嶆搷浣滃悧锛�', '閮ㄩ棬涓荤璁剧疆鎿嶄綔鎻愮ず')
- .then(() => {
- this.heading = true
- updateHead({ id: row.id, headStatus: type })
- .then(res => {
- this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
- this.search()
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.heading = false
- })
- .catch(() => {})
- })
+ .then(() => {
+ this.heading = true
+ updateHead({ id: row.id, headStatus: type })
+ .then(res => {
+ this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.heading = false
+ })
+ .catch(() => {})
+ })
},
changeWorkStatus (e, row) {
this.working = true
@@ -326,7 +355,7 @@
})
.catch(() => {})
},
- changeCanvisit (e, row) {
+ changeCanvisit (e, row) {
this.canvisiting = true
updateCanVisit({ id: row.id, canVisit: e })
.then(res => {
@@ -342,6 +371,7 @@
.catch(() => {})
},
callback (row) {
+ console.log(row)
this.searchForm.erpOrgId = row.erpId
this.searchForm.companyId = row.id
this.search()
--
Gitblit v1.9.3