From 4c2ef7f4beb69879375cc76752999de8cf2d8a73 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 25 Apr 2022 14:22:25 +0800
Subject: [PATCH] fix bug

---
 .../complaint-detail/complaint-detail.component.ts           | 5 +++--
 .../components/role-management/edit/edit.component.ts        | 2 ++
 .../components/role-management/menu/menu.component.ts        | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts
index 0c311e0e..19ee68de 100644
--- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts
+++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts
@@ -195,7 +195,7 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
     }
     this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
       if(res) {
-        this.service.msgSrv.success('已拒绝！')
+        this.service.msgSrv.success('已取消！')
         this.isVisibleRE = false
         this.getDetail(this.id);
         this.complaintStatus = true;
@@ -214,9 +214,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
       return
     }
     const paramsa = {
+      ...this.sfView.value,
       id: this.channelId
     }
-    this.service.request(this.service.$api_get_canelComplaint, paramsa).subscribe((res: any) =>{
+    this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
       if(res) {
         this.service.msgSrv.success('已拒绝！')
         this.isVisibleRE = false
diff --git a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts
index a390161f..70a60ca2 100644
--- a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts
+++ b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts
@@ -73,6 +73,8 @@ console.log(this.params.infoUrl)
     });
   }
   getData(res: { authority: any[]; authorityAssistId: any[] }) {
+    console.log('修改了');
+    
     this.authority = res.authority;
     this.authorityAssistId = res.authorityAssistId;
   }
diff --git a/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts b/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts
index 34a9ba11..2a17332c 100644
--- a/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts
+++ b/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts
@@ -63,8 +63,6 @@ export class SettingMenuComponent implements OnInit, OnChanges {
       // 判断此菜单权限是否已经存在权限列表中
       // 当前操作菜单id存在权限列表里
       this.authority.forEach(menuItem => {
-        console.log(menuItem);
-        console.log(item);
         
         if (menuItem.authorityId === origin.id) {
           menuItem.buttonAuthorityIds = menuItem.buttonAuthorityIds || []; // 防止属性不存在，给属性指定数据类型
@@ -73,9 +71,12 @@ export class SettingMenuComponent implements OnInit, OnChanges {
             if (item.checked) {
               if (menuItem.buttonAuthorityIds.indexOf(item.functionButtonId) === -1) {
                 // 如果该按钮在数据权限数组中不存在
+                console.log('不存在');
+                
                 menuItem.buttonAuthorityIds.push(item.functionButtonId);
               }
             } else {
+              console.log('存在');
               if (menuItem.buttonAuthorityIds && menuItem.buttonAuthorityIds.length) {
                 menuItem.buttonAuthorityIds.forEach((btnItem: any, index: any) => {
                   if (btnItem === item.functionButtonId) {