duy 2 жил өмнө
parent
commit
3359708b2f

+ 28 - 11
src/views/system/menu.vue

@@ -14,11 +14,13 @@
             <template #extra>
                 <div class="ml-2">
                         <el-button type="primary" @click="addClick"  size="large">
+                            <HcIcon name="add"/>
                             <span>新增</span>
                         </el-button>
                 </div>
                 <div class="ml-2">
                         <el-button type="danger" @click="cancelClick"  size="large" :disabled="tableCheckedKeys.length <= 0">
+                            <HcIcon name="delete-bin-2"/>
                             <span>删除</span>
                         </el-button>
                 </div>
@@ -37,16 +39,16 @@
                 <HcPages :pages="searchForm" @change="pageChange"></HcPages>
             </template>
             <HcDialog bgColor="#ffffff" isToBody :show="addModal" :title="modalTitle+'菜单'" @close="addModalClose"  widths="80rem">
-                <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="left"
+                <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="left" label-width="auto"
                              size="large">
                         <el-row :gutter="20">
                             <el-col :span="12">
-                                <el-form-item label="菜单名称">
+                                <el-form-item label="菜单名称:" prop="name">
                                     <el-input v-model="formModel.name" />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="菜单类型">
+                                <el-form-item label="菜单类型:" prop="type">
                                     <el-radio-group v-model="formModel.type">
                                         <el-radio :label="3">菜单</el-radio>
                                         <el-radio :label="6">按钮</el-radio>
@@ -54,15 +56,14 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="路由地址">
+                                <el-form-item label="路由地址:" prop="location">
                                     <el-input v-model="formModel.idNumber"  placeholder=""/>
                                 </el-form-item>
                             </el-col>
                       
                             <el-col :span="12">
-                                <el-form-item label="上级菜单">
-
-                                        <el-select v-model="formModel.top" class="m-2" placeholder="请选择" size="large" style="width:100%">
+                                <el-form-item label="上级菜单:">
+                                        <el-select v-model="formModel.top" class="block" placeholder="请选择" size="large" >
                                             <el-option
                                             v-for="item in topMenuoptions"
                                             :key="item.value"
@@ -75,17 +76,17 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="菜单编号">
+                                <el-form-item label="菜单编号:">
                                     <el-input v-model="formModel.deptId"  placeholder=""/>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="菜单图标">
+                                <el-form-item label="菜单图标:">
                                     <el-input v-model="formModel.deptId"  placeholder=""/>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="排序">
+                                <el-form-item label="排序:">
                                     <el-input v-model="formModel.deptId"  placeholder=""/>
                                 </el-form-item>
                             </el-col>
@@ -187,7 +188,23 @@ const eidtModal=()=>{
 }
 const formRef=ref(null)
 const formModel=ref({})
-const formRules=ref({})
+const formRules = {
+    name: {
+        required: true,
+        trigger: 'blur',
+        message: "请输入菜单名称"
+    },
+    location: {
+        required: true,
+        trigger: 'blur',
+        message: "请输入路由地址"
+    },
+    type: {
+        required: true,
+        trigger: 'blur',
+        message: "请选择类型"
+    }
+}
 const topMenuoptions=ref([])
 </script>
 

+ 2 - 0
src/views/system/user.vue

@@ -19,11 +19,13 @@
             <template #extra>
                 <div class="ml-2">
                         <el-button type="primary" @click="addClick"  size="large">
+                            <HcIcon name="add"/>
                             <span>创建账户</span>
                         </el-button>
                 </div>
                 <div class="ml-2">
                         <el-button type="danger" @click="cancelClick"  size="large" :disabled="tableCheckedKeys.length <= 0">
+                            <HcIcon name="delete-bin-2"/>
                             <span>注销账户</span>
                         </el-button>
                 </div>