ledger

pc4mobx/hrmSalary/pages/ledger/index.js

@@ -108,6 +108,8 @@ export default class Ledger extends React.Component {
             return <a onClick={() => {this.handleItemClick(record)}}>{text}</a>
           case "disable":
             return <Switch checked={text == 0} onChange={(value) => {this.handleItemStatusChange(value, record)}}/>
+          case "operate":
+            return <a onClick={() => {this.handleItemClick(record, 1)}}>关联人员</a>
           default:
             return <div dangerouslySetInnerHTML={{ __html: valueSpan }} />
         }

pc4mobx/hrmSalary/pages/ledger/slideBaseForm.js

@@ -18,9 +18,12 @@ export default class SlideBaseForm extends React.Component {
     }
     componentWillMount() {
         const { edit } = this.props;
+        const { ledgerStore: {initBaseInfoRequest}} = this.props;
         if(edit) {
             const { ledgerStore: { getLedgerBasicForm }} = this.props;
             getLedgerBasicForm()
+        } else {
+            initBaseInfoRequest();
         }
     }
 

pc4mobx/hrmSalary/pages/ledger/step4/RuleEditModal.js

@@ -14,13 +14,18 @@ export default class RuleEditModal extends React.Component {
             itemValue: "",
             effectiveDate: "",
             beforeAdjustmentType: 1,
-            afterAdjustmentType: 1
+            afterAdjustmentType: 1,
+            initedSelect: false
         }
     }
 
     componentWillMount() {
         const { ledgerStore: {listSalarySobItem}} = this.props;
-        listSalarySobItem();
+        listSalarySobItem().then(() => {
+            this.setState({
+                initedSelect: true
+            })
+        })
     }
 
     beforeAdjustmentTypeChange(e) {
@@ -32,7 +37,6 @@ export default class RuleEditModal extends React.Component {
     }
     
     handleSave() {
-
         const { ledgerStore } = this.props;
         const { ruleOptionList } = ledgerStore;
         let salaryItemName = ""
@@ -54,7 +58,7 @@ export default class RuleEditModal extends React.Component {
     render() {
         const { ledgerStore } = this.props;
         const { ruleOptionList } = ledgerStore;
-        const { beforeAdjustmentType, afterAdjustmentType } = this.state
+        const { beforeAdjustmentType, afterAdjustmentType, initedSelect } = this.state
         return (
             <Modal visible={this.props.visible} onCancel={() => {this.props.onCancel()}} width={800} 
                 footer={<Button type="primary" onClick={() => {this.handleSave()}}>保存</Button>}
@@ -65,7 +69,7 @@ export default class RuleEditModal extends React.Component {
                         <Col span={8}>薪资项目</Col>
                         <Col span={16}>
                             {
-                                ruleOptionList.length > 0 && 
+                                initedSelect && 
                                 <WeaSelect style={{width: "200px"}} options={ruleOptionList} value={this.state.itemValue} onChange={(value) => {this.setState({itemValue: value})} } />
                             }
                         </Col>

pc4mobx/hrmSalary/stores/ledger.js

@@ -176,6 +176,21 @@ export class LedgerStore {
     })
   }
 
+  @action
+  initBaseInfoRequest = () => {
+    this.setBaseInfoRequest({
+      name: "",
+      taxableItems: "1",
+      salaryCycleType: "1",
+      salaryCycleFromDay: "1",
+      taxCycleType: "1",
+      attendCycleType: "1",
+      attendCycleFromDay: "1",
+      socialSecurityCycleType: "1",
+      description: ""
+    })
+  }
+
   // 获得高级搜索表单数据
   @action
   getCondition = () => {
@@ -396,17 +411,24 @@ export class LedgerStore {
       salarySobId: this.salarySobId,
       excludeSalaryItemIds: this.sobItemRuleDataSource.map(item => item.salaryItemId)
     }
-    API.listSalarySobItem(params).then(res => {
-      if(res.status) {
-        this.ruleOptionList = res.data.map(item => {
-          return {
-            key: item.salaryItemId.toString(),
-            showname: item.salaryItemName,
-            selected: false
-          }
-        })
-      }
+    return new Promise((resolve, reject) => {
+      API.listSalarySobItem(params).then(res => {
+        if(res.status) {
+          this.ruleOptionList = res.data.map(item => {
+            return {
+              key: item.salaryItemId.toString(),
+              showname: item.salaryItemName,
+              selected: false
+            }
+          })
+          resolve()
+        } else {
+          reject()
+          message.error(res.errormsg || "获取失败")
+        }
+      })
     })
+    
 
   }