From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商

---
 admin/src/views/system/user.vue |   53 +++++++++++++++++++++++++----------------------------
 1 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index 82b7c6f..7ff8a45 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -44,38 +44,32 @@
     </el-form>
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
-      <div style="display: flex;">
-        <div style="width: 15%; border-right: 1px solid #ececec;">
-          <Tree
-            :list="data"
-            :defaultProps="defaultProps"
-            @callback="callback"
-          ></Tree>
-        </div>
-        <div style="width: 84%; margin-left: 1%;">
+
+
+        <div>
           <div class="zdy_box">
             <div style="display: flex; align-items: center;">
               <span>{{name ? name : '鍏ㄩ儴'}} 锛坽{tableData.pagination.total}}锛�</span>
             </div>
             <ul class="toolbar" v-permissions="['system:user:create', 'system:user:delete']">
-              <li v-permissions="['system:user:create']">
-                <ImportButton
-                  text="瀵煎叆"
-                  template-name="鐢ㄦ埛妯℃澘.xlsx"
-                  template-path="/template/user_import_template.xlsx"
-                  action="/system/user/importSystemUserBatch"
-                  @success="search"
-                />
-              </li>
+<!--              <li v-permissions="['system:user:create']">-->
+<!--                <ImportButton-->
+<!--                  text="瀵煎叆"-->
+<!--                  template-name="鐢ㄦ埛妯℃澘.xlsx"-->
+<!--                  template-path="/template/user_import_template.xlsx"-->
+<!--                  action="/system/user/importSystemUserBatch"-->
+<!--                  @success="search"-->
+<!--                />-->
+<!--              </li>-->
               <li v-permissions="['system:user:create']"><el-button type="primary" @click="$refs.operaUserWindow.open('鏂板缓鐢ㄦ埛')">娣诲姞鐢ㄦ埛</el-button></li>
-              <li v-permissions="['system:user:create']"><el-button type="primary" @click="changeZZ">鏇存崲缁勭粐</el-button></li>
+              <!-- <li v-permissions="['system:user:create']"><el-button type="primary" @click="changeZZ">鏇存崲缁勭粐</el-button></li> -->
               <li v-permissions="['system:user:delete']"><el-button @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
             </ul>
           </div>
           <el-table
             v-loading="isWorking.search"
             :data="tableData.list"
-            
+
             stripe
             border
             @selection-change="handleSelectionChange"
@@ -83,10 +77,10 @@
           >
             <el-table-column type="selection" align="center" width="55"></el-table-column>
             <el-table-column prop="realname" label="濮撳悕" align="center" min-width="100px" fixed="left"></el-table-column>
-            
+
             <el-table-column prop="mobile" label="鎵嬫満鍙风爜" align="center" min-width="120px"></el-table-column>
             <el-table-column prop="empNo" label="宸ュ彿" align="center" min-width="120px"></el-table-column>
-            <el-table-column prop="department.name" label="閮ㄩ棬" align="center" min-width="120px"></el-table-column>
+<!--            <el-table-column prop="department.name" label="閮ㄩ棬" align="center" min-width="120px"></el-table-column>-->
             <!-- <el-table-column prop="email" label="閭" align="center" min-width="180px"></el-table-column> -->
     <!--        <el-table-column prop="birthday" label="鐢熸棩" sortable="custom" sort-by="BIRTHDAY" align="center" min-width="100px"></el-table-column>
           --> <el-table-column prop="roles" label="瑙掕壊" align="center" min-width="160px" class-name="table-column-strings">
@@ -96,7 +90,7 @@
                 </ul>
               </template>
             </el-table-column>
-            <el-table-column prop="wechatName" label="寰俊鏄电О" align="center" min-width="120px"></el-table-column>
+<!--            <el-table-column prop="wechatName" label="寰俊鏄电О" align="center" min-width="120px"></el-table-column>-->
             <el-table-column prop="createUser" label="鍒涘缓浜�" align="center" min-width="100px">
               <template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.realname}}</template>
             </el-table-column>
@@ -137,7 +131,6 @@
             :pagination="tableData.pagination"
           ></pagination>
         </div>
-      </div>
     </template>
     <!-- 鏂板缓/淇敼 -->
     <OperaUserWindow ref="operaUserWindow" @success="handlePageChange(tableData.pagination.pageIndex)"/>
@@ -161,7 +154,7 @@
 import PositionSelect from '@/components/common/PositionSelect'
 import Tree from '@/components/common/Tree'
 import ImportButton from '@/components/common/ImportButton'
-import { resetPwd, updateById } from '@/api/system/user'
+import { resetPwd, updateStatusById } from '@/api/system/user'
 import { fetchAll } from '@/api/system/role'
 import { fetchTree } from '@/api/system/department'
 export default {
@@ -243,7 +236,7 @@
         }
         return newItem
       });
-      
+
     },
     getRoleAll () {
       fetchAll({})
@@ -271,11 +264,15 @@
     },
     // 淇敼鐘舵��
     changeStatus (item) {
-      updateById({
+      updateStatusById({
         id: item.id,
         status: item.status
       }).then(res => {
-        this.search()
+
+      }).catch(e => {
+        this.$tip.apiFailed(e)
+      }).finally(() => {
+        this.handlePageChange()
       })
     },
     resPwd() {

--
Gitblit v1.9.3