From a75b18a4157ab486e0b51c438ac165ab3a08e3e0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 25 七月 2024 18:10:00 +0800
Subject: [PATCH] 代码提交
---
admin/src/views/business/shopUsers.vue | 159 ++++++++++++++++++++++++-----------------------------
1 files changed, 72 insertions(+), 87 deletions(-)
diff --git a/admin/src/views/business/shopUsers.vue b/admin/src/views/business/shopUsers.vue
index 4d9b582..e3af0ef 100644
--- a/admin/src/views/business/shopUsers.vue
+++ b/admin/src/views/business/shopUsers.vue
@@ -2,33 +2,32 @@
<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 label="" prop="queryKeyword">
+ <el-input v-model="searchForm.queryKeyword" 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" clearable placeholder="鏄惁鏈変汉鑴�">
- <el-option label="鏃�" value="0"></el-option>
- <el-option label="鏈�" value="1"></el-option>
+ <el-form-item label="" prop="iamUsername">
+ <el-input v-model="searchForm.iamUsername" placeholder="璇疯緭鍏ョ櫥褰曡处鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="shopType">
+ <el-select v-model="searchForm.shopType" @change="search" style="width: 130px" clearable placeholder="涓�绾х粍缁囩被鍨�">
+ <el-option label="HR" value="1"></el-option>
+ <el-option label="鍔犵洘鍟�" value="2"></el-option>
+ <el-option label="铏氭嫙缁勭粐" value="3"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="" prop="canVisit">
- <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-form-item label="" prop="shopSecType">
+ <el-select v-model="searchForm.shopSecType" @change="search" style="width: 130px" clearable placeholder="浜岀骇缁勭粐绫诲瀷">
+ <el-option label="S" value="1"></el-option>
+ <el-option label="F" value="2"></el-option>
+ <el-option label="搴楅潰" value="3"></el-option>
+ <el-option label="閮ㄩ棬" value="4"></el-option>
+ <el-option label="铏氭嫙搴楅潰" value="5"></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-select>
- </el-form-item>
- <el-form-item label="" prop="hkStatus">
- <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 v-model="searchForm.status" @keypress.enter.native="search" style="width: 120px" clearable placeholder="鐘舵��">
+ <el-option label="鍋滅敤" value="0"></el-option>
+ <el-option label="姝ｅ父" value="1"></el-option>
</el-select>
</el-form-item>
<section>
@@ -53,12 +52,14 @@
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:delete','business:member:create,business:empower:create']">
- <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 style="float: right">
- <el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1" @change="search" >鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
+ <ul class="toolbar" style="height: 26px">
+ <li><el-button type="primary" @click="$refs.OperaUserImportWindow.open('鍒濆鍖栧鍏�')" icon="el-icon-plus" v-permissions="['business:member:create']">鍒濆鍖栧鍏�</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 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
@@ -68,64 +69,59 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="濮撳悕" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="iamUsername" fixed label="鐧诲綍璐﹀彿" min-width="100px"></el-table-column>
+ <el-table-column prop="phone" label="鎵嬫満鍙�" fixed min-width="100px"></el-table-column>
<el-table-column label="鎬у埆" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.sex == 1">鐢�</span>
- <span v-if="row.sex == 2">濂�</span>
+ <span v-if="row.sex == 0">鐢�</span>
+ <span v-if="row.sex == 1">濂�</span>
</template>
</el-table-column>
- <el-table-column prop="shopName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
+ <el-table-column prop="shopName" label="鎵�灞為儴闂�" min-width="150px"></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>
+ <span v-if="row.status == 0" style="color: red">鍋滅敤</span>
+ <span v-if="row.status == 1" style="color:green">鍚敤</span>
</template>
</el-table-column>
- <el-table-column label="閮ㄩ棬绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
- <span v-if="row.companyType == 1">鍐呴儴缁勭粐</span>
- </template>
- </el-table-column>
- <el-table-column label="鍦ㄨ亴鐘舵��">
- <template slot-scope="{row}">
- <el-switch
- @change="changeWorkStatus($event, row)"
- v-model="row.workStatus"
- active-color="#13ce66"
- inactive-color="#ff4949"
- :active-value="0"
- :inactive-value="1">
- </el-switch>
+ <el-table-column prop="shopType" label="缁勭粐绫诲瀷" min-width="110px">
+ <template scope="{row}">
+ <span v-if="row.shopType == 1">HR</span>
+ <span v-if="row.shopType == 2">鍔犵洘鍟�</span>
+ <span v-if="row.shopType == 3">铏氭嫙缁勭粐</span>
+ <span v-if="row.shopSecType == 1">-S</span>
+ <span v-if="row.shopSecType == 2">-F</span>
+ <span v-if="row.shopSecType == 3">-搴楅潰</span>
+ <span v-if="row.shopSecType == 4">-閮ㄩ棬</span>
+ <span v-if="row.shopSecType == 5">-铏氭嫙搴楅潰</span>
</template>
</el-table-column>
<el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
+ <el-table-column prop="roleNames" label="浜哄憳瑙掕壊" min-width="100px"></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">
+ <el-table-column fixed="right" label="澶村儚" align="center" min-width="100px">
<template slot-scope="{row}">
<el-image
- v-if="row.faceImgFull"
+ v-if="row.imgurlFull"
style="width: 60px; height: 60px"
- :src="row.faceImgFull"
- :preview-src-list="[row.faceImgFull]">
+ :src="row.imgurlFull"
+ :preview-src-list="[row.imgurlFull]">
</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"
- >
+ <!-- <el-table-column
+ v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
+ label="鎿嶄綔"
+ min-width="280"
+ fixed="right"
+ >
<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" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:member:delete']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
+ <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" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:member:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>-->
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -134,8 +130,7 @@
>
</pagination>
<!-- 鏌ョ湅浜哄憳寮�鍗¤褰� -->
- <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
- <OperaMemberImportWindow ref="OperaMemberImportWindow" @success="handlePageChange" />
+ <OperaUserImportWindow ref="OperaUserImportWindow" @success="handlePageChange" />
</template>
</TableLayout1>
</template>
@@ -144,35 +139,26 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout1 from '@/layouts/TableLayout1'
import Pagination from '@/components/common/Pagination'
-import Tree from '@/components/common/Tree'
-import OperaMemberWindow from '@/components/business/OperaMemberWindow'
-import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
+import OperaUserImportWindow from '@/components/business/OperaUserImportWindow'
import { fetchListByParent } from '@/api/business/shop'
export default {
name: 'internalMember',
extends: BaseTable,
- components: { TableLayout1, Pagination, OperaMemberWindow, OperaMemberImportWindow },
+ components: { TableLayout1, Pagination, OperaUserImportWindow },
data () {
return {
TreeList: [],
// 鎼滅储
searchForm: {
- name: '',
+ queryKeyword: '',
status: '',
- hkStatus: '',
- includeChild: false,
- canVisit: '',
- keyword: '',
- type: 2,
- companyType: 1,
- erpOrgId: '',
- companyId: '',
- hasFace: ''
+ iamOrgId: '',
+ shopName: '',
+ shopType: null,
+ shopSecType: null,
+ includeChild: false
},
loading: false,
- heading: false,
- working: false,
- canvisiting: false,
companyTree: [],
department: []
}
@@ -184,7 +170,7 @@
'field.id': 'id',
'field.main': 'id'
})
- // this.search()
+ this.search()
// this.loadShopTree()
},
methods: {
@@ -211,8 +197,7 @@
},
callback (row) {
console.log(row)
- this.searchForm.erpOrgId = row.erpId
- this.searchForm.companyId = row.id
+ this.searchForm.iamOrgId = row.orgId
this.search()
}
}
--
Gitblit v1.9.3