From 7df64634d3d7b292713eebfa008c40b3f5f9f65f Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期二, 20 九月 2022 15:57:03 +0800
Subject: [PATCH] 修改

---
 src/views/system/menu/component/menuDialog.vue |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/views/system/menu/component/menuDialog.vue b/src/views/system/menu/component/menuDialog.vue
index 960a05d..daf0dfc 100644
--- a/src/views/system/menu/component/menuDialog.vue
+++ b/src/views/system/menu/component/menuDialog.vue
@@ -18,40 +18,39 @@
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                         <el-form-item label="菜单名称">
-                            <el-input v-model="ruleForm.meta.title" placeholder="格式:message.router.xxx" clearable></el-input>
+                            <el-input v-model.trim="ruleForm.meta.title" placeholder="格式:message.router.xxx" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                         <el-form-item label="路由名称">
-                            <el-input v-model="ruleForm.name" placeholder="路由中的 name 值" clearable></el-input>
+                            <el-input v-model.trim="ruleForm.name" placeholder="路由中的 name 值" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                         <el-form-item label="路由路径">
-                            <el-input v-model="ruleForm.path" placeholder="路由中的 path 值" clearable></el-input>
+                            <el-input v-model.trim="ruleForm.path" placeholder="路由中的 path 值" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                         <el-form-item label="重定向">
-                            <el-input v-model="ruleForm.redirect" placeholder="请输入路由重定向" clearable></el-input>
+                            <el-input v-model.trim="ruleForm.redirect" placeholder="请输入路由重定向" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                         <el-form-item label="菜单图标">
-                            <el-input placeholder="请输入菜单图标" v-model="ruleForm.meta.icon" type="all" />
+                            <el-input placeholder="请输入菜单图标" v-model.trim="ruleForm.meta.icon" type="all" />
                             <!--							<IconSelector placeholder="请输入菜单图标" v-model="ruleForm.meta.icon" type="all" />-->
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                         <el-form-item label="组件路径">
-                            <el-input v-model="ruleForm.component" placeholder="组件路径" clearable></el-input>
+                            <el-input v-model.trim="ruleForm.component" placeholder="组件路径" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                         <el-form-item label="权限标识">
                             <el-select v-model="ruleForm.meta.roles" multiple placeholder="取角色管理" clearable class="w100">
-                                <el-option label="admin" value="admin"></el-option>
-                                <el-option label="common" value="common"></el-option>
+                                <el-option v-for="item in roleList" :key="item.roleId" :value="item.roleCode" :label="item.roleName"></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -86,7 +85,7 @@
             <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="onCancel" size="default">取 消</el-button>
-                    <el-button type="primary" @click="onSubmit" size="default">{{ buttonName }}</el-button>
+                    <el-button type="primary"  @click="onSubmit" size="default">{{ buttonName }}</el-button>
                 </span>
             </template>
         </el-dialog>
@@ -97,12 +96,10 @@
 import { reactive, toRefs, onMounted, defineComponent } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useRoutesList } from '/@/stores/routesList';
-import { i18n } from '/@/i18n/index';
 import IconSelector from '/@/components/iconSelector/index.vue';
 import { useMenuApi } from '/@/api/system/menu/index';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { Session } from '/@/utils/storage';
-// import { setBackEndControlRefreshRoutes } from "/@/router/backEnd";
+
 
 export default defineComponent({
     name: 'systemAddMenu',
@@ -137,6 +134,7 @@
                 },
                 btnPower: '' // 菜单类型为按钮时,权限标识
             },
+            roleList: [],
             menuData: [], // 上级菜单数据
             projectList: []
         });
@@ -152,8 +150,9 @@
             return arr;
         };
         // 打开弹窗
-        const openDialog = (type: string, value: any, projectList: any, projectId: string) => {
+        const openDialog = (type: string, value: any, projectList: any, projectId: string, roleList: []) => {
             state.projectList = JSON.parse(JSON.stringify(projectList));
+            state.roleList = roleList;
             state.isShowDialog = true;
             if (type === '新增') {
                 state.buttonName = '新增';

--
Gitblit v1.9.2