From a8a9df5cd461b8139287d55565cff3e5c15f48d2 Mon Sep 17 00:00:00 2001
From: zhangdaihao <zhangdaiscott@163.com>
Date: Tue, 28 May 2019 10:34:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E8=8F=9C=E5=8D=9540?=
 =?UTF-8?q?4=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=8F=9C=E5=8D=95=E8=B7=AF=E7=94=B1=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E2=80=9C=E6=98=AF=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/system/modules/PermissionModal.vue  | 40 ++++++++-----------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/ant-design-jeecg-vue/src/views/system/modules/PermissionModal.vue b/ant-design-jeecg-vue/src/views/system/modules/PermissionModal.vue
index 506bef7..c411282 100644
--- a/ant-design-jeecg-vue/src/views/system/modules/PermissionModal.vue
+++ b/ant-design-jeecg-vue/src/views/system/modules/PermissionModal.vue
@@ -214,7 +214,8 @@
         });
       },
       add () {
-        this.edit({status:'1',permsType:'1'});
+        // 默认值
+        this.edit({status:'1',permsType:'1',route:true});
       },
       edit (record) {
         this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度
@@ -222,30 +223,21 @@
         this.model = Object.assign({}, record);
         //--------------------------------------------------------------------------------------------------
         //根据菜单类型，动态展示页面字段
-        if(record){
-          console.log(record)
-          this.alwaysShow = !record.alwaysShow?false:true;
-          this.menuHidden = !record.hidden?false:true;
-          this.routeSwitch = record.route;
+        console.log(record)
+        this.alwaysShow = !record.alwaysShow?false:true;
+        this.menuHidden = !record.hidden?false:true;
+        if(record.route!=null){
+          this.routeSwitch = record.route?true:false;
+        }
 
-          //console.log('record.menuType', record.menuType);
-          this.show = record.menuType==2?false:true;
-          this.menuLabel = record.menuType==2?'按钮/权限名称':'菜单名称';
+        //console.log('record.menuType', record.menuType);
+        this.show = record.menuType==2?false:true;
+        this.menuLabel = record.menuType==2?'按钮/权限':'菜单名称';
 
-          if(this.model.parentId){
-            this.localMenuType = 1;
-          }else{
-            this.localMenuType = 0;
-          }
+        if(this.model.parentId){
+          this.localMenuType = 1;
         }else{
-          if(this.model.parentId){
-            this.localMenuType = 1;
-          }else{
-            this.localMenuType = 0;
-          }
-          this.show = true;
-          this.menuLabel = '菜单名称';
-          this.routeSwitch = true;
+          this.localMenuType = 0;
         }
         //----------------------------------------------------------------------------------------------
 
@@ -303,11 +295,11 @@
         }
       },
       onChangeMenuType(e) {
-        console.log('localMenuType checked', e.target.value)
+        //console.log('localMenuType checked', e.target.value)
         this.localMenuType=e.target.value
         if(e.target.value == 2){
           this.show = false;
-          this.menuLabel = '按钮/权限名称';
+          this.menuLabel = '按钮/权限';
         }else{
           this.show = true;
           this.menuLabel = '菜单名称';
-- 
GitLab