From fd5b644be1dcea3eb1e0fdee9f9c4c9a0911ac75 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 30 Nov 2022 15:09:06 +0800
Subject: [PATCH] =?UTF-8?q?mdf:=E7=94=A8=E6=88=B7=EF=BC=8C=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=8E=BBjpa2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nladmin-ui/src/views/system/user/index.vue | 73 +++++++++++-----------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue
index 3eb0a79..4c3ad0f 100644
--- a/nladmin-ui/src/views/system/user/index.vue
+++ b/nladmin-ui/src/views/system/user/index.vue
@@ -2,27 +2,27 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--侧边部门数据-->
-      <el-col :xs="9" :sm="6" :md="5" :lg="5" :xl="4">
-        <div class="head-container">
-          <el-input
-            v-model="deptName"
-            clearable
-            size="mini"
-            placeholder="请输入部门名称"
-            prefix-icon="el-icon-search"
-            class="filter-item"
-            @input="getDeptDatas"
-          />
-        </div>
-        <el-tree
-          :data="deptDatas"
-          :load="getDeptDatas"
-          :props="defaultProps"
-          :expand-on-click-node="false"
-          lazy
-          @node-click="handleNodeClick"
-        />
-      </el-col>
+      <!--      <el-col :xs="9" :sm="6" :md="5" :lg="5" :xl="4">-->
+      <!--        <div class="head-container">-->
+      <!--          <el-input-->
+      <!--            v-model="deptName"-->
+      <!--            clearable-->
+      <!--            size="mini"-->
+      <!--            placeholder="请输入部门名称"-->
+      <!--            prefix-icon="el-icon-search"-->
+      <!--            class="filter-item"-->
+      <!--            @input="getDeptDatas"-->
+      <!--          />-->
+      <!--        </div>-->
+      <!--        <el-tree-->
+      <!--          :data="deptDatas"-->
+      <!--          :load="getDeptDatas"-->
+      <!--          :props="defaultProps"-->
+      <!--          :expand-on-click-node="false"-->
+      <!--          lazy-->
+      <!--          @node-click="handleNodeClick"-->
+      <!--        />-->
+      <!--      </el-col>-->
       <!--用户数据-->
       <el-col :xs="15" :sm="18" :md="19" :lg="19" :xl="20">
         <!--工具栏-->
@@ -90,8 +90,8 @@
               />
             </el-form-item>
             <br v-if="!crud.status.add">
-            <el-form-item label="密码" prop="password" v-if="crud.status.add">
-              <el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password"/>
+            <el-form-item v-if="crud.status.add" label="密码" prop="password">
+              <el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password" />
             </el-form-item>
             <el-form-item label="性别">
               <el-radio-group v-model="form.gender" style="width: 178px">
@@ -143,29 +143,27 @@
         >
           <el-table-column :selectable="checkboxT" type="selection" width="55" />
           <el-table-column show-overflow-tooltip prop="username" label="用户名" />
-          <el-table-column show-overflow-tooltip prop="nickName" label="姓名" />
+          <el-table-column show-overflow-tooltip prop="person_name" label="姓名" />
           <el-table-column prop="gender" label="性别" />
           <el-table-column show-overflow-tooltip prop="phone" width="100" label="电话" />
           <el-table-column show-overflow-tooltip width="135" prop="email" label="邮箱" />
-          <el-table-column show-overflow-tooltip prop="dept" label="部门">
-            <template slot-scope="scope">
-              <div>{{ scope.row.dept.name }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="状态" align="center" prop="enabled">
+          <el-table-column show-overflow-tooltip prop="deptnames" label="部门" />
+          <el-table-column label="状态" align="center" prop="is_used">
             <template slot-scope="scope">
               <el-switch
-                v-model="scope.row.enabled"
+                v-model="scope.row.is_used"
                 :disabled="user.id === scope.row.id"
                 active-color="#409EFF"
                 inactive-color="#F56C6C"
-                @change="changeEnabled(scope.row, scope.row.enabled)"
+                active-value="1"
+                inactive-value="0"
+                @change="changeEnabled(scope.row, scope.row.is_used)"
               />
             </template>
           </el-table-column>
-          <el-table-column show-overflow-tooltip prop="createTime" width="135" label="创建日期">
+          <el-table-column show-overflow-tooltip prop="create_time" width="135" label="创建日期">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.create_time) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -183,11 +181,12 @@
                 :disabled-dle="scope.row.id === user.id"
               />
               <el-button
-                type="text"
                 slot="left"
-                icon="el-icon-refresh-left"
                 v-permission="permission.edit"
-                @click="resetPassword(scope.row)">
+                type="text"
+                icon="el-icon-refresh-left"
+                @click="resetPassword(scope.row)"
+              >
                 重置密码
               </el-button>
             </template>