|
|
@@ -1,6 +1,7 @@
|
|
|
<template>
|
|
|
<a-modal
|
|
|
width="60%"
|
|
|
+ height="100%"
|
|
|
:visible="visible"
|
|
|
:title="title"
|
|
|
@ok="handleSubmit"
|
|
|
@@ -10,10 +11,10 @@
|
|
|
wrapClassName="ant-modal-cust-warp"
|
|
|
>
|
|
|
<a-row :gutter="10" style="background-color: #ececec; padding: 10px; margin: -10px">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
- <a-card :bordered="false">
|
|
|
+ <!-- <a-col :md="6" :sm="24">
|
|
|
+ <a-card :bordered="false"> -->
|
|
|
<!--组织机构-->
|
|
|
- <a-directory-tree
|
|
|
+ <!-- <a-directory-tree
|
|
|
selectable
|
|
|
:selectedKeys="selectedDepIds"
|
|
|
:checkStrictly="true"
|
|
|
@@ -22,11 +23,11 @@
|
|
|
:expandAction="false"
|
|
|
:expandedKeys.sync="expandedKeys"
|
|
|
@select="onDepSelect"
|
|
|
- />
|
|
|
- </a-card>
|
|
|
- </a-col>
|
|
|
- <a-col :md="18" :sm="24">
|
|
|
- <a-card :bordered="false" style="height: 500px; overflow-y: scroll;">
|
|
|
+ /> -->
|
|
|
+ <!-- </a-card>
|
|
|
+ </a-col> -->
|
|
|
+ <a-col :md="24" :sm="24">
|
|
|
+ <a-card :bordered="false" style="height: 100%; overflow-y: scroll;">
|
|
|
用户姓名:
|
|
|
<a-input-search
|
|
|
:style="{width:'150px',marginBottom:'15px'}"
|
|
|
@@ -57,7 +58,7 @@
|
|
|
<script>
|
|
|
import {filterObj} from '@/utils/util'
|
|
|
import {queryDepartTreeList, getUserList, queryUserByDepId} from '@/api/api'
|
|
|
-
|
|
|
+ import { putAction,getAction } from '@/api/manage'
|
|
|
export default {
|
|
|
name: 'JSelectUserByDepModal',
|
|
|
components: {},
|
|
|
@@ -164,7 +165,8 @@
|
|
|
}
|
|
|
param[this.customReturnField] = values;
|
|
|
console.log("回显用户参数",param)
|
|
|
- getUserList(param).then((res) => {
|
|
|
+ getAction('/sys/user/listBy', {}).then((res) => {
|
|
|
+ // getUserList(param).then((res) => {
|
|
|
if (res.success) {
|
|
|
let selectedRowKeys = []
|
|
|
let realNames = []
|
|
|
@@ -193,7 +195,8 @@
|
|
|
let params = this.getQueryParams()//查询条件
|
|
|
params.syHireType ='在职'
|
|
|
if(params.realname) params.realname = `*${params.realname}*`;
|
|
|
- await getUserList(params).then((res) => {
|
|
|
+ await getAction('/sys/user/listBy', {}).then((res) => {
|
|
|
+ // await getUserList(params).then((res) => {
|
|
|
if (res.success) {
|
|
|
this.dataSourceAll = res.result.records
|
|
|
this.dataSource = res.result.records
|
