From 319dfc2de3db01f11ccdda006e8555a5f06a6e1b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 09 十月 2019 17:21:43 +0800
Subject: [PATCH] 修改函数命名防止冲突
---
ruoyi-ui/src/views/system/menu/index.vue | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 0cf7d60..440cdc3 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -44,7 +44,7 @@
<el-table-column prop="visible" label=" 可见" :formatter="visibleFormat" width="80px"></el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ dateFormat(scope.row.createTime) }}</span>
+ <span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
@@ -79,7 +79,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24" v-if="form.parentId !== 0">
- <el-form-item label="上级菜单" prop="parentId">
+ <el-form-item label="上级菜单">
<treeselect
v-model="form.parentId"
:options="menuOptions"
@@ -204,9 +204,6 @@
form: {},
// 表单校验
rules: {
- parentId: [
- { required: true, message: "上级菜单不能为空", trigger: "blur" }
- ],
menuName: [
{ required: true, message: "菜单名称不能为空", trigger: "blur" }
],
--
Gitblit v1.9.2