From 957c4d4774172f4a322c6b4c7eb133991640f18f Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 26 Jul 2023 19:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/company/CompanyExtend.js       | 19 ++++++++++---------
 .../components/company/company.js             |  6 +++---
 .../components/department/department.js       |  6 +++---
 .../components/department/departmentExtend.js | 19 ++++++++++---------
 pc4mobx/organization/stores/job.js            |  4 ++--
 5 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/pc4mobx/organization/components/company/CompanyExtend.js b/pc4mobx/organization/components/company/CompanyExtend.js
index d71d440..b49a5f4 100644
--- a/pc4mobx/organization/components/company/CompanyExtend.js
+++ b/pc4mobx/organization/components/company/CompanyExtend.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-05-18 14:52:39
- * @LastEditTime: 2022-12-16 17:48:54
+ * @LastEditTime: 2023-07-26 18:59:02
  * @Description:
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/CompanyExtend.js
  */
@@ -180,14 +180,15 @@ export default class CompanyExtend extends React.Component {
             onClick: key => {
               this.editCard();
             }
-          }, {
-            icon: <i className='icon-coms-common' />,
-            content: i18n.button.version(),
-            key: 'view',
-            onClick: key => {
-              this.view();
-            }
           }
+          //, {
+          //   icon: <i className='icon-coms-common' />,
+          //   content: i18n.button.version(),
+          //   key: 'view',
+          //   onClick: key => {
+          //     this.view();
+          //   }
+          // }
           ]
         }
       }
@@ -212,7 +213,7 @@ export default class CompanyExtend extends React.Component {
       } else {
         if (buttons.hasEdit) {
           btns.push(edit);
-          btns.push(view);
+          //btns.push(view);
         }
       }
     } catch (e) { }
diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js
index 64fd9f2..3caa28b 100644
--- a/pc4mobx/organization/components/company/company.js
+++ b/pc4mobx/organization/components/company/company.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-05-18 16:23:32
- * @LastEditTime: 2022-12-16 17:17:45
+ * @LastEditTime: 2023-07-26 18:41:11
  * @Description: 
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
  */
@@ -366,9 +366,9 @@ export default class Company extends React.Component {
                             <Menu.Item key="4">
                                 <a href='javascript:void(0);' onClick={() => { _this.transfer(record.id) }}>转移</a>
                             </Menu.Item>
-                            <Menu.Item key="5">
+                            {/* <Menu.Item key="5">
                                 <a href='javascript:void(0);' onClick={() => { _this.version(record) }}>另存为版本</a>
-                            </Menu.Item>
+                            </Menu.Item> */}
                         </Menu>
                     )
                     return <Dropdown overlay={menu}>
diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js
index 538f594..a98b901 100644
--- a/pc4mobx/organization/components/department/department.js
+++ b/pc4mobx/organization/components/department/department.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-06-02 09:19:37
- * @LastEditTime: 2022-12-16 17:47:38
+ * @LastEditTime: 2023-07-26 18:46:24
  * @Description: 
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
  */
@@ -401,9 +401,9 @@ export default class Department extends React.Component {
                             <Menu.Item key="5">
                                 <a href='javascript:void(0);' onClick={() => { _this.copy(record.id) }}>复制</a>
                             </Menu.Item>
-                            <Menu.Item key="6">
+                            {/* <Menu.Item key="6">
                                 <a href='javascript:void(0);' onClick={() => { _this.version(record) }}>另存为版本</a>
-                            </Menu.Item>
+                            </Menu.Item> */}
                         </Menu>
                     )
                     return <Dropdown overlay={menu}>
diff --git a/pc4mobx/organization/components/department/departmentExtend.js b/pc4mobx/organization/components/department/departmentExtend.js
index bbdfe06..c230801 100644
--- a/pc4mobx/organization/components/department/departmentExtend.js
+++ b/pc4mobx/organization/components/department/departmentExtend.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-06-02 09:20:03
- * @LastEditTime: 2022-12-16 16:35:02
+ * @LastEditTime: 2023-07-26 18:59:14
  * @Description:
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/departmentExtend.js
  */
@@ -190,14 +190,15 @@ export default class DepartmentExtendStore extends React.Component {
             onClick: key => {
               this.editCard();
             }
-          }, {
-            icon: <i className='icon-coms-common' />,
-            content: i18n.button.version(),
-            key: 'view',
-            onClick: key => {
-              this.view();
-            }
           }
+          // , {
+          //   icon: <i className='icon-coms-common' />,
+          //   content: i18n.button.version(),
+          //   key: 'view',
+          //   onClick: key => {
+          //     this.view();
+          //   }
+          // }
           ]
         }
       }
@@ -223,7 +224,7 @@ export default class DepartmentExtendStore extends React.Component {
       } else {
         if (buttons.hasEdit) {
           btns.push(edit);
-          btns.push(view);
+          //btns.push(view);
         }
       }
     } catch (e) { }
diff --git a/pc4mobx/organization/stores/job.js b/pc4mobx/organization/stores/job.js
index 66e91e7..f17ebf0 100644
--- a/pc4mobx/organization/stores/job.js
+++ b/pc4mobx/organization/stores/job.js
@@ -69,8 +69,8 @@ export class JobStore {
   saveAndSetting = false;
 
   @action initData() {
-    this.getTableInfo();
     this.getHasRight();
+    this.refresh();
     // this.getCopyForm();
     // this.getMergeForm();
   }
@@ -159,7 +159,7 @@ export class JobStore {
     Api.refresh().then(res => {
       if (res.code === 200) {
         this.getTableInfo();
-        message.success(res.msg);
+        message.success("数据刷新成功");
       } else {
         message.warning(res.msg);
       }