From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/system/user/index.vue | 398 +++++++++++++++++++++++++++++---------------------------
1 files changed, 205 insertions(+), 193 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a999c8f..0fb4722 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -3,107 +3,121 @@
<el-row :gutter="20">
<splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">
<!--閮ㄩ棬鏁版嵁-->
- <pane size="16">
+ <pane size="12">
<el-col>
<div class="head-container addButton">
- <el-input v-model="deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
- <el-button style="margin-left: 4px" type="primary" plain icon="el-icon-plus" size="mini" circle @click="addSchema"></el-button>
+ <el-input v-model="deptName" placeholder="閮ㄩ棬鍚嶇О" clearable size="small" prefix-icon="el-icon-search"
+ style="margin-bottom: 20px" />
+ <!-- <el-button style="margin-left: 4px" type="primary" plain icon="el-icon-plus" size="mini" circle
+ @click="addSchema"></el-button> -->
</div>
<div class="head-container">
- <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
+ <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+ :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+ @node-click="handleNodeClick" />
</div>
</el-col>
</pane>
<!--鐢ㄦ埛鏁版嵁-->
- <pane size="84">
+ <pane size="88">
<div class="search_form">
<div>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鐢ㄦ埛鍚嶇О" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form-item label="鐢ㄦ埛鍚嶇О" prop="nickName">
+ <el-input v-model="queryParams.nickName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable
+ @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鐘舵��" prop="state">
- <el-select v-model="queryParams.state" placeholder="鐢ㄦ埛鐘舵��" clearable style="width: 240px">
- <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="queryParams.status" placeholder="鐢ㄦ埛鐘舵��" clearable @change="handleQuery">
+ <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌� 璇�</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
+ <el-button type="primary" size="mini" @click="handleQuery">鏌ヨ</el-button>
+ <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
</div>
<div class="options_button">
- <el-button type="primary" size="mini" @click="openthirdParty" v-hasPermi="['system:user:add']">鑾峰彇涓夋柟浜哄憳</el-button>
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">鏂板鐢ㄦ埛</el-button>
+ <el-button type="primary" size="mini" @click="openthirdParty"
+ v-hasPermi="['system:user:add']">鑾峰彇涓夋柟浜哄憳</el-button>
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['system:user:add']">鏂板鐢ㄦ埛</el-button>
</div>
</div>
<el-col>
- <el-table v-loading="loading" :data="userList">
+ <el-table v-loading="loading" :data="userList" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" align="center" type="index" />
- <el-table-column label="濮撳悕" align="center" key="name" prop="name" :show-overflow-tooltip="true" />
- <el-table-column label="璐﹀彿" align="center" key="account" prop="account" :show-overflow-tooltip="true" />
+ <el-table-column label="濮撳悕" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
+ <el-table-column label="璐﹀彿" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="瑙掕壊" align="center" key="roleName" prop="roleName" :show-overflow-tooltip="true" />
- <el-table-column label="鐘舵��" align="center" key="state">
+ <el-table-column label="鐘舵��" align="center" key="status">
<template slot-scope="scope">
- <el-switch v-model="scope.row.state" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+ <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+ @change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
- <el-table-column label="鎵嬫満鍙风爜" align="center" key="phone" prop="phone" width="120" />
- <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
+ <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" width="120" />
+ <el-table-column label="鎿嶄綔" align="center" width="160" class-nickName="small-padding fixed-width">
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">淇敼</el-button>
-<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">鍒犻櫎</el-button>-->
-<!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">-->
-<!-- <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏇村</el-button>-->
-<!-- <el-dropdown-menu slot="dropdown">-->
-<!-- <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-dropdown-item>-->
-<!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">鍒嗛厤瑙掕壊</el-dropdown-item>-->
-<!-- </el-dropdown-menu>-->
-<!-- </el-dropdown>-->
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:user:edit']">淇敼</el-button>
+ <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">鍒犻櫎</el-button>-->
+ <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">-->
+ <!-- <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏇村</el-button>-->
+ <!-- <el-dropdown-menu slot="dropdown">-->
+ <!-- <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-dropdown-item>-->
+ <!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">鍒嗛厤瑙掕壊</el-dropdown-item>-->
+ <!-- </el-dropdown-menu>-->
+ <!-- </el-dropdown>-->
</template>
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize" @pagination="getList" />
</el-col>
</pane>
</splitpanes>
</el-row>
<!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body @close="reset">
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-row>
<el-col :span="12">
- <el-form-item label="濮撳悕" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
+ <el-form-item label="濮撳悕" prop="nickName">
+ <el-input v-model="form.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璐﹀彿" prop="account">
- <el-input v-model="form.account" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
+ <el-form-item label="璐﹀彿" prop="userName">
+ <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="state">
- <el-radio-group v-model="form.state">
- <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-radio-group v-model="form.status">
+ <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+ dict.label
+ }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐢佃瘽鍙风爜" prop="phone">
- <el-input v-model="form.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="11" />
+ <el-form-item label="鐢佃瘽鍙风爜" prop="phonenumber">
+ <el-input v-model="form.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="11" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="瑙掕壊" prop="roleName">
- <el-select v-model="form.roleName" placeholder="璇烽�夋嫨瑙掕壊" style="width: 100%" clearable>
- <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ <el-form-item label="瑙掕壊" prop="roleIds">
+ <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨瑙掕壊" clearable>
+ <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
+ :disabled="item.status == 1"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -120,52 +134,44 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="骞撮緞" prop="age">
- <el-input v-model="form.age" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
+ <el-form-item label="閭" prop="email">
+ <el-input v-model="form.email" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="閭" prop="email">
- <el-input v-model="form.email" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ <el-form-item label="鍗曚綅" prop="company">
+ <el-select v-model="form.company" placeholder="璇烽�夋嫨鍗曚綅" style="width: 100%" clearable>
+ <el-option v-for="item in postOptions" :key="item.id" :label="item.company"
+ :value="item.id"></el-option>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍗曚綅" prop="company">
- <el-select v-model="form.company" placeholder="璇烽�夋嫨宀椾綅" style="width: 100%" clearable>
- <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"></el-option>
- </el-select>
+ <el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
+ <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true"
+ placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="绛惧悕">
- <el-upload
- class="avatar-uploader"
- :action="uploadAction"
- :show-file-list="false"
- accept=".png, .jpg, .jpeg, .gif"
- :on-error="handleUploadError"
- :on-success="handleUploadSuccess"
- :before-upload="handleBeforeUpload">
- <img v-if="signatureUrl" :src="signatureUrl" class="avatar" alt="">
+ <el-upload class="avatar-uploader" :action="uploadAction" :show-file-list="false"
+ :headers="upload.headers" accept=".png, .jpg, .jpeg, .gif" :on-error="handleUploadError"
+ :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload">
+ <img v-if="form.signatureUrl" :src="javaApi + '/img/' + form.signatureUrl" class="avatar" alt="">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="涓汉鐓х墖">
- <el-upload
- class="avatar-uploader"
- :action="uploadAction"
- :show-file-list="false"
- accept=".png, .jpg, .jpeg, .gif"
- :on-error="handleUploadError1"
- :on-success="handleUploadSuccess1"
- :before-upload="handleBeforeUpload1">
- <img v-if="pictureUrl" :src="pictureUrl" class="avatar" alt="">
+ <el-upload class="avatar-uploader" :action="uploadAction" :show-file-list="false"
+ :headers="upload.headers" accept=".png, .jpg, .jpeg, .gif" :on-error="handleUploadError1"
+ :on-success="handleUploadSuccess1" :before-upload="handleBeforeUpload1">
+ <img v-if="form.pictureUrl" :src="javaApi + '/img/' + form.pictureUrl" class="avatar" alt="">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
@@ -173,14 +179,16 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
</div>
</el-dialog>
<!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
- <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
<div class="el-upload__tip text-center" slot="tip">
@@ -188,12 +196,13 @@
<el-checkbox v-model="upload.updateSupport" />鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
</div>
<span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
- <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">涓嬭浇妯℃澘</el-link>
+ <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+ @click="importTemplate">涓嬭浇妯℃澘</el-link>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
<el-button @click="upload.open = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
</div>
</el-dialog>
@@ -201,24 +210,23 @@
<el-dialog title="鑾峰彇浜轰簨绯荤粺浜哄憳淇℃伅" :visible.sync="addthirdParty" width="70%">
<div class="body" v-loading="thirdPartyLoading">
<el-row>
- <el-col :span="8" style="height: 70vh;overflow: hidden;" v-if="companiesList.length!=1">
- <el-input v-model="search2" placeholder="杈撳叆鍏抽敭瀛楁悳绱�" clearable size="small"
- @clear="searchFilter2" @keyup.enter.native="searchFilter2"
- prefix-icon="el-icon-search" style="margin-bottom: 20px;width: 90%"/>
- <el-tree :data="datathirdParty" node-key="companyId" :props="defaultProps" @node-click="nodeClick2"
- style="height: calc(100% - 42px);" @node-expand="nodeOpen0" :filter-node-method="filterNode2" ref="tree2"
- highlight-current>
+ <el-col :span="8" style="height: 70vh;overflow: hidden;" v-if="companiesList.length != 1">
+ <el-input v-model="search2" placeholder="杈撳叆鍏抽敭瀛楁悳绱�" clearable size="small" @clear="searchFilter2"
+ @keyup.enter.native="searchFilter2" prefix-icon="el-icon-search" style="margin-bottom: 20px;width: 90%" />
+ <el-tree :data="datathirdParty" node-key="companyId" :props="defaultProps1" @node-click="nodeClick2"
+ style="height: calc(100% - 42px);" @node-expand="nodeOpen0" :filter-node-method="filterNode2" ref="tree2"
+ highlight-current>
</el-tree>
</el-col>
- <el-col :span="companiesList.length==1?24:16" style="height: 70vh;padding-left: 8px;">
+ <el-col :span="companiesList.length == 1 ? 24 : 16" style="height: 70vh;padding-left: 8px;">
<div style="display: flex;align-items: center;margin-bottom: 10px">
<span style="width: 140px">鍛樺伐鍙�/鍛樺伐濮撳悕:</span>
<el-input size="small" placeholder="璇疯緭鍏ュ憳宸ュ彿/鍛樺伐濮撳悕" @clear="searchPerson" clearable v-model="userSearch2"
- style="width: 50%"
- @keyup.enter.native="searchPerson()"></el-input>
+ style="width: 50%" @keyup.enter.native="searchPerson()"></el-input>
</div>
<el-table height="67vh" stripe :data="personList" v-loading="personLoad" ref="personTable"
- @selection-change="handleSelectionChange">
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50">
</el-table-column>
<el-table-column prop="employeeID" label="鍛樺伐鍙�">
@@ -237,8 +245,8 @@
</el-row>
</div>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="addUser2" :loading="addLoad">纭� 瀹�</el-button>
<el-button @click="addthirdParty = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="addUser2" :loading="addLoad">纭� 瀹�</el-button>
</div>
</el-dialog>
<el-dialog title="鏋舵瀯鏂板" :visible.sync="addDia" width="400px">
@@ -248,7 +256,7 @@
<span class="required-span">* </span>鏋舵瀯鍚嶇О锛�
</el-col>
<el-col :span="16" :offset="1">
- <el-input v-model="addOb.name" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small"></el-input>
+ <el-input v-model="addOb.nickName" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small"></el-input>
</el-col>
</el-row>
</div>
@@ -279,13 +287,14 @@
import "splitpanes/dist/splitpanes.css";
export default {
- name: "User",
+ nickName: "User",
dicts: ['sys_normal_disable', 'sys_user_sex'],
components: { Treeselect, Splitpanes, Pane },
data() {
return {
// 閬僵灞�
loading: true,
+ multipleSelection: [],
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -322,6 +331,10 @@
children: "children",
label: "label"
},
+ defaultProps1: {
+ children: "children",
+ label: "companyName"
+ },
// 鐢ㄦ埛瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
@@ -338,15 +351,13 @@
url: process.env.VUE_APP_BASE_API + "/system/user/importData"
},
uploadAction: process.env.VUE_APP_BASE_API + '/deviceScope/uploadFile',
- signatureUrl: '',
- pictureUrl: '',
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
pageSize: 10,
- name: undefined,
- phone: undefined,
- state: undefined,
+ nickName: undefined,
+ phonenumber: undefined,
+ status: undefined,
deptId: undefined
},
// 鍒椾俊鎭�
@@ -361,25 +372,25 @@
],
// 琛ㄥ崟鏍￠獙
rules: {
- name: [
+ nickName: [
{ required: true, message: "璇峰～鍐欏鍚�", trigger: "blur" },
],
- account: [
+ userName: [
{ required: true, message: "璇峰～鍐欒处鍙�", trigger: "blur" }
],
- nameEn: [
- { required: true, message: "璇疯緭鍏ュ鍚岴N", trigger: "blur" }
- ],
- state: [
+ // nameEn: [
+ // { required: true, message: "璇疯緭鍏ュ鍚岴N", trigger: "blur" }
+ // ],
+ status: [
{ required: true, message: "璇烽�夋嫨鐘舵��", trigger: "change" }
],
- roleName: [
+ roleIds: [
{ required: true, message: "璇烽�夋嫨瑙掕壊", trigger: "change" }
],
- password: [
- { required: true, message: "瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
- ],
- phone: [
+ // password: [
+ // { required: true, message: "瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
+ // ],
+ phonenumber: [
{
required: true,
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -390,7 +401,7 @@
},
// 鑾峰彇涓夋柟浜哄憳寮规
addthirdParty: false,
- thirdPartyLoading:false,
+ thirdPartyLoading: false,
companiesList: [],
search2: '',
datathirdParty: [],
@@ -404,7 +415,7 @@
addDia: false, // 娣诲姞鏋舵瀯寮规
addOb: {
fatherId: 10001,
- name: '',
+ nickName: '',
},
};
},
@@ -426,33 +437,29 @@
getList() {
this.loading = true;
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- this.userList = response.rows;
- this.total = response.total;
- this.loading = false;
- }
+ this.userList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ }
);
},
// 鎵撳紑娣诲姞鏋舵瀯寮规
- addSchema () {
+ addSchema() {
this.addDia = true
},
// 鎻愪氦鏋舵瀯
- addStandardTree () {
- if (this.addOb.name == null || this.addOb.factory == '') {
+ addStandardTree() {
+ if (this.addOb.nickName == null || this.addOb.factory == '') {
this.$message.error('鏋勬灦鍚嶇О鏄繀濉」')
return
}
this.addLoad = true
addDepartment(this.addOb).then(res => {
- if (res.code === 201) {
- this.addLoad = false
- return
- }
this.$message.success('娣诲姞鎴愬姛')
this.addDia = false
this.getList()
this.addLoad = false
- this.addOb.name = ''
+ this.addOb.nickName = ''
}).catch(e => {
this.addDia = false
this.addLoad = false
@@ -489,13 +496,13 @@
},
// 鐢ㄦ埛鐘舵�佷慨鏀�
handleStatusChange(row) {
- let text = row.state === "0" ? "鍚敤" : "鍋滅敤";
- this.$modal.confirm('纭瑕�"' + text + '""' + row.name + '"鐢ㄦ埛鍚楋紵').then(function() {
- return changeUserStatus(row.userId, row.state);
+ let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
+ this.$modal.confirm('纭瑕�"' + text + '""' + row.nickName + '"鐢ㄦ埛鍚楋紵').then(function () {
+ return changeUserStatus(row.userId, row.status);
}).then(() => {
this.$modal.msgSuccess(text + "鎴愬姛");
- }).catch(function() {
- row.state = row.state === "0" ? "1" : "0";
+ }).catch(function () {
+ row.status = row.status === "0" ? "1" : "0";
});
},
// 鍙栨秷鎸夐挳
@@ -508,17 +515,21 @@
this.form = {
userId: undefined,
deptId: undefined,
- name: undefined,
- account: undefined,
- phone: undefined,
+ nickName: undefined,
+ userName: undefined,
+ phonenumber: undefined,
password: undefined,
nameEn: undefined,
email: undefined,
sex: undefined,
- state: "0",
+ status: "0",
company: '',
- roleName: ''
+ roleIds: [],
+ signatureUrl: '',
+ pictureUrl: ''
};
+ // this.signatureUrl = '';
+ // this.pictureUrl = ''
this.resetForm("form");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -536,6 +547,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ this.multipleSelection = selection;
this.ids = selection.map(item => item.userId);
this.single = selection.length != 1;
this.multiple = !selection.length;
@@ -554,30 +566,31 @@
}
},
// 鑾峰彇涓夋柟浜哄憳
- openthirdParty() {
- this.addthirdParty = true;
- this.thirdPartyLoading = true;
- selectCompaniesList().then(res => {
- this.companiesList = this.HaveJson(res.data);
- if(this.companiesList.length ==1){
- selectSimpleList({companyId: this.companiesList[0].companyId}).then(res => {
- this.thirdPartyLoading = false;
- this.personListCopy = JSON.parse(JSON.stringify(res.data))
- this.personList = res.data
- this.$refs.personTable.doLayout()
- })
- }else{
- this.thirdPartyLoading = false;
+ async openthirdParty() {
+ try {
+ this.addthirdParty = true;
+ this.thirdPartyLoading = true;
+
+ const companiesResponse = await selectCompaniesList();
+ this.companiesList = this.HaveJson(companiesResponse.data);
+
+ if (this.companiesList.length === 1) {
+ const personResponse = await selectSimpleList({ companyId: this.companiesList[0].companyId });
+ this.personListCopy = JSON.parse(JSON.stringify(personResponse.data));
+ this.personList = personResponse.data;
+ this.$refs.personTable.doLayout();
}
- this.datathirdParty = this.tranListToTreeData(res.data, "ROOT");
- }).catch(() => {
+
+ this.datathirdParty = this.tranListToTreeData(this.companiesList, "ROOT");
+ console.log(' this.datathirdParty---', this.datathirdParty)
+ } catch (error) {
+ console.error("Error fetching third party data:", error);
+ } finally {
this.thirdPartyLoading = false;
- })
- if(this.componentData.entity.roleId > 10000)this.$message.warning('鐢变簬鏈�変腑鍏蜂綋瑙掕壊锛屾柊澧炵敤鎴峰皢鎴愪负榛樿瑙掕壊')
+ }
},
tranListToTreeData(list, rootValue) {
- const arr = [];
- list.forEach((item) => {
+ return list.reduce((arr, item) => {
if (item.parentCompanyId === rootValue) {
const children = this.tranListToTreeData(list, item.companyId);
if (children.length) {
@@ -585,13 +598,13 @@
}
arr.push(item);
}
- });
- return arr;
+ return arr;
+ }, []);
},
searchPerson() {
let arr = JSON.parse(JSON.stringify(this.personListCopy))
this.personList = arr.filter(a => {
- if (a.employeeID.includes(this.userSearch2) || a.name.includes(this.userSearch2)) {
+ if (a.employeeID.includes(this.userSearch2) || a.nickName.includes(this.userSearch2)) {
return true
}
})
@@ -603,7 +616,7 @@
this.getNodeParent(node)
if (ob.companyId !== 'SC21') {
this.personLoad = true
- selectSimpleList({companyId: ob.companyId}).then(res => {
+ selectSimpleList({ companyId: ob.companyId }).then(res => {
this.personListCopy = JSON.parse(JSON.stringify(res.data))
this.personList = res.data
this.personLoad = false
@@ -618,7 +631,7 @@
}
},
nodeOpen0(data, node, el) {
- this.currentCompaniesList[node.level - nodeOpen01] = data.id
+ // this.currentCompaniesList[node.level - nodeOpen01] = data.id
},
filterNode2(value, data) {
if (!value) return true;
@@ -646,16 +659,13 @@
addPersonUser({
company: arr,
person: this.multipleSelection,
- roleId: this.componentData.entity.roleId
+ // roleId: this.componentData.entity.roleId
}).then(res => {
- if (res.code === 201) {
- this.addLoad = false
- return
- }
this.$message.success('鎿嶄綔鎴愬姛')
this.multipleSelection = []
this.$refs.personTable.clearSelection()
this.addLoad = false
+ this.addthirdParty = false
this.userSearch2 = ''
this.getList()
}).catch(e => {
@@ -669,12 +679,9 @@
selectCustomEnum().then(res => {
this.postOptions = res.data;
})
- selectRoleList().then(res => {
- this.roleOptions = res.data;
- })
getUser().then(response => {
+ this.roleOptions = response.roles;
this.title = "娣诲姞鐢ㄦ埛";
- this.form.password = this.initPassword;
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
@@ -683,20 +690,19 @@
selectCustomEnum().then(res => {
this.postOptions = res.data;
})
- selectRoleList().then(res => {
- this.roleOptions = res.data;
- })
- const userId = row.userId;
+ const userId = row.userId || this.ids;
getUser(userId).then(response => {
this.form = response.data;
+ this.form.password = ''
+ this.roleOptions = response.roles;
+ this.$set(this.form, "roleIds", response.roleIds);
this.open = true;
this.title = "淇敼鐢ㄦ埛";
- this.form.password = "";
});
},
/** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
handleResetPwd(row) {
- this.$prompt('璇疯緭鍏�"' + row.name + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
+ this.$prompt('璇疯緭鍏�"' + row.nickName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
closeOnClickModal: false,
@@ -708,18 +714,18 @@
}
},
}).then(({ value }) => {
- resetUserPwd(row.userId, value).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value);
- });
- }).catch(() => {});
+ resetUserPwd(row.userId, value).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value);
+ });
+ }).catch(() => { });
},
/** 鍒嗛厤瑙掕壊鎿嶄綔 */
- handleAuthRole: function(row) {
+ handleAuthRole: function (row) {
const userId = row.userId;
this.$router.push("/system/user-auth/role/" + userId);
},
/** 鎻愪氦鎸夐挳 */
- submitForm: function() {
+ submitForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.userId != undefined) {
@@ -741,12 +747,12 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const userIds = row.userId || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�').then(function () {
return delUser(userIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).catch(() => { });
},
/** 涓嬭浇妯℃澘鎿嶄綔 */
importTemplate() {
@@ -792,14 +798,14 @@
// 濡傛灉涓婁紶鎴愬姛
if (res.code == 200) {
// 鑾峰彇瀵屾枃鏈粍浠跺疄渚�
- let quill = this.Quill;
- // 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃�
- let length = quill.getSelection().index;
- // 鎻掑叆鍥剧墖 res.url涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧�
- quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
- // 璋冩暣鍏夋爣鍒版渶鍚�
- quill.setSelection(length + 1);
- this.signatureUrl = res.data.url
+ // let quill = this.Quill;
+ // // 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃�
+ // let length = quill.getSelection().index;
+ // // 鎻掑叆鍥剧墖 res.url涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧�
+ // quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+ // // 璋冩暣鍏夋爣鍒版渶鍚�
+ // quill.setSelection(length + 1);
+ this.form.signatureUrl = res.data.url
} else {
this.$message.error("鍥剧墖鎻掑叆澶辫触");
}
@@ -830,14 +836,14 @@
// 濡傛灉涓婁紶鎴愬姛
if (res.code == 200) {
// 鑾峰彇瀵屾枃鏈粍浠跺疄渚�
- let quill = this.Quill;
- // 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃�
- let length = quill.getSelection().index;
- // 鎻掑叆鍥剧墖 res.url涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧�
- quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
- // 璋冩暣鍏夋爣鍒版渶鍚�
- quill.setSelection(length + 1);
- this.pictureUrl = res.data.url
+ // let quill = this.Quill;
+ // // 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃�
+ // let length = quill.getSelection().index;
+ // // 鎻掑叆鍥剧墖 res.url涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧�
+ // quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+ // // 璋冩暣鍏夋爣鍒版渶鍚�
+ // quill.setSelection(length + 1);
+ this.form.pictureUrl = res.data.url
} else {
this.$message.error("鍥剧墖鎻掑叆澶辫触");
}
@@ -853,10 +859,12 @@
.search_form {
display: flex;
justify-content: space-between;
+
.options_button {
margin-top: 3px;
}
}
+
.avatar-uploader ::v-deep .el-upload {
border: 1px dashed #666666;
border-radius: 6px;
@@ -864,9 +872,11 @@
position: relative;
overflow: hidden;
}
+
.avatar-uploader ::v-deep .el-upload:hover {
border-color: #409EFF;
}
+
.avatar-uploader-icon {
font-size: 20px;
color: #8c939d;
@@ -875,11 +885,13 @@
line-height: 90px;
text-align: center;
}
+
.avatar {
width: 90px;
height: 90px;
display: block;
}
+
.addButton {
display: flex;
align-items: flex-start;
--
Gitblit v1.9.3