diff --git a/src/lang/en.js b/src/lang/en.js
index 82265ef..34062ef 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -83,7 +83,6 @@ export default {
     system: {
       menu: {
         name: 'name',
-        namePlaceholder: 'namePlaceholder',
         status: 'status',
         statusAll: 'All',
         statusVisible: 'visible',
@@ -111,6 +110,20 @@ export default {
         root: 'root',
 
         notEmpty: ' can not be empty'
+      },
+      role: {
+        name: 'name',
+        key: 'code',
+        status: 'status',
+        remark: 'remark',
+        permit: 'permit',
+
+        statusEnable: 'enable',
+        statusDisable: 'disable',
+
+        edit: 'edit',
+        allocate: 'allocate',
+        detail: 'detail'
       }
     }
   }
diff --git a/src/lang/zh.js b/src/lang/zh.js
index fd4bcd1..15f83c8 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -83,7 +83,6 @@ export default {
     system: {
       menu: {
         name: '菜单名称',
-        namePlaceholder: '请输入',
         status: '菜单状态',
         statusAll: '全部',
         statusVisible: '显示',
@@ -111,6 +110,20 @@ export default {
         root: '主类目',
 
         notEmpty: '不能为空'
+      },
+      role: {
+        name: '角色名称',
+        key: '角色编码',
+        status: '状态',
+        remark: '备注',
+        permit: '权限',
+
+        statusEnable: '启用',
+        statusDisable: '禁用',
+
+        edit: '编辑',
+        allocate: '分配用户',
+        detail: '详情'
       }
     }
   }
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 2e93fa5..efd6d41 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -4,14 +4,13 @@
       <el-form-item :label="$t('page.system.menu.name')+'：'" prop="menuName">
         <el-input
           v-model="queryParams.menuName"
-          :placeholder="$t('page.system.menu.namePlaceholder')"
+          :placeholder="$t('form.placeholderInput')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item :label="$t('page.system.menu.status')+'：'" prop="visible">
-        <el-select v-model="queryParams.visible" :placeholder="$t('page.system.menu.status')">
-          <el-option :label="$t('page.system.menu.statusAll')" value="" />
+        <el-select v-model="queryParams.visible" :placeholder="$t('form.placeholderSelect')">
           <el-option :label="$t('page.system.menu.statusVisible')" :value="0" />
           <el-option :label="$t('page.system.menu.statusHide')" :value="1" />
         </el-select>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index ab01a4a..7fca818 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,28 +1,28 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="角色名称" prop="roleName">
+      <el-form-item :label="$t('page.system.role.name')+'：'" prop="roleName">
         <el-input
           v-model="queryParams.roleName"
-          placeholder="请输入角色名称"
+          :placeholder="$t('form.placeholderInput')"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
+      <el-form-item :label="$t('page.system.role.key')+'：'" prop="roleKey">
         <el-input
           v-model="queryParams.roleKey"
-          placeholder="请输入权限字符"
+          :placeholder="$t('form.placeholderInput')"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item :label="$t('page.system.role.status')+'：'" prop="status">
         <el-select
           v-model="queryParams.status"
-          placeholder="角色状态"
+          :placeholder="$t('form.placeholderSelect')"
           clearable
           style="width: 240px"
         >
@@ -34,7 +34,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
+      <!-- <el-form-item label="创建时间">
         <el-date-picker
           v-model="dateRange"
           style="width: 240px"
@@ -44,10 +44,10 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
         ></el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('form.search')}}</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('form.reset')}}</el-button>
       </el-form-item>
     </el-form>
 
@@ -60,9 +60,9 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:role:add']"
-        >新增</el-button>
+        >{{$t('form.add')}}</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -94,16 +94,23 @@
           v-hasPermi="['system:role:export']"
         >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
-      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="显示顺序" prop="roleSort" width="100" />
-      <el-table-column label="状态" align="center" width="100">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <!-- <el-table-column label="角色编号" prop="roleId" width="120" /> -->
+      <el-table-column :label="$t('page.system.role.name')" prop="roleName" :show-overflow-tooltip="true" width="250" />
+      <el-table-column :label="$t('page.system.role.key')" prop="roleKey" :show-overflow-tooltip="true" width="250" />
+      <el-table-column :label="$t('page.system.role.remark')" prop="remark" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="显示顺序" prop="roleSort" width="100" /> -->
+      <el-table-column :label="$t('page.system.role.status')" prop="status" :show-overflow-tooltip="true" width="150">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status==='0'">{{$t('page.system.role.statusEnable')}}</span>
+          <span v-if="scope.row.status==='1'">{{$t('page.system.role.statusDisable')}}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="状态" align="center" width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -117,20 +124,48 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      </el-table-column> -->
+      <el-table-column :label="$t('form.operate')" align="center" class-name="small-padding fixed-width" width="200">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:role:edit']"
-          >修改</el-button>
+          >{{$t('page.system.role.edit')}}</el-button>
+
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+            v-if="scope.row.status==='0'"
+          >{{$t('page.system.role.statusDisable')}}</el-button>
+
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+            v-if="scope.row.status==='1'"
+          >{{$t('page.system.role.statusEnable')}}</el-button>
+
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+          >{{$t('page.system.role.allocate')}}</el-button>
+
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+          >{{$t('page.system.role.detail')}}</el-button>
+
+          <!-- <el-button
+            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
@@ -142,7 +177,7 @@
               <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
                 v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown> -->
         </template>
       </el-table-column>
     </el-table>