权限控制

src/pages/shop/IncreaseDataCompany.vue

@@ -59,7 +59,7 @@
                         key: 'allCustomer'
                     },
                     {
-                        title: '有效好友总数',
+                        title: '总好友数（去重）',
                         key: 'effectiveCustomer'
                     },
                     {
@@ -67,15 +67,15 @@
                         key: 'newCustomer'
                     },
                     {
-                        title: '新增有效好友数',
+                        title: '新增好友数（去重）',
                         key: 'newEffectiveCustomer'
                     },
                     {
-                        title: '日增有效好友平均',
+                        title: '日增好友平均（去重）',
                         key: 'avgNewCustomer'
                     },
                     {
-                        title: '删除/拉黑成员好友数（累计）',
+                        title: '删除/拉黑成员客户数（累计）',
                         key: 'delCustomer'
                     },
                     {
@@ -116,7 +116,10 @@
                         return;
                     }
                     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("请选择日期");
                     return
                 }
+                debugger
+                let orgId = this.selectedCompany;
+                if(this.selectedCompany === '-1'){
+                    orgId = null;
+                }
                 let request = {
                     startTime: this.selectDate[0],
                     endTime: this.selectDate[1],
-                    orgId: this.selectedCompany,
+                    orgId: orgId,
                     pageNum: this.pageNum,
                     pageSize: this.pageSize
                 };

src/pages/shop/IncreaseDataStaff.vue

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

src/pages/shop/IncreaseDataStore.vue

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

src/pages/user/AccountManager.vue

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

src/pages/user/AccountManagerAdd.vue

@@ -95,17 +95,17 @@
                     ],
                     account: [
                         {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'},
                     ],
                     password: [
                         {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'},
                     ],
                     confirmPassword: [
                         {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'},
                     ],
                 },
@@ -135,6 +135,8 @@
             }
         },
         mounted: function () {
+            //设置面包屑
+            this.bus.$emit('setHeader',{header:"添加账户"});
             //查询所有角色-下拉框
             this.listRoleInfo();
         },