Pre Merge pull request !373 from 试着奔跑的菜鸟/master

ruoyi-ui/src/views/system/menu/index.vue

@@ -130,7 +130,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12" v-if="form.menuType != 'F'">
+          <el-col :span="24" v-if="form.menuType != 'F'">
             <el-form-item label="菜单图标" prop="icon">
               <el-popover
                 placement="bottom-start"
@@ -151,11 +151,6 @@
               </el-popover>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -163,15 +158,9 @@
               <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="form.menuType == 'C'">
-            <el-form-item prop="routeName">
-              <el-input v-model="form.routeName" placeholder="请输入路由名称" />
-              <span slot="label">
-                <el-tooltip content="默认不填则和路由地址相同：如地址为：`user`，则名称为`User`（注意：为避免名字的冲突，特殊情况下请自定义，保证唯一性）" placement="top">
-                <i class="el-icon-question"></i>
-                </el-tooltip>
-                路由名称
-              </span>
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="orderNum">
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
             </el-form-item>
           </el-col>
         </el-row>