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] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=BA=E5=BA=8F=E4=BF=9D=E6=8C=81=E4=B8=A4=E4=BD=8D?=
 =?UTF-8?q?=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={() => {