Commit 7b16ca27 by 陈羽

update: 修改样式和修改路由

parent 2fb8b315
...@@ -9,8 +9,11 @@ ...@@ -9,8 +9,11 @@
<!-- <!--
选择门店分组组件: 选择门店分组组件:
<gic-select-group <gic-select-group
:selectData="selectData" :brandId="enterpriseId"
@checkGroupIds="checkGroupIds"> width="287px"
:authMerchant="true"
:selectData="partForm.storeGroup"
@checkGroupIds="checkGroupIds">
</gic-select-group> </gic-select-group>
import gicSelectGroup from '@/components/common/gic-select-group.vue'; import gicSelectGroup from '@/components/common/gic-select-group.vue';
...@@ -66,7 +69,7 @@ export default { ...@@ -66,7 +69,7 @@ export default {
width: { width: {
type: String, type: String,
default() { default() {
return '357px'; return '287px';
} }
}, },
selectData: { selectData: {
...@@ -324,6 +327,6 @@ export default { ...@@ -324,6 +327,6 @@ export default {
} }
} }
.authMerchant { .authMerchant {
width: 323px; width: 253px;
} }
</style> </style>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<el-tooltip slot="label" class="item" effect="dark" :open-delay="200" placement="top-start" content="输入品牌/商户的企业名称,只支持精确搜素。"> <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> <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266">选择商户</span>
</el-tooltip> </el-tooltip>
<el-popover placement="bottom" title="" :disabled="type === 'edit'" trigger="click" popper-class="company-select-pop" width="253"> <el-popover placement="bottom" title="" :disabled="type === 'edit'" trigger="click" popper-class="authMerchant-select-pop" width="253">
<div class="company-select"> <div class="company-select">
<div class="el-scrollbar define-search-select"> <div class="el-scrollbar define-search-select">
<div class="el-select-dropdown__wrap el-scrollbar__wrap" style="margin-bottom: -5px; margin-right: -5px;"> <div class="el-select-dropdown__wrap el-scrollbar__wrap" style="margin-bottom: -5px; margin-right: -5px;">
...@@ -447,4 +447,7 @@ export default { ...@@ -447,4 +447,7 @@ export default {
.auth-merchant-add .el-select-dropdown__item { .auth-merchant-add .el-select-dropdown__item {
height: 50px; height: 50px;
} }
.authMerchant-select-pop {
left: 168px !important;
}
</style> </style>
...@@ -116,7 +116,7 @@ export default { ...@@ -116,7 +116,7 @@ export default {
that.changeRoute(`/storeList`); that.changeRoute(`/storeList`);
break; break;
case '2': case '2':
that.changeRoute(`/taskList`); that.changeRoute(`/salesTaskList`);
break; break;
case '3': case '3':
that.changeRoute(`/salesleadsSet`); that.changeRoute(`/salesleadsSet`);
......
...@@ -235,9 +235,7 @@ export default { ...@@ -235,9 +235,7 @@ export default {
let para = { let para = {
...that.pageParams, ...that.pageParams,
enterpriseId: localStorage.getItem('userInfoBrandId'), enterpriseId: localStorage.getItem('userInfoBrandId'),
// storeId: 'ff80808175acbdbd0175aff217960011'
storeId: that.$route.params.id storeId: that.$route.params.id
// (ecmPlanId )
}; };
if (this.$route.query.ecmPlanId) { if (this.$route.query.ecmPlanId) {
para.ecmPlanId = this.$route.query.ecmPlanId; para.ecmPlanId = this.$route.query.ecmPlanId;
......
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