From 7fbd34475e8f4b7abff6d9291107fbe27cfab568 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 27 Aug 2024 16:13:10 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=85=A8=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/organization/components/resource/resource.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index f844268..08a5120 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -50,6 +50,17 @@ const WeaTable = WeaTableNew.WeaTable;
 const { ButtonSelect } = WeaDropdown;
 const getLabel = WeaLocaleProvider.getLabel;
 
+const viewDepartment = (id) => {
+    window.open(`/spa/hrm/engine.html#/hrmengine/organization?showTree=false&isView=1&type=department&id=${id}`);
+  }
+  
+const viewSubCompany = (id) => {
+window.open(`/spa/hrm/engine.html#/hrmengine/organization?showTree=false&isView=1&type=subcompany&id=${id}`);
+}
+
+window.viewDepartment = viewDepartment;
+window.viewSubCompany = viewSubCompany;
+
 @inject('resource')
 @inject('datasImport')
 @observer

From bdb67fd47baf04ecd8d7a0a1902fa02bc1146b45 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 27 Aug 2024 16:49:40 +0800
Subject: [PATCH 2/4] =?UTF-8?q?r=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95=E6=BB=9A=E5=8A=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/organization/components/resource/PersonnelResume.js | 2 +-
 pc4mobx/organization/style/resume.less                      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/organization/components/resource/PersonnelResume.js b/pc4mobx/organization/components/resource/PersonnelResume.js
index 28b81f1..78a0f12 100644
--- a/pc4mobx/organization/components/resource/PersonnelResume.js
+++ b/pc4mobx/organization/components/resource/PersonnelResume.js
@@ -326,7 +326,7 @@ export default class PersonnelResume extends React.Component {
                         dropMenuDatas={this.getDropMenuDatas()}
                         onDropMenuClick={(e) => this.handleMenuClick(e)}
                     >
-                        <WeaLeftRightLayout ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftRightLayout@7muhhb`} isNew={true} showLeft={defaultShowLeft} leftCom={this.getTree()}>
+                        <WeaLeftRightLayout className='org-personnel-resume' ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftRightLayout@7muhhb`} isNew={true} showLeft={defaultShowLeft} leftCom={this.getTree()}>
                             {
                                !this.isEmptyObject(resumeList) ?  <div id='personnel-resume'>
                                <div className='content'>
diff --git a/pc4mobx/organization/style/resume.less b/pc4mobx/organization/style/resume.less
index 419010e..d016b2a 100644
--- a/pc4mobx/organization/style/resume.less
+++ b/pc4mobx/organization/style/resume.less
@@ -37,4 +37,10 @@
     left: 44%;
     box-shadow: 2px 2px 10px #909090;
     background-color: #FFFFFF;
+  }
+
+  .org-personnel-resume {
+    .wea-left-right-layout-right {
+      overflow: scroll !important;
+    }
   }
\ No newline at end of file

