|
@@ -925,7 +925,7 @@ export default {
|
|
|
|
|
|
});
|
|
|
this.operateDisabled=false;
|
|
|
- this.operate=this.userId
|
|
|
+ // this.operate=this.userId
|
|
|
// this.accountDisabled=true
|
|
|
}
|
|
|
if(val){
|
|
@@ -952,10 +952,7 @@ export default {
|
|
|
// this.treeValue=arguments[0].value
|
|
|
},
|
|
|
disabledDate(current) {
|
|
|
- // console.log(current)
|
|
|
-
|
|
|
- // return current && current > moment().add(1, 'day')
|
|
|
- return moment().endOf('day');
|
|
|
+ return moment().endOf('day');
|
|
|
},
|
|
|
filterOption(input, option){
|
|
|
|
|
@@ -963,7 +960,6 @@ export default {
|
|
|
option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
|
|
);
|
|
|
},
|
|
|
-
|
|
|
//打开日期框
|
|
|
opendate() {
|
|
|
this.openOptions =! this.openOptions;
|
|
@@ -1023,14 +1019,34 @@ export default {
|
|
|
moment,
|
|
|
// table区域的tab切换
|
|
|
tableTabChange(key) {
|
|
|
- if (key === 1) {
|
|
|
- this.columns = this.tabKey === 1 ? [...TTcolumns] : [...KScolumns];
|
|
|
- this.target = 'new';
|
|
|
+ if (this.value === 1) {
|
|
|
+ if (key === 1) {
|
|
|
+ this.columns = this.tabKey === 1 ? [...TTcolumns] : [...KScolumnsPlan];
|
|
|
+ this.target = 'new';
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ this.columns = this.tabKey === 1 ? [...TTcolumnsVaild] : [...KScolumnsPlanVaild];
|
|
|
+ this.target = 'valid';
|
|
|
+ }
|
|
|
}
|
|
|
else {
|
|
|
- this.columns = this.tabKey === 1 ? [...TTcolumnsVaild] : [...KScolumnsVaild];
|
|
|
- this.target = 'valid';
|
|
|
+ if (key === 1) {
|
|
|
+ this.columns = this.tabKey === 1 ? [...TTcolumns] : [...KScolumns];
|
|
|
+ this.target = 'new';
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ this.columns = this.tabKey === 1 ? [...TTcolumnsVaild] : [...KScolumnsVaild];
|
|
|
+ this.target = 'valid';
|
|
|
+ }
|
|
|
}
|
|
|
+ // if (key === 1) {
|
|
|
+ // this.columns = this.tabKey === 1 ? [...TTcolumns] : [...KScolumns];
|
|
|
+ // this.target = 'new';
|
|
|
+ // }
|
|
|
+ // else {
|
|
|
+ // this.columns = this.tabKey === 1 ? [...TTcolumnsVaild] : [...KScolumnsVaild];
|
|
|
+ // this.target = 'valid';
|
|
|
+ // }
|
|
|
this.getNewPlan()
|
|
|
},
|
|
|
//处理echart
|
|
@@ -1111,7 +1127,7 @@ export default {
|
|
|
accountHttp(key){
|
|
|
this.treeData=[]
|
|
|
this.treeValue=[];
|
|
|
- getAction(`/ctop/projectMember/getProjectAccountByUserId?mediaType=${key}`, {}).then(res => {
|
|
|
+ getAction(`/ctop/projectMember/getProjectAccountByUserId?mediaType=${key}&userId=${this.userInfo().id}`, {}).then(res => {
|
|
|
if(res.success){
|
|
|
// console.log(res);
|
|
|
|
|
@@ -1170,7 +1186,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
// 运营数据获取
|
|
|
operateHttp(){
|
|
|
postAction('',{}).then(res=>{
|
|
@@ -1183,7 +1198,7 @@ export default {
|
|
|
this.operateList = [];
|
|
|
const paramsData = {
|
|
|
userId: this.userInfo().id,
|
|
|
- userName: this.userInfo().username
|
|
|
+ userName: this.userInfo().realname
|
|
|
};
|
|
|
// TODO 2021.8.24 和泽宇联调更换的统一接口
|
|
|
getAction('/ctop/kuaishou/newGroup/report/AllOperator', paramsData).then(res => {
|
|
@@ -1291,7 +1306,7 @@ export default {
|
|
|
|
|
|
// 查询按钮
|
|
|
search(){
|
|
|
- if(this.accountId || this.operate){
|
|
|
+ if((this.accountId && this.accountId.length) || this.operate){
|
|
|
this.echartSpinning=true;
|
|
|
this.getNewPlan()
|
|
|
}else{
|