员工等

src/components/page/Assessment.vue

@@ -146,6 +146,7 @@ export default {
         return {
             name: sessionStorage.getItem('ms_username'),
             userId: this.$store.state.userLoginId,
+            roleId: this.$store.state.userRoleId.includes(',') ? 13 : Number(this.$store.state.userRoleId),
             systemList: [
                 {
                     id: 1,
@@ -300,7 +301,6 @@ export default {
     },
     methods: {
         getData() {
-            // return 
             let data = {
                 type: this.form.type,
                 startTime: this.form.startTime,
@@ -311,6 +311,7 @@ export default {
                 pageNum: this.pageNo,
                 pageSize: this.pageSize,
                 userId: this.userId,
+                role: this.roleId
             }
             this.$post(this.api.assessmentByScreen,data).then(res => {
                 this.customerData = res.list.list

src/components/page/Staff.vue

@@ -363,8 +363,7 @@ export default {
         },
         getData(){
             let data = {
-                // staffProfessionalArchitectureIds: this.oneDepartmentIds,
-                staffProfessionalArchitectureIds: '',
+                staffProfessionalArchitectureIds: (this.oneDepartmentIds && this.twoDepartmentIds) ? '' : this.oneDepartmentIds,
                 staffGradeIds: this.twoDepartmentIds,
                 searchContent: this.encodeString(this.keyword),
                 page: this.pageNo,