From 8e44ce5a0c75861e5fdca999e3dc5b6f61faa585 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期四, 16 二月 2023 09:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

---
 src/views/maintenance/userManagement.vue |   82 +++++++++++++---------------------------
 1 files changed, 27 insertions(+), 55 deletions(-)

diff --git a/src/views/maintenance/userManagement.vue b/src/views/maintenance/userManagement.vue
index 3aaa7c1..29aff91 100644
--- a/src/views/maintenance/userManagement.vue
+++ b/src/views/maintenance/userManagement.vue
@@ -15,7 +15,7 @@
           prop="uname"
           :label="$t('userManage.userInfoObj.uname')"
         >
-          <el-input v-model="queryForm.uname" />
+          <el-input v-model="queryForm.uname" style="width:200px"/>
         </el-form-item>
         <el-form-item
           prop="depid"
@@ -25,6 +25,7 @@
             :popper-append-to-body="false"
             v-model="queryForm.depName"
             placeholder="璇烽�夋嫨"
+            style="width:200px"
           >
             <el-option
               :value="queryForm.depid"
@@ -40,34 +41,9 @@
               />
             </el-option>
           </el-select>
-
-          <!-- <el-cascader
-            v-model="queryForm.depid"
-            :options="treeOptions"
-            filterable
-            ref="cascaderHandle"
-            @change="handleChange"
-            :show-all-levels="false"
-            :props="{
-              label: 'name',
-              value: 'id',
-              children: 'children',
-              checkStrictly: true,
-              emitPath: false,
-            }"
-          >
-          </el-cascader> -->
         </el-form-item>
-        <el-form-item>
-          <el-button
-            size="small"
-            @click="queryInfo()"
-            icon="el-icon-search"
-            type="primary"
-          >{{ $t('operatManage.ELM.search') }}
-          </el-button>
-        </el-form-item>
-        <el-form-item>
+        
+        <el-form-item style="float:right">
           <el-button
             type="info"
             size="small"
@@ -77,19 +53,17 @@
             {{ $t('operatManage.ELM.reset') }}
           </el-button>
         </el-form-item>
-
-        <el-form-item>
+        <el-form-item style="float:right" v-show="setbatchFlag">
           <el-button
-            v-if="menuStatus.insert"
-            type="success"
+            v-if="menuStatus.update"
             size="small"
-            @click="showAddDialog"
-            icon="el-icon-plus"
-          >
-            {{ $t('common.append') }}
+            @click="editPwd"
+            type="warning"
+            icon="el-icon-unlock"
+          >{{ $t('common.changepassWord') }}
           </el-button>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="float:right">
           <el-button
             v-if="menuStatus.delete"
             type="danger"
@@ -100,26 +74,27 @@
             {{ $t('common.delete') }}
           </el-button>
         </el-form-item>
-        <el-form-item v-show="setbatchFlag">
+        <el-form-item style="float:right">
           <el-button
-            v-if="menuStatus.update"
+            v-if="menuStatus.insert"
+            type="success"
             size="small"
-            @click="editPwd"
-            type="warning"
-            icon="el-icon-unlock"
-          >{{ $t('common.changepassWord') }}
+            @click="showAddDialog"
+            icon="el-icon-plus"
+          >
+            {{ $t('common.append') }}
           </el-button>
         </el-form-item>
       </el-form>
     </div>
-    <div class="table_box subpage_Div">
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%;overflow: auto;height: 900px;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
+    <div style="height: 73%">
+          <el-table
+            ref="filterTable"
+            :data="tableData"
+            style="width: 100%"
+            height="90%"
+          >
+          <el-table-column
           type="selection"
           width="55"
         />
@@ -128,7 +103,6 @@
           type="index"
           :label="$t('common.index')"
           width="70px"
-          fixed
         />
 
         <el-table-column
@@ -136,7 +110,6 @@
           prop="uname"
           width="150px"
           :label="$t('userManage.userInfoObj.uname')"
-          fixed
         />
         <el-table-column
           align="center"
@@ -239,7 +212,6 @@
         <el-table-column
           :label="$t('common.operate')"
           width="80px"
-          fixed="right"
           v-if="menuStatus.update"
         >
           <template slot-scope="scope">
@@ -249,7 +221,7 @@
               plain
               @click="editInfo(scope.row)"
               size="small"
-            >{{ $t('common.edit') }}</el-button>
+            >{{ $t('common.update') }}</el-button>
           </template>
         </el-table-column>
       </el-table>

--
Gitblit v1.9.3