Skip to content

H
haoban-3
Commit 85f39c1a by caoyanzhi
Options

Merge branch 'feature/4月-菜单和权限' into dev

parents b796398a 6c4df308
Showing with 54 additions and 101 deletions
menu-data/button-code.js
......@@ -297,7 +297,8 @@ module.exports = {
delAppsSecret: ['删除', 1, 1]
},
authMerchant: {
// TODO 1.查看授权设置（按钮，控制“查看授权商户”页面内所有操作权限）；
// 1.查看授权设置（按钮，控制“查看授权商户”页面内所有操作权限）；
checkAuth: ['查看授权设置', 1, 0, 'authMerchantForm'],
// 2.绑定门店列表（按钮，控制“绑定门店列表”页面内所有操作权限）
bindStoreList: ['绑定门店列表', 1, 0, 'merchantStoreList']
},
......
menu-data/menu-data.js
......@@ -236,8 +236,7 @@ module.exports = [
{
menu: ['授权商户', 'authMerchant', 1],
children: [
{menu: ['新建授权', 'authMerchantForm', 1]},
// {menu: ['查看授权设置', '', 1]}, // TODO 本次新增页面
{menu: ['查看授权设置', 'authMerchantForm', 1]},
{menu: ['绑定门店列表', 'merchantStoreList', 1]}
]
}
......
src/components/common/gic-select-group-auth.vue
......@@ -24,7 +24,7 @@
},
-->
<template>
<el-popover placement="bottom-start" style="min-width: 357px" v-model="departmentVisible">
<el-popover :disabled="disabled" placement="bottom-start" style="min-width: 357px" v-model="departmentVisible">
<div class="select-search authMerchant">
<el-input placeholder="请输入内容" maxlength="50" v-model="searchSelect" style="width: 100%;" @keyup.native="value => toInput(value, searchSelect)" @clear="clearSearch"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
</div>
......@@ -48,7 +48,7 @@
<template v-for="(item, index) in groupIds">
<span class="el-tag el-tag--info el-tag--small" :key="index">
<span class="el-select__tags-text">{{ item.relationName }}</span>
<i class="el-tag__close el-icon-close" @click.stop="delDepart(index, groupIds)"></i>
<i class="el-tag__close el-icon-close" v-if="!disabled" @click.stop="delDepart(index, groupIds)"></i>
</span>
</template>
</span>
......@@ -66,6 +66,10 @@ import { _debounce } from '@/common/js/public';
export default {
name: 'gic-select-group',
props: {
disabled: {
type: Boolean,
default: false
},
width: {
type: String,
default() {
......
src/views/business/authMerchant-form.vue
<template>
<div class="auth-merchant-add">
<div class="right-content">
<div class="right-box" style="min-height: calc(100vh - 104px);">
<div class="apps-content flex" style="min-height: calc(100vh - 104px);">
<div class="right-box">
<div class="apps-content flex">
<div class="apps-content-right">
<div class="overstore-tip w-718">
<!-- <div class="overstore-tip w-718">
<div role="alert" class="el-alert el-alert--info flex flex-align-center">
<i class="el-alert__icon el-icon-warning font-13 color-2f54eb"></i>
<div class="el-alert__content color-303133 font-13">
......@@ -15,16 +15,19 @@
<p class="line-22">4. 商户授权门店绑定或修改，默认次日生效，如需立即生效可在商户授权列表手动刷新。</p>
</div>
</div>
</div>
</div> -->
<div class="m-t-24">
<el-form :model="partForm" :rules="rules" ref="form" label-width="128px" class="dialog-form">
<el-form :model="partForm" :rules="rules" ref="form" label-width="160px" class="dialog-form">
<el-form-item label="企业名称">
{{ corpName }}
</el-form-item>
<el-form-item>
<el-tooltip slot="label" class="item" effect="dark" :open-delay="200" placement="top-start" content="输入品牌/商户的企业名称，只支持精确搜素。">
<span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266">选择商户</span>
</el-tooltip>
<template slot="label">
选择商户
<el-tooltip effect="dark" :open-delay="200" placement="top" content="输入品牌/商户的企业名称，只支持精确搜素。">
<i class="label-tips-icon iconfont-components3 icon-cp-QuestionCircleOutlined"></i>
</el-tooltip>
</template>
<el-popover placement="bottom" title="" :disabled="type === 'edit'" trigger="click" popper-class="authMerchant-select-pop" width="253">
<div class="company-select">
<div class="el-scrollbar define-search-select">
......@@ -56,25 +59,31 @@
</el-popover>
</el-form-item>
<el-form-item>
<el-tooltip slot="label" class="item" effect="dark" :open-delay="200" placement="top-start" content="拥有选中的门店管理权限，以及导购账号绑定权限">
<span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266">门店绑定</span>
</el-tooltip>
<gic-select-group-auth :brandId="enterpriseId" width="287px" :authMerchant="true" :selectData="partForm.storeGroup" @checkGroupIds="checkGroupIds"> </gic-select-group-auth>
<template slot="label">
门店绑定
<el-tooltip effect="dark" :open-delay="200" placement="top" content="拥有选中的门店管理权限，以及导购账号绑定权限">
<i class="label-tips-icon iconfont-components3 icon-cp-QuestionCircleOutlined"></i>
</el-tooltip>
</template>
<gic-select-group-auth :disabled="true" :brandId="enterpriseId" width="287px" :authMerchant="true" :selectData="partForm.storeGroup" @checkGroupIds="checkGroupIds"> </gic-select-group-auth>
</el-form-item>
<el-form-item style="margin-top:-10px;margin-bottom:12px;">
<el-tooltip popper-class="authMerchant-member-open-card-flag-tooltip" slot="label" class="item" effect="dark" :open-delay="200" placement="top-start">
<div slot="content" style="line-height:18px;">
①选择同一开平，通过企业微信添加客户，可以直接更新会员信息（一码两用）。<br />
原因：因为获取的用户unionid相同，可以将客户身份（企微客户）和会员（微信会员）身份直接关联；<br />
②选择不同开平，通过企业微信添加客户，无法直接更新会员信息（一码两用）。<br />
原因：因为获取的用户unionid不同，无法将客户身份（企微客户）和会员（微信会员）身份直接关联
</div>
<span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266">开放平台类型</span>
</el-tooltip>
<template slot="label">
微信开放平台类型
<el-tooltip effect="dark" :open-delay="200" placement="top">
<div slot="content" style="max-width: 440px line-height:18px;">
①选择同一微信开放平台，通过企业微信添加客户，可以直接更新会员信息（一码两用）。<br />
原因：因为获取的用户unionid相同，可以将客户身份（企微客户）和会员（微信会员）身份直接关联；<br />
②选择不同微信开放平台，通过企业微信添加客户，无法直接更新会员信息（一码两用）。<br />
原因：因为获取的用户unionid不同，无法将客户身份（企微客户）和会员（微信会员）身份直接关联
</div>
<i class="label-tips-icon iconfont-components3 icon-cp-QuestionCircleOutlined"></i>
</el-tooltip>
</template>
<div style="padding-top: 10px;">
<el-radio v-model="partForm.memberOpenCardFlag" :label="0" :disabled="type === 'edit'">
<div class="m-b-20" style="display:inline-block;vertical-align:top;">
<p class="l-h-1 m-b-5 color-303133">同一开平</p>
<p class="l-h-1 m-b-5 color-303133">同一微信开放平台</p>
<p class="tip">(授权商户的小程序/公众号，和当前企业【客户联系】微信开发者ID绑在同一开放平台 。例：绑定同一开平的集团企业）</p>
</div>
</el-radio>
......@@ -82,7 +91,7 @@
<div>
<el-radio v-model="partForm.memberOpenCardFlag" :label="1" :disabled="type === 'edit'">
<div style="display:inline-block;vertical-align:top;">
<p class="l-h-1 m-b-5 color-303133">不同开平</p>
<p class="l-h-1 m-b-5 color-303133">不同微信开放平台</p>
<p class="tip">(授权商户的小程序/公众号，和当前企业【客户联系】微信开发者ID绑在不同开放平台。例：没绑定同一开平的代理商企业）</p>
</div>
</el-radio>
......@@ -92,7 +101,7 @@
<el-radio v-model="partForm.wxEnterpriseType" :label="0" :disabled="type === 'edit'">总部</el-radio>
<el-radio v-model="partForm.wxEnterpriseType" :label="1" :disabled="type === 'edit'">代理</el-radio>
</el-form-item>
<el-button type="primary" style="display:block;margin:38px 0 0 128px;" @click="addShow = true" :disabled="!(enterpriseId && partForm.storeGroup.length && partForm.searchSelect)"> 授权校验并{{ type === 'edit' ? '保存' : '新建' }}</el-button>
<!-- <el-button type="primary" style="display:block;margin:38px 0 0 128px;" @click="addShow = true" :disabled="!(enterpriseId && partForm.storeGroup.length && partForm.searchSelect)"> 授权校验并{{ type === 'edit' ? '保存' : '新建' }}</el-button> -->
</el-form>
</div>
</div>
......@@ -325,6 +334,10 @@ export default {
};
</script>
<style type="text/scss" lang="scss" scoped>
.label-tips-icon {
font-size: 14px;
color: #909399;
}
.w-287 {
width: 287px;
}
......@@ -390,7 +403,6 @@ export default {
padding: 0px;
.apps-content {
.apps-content-right {
min-height: 787px;
box-sizing: border-box;
width: 100%;
padding: 20px;
......@@ -422,8 +434,4 @@ export default {
.authMerchant-select-pop {
left: 168px !important;
}
.authMerchant-member-open-card-flag-tooltip {
max-width: 440px !important;
width: 440px;
}
</style>
src/views/business/authMerchant.vue
......@@ -13,19 +13,11 @@
<div class="apps-content flex" style="min-height: calc(100vh - 104px);">
<div class="apps-content-right">
<div class="flex flex-space-between flex-align-center">
<div class="overstore-tip">
<div role="alert" class="el-alert el-alert--info flex flex-align-center">
<i class="el-alert__icon el-icon-warning font-13 color-2f54eb"></i>
<div class="el-alert__content">
<p class="el-alert__title color-303133 font-13">绑定门店：绑定门店拥有门店资源管理权限。能查看数据，绑定导购账号，管理门店等。</p>
<p class="el-alert__title color-303133 font-13">刷新门店：编辑或修改绑定门店范围，手动刷新获取最近门店列表。</p>
</div>
</div>
</div>
<div>
<el-alert type="info" show-icon :closable="false" style="width: 300px" title="如需新增商户，请联系达摩运营人员"></el-alert>
<!-- <div>
<span class="color-909399 font-13 m-r-19">最多授权 10 个商户</span>
<el-button v-if="tableData.length < 10" type="primary" @click="AddAuthMerchant">新建授权</el-button>
</div>
</div> -->
</div>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
......@@ -52,12 +44,12 @@
><span class="color-606266">{{ scope.row.wxEnterpriseType | wxEnterpriseTypeFilter }}</span></template
>
</el-table-column>
<el-table-column prop="" label="开平类型" show-overflow-tooltip>
<el-table-column prop="" label="微信开放平台类型" show-overflow-tooltip>
<template slot-scope="scope"
><span class="color-606266">{{ scope.row.memberOpenCardFlag ? '不同开平' : '同一开平' }}</span></template
><span class="color-606266">{{ scope.row.memberOpenCardFlag ? '不同微信开放平台' : '同一微信开放平台' }}</span></template
>
</el-table-column>
<el-table-column prop="" label="导购编辑" show-overflow-tooltip>
<!-- <el-table-column prop="" label="导购编辑" show-overflow-tooltip>
<template slot-scope="scope">
<el-switch v-model="scope.row.clerkEditFlag" :active-value="1" :inactive-value="0" :disabled="scope.row.wxEnterpriseType === 1" @change="clerkEditFlagChange(scope.row, scope.$index)"> </el-switch>
</template>
......@@ -66,7 +58,7 @@
<template slot-scope="scope"
><span class="color-606266">{{ scope.row.staffName || '--' }}</span></template
>
</el-table-column>
</el-table-column> -->
<el-table-column prop="" label="完成时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="line-18 color-606266">{{ scope.row.createTime | timeStampToYmd }}</div>
......@@ -75,7 +67,7 @@
</el-table-column>
<el-table-column prop="" label="操作" min-width="200">
<template slot-scope="scope">
<el-button type="text" @click="AddAuthMerchant(scope.row)">编辑授权设置</el-button>
<el-button type="text" v-if="$getButtonLimit($buttonCode.checkAuth)" :limit-code="$buttonCode.checkAuth" @click="AddAuthMerchant(scope.row)">查看授权设置</el-button>
<el-button v-if="$getButtonLimit($buttonCode.bindStoreList)" :limit-code="$buttonCode.bindStoreList" type="text" @click="toStoreList(scope.row)">绑定门店列表</el-button>
<el-button slot="reference" type="text" @click="refreshStoreBind(scope.row)">刷新门店 </el-button>
</template>
......@@ -89,7 +81,6 @@
</div>
</div>
</div>
<!-- <vue-gic-footer></vue-gic-footer> -->
</div>
</template>
<script>
......@@ -271,56 +262,6 @@ export default {
};
</script>
<style type="text/scss" lang="scss" scoped>
.span-dot {
display: inline-block;
vertical-align: middle;
width: 6px;
height: 6px;
margin-right: 6px;
border-radius: 3px;
&.bg-52c41a {
background: #52c41a;
}
&.bg-f5222d {
background: #f5222d;
}
}
.bg-82C5FF {
background: #82c5ff;
}
.color-508CEE {
color: #508cee;
}
.color-FF585C {
color: #ff585c;
}
.line-h-18 {
line-height: 18px;
}
.tooltip-text {
width: 100%;
white-space: pre-wrap;
word-break: break-all;
}
.w-293 {
width: 293px;
}
.w-191 {
width: 191px;
}
.el-alert--info {
background: rgba(240, 245, 255, 1);
border-radius: 2px;
border: 1px solid rgba(133, 165, 255, 1);
-webkit-box-align: flex-start;
-webkit-align-items: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
.el-alert__icon {
font-size: 12px;
padding-top: 3px;
}
}
.my-customer-wrap {
height: 100%;
}
......
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