调整新建菜单

src/views/permission/menu-config/menu-list.vue

@@ -98,15 +98,11 @@
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="角色类型">
-          <el-checkbox-group v-model="editMenu.roleType">
-            <el-checkbox :label="1">管理员</el-checkbox>
-            <el-checkbox :label="2">门店角色</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
         <el-form-item label="权限适用">
           <el-radio-group v-model="editMenu.roleRange">
             <el-radio :label="1">管理员权限集</el-radio>
+            <el-radio :label="2">管理员和门店适用</el-radio>
+            <el-radio :label="3">门店适用</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -162,8 +158,7 @@ export default {
         menuIcon: '',
         openType: 1, // 1当前页2新开页
         menuFlag: 1, // 是否作为节点1是0否
-        roleType: [], // 1管理角色2门店角色
-        roleRange: 1, // 1管理员适用
+        roleRange: 1, // 1管理员适用2管理员和门店适用3门店适用
       },
       editMenuRules: {
         hbVersion: [{ required: true, message: '请选择好办版本', trigger: 'change' }],
@@ -223,7 +218,7 @@ export default {
     },
     // 新建节点、新建子节点、编辑节点弹窗打开
     onEditMenu(menuData, isSubMenu) {
-      const { parentCode, parentId, menuId, menuName, hbVersion, code, menuUrl, menuIcon, openType, menuFlag, roleType, roleRange } = menuData || {};
+      const { parentCode, parentId, menuId, menuName, hbVersion, code, menuUrl, menuIcon, openType, menuFlag, roleRange } = menuData || {};
       // 新建子节点
       if (isSubMenu) {
         Object.assign(this.editMenu, {
@@ -244,10 +239,9 @@ export default {
           code,
           menuUrl,
           menuIcon,
-          openType: typeof openType == 'undefined' ? 1 : openType,
-          menuFlag: typeof menuFlag == 'undefined' ? 1 : menuFlag,
-          roleType: typeof roleType == 'string' && roleType.length > 0 ? roleType.split(',') : [],
-          roleRange: typeof roleRange == 'undefined' ? 1 : roleRange
+          openType: openType ? openType : 1,
+          menuFlag: menuFlag ? menuFlag : 0,
+          roleRange: roleRange ? roleRange : 1
         });
       }
       Object.assign(this.editMenu, { show: true });
@@ -266,7 +260,6 @@ export default {
         menuIcon: '',
         openType: 1,
         menuFlag: 1,
-        roleType: [],
         roleRange: 1
       })
       this.$nextTick(this.$refs.editMenu.clearValidate);
@@ -275,7 +268,7 @@ export default {
     onEditMenuSave() {
       this.$refs.editMenu.validate(vali => {
         if (!vali) return;
-        const { isSubMenu, menuId, menuName, parentId, hbVersion, code, menuUrl, menuIcon, openType, menuFlag, roleType, roleRange } = this.editMenu;
+        const { isSubMenu, menuId, menuName, parentId, parentCode, hbVersion, code, menuUrl, menuIcon, openType, menuFlag, roleRange } = this.editMenu;
         const params = {
           menuName,
           hbVersion,
@@ -284,7 +277,6 @@ export default {
           menuIcon,
           openType,
           menuFlag,
-          roleType: roleType.join(','),
           roleRange
         }
         if (parentId) {
@@ -296,6 +288,7 @@ export default {
           editMenu(params).then(succ.bind(this, '保存成功！')).finally(() => this.editMenu.loading = false);
         } else {
           params.appType = this.appType;
+          params.parentCode = parentCode;
           // 新建节点、新建子节点
           addMenu(params).then(succ.bind(this, '新建成功！')).finally(() => this.editMenu.loading = false);
         }

src/views/permission/operation-list/operation-table.vue

@@ -221,7 +221,7 @@ export default {
         operationItemCode,
         operationItemUrl,
         authItemFlag,
-        roleRange: typeof roleRange == 'undefined' ? '1' : roleRange,
+        roleRange: roleRange ? roleRange : '1',
         version
       });
       function getFullId(menuList, menuId) {