Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/system/role-form.vue

@@ -9,16 +9,13 @@
 
   .role-form .role_MenuList {
     width: 100%;
-    height: 40px;
+    height: auto;
     border-radius: 3px;
     border: 1px solid #2961FE;
     color: #2961FE;
     align-items: center;
     font-size: 12px;
-    white-space: nowrap;
   }
-
-
   .role-form .role_TreeList {
     height: 250px;
     overflow: auto;
@@ -52,8 +49,9 @@
   }
 
 
-  .role-form .role_MenuList span {
-    width: 80px;
+  .role-form .role_MenuList>span {
+    width: auto;
+    padding:0 14px;
     display: inline-block;
     text-align: center;
     height: 100%;
@@ -71,7 +69,7 @@
   }
 
   .role-form .role_ItemList {
-    width: 200px;
+    min-width: 200px;
     height: 300px;
     background-color: #F1F1F1;
     margin-right: 10px;

src/pages/system/processSet.vue

@@ -75,10 +75,10 @@
             name: "5",
             label: "临时上课邀请流程"
           },
-          {
-            name: "6",
-            label: "分拆"
-          }
+          // {
+          //   name: "6",
+          //   label: "分拆"
+          // }
         ],
         tabCheck: '1',
       }