权限控制

master
Caps 6 years ago
parent b93455df22
commit e948cce022

@ -59,7 +59,7 @@
key: 'allCustomer' key: 'allCustomer'
}, },
{ {
title: '有效好友总数', title: '总好友数(去重)',
key: 'effectiveCustomer' key: 'effectiveCustomer'
}, },
{ {
@ -67,15 +67,15 @@
key: 'newCustomer' key: 'newCustomer'
}, },
{ {
title: '新增有效好友数', title: '新增好友数(去重)',
key: 'newEffectiveCustomer' key: 'newEffectiveCustomer'
}, },
{ {
title: '日增有效好友平均', title: '日增好友平均(去重)',
key: 'avgNewCustomer' key: 'avgNewCustomer'
}, },
{ {
title: '删除/拉黑成员好友数(累计)', title: '删除/拉黑成员客户数(累计)',
key: 'delCustomer' key: 'delCustomer'
}, },
{ {
@ -116,7 +116,10 @@
return; return;
} }
if (data.code === '0000') { if (data.code === '0000') {
that.companyList = data.results; that.companyList.push({id:'-1',name:"全部"});
data.results.forEach(da => {
that.companyList.push(da);
})
} }
}) })
}, },
@ -125,10 +128,15 @@
this.$Message.info("请选择日期"); this.$Message.info("请选择日期");
return return
} }
debugger
let orgId = this.selectedCompany;
if(this.selectedCompany === '-1'){
orgId = null;
}
let request = { let request = {
startTime: this.selectDate[0], startTime: this.selectDate[0],
endTime: this.selectDate[1], endTime: this.selectDate[1],
orgId: this.selectedCompany, orgId: orgId,
pageNum: this.pageNum, pageNum: this.pageNum,
pageSize: this.pageSize pageSize: this.pageSize
}; };

@ -95,7 +95,7 @@
key: 'allCustomer' key: 'allCustomer'
}, },
{ {
title: '有效好友总数', title: '总好友数(去重)',
key: 'effectiveCustomer' key: 'effectiveCustomer'
}, },
{ {
@ -103,11 +103,11 @@
key: 'newCustomer' key: 'newCustomer'
}, },
{ {
title: '新增有效好友数', title: '新增好友数(去重)',
key: 'newEffectiveCustomer' key: 'newEffectiveCustomer'
}, },
{ {
title: '日增有效好友平均', title: '日增好友平均(去重)',
key: 'avgNewCustomer' key: 'avgNewCustomer'
} }
], ],

@ -76,7 +76,7 @@
key: 'allCustomer' key: 'allCustomer'
}, },
{ {
title: '有效好友总数', title: '总好友数(去重)',
key: 'effectiveCustomer' key: 'effectiveCustomer'
}, },
{ {
@ -84,15 +84,15 @@
key: 'newCustomer' key: 'newCustomer'
}, },
{ {
title: '新增有效好友数', title: '新增好友数(去重)',
key: 'newEffectiveCustomer' key: 'newEffectiveCustomer'
}, },
{ {
title: '日增有效好友平均', title: '日增好友平均(去重)',
key: 'avgNewCustomer' key: 'avgNewCustomer'
}, },
{ {
title: '删除/拉黑成员好友数(累计)', title: '删除/拉黑成员客户数(累计)',
key: 'delCustomer' key: 'delCustomer'
}, },
{ {

@ -18,9 +18,9 @@
<Button type="primary" style="margin-bottom: 20px;margin-right: 20px;float:right;margin-top: 25px" <Button type="primary" style="margin-bottom: 20px;margin-right: 20px;float:right;margin-top: 25px"
@click="addOneAccount()">+添加账户 @click="addOneAccount()">+添加账户
</Button> </Button>
<Button type="primary" ghost style="margin-bottom: 20px;margin-right: 20px;float:right;margin-top: 25px" <!-- <Button type="primary" ghost style="margin-bottom: 20px;margin-right: 20px;float:right;margin-top: 25px"-->
@click="uploadAccount">批量导入账户 <!-- @click="uploadAccount">批量导入账户-->
</Button> <!-- </Button>-->
</Row> </Row>
</template> </template>
<Table :columns="columns1" :data="data1" style="margin-top: 30px"></Table> <Table :columns="columns1" :data="data1" style="margin-top: 30px"></Table>
@ -202,9 +202,9 @@
}); });
}, },
// //
uploadAccount() { // uploadAccount() {
this.$router.push({path: '/account/upload'}); // this.$router.push({path: '/account/upload'});
}, // },
// //
listRoleInfo() { listRoleInfo() {
let that = this; let that = this;

@ -95,17 +95,17 @@
], ],
account: [ account: [
{required: true, message: '账号不能为空', trigger: 'blur'}, {required: true, message: '账号不能为空', trigger: 'blur'},
{min: 1, max: 12, message: '长度在 1 到 12 个字符', trigger: 'blur'}, {min: 2, max: 8, message: '长度在 2 到 8 个字符', trigger: 'blur'},
{pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母', trigger: 'blur'}, {pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母', trigger: 'blur'},
], ],
password: [ password: [
{required: true, message: '密码不能为空', trigger: 'blur'}, {required: true, message: '密码不能为空', trigger: 'blur'},
{min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur'}, {min: 6, max: 18, message: '长度在 6 到 18 个字符', trigger: 'blur'},
{pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母', trigger: 'blur'}, {pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母', trigger: 'blur'},
], ],
confirmPassword: [ confirmPassword: [
{required: true, message: '确认密码不能为空', trigger: 'blur'}, {required: true, message: '确认密码不能为空', trigger: 'blur'},
{min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur'}, {min: 6, max: 18, message: '长度在 6 到 18 个字符', trigger: 'blur'},
{pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母', trigger: 'blur'}, {pattern: /^[0-9a-zA-Z]*$/g, message: '只可以输入数字和字母', trigger: 'blur'},
], ],
}, },
@ -135,6 +135,8 @@
} }
}, },
mounted: function () { mounted: function () {
//
this.bus.$emit('setHeader',{header:"添加账户"});
//- //-
this.listRoleInfo(); this.listRoleInfo();
}, },

Loading…
Cancel
Save