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 | 676 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 511 insertions(+), 165 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1dbc2d1..0fb4722 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -3,185 +3,192 @@
<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">
- <el-input v-model="deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
+ <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> -->
</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">
+ <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="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" 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>
+ </div>
+ </div>
<el-col>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
- <el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
- <el-input v-model="queryParams.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="queryParams.status" 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-select>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"></el-date-picker>
- </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-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">瀵煎叆</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="50" align="center" />
- <el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
- <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
- <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
- <el-table-column label="閮ㄩ棬" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
- <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
- <el-table-column label="鐘舵��" align="center" key="status" v-if="columns[5].visible">
+ <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="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="status">
<template slot-scope="scope">
- <el-switch v-model="scope.row.status" 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" prop="createTime" v-if="columns[6].visible" width="160">
+ <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">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
- <template slot-scope="scope" v-if="scope.row.userId !== 1">
- <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="600px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <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="nickName">
+ <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="deptId">
- <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
+ <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="phonenumber">
+ <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="phonenumber">
<el-input v-model="form.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="11" />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="閭" prop="email">
- <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" maxlength="50" />
- </el-form-item>
- </el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛鍚嶇О" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
+ <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>
<el-col :span="12">
- <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛瀵嗙爜" prop="password">
+ <el-form-item label="瀵嗙爜" prop="password">
<el-input v-model="form.password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" type="password" maxlength="20" show-password />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鐢ㄦ埛鎬у埆">
- <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
- <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
- </el-select>
+ <el-form-item label="濮撳悕EN" prop="nameEn">
+ <el-input v-model="form.nameEn" placeholder="璇疯緭鍏ュ鍚岴N" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐘舵��">
- <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 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="宀椾綅">
- <el-select v-model="form.postIds" multiple placeholder="璇烽�夋嫨宀椾綅">
- <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1" ></el-option>
+ <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="瑙掕壊">
- <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨瑙掕壊">
- <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 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="24">
- <el-form-item label="澶囨敞">
- <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ <el-col :span="12">
+ <el-form-item label="绛惧悕">
+ <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"
+ :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>
</el-col>
</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">
@@ -189,19 +196,90 @@
<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>
+
+ <!-- 鑾峰彇浜轰簨绯荤粺浜哄憳淇℃伅 -->
+ <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="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;">
+ <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>
+ </div>
+ <el-table height="67vh" stripe :data="personList" v-loading="personLoad" ref="personTable"
+ :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="鍛樺伐鍙�">
+ </el-table-column>
+ <el-table-column prop="name" label="鍛樺伐濮撳悕">
+ </el-table-column>
+ <el-table-column prop="department" label="閮ㄩ棬" min-width="200">
+ </el-table-column>
+ <el-table-column prop="isLive" label="宸插瓨鍦�" width="80" align="center">
+ <template slot-scope="scope">
+ <el-tag type="success" effect="dark" v-if="scope.row.isLive === 1">鈭�</el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-col>
+ </el-row>
+ </div>
+ <div slot="footer" class="dialog-footer">
+ <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">
+ <div class="body">
+ <el-row style="line-height: 50px;">
+ <el-col :span="6" style="text-align: right;">
+ <span class="required-span">* </span>鏋舵瀯鍚嶇О锛�
+ </el-col>
+ <el-col :span="16" :offset="1">
+ <el-input v-model="addOb.nickName" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small"></el-input>
+ </el-col>
+ </el-row>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="addDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="addStandardTree" :loading="addLoad">纭� 瀹�</el-button>
+ </span>
</el-dialog>
</div>
</template>
<script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import {
+ listUser,
+ getUser,
+ delUser,
+ addUser,
+ updateUser,
+ resetUserPwd,
+ changeUserStatus,
+ deptTreeSelect,
+ selectCompaniesList, selectSimpleList, addPersonUser, uploadFile, selectRoleList, selectCustomEnum, addDepartment
+} from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -209,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: [],
// 闈炲崟涓鐢�
@@ -252,6 +331,10 @@
children: "children",
label: "label"
},
+ defaultProps1: {
+ children: "children",
+ label: "companyName"
+ },
// 鐢ㄦ埛瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
@@ -267,11 +350,12 @@
// 涓婁紶鐨勫湴鍧�
url: process.env.VUE_APP_BASE_API + "/system/user/importData"
},
+ uploadAction: process.env.VUE_APP_BASE_API + '/deviceScope/uploadFile',
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
pageSize: 10,
- userName: undefined,
+ nickName: undefined,
phonenumber: undefined,
status: undefined,
deptId: undefined
@@ -288,33 +372,51 @@
],
// 琛ㄥ崟鏍￠獙
rules: {
- userName: [
- { required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
- { min: 2, max: 20, message: '鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
- ],
nickName: [
- { required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "璇峰～鍐欏鍚�", trigger: "blur" },
],
- password: [
- { required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
- { min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' },
- { pattern: /^[^<>"'|\\]+$/, message: "涓嶈兘鍖呭惈闈炴硶瀛楃锛�< > \" ' \\\ |", trigger: "blur" }
+ userName: [
+ { required: true, message: "璇峰～鍐欒处鍙�", trigger: "blur" }
],
- email: [
- {
- type: "email",
- message: "璇疯緭鍏ユ纭殑閭鍦板潃",
- trigger: ["blur", "change"]
- }
+ // nameEn: [
+ // { required: true, message: "璇疯緭鍏ュ鍚岴N", trigger: "blur" }
+ // ],
+ status: [
+ { required: true, message: "璇烽�夋嫨鐘舵��", trigger: "change" }
],
+ roleIds: [
+ { required: true, message: "璇烽�夋嫨瑙掕壊", trigger: "change" }
+ ],
+ // password: [
+ // { required: true, message: "瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
+ // ],
phonenumber: [
{
+ required: true,
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜",
trigger: "blur"
}
]
- }
+ },
+ // 鑾峰彇涓夋柟浜哄憳寮规
+ addthirdParty: false,
+ thirdPartyLoading: false,
+ companiesList: [],
+ search2: '',
+ datathirdParty: [],
+ currentCompaniesList: [],
+ personList: [],
+ personListCopy: [],
+ personLoad: false,
+ userSearch2: '',
+ addLoad: false,
+ //
+ addDia: false, // 娣诲姞鏋舵瀯寮规
+ addOb: {
+ fatherId: 10001,
+ nickName: '',
+ },
};
},
watch: {
@@ -335,11 +437,33 @@
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() {
+ this.addDia = true
+ },
+ // 鎻愪氦鏋舵瀯
+ addStandardTree() {
+ if (this.addOb.nickName == null || this.addOb.factory == '') {
+ this.$message.error('鏋勬灦鍚嶇О鏄繀濉」')
+ return
+ }
+ this.addLoad = true
+ addDepartment(this.addOb).then(res => {
+ this.$message.success('娣诲姞鎴愬姛')
+ this.addDia = false
+ this.getList()
+ this.addLoad = false
+ this.addOb.nickName = ''
+ }).catch(e => {
+ this.addDia = false
+ this.addLoad = false
+ })
},
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
getDeptTree() {
@@ -373,11 +497,11 @@
// 鐢ㄦ埛鐘舵�佷慨鏀�
handleStatusChange(row) {
let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- this.$modal.confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚楋紵').then(function() {
+ this.$modal.confirm('纭瑕�"' + text + '""' + row.nickName + '"鐢ㄦ埛鍚楋紵').then(function () {
return changeUserStatus(row.userId, row.status);
}).then(() => {
this.$modal.msgSuccess(text + "鎴愬姛");
- }).catch(function() {
+ }).catch(function () {
row.status = row.status === "0" ? "1" : "0";
});
},
@@ -391,17 +515,21 @@
this.form = {
userId: undefined,
deptId: undefined,
- userName: undefined,
nickName: undefined,
- password: undefined,
+ userName: undefined,
phonenumber: undefined,
+ password: undefined,
+ nameEn: undefined,
email: undefined,
sex: undefined,
status: "0",
- remark: undefined,
- postIds: [],
- roleIds: []
+ company: '',
+ roleIds: [],
+ signatureUrl: '',
+ pictureUrl: ''
};
+ // this.signatureUrl = '';
+ // this.pictureUrl = ''
this.resetForm("form");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -419,6 +547,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ this.multipleSelection = selection;
this.ids = selection.map(item => item.userId);
this.single = selection.length != 1;
this.multiple = !selection.length;
@@ -436,35 +565,144 @@
break;
}
},
+ // 鑾峰彇涓夋柟浜哄憳
+ 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(this.companiesList, "ROOT");
+ console.log(' this.datathirdParty---', this.datathirdParty)
+ } catch (error) {
+ console.error("Error fetching third party data:", error);
+ } finally {
+ this.thirdPartyLoading = false;
+ }
+ },
+ tranListToTreeData(list, rootValue) {
+ return list.reduce((arr, item) => {
+ if (item.parentCompanyId === rootValue) {
+ const children = this.tranListToTreeData(list, item.companyId);
+ if (children.length) {
+ item.children = children;
+ }
+ arr.push(item);
+ }
+ return arr;
+ }, []);
+ },
+ searchPerson() {
+ let arr = JSON.parse(JSON.stringify(this.personListCopy))
+ this.personList = arr.filter(a => {
+ if (a.employeeID.includes(this.userSearch2) || a.nickName.includes(this.userSearch2)) {
+ return true
+ }
+ })
+ },
+ searchFilter2() {
+ this.$refs.tree2.filter(this.search2)
+ },
+ nodeClick2(ob, node, el) {
+ this.getNodeParent(node)
+ if (ob.companyId !== 'SC21') {
+ this.personLoad = true
+ selectSimpleList({ companyId: ob.companyId }).then(res => {
+ this.personListCopy = JSON.parse(JSON.stringify(res.data))
+ this.personList = res.data
+ this.personLoad = false
+ this.$refs.personTable.doLayout()
+ })
+ }
+ },
+ getNodeParent(val) {
+ this.currentCompaniesList[val.level - 1] = val.data.companyId
+ if (val.parent != null) {
+ this.getNodeParent(val.parent)
+ }
+ },
+ nodeOpen0(data, node, el) {
+ // this.currentCompaniesList[node.level - nodeOpen01] = data.id
+ },
+ filterNode2(value, data) {
+ if (!value) return true;
+ return data['companyName'].indexOf(value) !== -1;
+ },
+ addUser2() {
+ if (this.multipleSelection.length === 0) {
+ return this.$message.error('璇烽�夋嫨浜哄憳')
+ }
+ if (this.currentCompaniesList.length === 0) {
+ return this.$message.error('璇烽�夋嫨缁勭粐')
+ }
+ /* for (let index = this.currentCompaniesList.length-1; index >1; index--) {
+ let obj = this.multipleSelection.find(a=>a.companyId==this.currentCompaniesList[index])
+ if(!obj){
+ this.currentCompaniesList.splice(index,1)
+ }
+ } */
+ let arr = []
+ this.currentCompaniesList.forEach(b => {
+ let obj = this.companiesList.find(a => a.companyId == b)
+ arr.push(obj)
+ })
+ this.addLoad = true
+ addPersonUser({
+ company: arr,
+ person: this.multipleSelection,
+ // roleId: this.componentData.entity.roleId
+ }).then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.multipleSelection = []
+ this.$refs.personTable.clearSelection()
+ this.addLoad = false
+ this.addthirdParty = false
+ this.userSearch2 = ''
+ this.getList()
+ }).catch(e => {
+ this.addLoad = false
+ })
+ },
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
+ this.open = true;
+ selectCustomEnum().then(res => {
+ this.postOptions = res.data;
+ })
getUser().then(response => {
- this.postOptions = response.posts;
this.roleOptions = response.roles;
- this.open = true;
this.title = "娣诲姞鐢ㄦ埛";
- this.form.password = this.initPassword;
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
+ selectCustomEnum().then(res => {
+ this.postOptions = res.data;
+ })
const userId = row.userId || this.ids;
getUser(userId).then(response => {
this.form = response.data;
- this.postOptions = response.posts;
+ this.form.password = ''
this.roleOptions = response.roles;
- this.$set(this.form, "postIds", response.postIds);
this.$set(this.form, "roleIds", response.roleIds);
this.open = true;
this.title = "淇敼鐢ㄦ埛";
- this.form.password = "";
});
},
/** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
handleResetPwd(row) {
- this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
+ this.$prompt('璇疯緭鍏�"' + row.nickName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
closeOnClickModal: false,
@@ -476,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) {
@@ -509,23 +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(() => {});
- },
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('system/user/export', {
- ...this.queryParams
- }, `user_${new Date().getTime()}.xlsx`)
- },
- /** 瀵煎叆鎸夐挳鎿嶄綔 */
- handleImport() {
- this.upload.title = "鐢ㄦ埛瀵煎叆";
- this.upload.open = true;
+ }).catch(() => { });
},
/** 涓嬭浇妯℃澘鎿嶄綔 */
importTemplate() {
@@ -547,7 +774,126 @@
// 鎻愪氦涓婁紶鏂囦欢
submitFileForm() {
this.$refs.upload.submit();
- }
+ },
+ // 涓婁紶鍓嶆牎妫�鏍煎紡鍜屽ぇ灏�
+ handleBeforeUpload(file) {
+ const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"];
+ const isJPG = type.includes(file.type);
+ // 妫�楠屾枃浠舵牸寮�
+ if (!isJPG) {
+ this.$message.error(`鍥剧墖鏍煎紡閿欒!`);
+ return false;
+ }
+ // 鏍℃鏂囦欢澶у皬
+ if (this.fileSize) {
+ const isLt = file.size / 1024 / 1024 < this.fileSize;
+ if (!isLt) {
+ this.$message.error(`涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 ${this.fileSize} MB!`);
+ return false;
+ }
+ }
+ return true;
+ },
+ handleUploadSuccess(res, file) {
+ // 濡傛灉涓婁紶鎴愬姛
+ 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.form.signatureUrl = res.data.url
+ } else {
+ this.$message.error("鍥剧墖鎻掑叆澶辫触");
+ }
+ },
+ handleUploadError() {
+ this.$message.error("鍥剧墖鎻掑叆澶辫触");
+ },
+ // 涓婁紶鍓嶆牎妫�鏍煎紡鍜屽ぇ灏�
+ handleBeforeUpload1(file) {
+ const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"];
+ const isJPG = type.includes(file.type);
+ // 妫�楠屾枃浠舵牸寮�
+ if (!isJPG) {
+ this.$message.error(`鍥剧墖鏍煎紡閿欒!`);
+ return false;
+ }
+ // 鏍℃鏂囦欢澶у皬
+ if (this.fileSize) {
+ const isLt = file.size / 1024 / 1024 < this.fileSize;
+ if (!isLt) {
+ this.$message.error(`涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 ${this.fileSize} MB!`);
+ return false;
+ }
+ }
+ return true;
+ },
+ handleUploadSuccess1(res, file) {
+ // 濡傛灉涓婁紶鎴愬姛
+ 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.form.pictureUrl = res.data.url
+ } else {
+ this.$message.error("鍥剧墖鎻掑叆澶辫触");
+ }
+ },
+ handleUploadError1() {
+ this.$message.error("鍥剧墖鎻掑叆澶辫触");
+ },
}
};
-</script>
\ No newline at end of file
+</script>
+
+<style scoped lang="scss">
+.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;
+ cursor: pointer;
+ position: relative;
+ overflow: hidden;
+}
+
+.avatar-uploader ::v-deep .el-upload:hover {
+ border-color: #409EFF;
+}
+
+.avatar-uploader-icon {
+ font-size: 20px;
+ color: #8c939d;
+ width: 90px;
+ height: 90px;
+ line-height: 90px;
+ text-align: center;
+}
+
+.avatar {
+ width: 90px;
+ height: 90px;
+ display: block;
+}
+
+.addButton {
+ display: flex;
+ align-items: flex-start;
+}
+</style>
--
Gitblit v1.9.3