From 9e3739d8163e1ee2f347d9a5c7c459933fa1c342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 12 Dec 2022 16:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/ledgerPage/components/index.less      |  2 ++
 .../components/ledgerAdjustRuleAddModal.js      | 17 +++++++++--------
 .../components/ledgerSalaryAdjustmentRules.js   |  4 +++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
index f24e52f2..f11be705 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
@@ -93,6 +93,8 @@
     flex-direction: column;
     .adjustSalaryFlex{
       display: flex;
+      align-items: center;
+      margin-bottom: 10px;
     }
   }
 
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js
index 81fc8739..ebe0e19d 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js
@@ -15,17 +15,17 @@ class LedgerAdjustRuleAddModal extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      beforeAdjustmentType: "",
-      afterAdjustmentType: "",
+      beforeAdjustmentType: 4,
+      afterAdjustmentType: 1,
       salaryItemId: "",
       salaryItemName: "",
-      dayOfMonth: "",
+      dayOfMonth: "1",
       salaryItemOptions: []
     };
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.visible !== this.props.visible && !nextProps.salarySobId) this.listSalarySobItem();
+    if (nextProps.visible !== this.props.visible && nextProps.salarySobId) this.listSalarySobItem();
   }
 
   listSalarySobItem = () => {
@@ -59,12 +59,12 @@ class LedgerAdjustRuleAddModal extends Component {
         className="adjustRuleModalWrapper"
         title={title}
         visible={visible}
-        style={{ width: 680 }}
+        style={{ width: 780 }}
         buttons={buttons}
         onCancel={onCancel}
       >
-        <WeaSearchGroup col={1} needTigger title="" showGroup center>
-          <WeaFormItem label="薪资项目" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+        <WeaSearchGroup col={1} needTigger title="" showGroup>
+          <WeaFormItem label="薪资项目" labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
             <WeaSelect
               viewAttr={3}
               value={salaryItemId}
@@ -72,12 +72,13 @@ class LedgerAdjustRuleAddModal extends Component {
               onChange={(salaryItemId, salaryItemName) => this.setState({ salaryItemId, salaryItemName })}
             />
           </WeaFormItem>
-          <WeaFormItem label={<AdjustTitle/>} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+          <WeaFormItem label={<AdjustTitle/>} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
             <div className="adjustRuleDetailWrapper">
               <div className="adjustSalaryFlex">
                 <span>如果：调薪生效日期在</span>
                 <WeaSelect
                   viewAttr={3}
+                  style={{ width: 60 }}
                   value={dayOfMonth}
                   options={monthDays}
                   onChange={(dayOfMonth) => this.setState({ dayOfMonth })}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js
index 47d2c529..9ab9f162 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js
@@ -48,7 +48,9 @@ class LedgerSalaryAdjustmentRules extends Component {
   };
 
   render() {
-    const { taxAgentStore: { showOperateBtn }, editId, adjustRuleAddModal } = this.props;
+    const { taxAgentStore: { showOperateBtn }, editId } = this.props;
+    const { adjustRuleAddModal } = this.state;
+    const { dataSource, columns } = this.state;
     const btns = showOperateBtn ? [
       <WeaButtonIcon buttonType="add" type="primary" onClick={this.handleAddAdjustRule}/>
     ] : [];