From bf2338f5cc71890cda247d46edcffa42e21871f6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 07 十一月 2024 09:44:42 +0800
Subject: [PATCH] 优化需求

---
 company/src/views/system/user.vue |   42 +++++++++++++++++++++++++++---------------
 1 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/company/src/views/system/user.vue b/company/src/views/system/user.vue
index e43e158..d6acebf 100644
--- a/company/src/views/system/user.vue
+++ b/company/src/views/system/user.vue
@@ -2,21 +2,12 @@
   <TableLayout :permissions="['system:user:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="80px" inline>
-<!--      <el-form-item label="鐢ㄦ埛鍚�" prop="username">-->
-<!--        <el-input v-model="searchForm.username" v-trim placeholder="璇疯緭鍏ョ敤鎴峰悕" @keypress.enter.native="search"/>-->
-<!--      </el-form-item>-->
       <el-form-item label="濮撳悕" prop="realname">
         <el-input v-model="searchForm.realname" v-trim placeholder="璇疯緭鍏�" @keypress.enter.native="search"/>
       </el-form-item>
-<!--      <el-form-item label="鎵嬫満鍙风爜" prop="mobile">-->
-<!--        <el-input v-model="searchForm.mobile" v-trim placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" @keypress.enter.native="search"/>-->
-<!--      </el-form-item>-->
-<!--            <el-form-item label="鎵�灞為儴闂�" prop="rootDeptId">-->
-<!--        <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" clearable/>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="宀椾綅" prop="positionId">-->
-<!--        <PositionSelect v-model="searchForm.positionId" placeholder="璇烽�夋嫨宀椾綅" clearable/>-->
-<!--      </el-form-item>-->
+      <el-form-item label="鎵�灞為儴闂�" prop="companyDepartmentPathName">
+        <el-input v-model="searchForm.companyDepartmentPathName" v-trim placeholder="璇疯緭鍏�" @keypress.enter.native="search"/>
+      </el-form-item>
       <section>
         <el-button type="primary" icon="el-icon-search" @click="search">鎼滅储</el-button>
         <el-button @click="reset">閲嶇疆</el-button>
@@ -44,6 +35,19 @@
         <el-table-column prop="username" label="璐﹀彿" min-width="120px"></el-table-column>
         <el-table-column prop="realname" label="濮撳悕" min-width="100px"></el-table-column>
         <el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="100px"></el-table-column>
+        <el-table-column label="涓荤" min-width="100px">
+            <template slot-scope="{ row }">
+                <el-switch
+                    v-model="row.headStatus"
+                    @change="setHeadStatus($event, row)"
+                    active-color="#13ce66"
+                    inactive-color="#ff4949"
+                    :active-value="1"
+                    :inactive-value="0">
+                </el-switch>
+            </template>
+        </el-table-column>
+        <el-table-column prop="companyDepartmentPathName" label="鎵�鍦ㄩ儴闂�" min-width="100px"></el-table-column>
         <el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
           <template slot-scope="{row}">
             <ul>
@@ -72,7 +76,7 @@
         >
 <!--          row.id !== userInfo.id &&-->
           <template v-if="isAdmin || (row.roles.findIndex(r => r.code === adminCode) === -1)" slot-scope="{row}">
-            <el-button type="text" icon="el-icon-edit" @click="$refs.operaUserWindow.open('缂栬緫鐢ㄦ埛', row)" v-permissions="['system:user:update']">缂栬緫</el-button>
+            <el-button type="text" icon="el-icon-edit" @click="$refs.operaUserWindow.open('缂栬緫鐢ㄦ埛', {...row, departmentId: [row.departmentId]})" v-permissions="['system:user:update']">缂栬緫</el-button>
             <el-button type="text" @click="$refs.allocationEnterprises.open('鍒嗛厤浼佷笟', row)" v-if="userInfo.type !== 1">鍒嗛厤浼佷笟</el-button>
             <el-button type="text" icon="el-icon-s-custom" @click="$refs.roleConfigWindow.open(row)" v-permissions="['system:user:createUserRole']">閰嶇疆瑙掕壊</el-button>
             <el-button type="text" @click="$refs.resetPwdWindow.open(row)" v-permissions="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-button>
@@ -107,7 +111,7 @@
 import ResetPwdWindow from '@/components/system/user/ResetPwdWindow'
 import DepartmentSelect from '@/components/common/DepartmentSelect'
 import PositionSelect from '@/components/common/PositionSelect'
-import { updUserStatus } from '@/api/system/user'
+import { updUserStatus, updateHead } from '@/api/system/user'
 
 export default {
   name: 'SystemUser',
@@ -121,7 +125,8 @@
         realname: '', // 濮撳悕
         rootDeptId: null, // 閮ㄩ棬ID
         positionId: null, // 宀椾綅ID
-        mobile: '' // 鎵嬫満鍙风爜
+        mobile: '', // 鎵嬫満鍙风爜
+        companyDepartmentPathName: ''   // 閮ㄩ棬鍚嶇О
       }
     }
   },
@@ -138,6 +143,13 @@
     this.search()
   },
   methods: {
+    // 璁剧疆鍙栨秷涓荤
+    setHeadStatus(e, row) {
+      updateHead({ id: row.id, headStatus: row.headStatus })
+        .then(res => {
+          this.search()
+        })
+    },
     changeStatus(status, row) {
       updUserStatus({
         id: row.id,

--
Gitblit v1.9.3