From 893d5c68e60d1cacc8753abee8f6f812172a0605 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 18 May 2021 11:47:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E4=B8=8D=E9=80=89?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/menu/index.vue |  6 +++---
 frontend/src/views/system/user/index.vue | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue
index f1d1212d5b..58dcc70cd7 100644
--- a/frontend/src/views/system/menu/index.vue
+++ b/frontend/src/views/system/menu/index.vue
@@ -27,7 +27,7 @@
             <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" :label="$t('menu.create_time')" >
+        <el-table-column prop="createTime" :label="$t('menu.create_time')">
           <template v-slot:default="scope">
             <span>{{ scope.row.createTime | timestampFormatDate }}</span>
           </template>
@@ -76,7 +76,7 @@
           <el-input v-model="form.title" :placeholder="$t('menu.button_name')" style="width: 179px;" />
         </el-form-item>
         <el-form-item v-show="form.type !== 0" :label="$t('menu.authority_identification')" prop="permission">
-          <el-input v-model="form.permission" :disabled="form.iframe || formType!=='add'" :placeholder="$t('menu.authority_identification')"  style="width: 179px;" />
+          <el-input v-model="form.permission" :disabled="form.iframe || formType!=='add'" :placeholder="$t('menu.authority_identification')" style="width: 179px;" />
         </el-form-item>
         <el-form-item v-if="form.type !== 2" label="$t('menu.route_addr')" prop="path">
           <el-input v-model="form.path" :placeholder="$t('menu.route_addr')" :disabled="formType!=='add'" style="width: 179px;" />
@@ -85,7 +85,7 @@
           <el-input-number v-model.number="form.menuSort" :min="0" :max="999" controls-position="right" style="width: 179px;" />
         </el-form-item>
         <el-form-item v-show="!form.iframe && form.type === 1" :label="$t('menu.module_name')" prop="componentName">
-          <el-input v-model="form.componentName" :disabled="formType!=='add'" style="width: 179px;" :placeholder="匹配组件内Name字段" />
+          <el-input v-model="form.componentName" :disabled="formType!=='add'" style="width: 179px;" placeholder="匹配组件内Name字段" />
         </el-form-item>
         <el-form-item v-show="!form.iframe && form.type === 1" label="$t('menu.path')" prop="component">
           <el-input v-model="form.component" :disabled="formType!=='add'" style="width: 179px;" :placeholder="$t('menu.path')" />
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index cca292902f..1a4e138d0f 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -14,18 +14,18 @@
         <!-- <fu-table-button v-permission="['user:add']" icon="el-icon-circle-plus-outline" :label="$t('user.create')" @click="create" /> -->
       </template>
 
-      <el-table-column prop="username" :label="$t('commons.name')"   />
-      <el-table-column prop="nickName" :label="$t('commons.nick_name')"   />
-      <el-table-column prop="gender" :label="$t('commons.gender')"   />
+      <el-table-column prop="username" :label="$t('commons.name')" />
+      <el-table-column prop="nickName" :label="$t('commons.nick_name')" />
+      <el-table-column prop="gender" :label="$t('commons.gender')" />
 
-      <el-table-column :show-overflow-tooltip="true" prop="phone"   :label="$t('commons.phone')" />
-      <el-table-column :show-overflow-tooltip="true"   prop="email" :label="$t('commons.email')" />
+      <el-table-column :show-overflow-tooltip="true" prop="phone" :label="$t('commons.phone')" />
+      <el-table-column :show-overflow-tooltip="true" prop="email" :label="$t('commons.email')" />
       <el-table-column :show-overflow-tooltip="true" prop="dept" :label="$t('commons.organization')">
         <template slot-scope="scope">
-          <div>{{ scope.row.dept.deptName }}</div>
+          <div>{{ scope.row.dept && scope.row.dept.deptName }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="status" :label="$t('commons.status')" >
+      <el-table-column prop="status" :label="$t('commons.status')">
         <template v-slot:default="scope">
           <el-switch v-model="scope.row.enabled" :active-value="1" :inactive-value="0" inactive-color="#DCDFE6" @change="changeSwitch(scope.row)" />
         </template>
@@ -64,11 +64,11 @@
 
         <el-form-item :label="$t('commons.gender')">
           <el-radio-group v-model="form.gender" style="width: 178px">
-            <el-radio  :label="$t('commons.man')">{{ $t('commons.man') }}</el-radio>
-            <el-radio  :label="$t('commons.woman')">{{ $t('commons.woman') }}</el-radio>
+            <el-radio :label="$t('commons.man')">{{ $t('commons.man') }}</el-radio>
+            <el-radio :label="$t('commons.woman')">{{ $t('commons.woman') }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item :label="$t('commons.status')" >
+        <el-form-item :label="$t('commons.status')">
           <el-radio-group v-model="form.enabled" style="width: 140px">
             <el-radio :label="1">{{ $t('commons.enable') }} </el-radio>
             <el-radio :label="0"> {{ $t('commons.disable') }} </el-radio>