Skip to content

Y
ybf
Commit 9d22232a authored by Z's avatar Z
Browse files
Options

Merge branch 'master' of http://114.67.93.201/xulili/ybf

parents 6e4d9f16 44c70323
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 112 deletions
ybf_admin/src/pages/in/contact/mail.vue
View file @ 9d22232a
<template>
<div class="mail">
<div class="left">
<!-- <div class="left-c"> -->
<div>
<div class="title">组织架构</div>
<div class="bottom">
<div class="ty">
......@@ -9,24 +9,12 @@
<span>全部</span>
<span class="number">(103)</span>
</div>
<!-- <div>
<span><d2-icon-svg name="edit" class="icon"/></span>
<span style="margin-left:8px;"
><d2-icon-svg name="delete" class="icon"
/></span>
</div> -->
</div>
<div class="ty" style="margin:15px 0;">
<div>
<span>未分组</span>
<span class="number">(8)</span>
</div>
<!-- <div>
<span><d2-icon-svg name="edit" class="icon"/></span>
<span style="margin-left:8px;"
><d2-icon-svg name="delete" class="icon"
/></span>
</div> -->
</div>
<div class="tree">
<el-tree
......@@ -53,101 +41,99 @@
</el-tree>
</div>
</div>
<div class="run">
<div class="end">
<span class="add-l" @click="addCounter">添加柜组</span>
<span class="add-r" @click="addStore">添加门店/专柜</span>
</div>
</div>
</div>
<!-- <div class="run"> -->
<div class="end">
<span class="add-l" @click="addCounter">添加柜组</span>
<span class="add-r" @click="addStore">添加门店/专柜</span>
</div>
<!-- </div> -->
</div>
<div class="right">
<!-- <div class="right-c"> -->
<div class="top">三号柜组（共18人）</div>
<div class="searchs">
<div class="buttons">
<el-button
class="button buttonlight"
size="small"
@click="synchronismMember"
>同步成员</el-button
>
<el-button
class="button buttondark"
size="small"
@click="handleMove"
>移动</el-button
>
</div>
<!-- 搜索区 -->
<el-form
class="searchzone"
:inline="true"
:model="formData"
label-width="auto"
<div class="top">三号柜组（共18人）</div>
<div class="searchs">
<div class="buttons">
<el-button
class="button buttonlight"
size="small"
@click="synchronismMember"
>同步成员</el-button
>
<el-button class="button buttondark" size="small" @click="handleMove"
>移动</el-button
>
<el-form-item label="关键词">
<el-input
size="small"
v-model="formData.keys"
style="width:160px"
placeholder="请输入关键词"
/>
</el-form-item>
<el-button class="button buttondark" size="small">搜索</el-button>
</el-form>
</div>
<el-table
stripe
class="list"
ref="multipleTable"
:data="list.main"
tooltip-effect="dark"
style="width: 100%"
height="calc(100% - 140px)"
<!-- 搜索区 -->
<el-form
class="searchzone"
:inline="true"
:model="formData"
label-width="auto"
>
<el-table-column type="selection" width="60"></el-table-column>
<el-table-column
prop="taskName"
label="姓名"
align="center"
></el-table-column>
<el-table-column
prop="id"
label="企业微信ID"
align="center"
width="120"
></el-table-column>
<el-table-column
prop="taskType"
label="部门"
align="center"
width="150"
></el-table-column>
<el-table-column
prop="taskType"
label="角色"
align="center"
width="120"
></el-table-column>
<el-table-column
prop="bar"
label="手机号"
align="center"
width="150"
></el-table-column>
<el-table-column label="同步时间" width="180" align="center">
<template slot-scope="scope">{{ scope.row.sendDate }}</template>
</el-table-column>
<el-table-column
prop="bar"
label="备注"
align="center"
width="120"
></el-table-column>
</el-table>
<div class="fy">
<el-pagination
<el-form-item label="关键词">
<el-input
size="small"
v-model="formData.keys"
style="width:160px"
placeholder="请输入关键词"
/>
</el-form-item>
<el-button class="button buttondark" size="small">搜索</el-button>
</el-form>
</div>
<el-table
stripe
class="list"
ref="multipleTable"
:data="list.main"
tooltip-effect="dark"
style="width: 100%"
height="calc(100% - 140px)"
>
<el-table-column type="selection" width="60"></el-table-column>
<el-table-column
prop="taskName"
label="姓名"
align="center"
></el-table-column>
<el-table-column
prop="id"
label="企业微信ID"
align="center"
width="120"
></el-table-column>
<el-table-column
prop="taskType"
label="部门"
align="center"
width="150"
></el-table-column>
<el-table-column
prop="taskType"
label="角色"
align="center"
width="120"
></el-table-column>
<el-table-column
prop="bar"
label="手机号"
align="center"
width="150"
></el-table-column>
<el-table-column label="同步时间" width="180" align="center">
<template slot-scope="scope">{{ scope.row.sendDate }}</template>
</el-table-column>
<el-table-column
prop="bar"
label="备注"
align="center"
width="120"
></el-table-column>
</el-table>
<div class="fy">
<el-pagination
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.size"
......@@ -155,8 +141,8 @@
:total="page.total"
>
</el-pagination>
</div>
</div>
<!-- </div> -->
</div>
<move-dialog
......@@ -238,7 +224,49 @@ export default {
label: "二级 3-2"
}
]
}
},
{
id: 9,
label: "一级 3",
children: [
{
id: 10,
label: "二级 3-1"
},
{
id: 11,
label: "二级 3-2"
}
]
},
/* {
id: 9,
label: "一级 3",
children: [
{
id: 10,
label: "二级 3-1"
},
{
id: 11,
label: "二级 3-2"
}
]
},*/
{
id: 9,
label: "一级 3",
children: [
{
id: 10,
label: "二级 3-1"
},
{
id: 11,
label: "二级 3-2"
}
]
}
];
return {
data1: JSON.parse(JSON.stringify(data1)),
......@@ -395,6 +423,10 @@ export default {
</script>
<style scoped>
.tree {
/* height: 100%;
overflow: auto; */
}
.mail {
display: flex;
width: 100%;
......@@ -411,7 +443,6 @@ export default {
}
.end {
position: absolute;
display: flex;
align-items: center;
border: 1px solid rgba(78, 89, 199, 1);
......@@ -449,7 +480,8 @@ export default {
}
.bottom {
padding: 12px;
margin-bottom: 194px;
margin-bottom: 20px;
/* margin-bottom: 194px; */
}
.title {
height: 48px;
......@@ -469,25 +501,26 @@ export default {
position: relative;
width: 20%;
overflow: auto;
flex-direction: column;
justify-content: space-between;
}
.right {
position: relative;
padding: 10px;
margin-left: 10px;
width: 79%;
/*width: 80%;*/
}
.left,
.right {
display: flex;
flex-direction: column;
.right {
display: flex;
flex-direction: column;
background-color: #fff;
height: 100%;
box-sizing: border-box;
}
.right-c, .left-c {
.right-c,
.left-c {
width: 100%;
}
.number {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment