Commit 8f4e8028 by caoyanzhi

update: 菜单应用

parent f8f2b6db
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<!-- <!--
门店下拉选择: 门店下拉选择:
import dailyExport from '@/components/app/cloudDaily/daily-export.vue'; import dailyExport from '@/components/app/cloudDaily/daily-export.vue';
<daily-export :brandId="brandId" :activeGroupId="activeGroupId"></daily-export> <daily-export :brandId="brandId"></daily-export>
components: { components: {
dailyExport dailyExport
} }
...@@ -81,19 +81,12 @@ export default { ...@@ -81,19 +81,12 @@ export default {
default() { default() {
return ''; return '';
} }
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
return { return {
projectName: '', // 当前项目名 projectName: '', // 当前项目名
activeBrand: this.brandId, // 品牌 id activeBrand: this.brandId, // 品牌 id
activeGroup: this.activeGroupId, // 传递的品牌分组 id
dailyRuleForm: { dailyRuleForm: {
dateRange: [], dateRange: [],
storeType: '', storeType: '',
...@@ -327,7 +320,6 @@ export default { ...@@ -327,7 +320,6 @@ export default {
let that = this; let that = this;
let para = { let para = {
enterpriseId: that.activeBrand, enterpriseId: that.activeBrand,
storeGroupId: that.activeGroup,
showChild: 1, showChild: 1,
showType: 1, showType: 1,
status: 1, status: 1,
...@@ -383,19 +375,12 @@ export default { ...@@ -383,19 +375,12 @@ export default {
that.activeBrand = newData; that.activeBrand = newData;
that.getTemplateData(); that.getTemplateData();
} }
},
activeGroupId: function(newData, oldData) {
let that = this;
if (!!newData) {
that.activeGroup = newData;
}
} }
}, },
mounted() { mounted() {
const that = this; const that = this;
if (!!that.brandId) { if (!!that.brandId) {
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
that.activeGroup = that.activeGroupId;
that.getTemplateData(); that.getTemplateData();
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* @LastEditTime: 2020-12-01 15:08:33 * @LastEditTime: 2020-12-01 15:08:33
--> -->
<!-- <!--
<taskView :brandId="brandId" activeGroupId></taskView> <taskView :brandId="brandId"></taskView>
import taskView from '@/components/app/taskView.vue'; import taskView from '@/components/app/taskView.vue';
--> -->
<template> <template>
...@@ -97,12 +97,6 @@ export default { ...@@ -97,12 +97,6 @@ export default {
default() { default() {
return ''; return '';
} }
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
...@@ -110,7 +104,6 @@ export default { ...@@ -110,7 +104,6 @@ export default {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeTab: '1', activeTab: '1',
activeBrand: this.brandId, // 商户(品牌) id activeBrand: this.brandId, // 商户(品牌) id
activeGroup: this.activeGroupId, // 商户(品牌) groupId
activeId: '1', activeId: '1',
showDialog: false, showDialog: false,
// 条件 // 条件
...@@ -439,12 +432,6 @@ export default { ...@@ -439,12 +432,6 @@ export default {
that.activeBrand = newData; that.activeBrand = newData;
that.getTableList(); that.getTableList();
} }
},
activeGroupId: function(newData, oldData) {
let that = this;
if (!!newData) {
that.activeGroup = newData;
}
} }
}, },
mounted() { mounted() {
......
...@@ -149,7 +149,6 @@ export default { ...@@ -149,7 +149,6 @@ export default {
data() { data() {
return { return {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeId: '2', // 详情头部选中 id
activeBrand: this.brandId, // 品牌 id activeBrand: this.brandId, // 品牌 id
loading: true, loading: true,
selectRadio: 0, // 0:选择当页; 1:选择全部 selectRadio: 0, // 0:选择当页; 1:选择全部
...@@ -479,17 +478,12 @@ export default { ...@@ -479,17 +478,12 @@ export default {
}, },
mounted() { mounted() {
const that = this; const that = this;
document.documentElement.style.backgroundColor = '#f0f2f5';
that.$emit('showTab', '11','111');
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
that.conditionObj.storeId = that.$route.query.storeId; that.conditionObj.storeId = that.$route.query.storeId;
if (!!that.brandId) { if (!!that.brandId) {
that.getTableList(); that.getTableList();
} }
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: { components: {
multipleDel, multipleDel,
qrcodeDialog, qrcodeDialog,
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<template> <template>
<div class="daily-set-wrap "> <div class="daily-set-wrap ">
<div class="daily-set-content border-box"> <div class="daily-set-content border-box">
<daily-export :brandId="brandId" :activeGroupId="activeGroupId"></daily-export> <daily-export :brandId="brandId"></daily-export>
</div> </div>
</div> </div>
</template> </template>
...@@ -24,12 +24,6 @@ export default { ...@@ -24,12 +24,6 @@ export default {
default() { default() {
return ''; return '';
} }
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
...@@ -38,7 +32,6 @@ export default { ...@@ -38,7 +32,6 @@ export default {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeTab: '1', activeTab: '1',
activeBrand: this.brandId, // 商户(品牌) id activeBrand: this.brandId, // 商户(品牌) id
activeGroup: this.activeGroupId, // 商户(品牌) groupId
activeId: '1', activeId: '1',
showDialog: false showDialog: false
...@@ -52,24 +45,11 @@ export default { ...@@ -52,24 +45,11 @@ export default {
if (!!newData) { if (!!newData) {
that.activeBrand = newData; that.activeBrand = newData;
} }
},
activeGroupId: function(newData, oldData) {
const that = this;
if (!!newData) {
that.activeGroup = newData;
}
} }
}, },
mounted() { mounted() {
const that = this; const that = this;
that.$emit('showTab', '12');
document.documentElement.style.backgroundColor = '#f0f2f5';
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
that.activeGroup = that.activeGroupId;
},
destroyed() {
this.activeGroup = '';
document.documentElement.style.backgroundColor = '#fff';
}, },
components: { components: {
dailyExport dailyExport
......
...@@ -90,12 +90,6 @@ export default { ...@@ -90,12 +90,6 @@ export default {
default() { default() {
return ''; return '';
} }
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
...@@ -104,7 +98,6 @@ export default { ...@@ -104,7 +98,6 @@ export default {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeTab: '1', activeTab: '1',
activeBrand: this.brandId, // 商户(品牌) id activeBrand: this.brandId, // 商户(品牌) id
activeGroup: this.activeGroupId, // 商户(品牌) groupId
activeId: '1', activeId: '1',
showDialog: false, showDialog: false,
...@@ -417,28 +410,15 @@ export default { ...@@ -417,28 +410,15 @@ export default {
that.activeBrand = newData; that.activeBrand = newData;
that.getTableList(); that.getTableList();
} }
},
activeGroupId: function(newData, oldData) {
let that = this;
if (!!newData) {
that.activeGroup = newData;
}
} }
}, },
mounted() { mounted() {
let that = this; let that = this;
that.$emit('showTab', '11');
document.documentElement.style.backgroundColor = '#f0f2f5';
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
that.activeGroup = that.activeGroupId;
if (!!that.brandId) { if (!!that.brandId) {
that.getTableList(); that.getTableList();
} }
}, },
destroyed() {
this.activeGroup = '';
document.documentElement.style.backgroundColor = '#fff';
},
components: { components: {
multipleDel, multipleDel,
gicSelectGroup gicSelectGroup
......
...@@ -70,15 +70,7 @@ export default { ...@@ -70,15 +70,7 @@ export default {
}, },
data() { data() {
return { return {
activeTab: '1',
activeBrand: this.brandId, // 商户(品牌) id activeBrand: this.brandId, // 商户(品牌) id
topMenuData: [
{
id: '1',
name: '任务下发设置'
}
],
activeId: '1',
setData: { setData: {
status: false, status: false,
time: '12:00', time: '12:00',
...@@ -161,15 +153,10 @@ export default { ...@@ -161,15 +153,10 @@ export default {
}, },
mounted() { mounted() {
let that = this; let that = this;
document.documentElement.style.backgroundColor = '#f0f2f5';
that.$emit('showTab', '2');
if (!!that.brandId) { if (!!that.brandId) {
that.getData(); that.getData();
} }
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: {} components: {}
}; };
</script> </script>
......
...@@ -66,12 +66,10 @@ export default { ...@@ -66,12 +66,10 @@ export default {
}, },
data() { data() {
return { return {
activeTab: '1',
brandName: '', // 商户(品牌) 名 brandName: '', // 商户(品牌) 名
activeBrand: this.brandId, // 商户(品牌) id activeBrand: this.brandId, // 商户(品牌) id
yearMonth: '', yearMonth: '',
activeId: '3',
myObject: { myObject: {
hasEmptyGrid: false, hasEmptyGrid: false,
empytGrids: [], empytGrids: [],
...@@ -358,16 +356,11 @@ export default { ...@@ -358,16 +356,11 @@ export default {
}, },
mounted() { mounted() {
let that = this; let that = this;
document.documentElement.style.backgroundColor = '#f0f2f5';
that.$emit('showTab', '1', '12');
if (!!that.brandId) { if (!!that.brandId) {
that.yearMonth = that.$route.query.yearMonth; that.yearMonth = that.$route.query.yearMonth;
that.getData(); that.getData();
} }
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: {} components: {}
}; };
</script> </script>
......
...@@ -43,19 +43,6 @@ export default { ...@@ -43,19 +43,6 @@ export default {
}, },
data() { data() {
return { return {
activeId: '2',
topMenuData: [
{
id: '1',
name: '指标管理',
path: `/quota`
},
{
id: '2',
name: '月指标',
path: ''
}
],
yearList: [], yearList: [],
year: '', year: '',
tableList: [], tableList: [],
...@@ -173,7 +160,6 @@ export default { ...@@ -173,7 +160,6 @@ export default {
}, },
mounted() { mounted() {
let that = this; let that = this;
that.$emit('showTab', '1');
if (!!that.brandId) { if (!!that.brandId) {
that.getYearList(); that.getYearList();
} }
......
...@@ -58,33 +58,12 @@ export default { ...@@ -58,33 +58,12 @@ export default {
default() { default() {
return ''; return '';
} }
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
return { return {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeTab: '1',
activeBrand: this.brandId, // 商户(品牌) id activeBrand: this.brandId, // 商户(品牌) id
activeGroup: this.activeGroupId, // 商户(品牌) groupId
activeId: '2',
topMenuData: [
{
id: '1',
name: '指标管理',
path: `/monthList`
},
{
id: '2',
name: '月指标任务',
path: ''
}
],
showDialog: false, showDialog: false,
// 条件 // 条件
conditionObj: { conditionObj: {
...@@ -159,13 +138,6 @@ export default { ...@@ -159,13 +138,6 @@ export default {
handleCommand(command) { handleCommand(command) {
this.selectRadio = command; this.selectRadio = command;
}, },
/**
* 返回 的 brandId
*/
setSelectTab(item) {
let that = this;
that.activeTab = item.tabId;
},
/** /**
* 输入 * 输入
...@@ -323,28 +295,15 @@ export default { ...@@ -323,28 +295,15 @@ export default {
that.activeBrand = newData; that.activeBrand = newData;
that.getTableList(); that.getTableList();
} }
},
activeGroupId: function(newData, oldData) {
let that = this;
if (!!newData) {
that.activeGroup = newData;
}
} }
}, },
mounted() { mounted() {
let that = this; let that = this;
document.documentElement.style.backgroundColor = '#f0f2f5';
that.$emit('showTab', '2');
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
that.activeGroup = that.activeGroupId;
if (!!that.brandId) { if (!!that.brandId) {
that.getTableList(); that.getTableList();
} }
}, },
destroyed() {
this.activeGroup = '';
document.documentElement.style.backgroundColor = '#fff';
},
components: { components: {
gicSelectGroup gicSelectGroup
} }
......
...@@ -145,7 +145,6 @@ export default { ...@@ -145,7 +145,6 @@ export default {
data() { data() {
return { return {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeId: '3', // 详情头部选中 id
activeBrand: this.brandId, // 品牌 id activeBrand: this.brandId, // 品牌 id
selectRadio: 0, // 0:选择当页; 1:选择全部 selectRadio: 0, // 0:选择当页; 1:选择全部
...@@ -235,8 +234,6 @@ export default { ...@@ -235,8 +234,6 @@ export default {
let that = this; let that = this;
let startDate = that.$route.query.startDate; let startDate = that.$route.query.startDate;
let endDate = that.$route.query.endDate; let endDate = that.$route.query.endDate;
document.documentElement.style.backgroundColor = '#f0f2f5';
that.$emit('showTab', '2','21');
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
that.conditionObj.storeId = that.$route.query.storeId; that.conditionObj.storeId = that.$route.query.storeId;
that.conditionObj.dateRange = endDate ? [startDate, endDate] : []; that.conditionObj.dateRange = endDate ? [startDate, endDate] : [];
...@@ -468,9 +465,6 @@ export default { ...@@ -468,9 +465,6 @@ export default {
mounted() { mounted() {
this.init(); this.init();
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: { components: {
multipleDel multipleDel
} }
......
...@@ -72,10 +72,8 @@ export default { ...@@ -72,10 +72,8 @@ export default {
data() { data() {
return { return {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeTab: '1',
activeBrand: this.brandId, // 商户(品牌) id activeBrand: this.brandId, // 商户(品牌) id
operationStaffName: localStorage.getItem('userInfos') ? JSON.parse(localStorage.getItem('userInfos')).staffDTO['staffName'] : '', operationStaffName: localStorage.getItem('userInfos') ? JSON.parse(localStorage.getItem('userInfos')).staffDTO['staffName'] : '',
activeId: '4',
tableData: [], tableData: [],
performanceSum: '0.00', // 总指标 performanceSum: '0.00', // 总指标
clerkObj: { clerkObj: {
...@@ -246,8 +244,6 @@ export default { ...@@ -246,8 +244,6 @@ export default {
}, },
mounted() { mounted() {
let that = this; let that = this;
document.documentElement.style.backgroundColor = '#f0f2f5';
that.$emit('showTab', '1', '11', '111');
if (!!that.brandId) { if (!!that.brandId) {
that.clerkObj.yearMonth = that.$route.query.yearMonth; that.clerkObj.yearMonth = that.$route.query.yearMonth;
...@@ -255,9 +251,6 @@ export default { ...@@ -255,9 +251,6 @@ export default {
that.getData(); that.getData();
} }
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: {} components: {}
}; };
</script> </script>
......
...@@ -68,20 +68,12 @@ export default { ...@@ -68,20 +68,12 @@ export default {
default() { default() {
return ''; return '';
} }
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
return { return {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeId: '3', // 详情头部选中 id
activeBrand: this.brandId, // 品牌 id activeBrand: this.brandId, // 品牌 id
activeGroup: this.activeGroupId, // 商户(品牌) groupId
selectRadio: 0, // 0:选择当页; 1:选择全部 selectRadio: 0, // 0:选择当页; 1:选择全部
showDialog: false, // 删除弹窗参数 showDialog: false, // 删除弹窗参数
...@@ -311,29 +303,17 @@ export default { ...@@ -311,29 +303,17 @@ export default {
that.yearMonth = that.$route.query.yearMonth; that.yearMonth = that.$route.query.yearMonth;
that.getTableList(); that.getTableList();
} }
},
activeGroupId: function(newData, oldData) {
let that = this;
if (!!newData) {
that.activeGroup = newData;
}
} }
}, },
mounted() { mounted() {
let that = this; let that = this;
document.documentElement.style.backgroundColor = '#f0f2f5';
that.$emit('showTab', '1', '11');
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
that.activeGroup = that.activeGroupId;
that.conditionObj.storeId = that.$route.query.storeId; that.conditionObj.storeId = that.$route.query.storeId;
if (!!that.brandId) { if (!!that.brandId) {
that.yearMonth = that.$route.query.yearMonth; that.yearMonth = that.$route.query.yearMonth;
that.getTableList(); that.getTableList();
} }
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: { components: {
qrcodeDialog, qrcodeDialog,
gicSelectGroup gicSelectGroup
......
<template> <template>
<div class="auth-merchant-add"> <div class="auth-merchant-add">
<nav-crumb :navpath="navpath"> </nav-crumb>
<div class="right-content"> <div class="right-content">
<div class="right-box" style="min-height: calc(100vh - 104px);"> <div class="right-box" style="min-height: calc(100vh - 104px);">
<div class="apps-content flex" style="min-height: calc(100vh - 104px);"> <div class="apps-content flex" style="min-height: calc(100vh - 104px);">
...@@ -107,7 +106,6 @@ ...@@ -107,7 +106,6 @@
<script> <script>
import authMerchantDailog from './authMerchant-dailog.vue'; import authMerchantDailog from './authMerchant-dailog.vue';
import gicSelectGroupAuth from '@/components/common/gic-select-group-auth.vue'; import gicSelectGroupAuth from '@/components/common/gic-select-group-auth.vue';
import navCrumb from '@/components/nav/nav.vue';
import { getRequest, postRequest } from '@/api/api'; import { getRequest, postRequest } from '@/api/api';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
// import { _debounce } from '@/common/js/public'; // import { _debounce } from '@/common/js/public';
...@@ -124,26 +122,6 @@ export default { ...@@ -124,26 +122,6 @@ export default {
} }
}; };
return { return {
bgHeight: window.screen.availHeight - 104 + 'px',
// 面包屑参数
navpath: [
{
name: '首页',
path: '/index'
},
{
name: '通讯录',
path: '/contacts'
},
{
name: '授权商户',
path: '/authMerchant'
},
{
name: '新建授权商户',
path: ''
}
],
partForm: { partForm: {
memberOpenCardFlag: 0, memberOpenCardFlag: 0,
wxEnterpriseType: 0, wxEnterpriseType: 0,
...@@ -339,13 +317,8 @@ export default { ...@@ -339,13 +317,8 @@ export default {
} else { } else {
this.type = 'add'; this.type = 'add';
} }
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
}, },
components: { components: {
navCrumb,
gicSelectGroupAuth, gicSelectGroupAuth,
authMerchantDailog authMerchantDailog
} }
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
<nav-crumb :navpath="navpath"> </nav-crumb>
<div class="right-content"> <div class="right-content">
<div class="right-box" style="min-height: calc(100vh - 104px);"> <div class="right-box" style="min-height: calc(100vh - 104px);">
<div class="apps-content flex" style="min-height: calc(100vh - 104px);"> <div class="apps-content flex" style="min-height: calc(100vh - 104px);">
...@@ -94,7 +93,6 @@ ...@@ -94,7 +93,6 @@
</div> </div>
</template> </template>
<script> <script>
import navCrumb from '@/components/nav/nav.vue';
import { getRequest } from '@/api/api'; import { getRequest } from '@/api/api';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
// import { _debounce } from '@/common/js/public'; // import { _debounce } from '@/common/js/public';
...@@ -102,30 +100,13 @@ export default { ...@@ -102,30 +100,13 @@ export default {
name: 'authMerchant', name: 'authMerchant',
data() { data() {
return { return {
bgHeight: window.screen.availHeight - 104 + 'px',
// 面包屑参数
navpath: [
{
name: '首页',
path: '/index'
},
{
name: '通讯录',
path: '/contactsList'
},
{
name: '授权商户',
path: ''
}
],
loading: true, loading: true,
// 分页参数 // 分页参数
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
total: 0, total: 0,
tableData: [], tableData: [],
addShow: false, addShow: false
activeBrand: ''
}; };
}, },
computed: {}, computed: {},
...@@ -283,26 +264,9 @@ export default { ...@@ -283,26 +264,9 @@ export default {
}); });
} }
}, },
watch: {
activeBrand: function(newData, oldData) {
const that = this;
that.activeBrand = newData;
},
activeGroup: function(newData, oldData) {
const that = this;
that.activeGroup = newData;
}
},
mounted() { mounted() {
const that = this; const that = this;
that.getTableList(); that.getTableList();
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: {
navCrumb
} }
}; };
</script> </script>
......
...@@ -8,10 +8,9 @@ ...@@ -8,10 +8,9 @@
--> -->
<template> <template>
<div class="contacts-wrap common-set-wrap"> <div class="contacts-wrap common-set-wrap">
<nav-crumb :navpath="navpath"> </nav-crumb>
<div class="right-content"> <div class="right-content">
<div class="right-box" :style="{ 'min-height': bgHeight }" v-loading="loading"> <div class="right-box" v-loading="loading">
<div class="apps-content flex" :style="{ 'min-height': bgHeight }"> <div class="apps-content flex">
<div class="apps-content-left border-box"> <div class="apps-content-left border-box">
<div class="left-tree-body border-box"> <div class="left-tree-body border-box">
<div class="left-tree-search"> <div class="left-tree-search">
...@@ -52,7 +51,6 @@ ...@@ -52,7 +51,6 @@
</div> </div>
</template> </template>
<script> <script>
import navCrumb from '@/components/nav/nav.vue';
import contactTree from '@/components/company/contact-tree.vue'; import contactTree from '@/components/company/contact-tree.vue';
import newDepartMember from '@/components/company/new-depart-member.vue'; import newDepartMember from '@/components/company/new-depart-member.vue';
import syncDialog from '@/components/company/sync-dialog.vue'; import syncDialog from '@/components/company/sync-dialog.vue';
...@@ -62,25 +60,12 @@ import { _debounce } from '@/common/js/public'; ...@@ -62,25 +60,12 @@ import { _debounce } from '@/common/js/public';
export default { export default {
name: 'reviewed', name: 'reviewed',
components: { components: {
navCrumb,
contactTree, contactTree,
newDepartMember, newDepartMember,
syncDialog syncDialog
}, },
data() { data() {
return { return {
bgHeight: window.screen.availHeight - 288 + 'px',
// 面包屑参数
navpath: [
{
name: '首页',
path: '/index'
},
{
name: '通讯录',
path: ''
}
],
loading: true, loading: true,
refreshTag: false, refreshTag: false,
searchInput: '', searchInput: '',
...@@ -445,15 +430,11 @@ export default { ...@@ -445,15 +430,11 @@ export default {
that.$once('hook:beforeDestroy', () => { that.$once('hook:beforeDestroy', () => {
clearInterval(that.syncTime); clearInterval(that.syncTime);
}); });
document.documentElement.style.backgroundColor = '#f0f2f5';
}, },
beforeDestroy() { beforeDestroy() {
const that = this; const that = this;
window.clearInterval(that.syncTime); window.clearInterval(that.syncTime);
that.syncTime = null; that.syncTime = null;
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
} }
}; };
</script> </script>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
<nav-crumb :navpath="navpath"> </nav-crumb>
<div class="right-content"> <div class="right-content">
<div class="right-box" style="min-height: calc(100vh - 104px);"> <div class="right-box" style="min-height: calc(100vh - 104px);">
<div class="apps-content flex" style="min-height: calc(100vh - 104px);"> <div class="apps-content flex" style="min-height: calc(100vh - 104px);">
...@@ -54,7 +53,6 @@ ...@@ -54,7 +53,6 @@
</div> </div>
</template> </template>
<script> <script>
import navCrumb from '@/components/nav/nav.vue';
import { getRequest } from '@/api/api'; import { getRequest } from '@/api/api';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
// import { _debounce } from '@/common/js/public'; // import { _debounce } from '@/common/js/public';
...@@ -62,26 +60,6 @@ export default { ...@@ -62,26 +60,6 @@ export default {
name: 'authMerchant', name: 'authMerchant',
data() { data() {
return { return {
bgHeight: window.screen.availHeight - 104 + 'px',
// 面包屑参数
navpath: [
{
name: '首页',
path: '/index'
},
{
name: '通讯录',
path: '/contactsList'
},
{
name: '授权商户',
path: '/authMerchant'
},
{
name: '门店绑定列表',
path: ''
}
],
pageParams: { pageParams: {
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 20,
...@@ -158,13 +136,6 @@ export default { ...@@ -158,13 +136,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
that.getTableList(); that.getTableList();
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: {
navCrumb
} }
}; };
</script> </script>
......
...@@ -8,10 +8,9 @@ ...@@ -8,10 +8,9 @@
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
<nav-crumb :navpath="navpath"> </nav-crumb>
<div class="right-content"> <div class="right-content">
<div class="right-box" :style="{ 'min-height': bgHeight }"> <div class="right-box">
<div class="apps-content flex" :style="{ 'min-height': bgHeight }"> <div class="apps-content flex">
<div class="apps-content-right"> <div class="apps-content-right">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="通讯录日志" name="first"> <el-tab-pane label="通讯录日志" name="first">
...@@ -140,7 +139,6 @@ ...@@ -140,7 +139,6 @@
</template> </template>
<script> <script>
import failLog from '@/components/company/fail-log.vue'; import failLog from '@/components/company/fail-log.vue';
import navCrumb from '@/components/nav/nav.vue';
import setDepartment from '@/components/company/set-department.vue'; import setDepartment from '@/components/company/set-department.vue';
import { getRequest, postRequest } from '@/api/api'; import { getRequest, postRequest } from '@/api/api';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
...@@ -149,26 +147,6 @@ export default { ...@@ -149,26 +147,6 @@ export default {
name: 'reviewed', name: 'reviewed',
data() { data() {
return { return {
bgHeight: window.screen.availHeight - 288 + 'px',
// 面包屑参数
navpath: [
{
name: '首页',
path: '/index'
},
{
name: '通讯录',
path: '/contactsList'
},
/* {
name: '组织架构管理',
path: '/orgStructSet'
}, */
{
name: '日志详情',
path: ''
}
],
activeName: 'first', activeName: 'first',
searchInput: '', searchInput: '',
// 分页参数 // 分页参数
...@@ -348,26 +326,11 @@ export default { ...@@ -348,26 +326,11 @@ export default {
}); });
} }
}, },
watch: {
activeBrand: function(newData, oldData) {
const that = this;
that.activeBrand = newData;
},
activeGroup: function(newData, oldData) {
const that = this;
that.activeGroup = newData;
}
},
mounted() { mounted() {
const that = this; const that = this;
that.getTableList(); that.getTableList();
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
}, },
components: { components: {
navCrumb,
setDepartment, setDepartment,
failLog failLog
} }
......
...@@ -101,13 +101,8 @@ export default { ...@@ -101,13 +101,8 @@ export default {
watch: {}, watch: {},
mounted() { mounted() {
const that = this; const that = this;
that.$emit('showTab', 2);
document.documentElement.style.backgroundColor = '#f0f2f5';
that.getData(); that.getData();
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: {} components: {}
}; };
</script> </script>
......
...@@ -750,8 +750,6 @@ export default { ...@@ -750,8 +750,6 @@ export default {
watch: {}, watch: {},
mounted() { mounted() {
const that = this; const that = this;
that.$emit('showTab', 1);
document.documentElement.style.backgroundColor = '#f0f2f5';
that.getAppData(); that.getAppData();
that.getData(); that.getData();
that.getSecretData(); that.getSecretData();
...@@ -759,9 +757,6 @@ export default { ...@@ -759,9 +757,6 @@ export default {
that.getRefreshShow(); that.getRefreshShow();
that.getRefreshTime(); that.getRefreshTime();
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: { components: {
setTip, setTip,
secretSet, secretSet,
......
...@@ -131,14 +131,9 @@ export default { ...@@ -131,14 +131,9 @@ export default {
}, },
mounted() { mounted() {
const that = this; const that = this;
that.$emit('showTab', 4);
document.documentElement.style.backgroundColor = '#f0f2f5';
that.getData(); that.getData();
// this.getSetting(); // this.getSetting();
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
computed: { computed: {
// echoFriendData() { // echoFriendData() {
// let content = ''; // let content = '';
......
...@@ -318,8 +318,6 @@ export default { ...@@ -318,8 +318,6 @@ export default {
} }
}, },
mounted() { mounted() {
this.$emit('showTab', 4);
document.documentElement.style.backgroundColor = '#f0f2f5';
const { id } = this.$route.query; const { id } = this.$route.query;
if (id) { if (id) {
this.getData(); this.getData();
...@@ -328,9 +326,6 @@ export default { ...@@ -328,9 +326,6 @@ export default {
this.getExistDefaultWelcome(); this.getExistDefaultWelcome();
this.getAppleList(); this.getAppleList();
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: { components: {
limitTextarea, limitTextarea,
singleUpload, singleUpload,
......
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
<!-- <nav-crumb :navpath="navpath"> </nav-crumb> -->
<div class="right-content"> <div class="right-content">
<div class="right-box" :style="{ 'min-height': bgHeight }"> <div class="right-box">
<div class="apps-content flex" :style="{ 'min-height': bgHeight }"> <div class="apps-content flex">
<div class="apps-content-right"> <div class="apps-content-right">
<div class="overstore-body"> <div class="overstore-body">
<div class="overstore-tip"> <div class="overstore-tip">
...@@ -101,7 +100,6 @@ ...@@ -101,7 +100,6 @@
<script> <script>
import salesleadsTaskinfo from '@/components/review/salesleads-task-info.vue'; import salesleadsTaskinfo from '@/components/review/salesleads-task-info.vue';
import headDefault from '@/assets/head_default.jpg'; import headDefault from '@/assets/head_default.jpg';
import navCrumb from '@/components/nav/nav.vue';
import { getRequest, postRequest, postExcel } from '@/api/api'; import { getRequest, postRequest, postExcel } from '@/api/api';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import showMsg from '@/common/js/showmsg'; import showMsg from '@/common/js/showmsg';
...@@ -129,21 +127,9 @@ export default { ...@@ -129,21 +127,9 @@ export default {
tableRefresh: false, tableRefresh: false,
multipleSelection: [], multipleSelection: [],
headDefault, headDefault,
bgHeight: window.screen.availHeight - 298 + 'px',
loading: false, loading: false,
dateStart: new Date().getTime() - 3600 * 1000 * 24 * 365, dateStart: new Date().getTime() - 3600 * 1000 * 24 * 365,
dateEnd: new Date(), dateEnd: new Date(),
// 面包屑参数
navpath: [
{
name: '首页',
path: '/index'
},
{
name: '销售线索',
path: ''
}
],
pageParams: { pageParams: {
storeId: this.$route.params.id, storeId: this.$route.params.id,
finishOverStatus: '0', finishOverStatus: '0',
...@@ -224,7 +210,7 @@ export default { ...@@ -224,7 +210,7 @@ export default {
let url = '/haoban-task-manage-web/market/clue/export/store-view-task-detail'; let url = '/haoban-task-manage-web/market/clue/export/store-view-task-detail';
const { finishOverStatus, taskType, pageNum, pageSize } = this.pageParams; const { finishOverStatus, taskType, pageNum, pageSize } = this.pageParams;
let para = { let para = {
enterpriseId: sessionStorage.getItem('userInfoBrandId'), enterpriseId: this.brandId,
dataType: 1, dataType: 1,
finishOverStatus, finishOverStatus,
taskType, taskType,
...@@ -329,7 +315,7 @@ export default { ...@@ -329,7 +315,7 @@ export default {
that.loading = true; that.loading = true;
let para = { let para = {
...that.pageParams, ...that.pageParams,
enterpriseId: sessionStorage.getItem('userInfoBrandId'), enterpriseId: this.brandId,
storeId: that.$route.params.id storeId: that.$route.params.id
}; };
if (Array.isArray(para.date) && para.date.length === 2) { if (Array.isArray(para.date) && para.date.length === 2) {
...@@ -381,7 +367,7 @@ export default { ...@@ -381,7 +367,7 @@ export default {
showDetail(item) { showDetail(item) {
const that = this; const that = this;
that.finishDetail = { that.finishDetail = {
enterpriseId: sessionStorage.getItem('userInfoBrandId'), enterpriseId: this.brandId,
taskId: item.taskId taskId: item.taskId
}; };
this.finishDetailShow = true; this.finishDetailShow = true;
...@@ -393,7 +379,7 @@ export default { ...@@ -393,7 +379,7 @@ export default {
showPreview(item) { showPreview(item) {
const that = this; const that = this;
let para = { let para = {
enterpriseId: sessionStorage.getItem('userInfoBrandId'), enterpriseId: this.brandId,
taskId: item.taskId taskId: item.taskId
}; };
postRequest('/haoban-task-manage-web/market/clue/web/send-task-preview', para) postRequest('/haoban-task-manage-web/market/clue/web/send-task-preview', para)
...@@ -425,23 +411,12 @@ export default { ...@@ -425,23 +411,12 @@ export default {
}, },
mounted() { mounted() {
const that = this; const that = this;
console.log(this.enableDownloadCompleteData);
that.getFilterOpts(); that.getFilterOpts();
that.$nextTick(() => { that.$nextTick(() => {
that.getTableList(); that.getTableList();
}); });
if (that.$route.query.tab) {
that.$emit('showTab', '212', '2121', '21211');
} else {
that.$emit('showTab', '211', '2111');
}
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
}, },
components: { components: {
navCrumb,
salesleadsTaskinfo, salesleadsTaskinfo,
detailPreview detailPreview
} }
......
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
<div class="right-content"> <div class="right-content">
<div class="right-box" :style="{ 'min-height': bgHeight }"> <div class="right-box">
<div class="apps-content flex" :style="{ 'min-height': bgHeight }"> <div class="apps-content flex">
<div class="apps-content-right"> <div class="apps-content-right">
<div class="overstore-body"> <div class="overstore-body">
<div class="overstore-tip"> <div class="overstore-tip">
...@@ -89,7 +89,6 @@ ...@@ -89,7 +89,6 @@
<script> <script>
import showMsg from '@/common/js/showmsg'; import showMsg from '@/common/js/showmsg';
import gicSelectGroup from '@/components/common/gic-select-group.vue'; import gicSelectGroup from '@/components/common/gic-select-group.vue';
import navCrumb from '@/components/nav/nav.vue';
import { getRequest, postExcel } from '@/api/api'; import { getRequest, postExcel } from '@/api/api';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import { _debounce } from '@/common/js/public'; import { _debounce } from '@/common/js/public';
...@@ -108,25 +107,9 @@ export default { ...@@ -108,25 +107,9 @@ export default {
selectRadio: 2, // 选择当页/选择全部 selectRadio: 2, // 选择当页/选择全部
tableRefresh: false, tableRefresh: false,
multipleSelection: [], multipleSelection: [],
bgHeight: window.screen.availHeight - 298 + 'px',
dateStart: new Date().getTime() - 3600 * 1000 * 24 * 365, dateStart: new Date().getTime() - 3600 * 1000 * 24 * 365,
dateEnd: new Date(), dateEnd: new Date(),
loading: false, loading: false,
// 面包屑参数
navpath: [
{
name: '首页',
path: '/index'
},
{
name: '营销任务',
path: '/trafficTaskSet'
},
{
name: '话务任务-话务任务设置',
path: ''
}
],
pageParams: { pageParams: {
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 20,
...@@ -190,6 +173,7 @@ export default { ...@@ -190,6 +173,7 @@ export default {
} }
this.loadingBtn = true; this.loadingBtn = true;
let url = '/haoban-task-manage-web/market/clue/export/store-view'; let url = '/haoban-task-manage-web/market/clue/export/store-view';
const userInfos = JSON.parse(sessionStorage.getItem('userInfos') || '{}');
const { pageNum, pageSize, storeName } = this.pageParams; const { pageNum, pageSize, storeName } = this.pageParams;
let para = { let para = {
pageNum, pageNum,
...@@ -198,8 +182,8 @@ export default { ...@@ -198,8 +182,8 @@ export default {
taskType: 2, taskType: 2,
selectType: this.selectRadio, selectType: this.selectRadio,
selectIdList: this.selectRadio == 1 ? '' : this.multipleSelection.map(ele => ele.storeId).join(','), // 门店分组,数组 selectIdList: this.selectRadio == 1 ? '' : this.multipleSelection.map(ele => ele.storeId).join(','), // 门店分组,数组
enterpriseId: sessionStorage.getItem('userInfoBrandId'), enterpriseId: userInfos.enterpriseId,
qywxEnterpriseId: JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId, qywxEnterpriseId: userInfos.wxEnterpriseId,
startTime: this.pageParams.date[0], startTime: this.pageParams.date[0],
endTime: this.pageParams.date[1] endTime: this.pageParams.date[1]
}; };
...@@ -305,10 +289,11 @@ export default { ...@@ -305,10 +289,11 @@ export default {
getTableList(val) { getTableList(val) {
const that = this; const that = this;
that.loading = true; that.loading = true;
const userInfos = JSON.parse(sessionStorage.getItem('userInfos') || '{}');
let para = { let para = {
...that.pageParams, ...that.pageParams,
enterpriseId: sessionStorage.getItem('userInfoBrandId'), enterpriseId: userInfos.enterpriseId,
qywxEnterpriseId: JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId, qywxEnterpriseId: userInfos.wxEnterpriseId,
taskType: 2 taskType: 2
}; };
if (that.pageParams.storeGroup) { if (that.pageParams.storeGroup) {
...@@ -366,18 +351,8 @@ export default { ...@@ -366,18 +351,8 @@ export default {
}, },
mounted() { mounted() {
this.getTableList(); this.getTableList();
if (this.$route.query.ecmPlanId) {
this.$emit('showTab', '212', '2121');
} else {
this.$emit('showTab', '211');
}
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
}, },
components: { components: {
navCrumb,
gicSelectGroup gicSelectGroup
} }
}; };
......
...@@ -8,10 +8,9 @@ ...@@ -8,10 +8,9 @@
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
<!-- <nav-crumb :navpath="navpath"> </nav-crumb> -->
<div class="right-content"> <div class="right-content">
<div class="right-box" :style="{ 'min-height': bgHeight }"> <div class="right-box">
<div class="apps-content flex" :style="{ 'min-height': bgHeight }"> <div class="apps-content flex">
<div class="apps-content-right"> <div class="apps-content-right">
<div class="overstore-body"> <div class="overstore-body">
<div class="overstore-tip"> <div class="overstore-tip">
...@@ -90,7 +89,6 @@ ...@@ -90,7 +89,6 @@
</div> </div>
</template> </template>
<script> <script>
import navCrumb from '@/components/nav/nav.vue';
import { getRequest, postExcel } from '@/api/api'; import { getRequest, postExcel } from '@/api/api';
import showMsg from '@/common/js/showmsg'; import showMsg from '@/common/js/showmsg';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
...@@ -111,21 +109,9 @@ export default { ...@@ -111,21 +109,9 @@ export default {
selectRadio: 2, // 选择当页/选择全部 selectRadio: 2, // 选择当页/选择全部
tableRefresh: false, tableRefresh: false,
multipleSelection: [], multipleSelection: [],
bgHeight: window.screen.availHeight - 298 + 'px',
dateStart: new Date().getTime() - 3600 * 1000 * 24 * 365, dateStart: new Date().getTime() - 3600 * 1000 * 24 * 365,
dateEnd: new Date(), dateEnd: new Date(),
loading: false, loading: false,
// 面包屑参数
navpath: [
{
name: '首页',
path: '/index'
},
{
name: '销售线索',
path: ''
}
],
pageParams: { pageParams: {
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 20,
...@@ -187,8 +173,8 @@ export default { ...@@ -187,8 +173,8 @@ export default {
this.loadingBtn = true; this.loadingBtn = true;
let para = { let para = {
...this.pageParams, ...this.pageParams,
enterpriseId: sessionStorage.getItem('userInfoBrandId'), enterpriseId: this.brandId,
qywxEnterpriseId: JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId, qywxEnterpriseId: JSON.parse(sessionStorage.getItem('userInfos')).wxEnterpriseId,
startTime: this.pageParams.date[0], startTime: this.pageParams.date[0],
endTime: this.pageParams.date[1], endTime: this.pageParams.date[1],
selectType: this.selectRadio, selectType: this.selectRadio,
...@@ -282,8 +268,8 @@ export default { ...@@ -282,8 +268,8 @@ export default {
that.loading = true; that.loading = true;
let para = { let para = {
...that.pageParams, ...that.pageParams,
enterpriseId: sessionStorage.getItem('userInfoBrandId'), enterpriseId: this.brandId,
qywxEnterpriseId: JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId qywxEnterpriseId: JSON.parse(sessionStorage.getItem('userInfos')).wxEnterpriseId
}; };
if (para.date) { if (para.date) {
para.startTime = para.date[0]; para.startTime = para.date[0];
...@@ -322,14 +308,6 @@ export default { ...@@ -322,14 +308,6 @@ export default {
mounted() { mounted() {
const that = this; const that = this;
that.getTableList(); that.getTableList();
that.$emit('showTab', 212);
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: {
navCrumb
} }
}; };
</script> </script>
......
...@@ -243,7 +243,6 @@ export default { ...@@ -243,7 +243,6 @@ export default {
data() { data() {
return { return {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeId: '2', // 详情头部选中 id
activeBrand: this.brandId, // 品牌 id activeBrand: this.brandId, // 品牌 id
loadingBtn: false, loadingBtn: false,
selectRadio: 2, // 0:选择当页; 1:选择全部 selectRadio: 2, // 0:选择当页; 1:选择全部
...@@ -705,21 +704,12 @@ export default { ...@@ -705,21 +704,12 @@ export default {
}, },
mounted() { mounted() {
let that = this; let that = this;
if (!!this.$route.query.ecmId) {
that.$emit('showTab', '122', '1221', '12211');
} else {
that.$emit('showTab', '121', '1211');
}
document.documentElement.style.backgroundColor = '#f0f2f5';
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
that.conditionObj.storeId = that.$route.query.storeId; that.conditionObj.storeId = that.$route.query.storeId;
if (!!that.brandId) { if (!!that.brandId) {
that.getTableList(); that.getTableList();
} }
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: { components: {
multipleDel, multipleDel,
qrcodeDialog, qrcodeDialog,
......
...@@ -101,20 +101,12 @@ export default { ...@@ -101,20 +101,12 @@ export default {
default() { default() {
return ''; return '';
} }
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
return { return {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeTab: '1',
activeBrand: this.brandId, activeBrand: this.brandId,
actictiveGroup: this.activeGroupId, // 商户(品牌) groupId
showDialog: false, showDialog: false,
activeId: '1', activeId: '1',
conditionObj: { conditionObj: {
...@@ -431,29 +423,18 @@ export default { ...@@ -431,29 +423,18 @@ export default {
that.activeBrand = newData; that.activeBrand = newData;
that.getTableList(); that.getTableList();
} }
},
activeGroupId: function(newData, oldData) {
let that = this;
if (!!newData) {
that.activeGroup = newData;
}
} }
}, },
mounted() { mounted() {
const that = this; const that = this;
// this.conditionObj.dateRange = that.initDataRange(); // this.conditionObj.dateRange = that.initDataRange();
document.documentElement.style.backgroundColor = '#f0f2f5';
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
that.$emit('showTab', 121);
if (!!this.brandId) { if (!!this.brandId) {
that.$nextTick(() => { that.$nextTick(() => {
that.getTableList(); that.getTableList();
}); });
} }
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: { components: {
gicSelectGroup, gicSelectGroup,
multipleDel multipleDel
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--> -->
<template> <template>
<div class="daily-set-wrap "> <div class="daily-set-wrap ">
<taskViewPage :brandId="brandId" :activeGroupId="activeGroupId"></taskViewPage> <taskViewPage :brandId="brandId"></taskViewPage>
</div> </div>
</template> </template>
<script> <script>
...@@ -25,12 +25,6 @@ export default { ...@@ -25,12 +25,6 @@ export default {
default() { default() {
return ''; return '';
} }
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
...@@ -38,7 +32,6 @@ export default { ...@@ -38,7 +32,6 @@ export default {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeTab: '1', activeTab: '1',
activeBrand: this.brandId, // 商户(品牌) id activeBrand: this.brandId, // 商户(品牌) id
activeGroup: this.activeGroupId, // 商户(品牌) groupId
activeId: '1', activeId: '1',
showDialog: false showDialog: false
...@@ -52,12 +45,6 @@ export default { ...@@ -52,12 +45,6 @@ export default {
if (!!newData) { if (!!newData) {
that.activeBrand = newData; that.activeBrand = newData;
} }
},
activeGroupId: function(newData, oldData) {
let that = this;
if (!!newData) {
that.activeGroup = newData;
}
} }
}, },
mounted() { mounted() {
......
...@@ -96,12 +96,6 @@ export default { ...@@ -96,12 +96,6 @@ export default {
return ''; return '';
} }
}, },
activeGroupId: {
type: String,
default() {
return '';
}
},
enableDownloadCompleteData: { enableDownloadCompleteData: {
type: [Number, String], type: [Number, String],
default() { default() {
...@@ -112,16 +106,13 @@ export default { ...@@ -112,16 +106,13 @@ export default {
data() { data() {
return { return {
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
activeTab: '1',
activeBrand: this.brandId, // 商户(品牌) id activeBrand: this.brandId, // 商户(品牌) id
activeGroup: this.activeGroupId, // 商户(品牌) groupId
pickerOptions: { pickerOptions: {
disabledDate: time => { disabledDate: time => {
const end = new Date(); const end = new Date();
return time.getTime() < end.getTime() - 3600 * 1000 * 24 * 365 || time.getTime() > end.getTime() - 3600 * 1000 * 24; return time.getTime() < end.getTime() - 3600 * 1000 * 24 * 365 || time.getTime() > end.getTime() - 3600 * 1000 * 24;
} }
}, },
activeId: '2',
showDialog: false, showDialog: false,
// 条件 // 条件
conditionObj: { conditionObj: {
...@@ -261,13 +252,6 @@ export default { ...@@ -261,13 +252,6 @@ export default {
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection();
} }
}, },
/**
* 返回 的 brandId
*/
setSelectTab(item) {
let that = this;
that.activeTab = item.tabId;
},
/** /**
* 输入 * 输入
...@@ -494,18 +478,10 @@ export default { ...@@ -494,18 +478,10 @@ export default {
that.getTableList(); that.getTableList();
} }
this.multipleSelection = []; this.multipleSelection = [];
},
activeGroupId: function(newData, oldData) {
let that = this;
if (!!newData) {
that.activeGroup = newData;
}
} }
}, },
mounted() { mounted() {
const that = this; const that = this;
that.$emit('showTab', '122', '1221');
document.documentElement.style.backgroundColor = '#f0f2f5';
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
if (!!that.brandId) { if (!!that.brandId) {
that.$nextTick(() => { that.$nextTick(() => {
...@@ -513,9 +489,6 @@ export default { ...@@ -513,9 +489,6 @@ export default {
}); });
} }
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: { components: {
gicSelectGroup, gicSelectGroup,
multipleDel, multipleDel,
......
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