From c78889e71d16d26c03ff59746db47c6d4d2b98e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 20:41:25 +0800
Subject: [PATCH] Merge branch 'master' into dev

---
 src/components/flow/User/MultUser.vue |   37 ++++++++++++++++---------------------
 1 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/components/flow/User/MultUser.vue b/src/components/flow/User/MultUser.vue
index 8e1f059..58971e8 100644
--- a/src/components/flow/User/MultUser.vue
+++ b/src/components/flow/User/MultUser.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      :title="`閫夋嫨杞姙鎺ユ敹浜哄憳`"
+      :title="title"
       :visible.sync="show"
       width="65%"
       :destroy-on-close="true"
@@ -39,11 +39,12 @@
         <!--鐢ㄦ埛鏁版嵁-->
         <el-col :span="18" :xs="24">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
+            <el-form-item label="鐢ㄦ埛鍚嶇О" prop="nickName">
               <el-input
-                v-model="queryParams.userName"
-                placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
+                v-model="queryParams.nickName"
+                placeholder="璇疯緭鍏ョ敤鎴峰鍚�"
                 clearable
+                @clear="handleQuery"
                 style="width: 150px"
                 @keyup.enter.native="handleQuery"
               />
@@ -80,7 +81,7 @@
 </template>
 
 <script>
-import { listUser, deptTreeSelect } from "@/api/system/user";
+import {listUser, deptTreeSelect, deptTreeSelectNoAuth, listUserNoAuth} from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {StrUtil} from '@/utils/StrUtil'
@@ -95,6 +96,11 @@
       required: true,
       type: Boolean
     },
+    title: {
+      type: String,
+      required: false,
+      default: '鍊欓�変汉鍛�'
+    },
     // 鍥炴樉鏁版嵁浼犲��
     selectUserList: {
       type: Array,
@@ -108,24 +114,16 @@
       innerSelected: [], // 閫変腑
       // 閬僵灞�
       loading: false,
-      // 閫変腑鏁扮粍
-      ids: [],
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
       // 鐢ㄦ埛琛ㄦ牸鏁版嵁
       userList: [],
-      // 寮瑰嚭灞傛爣棰�
-      title: "",
       // 閮ㄩ棬鏍戦�夐」
       deptOptions: undefined,
-      // 鏄惁鏄剧ず寮瑰嚭灞�
-      open: false,
       // 閮ㄩ棬鍚嶇О
       deptName: undefined,
-      // 琛ㄥ崟鍙傛暟
-      form: {},
       defaultProps: {
         children: "children",
         label: "label"
@@ -134,7 +132,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 5,
-        userName: undefined,
+        nickName: undefined,
         phonenumber: undefined,
         status: undefined,
         deptId: undefined
@@ -162,7 +160,8 @@
     this.getList();
   },
   methods: {
-    getRowKeys(row) {
+    // 淇濆瓨閫変腑鐨勬暟鎹甶d,row-key灏辨槸瑕佹寚瀹氫竴涓猭ey鏍囪瘑杩欎竴琛岀殑鏁版嵁
+    getRowKey (row) {
       return row.userId
     },
     setChecked(val) {
@@ -177,7 +176,7 @@
     /** 鏌ヨ鐢ㄦ埛鍒楄〃 */
     getList() {
       this.loading = true;
-      listUser(this.queryParams).then(response => {
+      listUserNoAuth(this.queryParams).then(response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -186,13 +185,9 @@
     },
     /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
     getDeptTree() {
-      deptTreeSelect().then(response => {
+      deptTreeSelectNoAuth().then(response => {
         this.deptOptions = response.data;
       });
-    },
-    // 淇濆瓨閫変腑鐨勬暟鎹甶d,row-key灏辨槸瑕佹寚瀹氫竴涓猭ey鏍囪瘑杩欎竴琛岀殑鏁版嵁
-    getRowKey (row) {
-      return row.userId
     },
     // 绛涢�夎妭鐐�
     filterNode(value, data) {

--
Gitblit v1.8.0