From baab15477c13b3eeb04784f784fcc5bac1c68393 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 12 七月 2024 18:35:39 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
admin/src/views/business/shopUsers.vue | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/admin/src/views/business/shopUsers.vue b/admin/src/views/business/shopUsers.vue
index 818c8a6..e3af0ef 100644
--- a/admin/src/views/business/shopUsers.vue
+++ b/admin/src/views/business/shopUsers.vue
@@ -9,14 +9,14 @@
<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" clearable placeholder="涓�绾х粍缁囩被鍨�">
+ <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="shopSecType">
- <el-select v-model="searchForm.shopSecType" @change="search" clearable placeholder="浜岀骇缁勭粐绫诲瀷">
+ <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>
@@ -25,10 +25,9 @@
</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 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>
@@ -54,10 +53,11 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" style="height: 26px">
-<!-- <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" @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>
@@ -69,23 +69,23 @@
@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="iamUsername" 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 == 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: red">鍋滅敤</span>
<span v-if="row.status == 1" style="color:green">鍚敤</span>
</template>
</el-table-column>
- <el-table-column prop="shopType" label="缁勭粐绫诲瀷" min-width="80px">
+ <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>
@@ -130,8 +130,7 @@
>
</pagination>
<!-- 鏌ョ湅浜哄憳寮�鍗¤褰� -->
- <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
- <OperaMemberImportWindow ref="OperaMemberImportWindow" @success="handlePageChange" />
+ <OperaUserImportWindow ref="OperaUserImportWindow" @success="handlePageChange" />
</template>
</TableLayout1>
</template>
@@ -140,13 +139,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout1 from '@/layouts/TableLayout1'
import Pagination from '@/components/common/Pagination'
-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: [],
--
Gitblit v1.9.3