From 6bbe73072fcb0ee0b7f190e0f3da286518c3d7a0 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Thu, 05 Sep 2024 20:37:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/components/SelectObjModal/selectPerson.jsx | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/gz-customerSystem/src/components/SelectObjModal/selectPerson.jsx b/gz-customerSystem/src/components/SelectObjModal/selectPerson.jsx
index 410056e..4a9c2e0 100644
--- a/gz-customerSystem/src/components/SelectObjModal/selectPerson.jsx
+++ b/gz-customerSystem/src/components/SelectObjModal/selectPerson.jsx
@@ -11,8 +11,8 @@
import { Button, Space, Input, Tree } from 'antd';
import { CloseOutlined } from '@ant-design/icons';
import './index.less';
-import MyModal from '../MyModal';
import * as $$ from '../../utils/utility';
+import { Modal } from '@arco-design/web-react';
const { Search } = Input;
@@ -97,8 +97,6 @@
};
function handleSearch(value, dataList) {
-
- console.log('value, dataList', value, dataList);
const newExpandedKeys = dataList
.map((item) => {
if (item.label.indexOf(value) > -1) {
@@ -107,8 +105,6 @@
return null;
})
.filter((item, i, self) => item && self.indexOf(item) === i);
-
- console.log('newExpandedKeys',newExpandedKeys);
setExpandedKeys(newExpandedKeys);
setSearchValue(value);
setAutoExpandParent(true);
@@ -150,7 +146,7 @@
return loop(data);
}, [searchValue, data]);
- // 默认调解员查询'22_00024-4'
+ // 默认调解员查询'22_00024-4'
const searchRole = type === 'person' ? { roleCode: '22_00024-4' } : {};
console.log(checkedKeys.keys,'checkedKeys.keyscheckedKeys.keys')
@@ -165,8 +161,6 @@
setData(res.data || []);
}
}
- console.log(checkKeys,'checkKeys')
- console.log(checkedKeys,'checkedKeys')
if (checkKeys.length !== 0) {
let keys = [];
checkKeys.forEach((x) => keys.push(x.value));
@@ -180,7 +174,15 @@
const nameStr = type === 'person' ? '人员' : type === 'unit' ? '组织' : '部门';
return (
- <MyModal visible={!!visible} title={`选择${nameStr}`} width={560} footer={false} onCancel={onClose}>
+ <Modal
+ visible={!!visible}
+ title={`选择${nameStr}`}
+ footer={null}
+ onCancel={onClose}
+ unmountOnExit={true}
+ maskClosable={false}
+ style={{ width: '560px' }}
+ >
<div className="selectObjModal-main">
<div className="selectObjModal-left">
<div className="selectObjModal-left-search">
@@ -203,6 +205,7 @@
checkedKeys={checkedKeys.keys}
treeData={treeData}
fieldNames={{ title: 'label', key: 'value' }}
+ height={400}
/>
) : (
$$.MyEmpty()
@@ -228,7 +231,7 @@
</Button>
</Space>
</div>
- </MyModal>
+ </Modal>
);
};
--
Gitblit v1.8.0