From 95f24f6dae7c6622aba8df8f0346bf3dc9f2d0bf Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Wed, 10 Jan 2024 14:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E3=80=91=E8=81=8C=E5=B7=A5=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heli/employee/UserAssignRoleForm.vue      |  2 +-
 .../src/views/heli/employee/UserForm.vue      |  2 +-
 .../src/views/heli/employee/index.vue         | 19 ++++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserAssignRoleForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserAssignRoleForm.vue
index a4cd9656..6c313019 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserAssignRoleForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserAssignRoleForm.vue
@@ -1,6 +1,6 @@
 <template>
   <Dialog v-model="dialogVisible" title="分配角色">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="108px">
       <el-form-item label="工号">
         <el-input v-model="formData.username" :disabled="true" />
       </el-form-item>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserForm.vue
index e51d234b..b3a7b6ae 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserForm.vue
@@ -5,7 +5,7 @@
       v-loading="formLoading"
       :model="formData"
       :rules="formRules"
-      label-width="80px"
+      label-width="108px"
     >
       <el-row>
         <el-col :span="12">
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/index.vue
index 0eb2deed..2f364d71 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/employee/index.vue
@@ -1,14 +1,18 @@
 <template>
-  <el-row :gutter="20">
+<el-card class="hl-card">
+  <template #header>
+    <span>职工信息</span>
+  </template>
+    <el-row :gutter="20">
     <!-- 左侧部门树 -->
     <el-col :span="4" :xs="24">
-      <ContentWrap class="h-1/1">
+      <ContentWrap class="h-1/1" style="border:none">
         <DeptTree @node-click="handleDeptNodeClick" :key="queryParams.deptId === null"/>
       </ContentWrap>
     </el-col>
     <el-col :span="20" :xs="24">
       <!-- 搜索 -->
-      <ContentWrap>
+      <ContentWrap class="borderxx">
         <el-form
           class="-mb-15px"
           :model="queryParams"
@@ -34,7 +38,7 @@
               class="!w-240px"
             />
           </el-form-item>
-          <el-form-item label="启用状态" prop="status">
+          <el-form-item label="启用状态" prop="status" label-width="108px">
             <el-select
               v-model="queryParams.status"
               placeholder="请选择启用状态"
@@ -69,7 +73,7 @@
             />
           </el-form-item>-->
           <el-form-item>
-            <el-button @click="handleQuery"><Icon icon="ep:search" />搜索</el-button>
+            <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" />搜索</el-button>
             <el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button>
             <el-button
               type="primary"
@@ -100,7 +104,7 @@
         </el-form>
       </ContentWrap>
       <ContentWrap>
-        <el-table v-loading="loading" :data="list">
+        <el-table v-loading="loading" :data="list" class="hl-table" :stripe="true">
           <el-table-column label="序号" type="index" width="100" />
           <el-table-column
             label="工号"
@@ -191,6 +195,7 @@
     </el-col>
   </el-row>
 
+</el-card>
   <!-- 添加或修改对话框 -->
   <UserForm ref="formRef" @success="getList" />
   <!-- 导入对话框 -->
@@ -224,7 +229,7 @@ const queryParams = reactive({
   username: undefined,
   nickname: undefined,
   mobile: undefined,
-  status: undefined,
+  status: 0,
   deptId: undefined,
   createTime: []
 })