From f1b4854a1eb45a385f78ff88bfc61101e780714e Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 22 Oct 2024 13:58:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F=E4=BF=9D=E6=8C=81=E4=B8=A4?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/organization/components/company/company.js       | 6 ++++++
 pc4mobx/organization/components/department/department.js | 6 ++++++
 pc4mobx/organization/components/job/Job.js               | 5 +++++
 pc4mobx/organization/components/log/LogView.js           | 9 ++++-----
 pc4mobx/organization/components/resource/resource.js     | 1 +
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js
index 71ddb6c..022557c 100644
--- a/pc4mobx/organization/components/company/company.js
+++ b/pc4mobx/organization/components/company/company.js
@@ -328,6 +328,12 @@ export default class Company extends React.Component {
         //     }
         // });
         columns.forEach((c, index) => {
+            if (c.dataIndex == 'showOrder') {
+                c.render = function (text, record) {
+                    return <span>{record.showOrder.toFixed(2)}</span>
+                }
+            }
+
             if (c.dataIndex == 'canceled') {
                 c.render = function (text, record) {
                     return <Switch checked={record.canceled == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} />
diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js
index f1d465a..f1e845c 100644
--- a/pc4mobx/organization/components/department/department.js
+++ b/pc4mobx/organization/components/department/department.js
@@ -375,6 +375,12 @@ export default class Department extends React.Component {
         } = this.props;
         let _this = this;
         columns.forEach((c, index) => {
+            if (c.dataIndex == 'showOrder') {
+                c.render = function (text, record) {
+                    return <span>{record.showOrder.toFixed(2)}</span>
+                }
+            }
+            
             if (c.dataIndex == 'canceled') {
                 c.render = function (text, record) {
                     return <Switch checked={record.canceled == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} />
diff --git a/pc4mobx/organization/components/job/Job.js b/pc4mobx/organization/components/job/Job.js
index 31e035d..4993f62 100644
--- a/pc4mobx/organization/components/job/Job.js
+++ b/pc4mobx/organization/components/job/Job.js
@@ -332,6 +332,11 @@ export default class Job extends React.Component {
         } = this.props;
         let _this = this;
         columns.forEach((c, index) => {
+            if (c.dataIndex == 'showOrder') {
+                c.render = function (text, record) {
+                    return <span>{record.showOrder.toFixed(2)}</span>
+                }
+            }
             if (c.dataIndex == 'forbiddenTag') {
                 c.render = function (text, record) {
                     return <Switch checked={record.forbiddenTag == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} />
diff --git a/pc4mobx/organization/components/log/LogView.js b/pc4mobx/organization/components/log/LogView.js
index 5231603..c34a154 100644
--- a/pc4mobx/organization/components/log/LogView.js
+++ b/pc4mobx/organization/components/log/LogView.js
@@ -143,12 +143,11 @@ export default class LogView extends React.Component {
 
         const btn = [
             (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@bx87i8`} type="primary" onClick={() => {
- logViewStore.getTableInfo(); this.setState({ showSearchAd: false }) 
-}}>{i18n.button.search()}</Button>),
+                logViewStore.getTableInfo(); this.setState({ showSearchAd: false }) 
+                }}>{i18n.button.search()}</Button>),
             (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@218ju6`} onClick={() => form.reset()}>{i18n.button.reset()}</Button>),
             (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@5u9mfz`} onClick={() => this.setState({ showSearchAd: false })}>{i18n.button.cancel()}</Button>),
         ];
-
         return btn;
     }
 
@@ -180,8 +179,8 @@ export default class LogView extends React.Component {
                         searchType={['advanced']}
                         showSearchAd={showSearchAd}
                         setShowSearchAd={bool => {
- this.setState({ showSearchAd: bool }) 
-}}
+                            this.setState({ showSearchAd: bool }) 
+                        }}
                         advanceHeight={161}
                         searchsAd={showSearchAd ? this.getPanelComponents() : <div></div>}
                         buttonsAd={this.getTabBtn()}
diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index 08a5120..6226e9e 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -383,6 +383,7 @@ export default class Resource extends React.Component {
         let _this = this;
         columns.forEach((c, index) => {
             c.className = "wea-table-indent"
+            c.oldWidth = (100 / columns.length).toFixed(2) + '%';
             if (c.dataIndex == 'lastname') {
                 c.render = function (text, record) {
                     return <a href='javascript:void(0);' onClick={() => {

From 1842906c83c4034c2191e622ac55dc163979a48b Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 28 Oct 2024 10:14:23 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/organization/components/resource/ResourceCard.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pc4mobx/organization/components/resource/ResourceCard.js b/pc4mobx/organization/components/resource/ResourceCard.js
index 493f622..ebdf177 100644
--- a/pc4mobx/organization/components/resource/ResourceCard.js
+++ b/pc4mobx/organization/components/resource/ResourceCard.js
@@ -263,7 +263,6 @@ export default class ResourceCard extends React.Component {
                                     </div>
                                 </div>
                                 <div className='right-button'>
-                                <Button  className='item' onClick={this.view} >{i18n.button.version()}</Button>
                                     {
                                         data.buttons.slice(0,3).map((item,index) => {
                                             return (