cyl/dev
wangxia 2 years ago
parent e42e4f1b14
commit c19f4323e7

@ -8,7 +8,7 @@
<script>
import zhCn from "ant-design-vue/lib/locale-provider/zh_CN";
let sp = document.createElement('script')
sp.src = '//at.alicdn.com/t/c/font_3135652_vgfhlnrtoao.js'
sp.src = '//at.alicdn.com/t/c/font_3135652_etcavihgi6d.js'
document.body.appendChild(sp)
export default {
provide() {

@ -27,7 +27,7 @@
</a-radio-group>
<div v-if="menuType == 'role'">
<a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
<a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')"></a-menu-item>
<a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')">19</a-menu-item>
</a-menu>
<div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div>
<div class="f12 c9 ml24 mb8">默认角色11</div>
@ -40,8 +40,8 @@
<div class="f12 c9 ml24 mb8">自定义角色8</div>
<a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
<!-- <template v-for="(item, index) in groupList"> -->
<a-menu-item key="角色1" class="fsa showdot" @click="selectGroup('角色1')">
{{'角色1'}}
<a-menu-item key="角色18人" class="fsa showdot" @click="selectGroup('角色18人')">
{{'角色18人'}}
<a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
<i class="iconfont icon-gengduo3 thedot f12" @click.stop></i>
<div class="groupdropdownbox backTable" slot="overlay">
@ -52,8 +52,8 @@
</div>
</a-dropdown>
</a-menu-item>
<a-menu-item key="角色2" class="fsa showdot" @click="selectGroup('角色2')">
{{'角色2'}}
<a-menu-item key="角色28人" class="fsa showdot" @click="selectGroup('角色28人')">
{{'角色28人'}}
<a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
<i class="iconfont icon-gengduo3 thedot f12" @click.stop></i>
<div class="groupdropdownbox backTable" slot="overlay">
@ -69,13 +69,13 @@
</div>
<div v-else>
<a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
<a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')"></a-menu-item>
<a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')">19</a-menu-item>
</a-menu>
<div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div>
<a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
<template v-for="(item, index) in groupList">
<a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
{{item.teamName}}
{{item.teamName + '8人'}}
<a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
<i class="iconfont icon-gengduo3 thedot f12" @click.stop></i>
<div class="groupdropdownbox backTable" slot="overlay">
@ -98,7 +98,7 @@
</div>
<div class="rightContainer mb24">
<div class="fsa pb14 bb1 mb24">
<div class="f16 fw500">{{modalTitle ? modalTitle : selectedKeys[0] == 'all' ? '全部成员':selectedKeys[0] }}</div>
<div class="f16 fw500">{{modalTitle ? modalTitle : selectedKeys[0] == 'all' ? '全部成员19人':selectedKeys[0] + '8人' }}</div>
<!-- <button class="addGroup" @click="addGroupShow = true">添加部门</button> -->
<a-button class="addmemeber f14" v-if="modalTitle == ''" @click="showDetail('add')">
<i class="iconfont icon-fangda"></i> 添加成员
@ -110,23 +110,12 @@
<div class>
<a-table :columns="columns" :scroll="{x:currWidth}" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id" :locale="tablenodata">
<!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
<span slot="nickName" slot-scope="text, record">
<!-- <svg class="svg_icon" v-if="record.agencyRole == 3" aria-hidden="true" style="width:32px">
<use xlink:href="#icon-chengyuan" />
</svg>
<svg class="svg_icon" v-if="record.agencyRole == 2" aria-hidden="true" style="width:32px">
<use xlink:href="#icon-guanliyuan" />
</svg>
<svg class="svg_icon" v-if="record.agencyRole == 1" aria-hidden="true" style="width:32px">
<use xlink:href="#icon-chuangjianren" />
</svg>-->
{{ record.aliasName || record.userName }}
</span>
<span slot="nickName" slot-scope="text, record">{{ record.aliasName || record.userName }}</span>
<div slot="join" slot-scope="text, record">
<a-switch default-checked :checked="record.join" @change="showChange(record)" />
<a-switch default-checked :checked="record.join" @change="showChange(record,'join')" />
</div>
<div slot="bigScreen" slot-scope="text, record">
<a-switch default-checked :checked="record.bigScreen" @change="showChange(record)" />
<a-switch default-checked :checked="record.bigScreen" @change="showChange(record,'bigScreen')" />
</div>
<div slot="setting" v-if="!record.children" class="setting" slot-scope="text, record" style="color: #1890FF">
<!-- <a @click="showDetail('detail', record)">详情</a> -->
@ -135,11 +124,12 @@
</div>
</a-table>
<div class="pagecontainer mt16">
<a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="20" :total="pagination.total" @change="onChange" />
<div class="ant-pagination-options-quick-jumper f14 ml12">
<!-- <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="20" :total="pagination.total" @change="onChange" /> -->
<a-pagination :current="pagination.pageNum" :page-size-options="pagination.pageSizeOptions" :default-current="1" :defaultPageSize="20" :show-total="total => `${total}`" :total="pagination.total" @change="onChange" size="small" show-size-changer show-quick-jumper />
<!-- <div class="ant-pagination-options-quick-jumper f14 ml12">
<span>{{ pagination.total }}</span>跳至
<input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />
</div>
</div>-->
</div>
</div>
<!-- <div v-else-if="modalTitle == '' || modalTitle == ''">
@ -348,12 +338,19 @@ export default {
),
},
form: this.$form.createForm(this),
pagination: {
pageNum: 1,
pageSize: 20,
total: null, //
status: 0,
keys: null,
size: 'small',
showTotal: function (total, range) {
return `${total}`
},
pageSizeOptions: ['25', '50', '100'],
showSizeChanger: true,
// searchTag: 1,
},
isspinning: false,
@ -589,12 +586,12 @@ export default {
return a.agencyRole - b.agencyRole
})
this.pagination.total = data.data.recordCount
this.isspinning = false
}
})
} catch (error) {
console.log(error)
}
this.isspinning = false
},
getMemberGroup() {
getMemberGroupApi().then(({ data }) => {
@ -892,8 +889,25 @@ export default {
*
*
*/
showChange(e) {
showChange(e, type) {
console.log(e)
let that = this
this.memberList.forEach((item) => {
if (item.id == e.id) {
item[type] = !item[type]
console.log(item[type])
if (type == 'bigScreen' && item['bigScreen'] == true) {
item['join'] = true
} else if (type == 'join' && item['join'] == false) {
item['bigScreen'] = false
}
console.log(item)
}
})
setTimeout(() => {
that.$forceUpdate()
}, 10)
},
},
}

@ -695,6 +695,12 @@ export default {
},
],
},
gzt: {
id: 7,
label: '工作台',
checked: false,
children: [],
},
},
}
},
@ -722,7 +728,7 @@ export default {
key: 'roleName',
scopedSlots: { customRender: 'roleName' },
ellipsis: true,
width: 120,
width: 80,
},
// {
// title: '',
@ -732,7 +738,7 @@ export default {
// ellipsis: true,
// },
{
title: '权限',
title: '角色备注',
dataIndex: 'pName',
key: 'pName',
// width: 100,

@ -27,13 +27,13 @@
</a-radio-group>
<div v-if="menuType == 'role'">
<a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
<a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')"></a-menu-item>
<a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')">50</a-menu-item>
</a-menu>
<div class="bb1 ml12 mr12 mt4 mb8" style="wdith:calc(100% - 24px)"></div>
<!-- <div class="f12 c9 ml24 mb8">默认角色11</div> -->
<a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
<template v-for="(item, index) in groupList">
<a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">{{item.teamName}}</a-menu-item>
<a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">{{item.teamName + '18'}}</a-menu-item>
</template>
</a-menu>
</div>
@ -137,13 +137,13 @@
<a @click="getBillInfo(text1,70)" style="color:#576B95;text-decoration:underline" slot="finshedGPA" slot-scope="text, text1">{{toFixed(text)}}</a>
</a-table>
</div>
<div class="pagecontainer mt16" v-if="dataList.length > 0">
<a-pagination :current="contentListSearchForm.pageNum" :default-current="1" :defaultPageSize="10" :total="contentListSearchForm.total" @change="onChange" />
<!-- <div class="pagecontainer mt16" v-if="dataList.length > 0">
<a-pagination :current="contentListSearchForm.pageNum" :page-size-options="pagination.pageSizeOptions" :default-current="1" :defaultPageSize="10" :total="contentListSearchForm.total" @change="onChange" size="small" show-size-changer show-quick-jumper />
<div class="ant-pagination-options-quick-jumper ml12 f14">
<span>{{ contentListSearchForm.total }}</span>跳至
<input ref="pageinput" type="text" style="height:28px" @keyup.enter="inputpageChange" @blur="inputpageChange" />
</div>
</div>
</div> -->
</div>
</div>
<a-modal class="townsmanDetailModal" centered v-model="townsmanDetailVisible" width="1200px" @cancel="townsmanDetailModalClose" :footer="null" destroyOnClose>
@ -158,18 +158,19 @@
<button slot="suffix" @click="onSearch"></button>
</a-input>-->
</div>
<a-table :columns="billColumns" :scroll="{ x: 1100,y:600}" :data-source="billList" class="detailTable" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
<a-table :columns="billColumns" :data-source="billList" class="detailTable" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
<span slot="storeJobName" slot-scope="text">{{text}}</span>
<span slot="userName" slot-scope="text">{{text}}1</span>
<span slot="billDate">{{dateType}}</span>
</a-table>
<div class="pagecontainer mt16" v-if="billList.length > 0">
<a-pagination :current="billPagination.pageNum" :default-current="1" :defaultPageSize="10" :total="billPagination.total" @change="onChange" />
<div class="ant-pagination-options-quick-jumper ml12">
<!-- <a-pagination :current="billPagination.pageNum" :default-current="1" :defaultPageSize="10" :total="billPagination.total" @change="onChange" /> -->
<a-pagination :current="billPagination.pageNum" :page-size-options="pagination.pageSizeOptions" :default-current="1" :defaultPageSize="20" :show-total="total => `${total}`" :total="billPagination.total" @change="onChange" size="small" show-size-changer show-quick-jumper />
<!-- <div class="ant-pagination-options-quick-jumper ml12">
<span>{{ billPagination.total }}</span>跳至
<input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />
</div>
</div> -->
</div>
</a-modal>
</div>
@ -218,7 +219,7 @@ export default {
groupList: [],
billPagination: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
total: null, //
status: 0,
keys: null,
@ -615,12 +616,12 @@ export default {
console.log(value)
if (value == 'group') {
console.log(this.columns)
this.columns.splice(2, 0, {
this.columns.splice(1, 1, {
title: '部门',
dataIndex: 'agencyTeamName',
key: 'agencyTeamName',
ellipsis: true,
width: 120,
// width: 120,
slots: { title: 'agencyTeamName' },
})
tableWidth(this, this.columns, 120)
@ -628,8 +629,21 @@ export default {
} else {
console.log(value)
console.log(this.columns.slice(2, 3))
if (this.columns.slice(2, 3)[0].title == '部门') {
this.columns.splice(2, 1)
if (this.columns.slice(1, 2)[0].title == '部门') {
this.columns.splice(1, 1, {
title: '姓名',
dataIndex: 'aliasName',
key: 'aliasName',
customRender: (text, row, index) => {
// if (row.users) {
// return row.agencyTeamName
// } else {
return row.aliasName
// }
},
ellipsis: true,
// width: 100,
})
}
}
},
@ -819,7 +833,7 @@ export default {
this.townsmanDetailVisible = false
this.billPagination = {
pageNum: 1,
pageSize: 10,
pageSize: 20,
total: null, //
status: 0,
keys: null,
@ -1048,46 +1062,6 @@ table {
// transform: translateY(-50%);
}
}
/deep/ .ant-table-content {
.ant-table-body {
.ant-table-thead {
th {
padding: 12px 0;
div {
// padding: 0px 8px;
}
&:not(:first-child) {
> span {
// line-height: 22px;
> div {
// line-height: 1;
border-left: 1px solid #ddd;
padding-left: 12px;
}
}
}
}
.ant-table-row-cell-break-word {
font-weight: bold;
}
.ant-table-row-cell-ellipsis {
font-weight: bold;
}
}
.ant-table-tbody {
.ant-table-row-cell-ellipsis {
padding: 12px 12px;
}
.ant-table-row-expand-icon {
// color: #000;
padding: 0;
}
.ant-table-row-indent {
display: none !important;
}
}
}
}
}
.pagechange {
button {
@ -1128,9 +1102,6 @@ table {
}
}
/deep/ .ant-table-thead > tr > th {
padding: 12px 0px !important;
}
td:empty:before {
content: '-';
}
@ -1170,6 +1141,7 @@ td:empty:before {
}
.navTitle {
// margin: 16px 0;
min-width: 856px;
}
.content {
position: relative;
@ -1227,14 +1199,17 @@ td:empty:before {
background-color: #40a9ff;
color: #fff;
}
.detailTable {
/deep/.ant-table-body {
/deep/.detailTable {
.ant-table-thead {
& > tr > th {
padding: 12px 8px !important;
}
.ant-table-row-cell-break-word {
padding: 12px 8px;
// text-align: center;
}
}
.ant-table-body {
.ant-table-tbody {
> tr > td {
font-size: 14px;
@ -1256,6 +1231,46 @@ td:empty:before {
}
.dataTable {
/deep/ .ant-table-content {
.ant-table-body {
.ant-table-thead {
th {
padding: 12px 0;
div {
// padding: 0px 8px;
}
&:not(:first-child) {
> span {
// line-height: 22px;
> div {
// line-height: 1;
border-left: 1px solid #ddd;
padding-left: 12px;
}
}
}
}
.ant-table-row-cell-break-word {
font-weight: bold;
}
.ant-table-row-cell-ellipsis {
font-weight: bold;
}
}
.ant-table-tbody {
.ant-table-row-cell-ellipsis {
padding: 12px 12px;
}
.ant-table-row-expand-icon {
// color: #000;
padding: 0;
}
.ant-table-row-indent {
display: none !important;
}
}
}
}
/deep/.ant-table-tbody {
> tr > td {
font-size: 14px;

@ -77,7 +77,7 @@
<!-- <button @click="statusFilter">filter</button> -->
<li>
<div>状态</div>
<a-select size="small" placeholder allowClear @change="resetStatus" :dropdownMatchSelectWidth="false" dropdownClassName="statusclass" style>
<a-select size="small" placeholder allowClear @change="resetStatus" :dropdownMatchSelectWidth="false" style>
<a-select-option v-for="(i, index) in orderStatus" :key="index" @click="handleChange(i)">{{ i.name }}</a-select-option>
</a-select>
</li>

@ -1,4 +1,4 @@
@import "http://at.alicdn.com/t/c/font_3135652_jgx9kzxm8t.css";
@import "http://at.alicdn.com/t/c/font_3135652_etcavihgi6d.css";
// 初始化页面样式
body,
@ -828,13 +828,17 @@ p.bottombox {
background: rgba(0, 0, 0, 0.1);
}
}
.ant-select-dropdown-menu-item-active,
.ant-select-dropdown-menu-item-selected {
// .f40 {
.f40 {
.ant-select-dropdown-menu-item-active,
.ant-select-dropdown-menu-item-selected {
color: #ff4400 !important;
font-weight: normal;
background-color: rgba(255, 106, 0, 0.1) !important;
}
}
// }
// 面包屑样式
.ant-breadcrumb {
margin-top: 12px;

@ -6,7 +6,10 @@
<div class="logo" style="box-shadow: none; min-width: 160px; max-width: 160px; margin-left: -8px">
<div @click.stop="clearOpenkey" style="cursor: pointer; border-right: 1px solid #eee;">
<router-link to="/main">
<img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/daotianLogo.svg" alt />
<!-- <img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/daotianLogo.svg" alt /> -->
<svg class="svg_icon f24" aria-hidden="true">
<use xlink:href="#icon-bocai1" />
</svg>
<!-- <router-link :to="{name:'home'}"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/adminLogo.svg" alt=""> -->
<h1>商家管理后台</h1>
<!-- style="position: relative;top: -1px;" -->
@ -403,7 +406,7 @@ header.header,
.logo h1 {
font-size: 16px;
margin: 0 0 0 4px;
// margin: 0 0 0 4px;
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
font-weight: 500;
vertical-align: middle;

Loading…
Cancel
Save