From 62d8c9dea03d101a35d76ecd3c7e362e8190c32a Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 26 Mar 2024 16:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=B5=B7=E6=B8=AF=E6=B9=BE=E4=BA=8C?=
 =?UTF-8?q?=E5=BC=80=E5=8E=BB=E9=99=A4=E6=8A=BD=E5=B1=89=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=BB=B4=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawer/index.jsx | 32 ++++++++------------------------
 src/components/topBar/index.jsx |  2 +-
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx
index d5446f9..1d6e01e 100644
--- a/src/components/drawer/index.jsx
+++ b/src/components/drawer/index.jsx
@@ -32,7 +32,7 @@ export default class DrawerComponents extends React.Component {
       dataSource: [],
       columns: [],
       spinning: true,
-      showJob: false,
+      showJob: false, //港湾二开 不显示岗位
     };
   }
 
@@ -70,8 +70,8 @@ export default class DrawerComponents extends React.Component {
   }
 
   //获取数据
-  getDeatilDatas(params, type = 'chart', showJob = '1') {
-    this.setState({ spinning: true, data: [], dataSource: [] });
+  getDeatilDatas(params, type = 'chart', showJob = '0') {
+    this.setState({ spinning: true });
     d3.json(
       '/api/bs/hrmorganization/orgchart/getDepartmentDetail?' +
         qs.stringify({ detauleType: type, ...params, showJob }),
@@ -325,18 +325,21 @@ export default class DrawerComponents extends React.Component {
   };
 
   showDrawer = (params) => {
-    this.getDeatilDatas(params, 'chart', '0');
+    //港湾二开 不显示岗位
+    const showJob = '0';
+    this.getDeatilDatas(params, 'chart', showJob);
     this.setState({ open: true, params: params });
   };
 
   onClose = () => {
     this.setState({ open: false, detailType: 'chart', showJob: false });
+    this.setState({ open: false, detailType: 'chart', showJob: false });
   };
 
   changeDetail = () => {
     const { detailType, params } = this.state;
     let type = detailType == 'chart' ? 'table' : 'chart';
-    const showJob = this.state.showJob ? '1' : '0';
+    const showJob = '0';
     this.setState({
       detailType: type,
     });
@@ -378,25 +381,6 @@ export default class DrawerComponents extends React.Component {
         }}
         extra={
           <Space>
-            {detailType == 'chart' && params && params.fclass == '0' && (
-              <Checkbox
-                style={{ marginTop: '5px', marginLeft: 100 }}
-                checked={showJob}
-                onChange={(e) => {
-                  this.setState({
-                    showJob: e.target.checked,
-                  });
-
-                  this.getDeatilDatas(
-                    params,
-                    detailType,
-                    e.target.checked ? '1' : '0',
-                  );
-                }}
-              >
-                {getLabel(547447, labelData)}
-              </Checkbox>
-            )}
             <Dropdown overlay={menu}>
               <Button type="primary">{getLabel(547314, labelData)}</Button>
             </Dropdown>
diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx
index baec137..bcf53ad 100644
--- a/src/components/topBar/index.jsx
+++ b/src/components/topBar/index.jsx
@@ -305,7 +305,7 @@ export class TopBar extends React.Component {
             </Tooltip>
           </Col>
           <Col span={16}>
-            <Button
+            {/* 港湾二开去除 <Button
               type="primary"
               style={{ marginRight: '10px' }}
               disabled={disabled}