diff --git a/pc4mobx/hrmSalary/pages/ledger/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js index bdbacd6e..39d335da 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.js +++ b/pc4mobx/hrmSalary/pages/ledger/index.js @@ -284,7 +284,7 @@ export default class Ledger extends React.Component { "基础设置", "关联人员", "薪资项目", - "调薪计薪规则", + "调薪计薪规则" // "校验规则" ]; @@ -317,13 +317,15 @@ export default class Ledger extends React.Component { saveLedgerBasic(baseInfoRequest).then(() => { nextStep(); }); - } else if (currentStep == 1 || currentStep == 3) { + // } else if (currentStep == 1 || currentStep == 3) { + } else if (currentStep == 1) { nextStep(); } else if (currentStep == 2) { saveLedgerItem().then(() => { nextStep(); }); - } else if (currentStep == 4) { + // } else if (currentStep == 4) { + } else if (currentStep == 3) { saveAdjustmentRule().then(() => { this.setState({ stepSlideVisible: false }); }); @@ -472,7 +474,8 @@ export default class Ledger extends React.Component { 下一步 } - {(currentStep == 2 || currentStep == 3) && + {/*{(currentStep == 2 || currentStep == 3) &&*/} + {currentStep == 2 &&
} - {currentStep == 4 && + {/*{currentStep == 4 &&*/} + {currentStep == 3 &&
+ {/*暂时去掉调整个税扣缴义务人导入按钮*/} + {/*{*/} + {/* showOperateBtn &&*/} + {/* */} + {/* 调整个税扣缴义务人*/} + {/* */} + {/* }*/} + {/* onClick={() => {*/} + {/* this.setState({ changeSalaryVisible: true });*/} + {/* }}>*/} + {/* 调薪*/} + {/* */} + {/*}*/}
); } @@ -219,7 +223,7 @@ export default class SalaryFile extends React.Component { const { salaryFileStore: {getTableDatas, form}} = this.props; getTableDatas(pageInfo) } - + // 搜索 handleSearch(value) { const { @@ -341,7 +345,8 @@ export default class SalaryFile extends React.Component { const menu = ( - {importType.map((item) => ( + {/*暂时去掉调整个税扣缴义务人导入按钮*/} + {_.filter(importType, it => it.id!=="taxAgentAdjust").map((item) => ( {item.content} ))} @@ -360,7 +365,7 @@ export default class SalaryFile extends React.Component { style={{ display: "inline-block", position: "relative" }} className="salaryFileTabWrapper"> { - showOperateBtn && + showOperateBtn && - - + @@ -93,7 +94,7 @@ export default class SalaryFileViewSlide extends React.Component { } - + 薪资档案 ) } -} \ No newline at end of file +} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index f631bb30..88bb497b 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -5,16 +5,10 @@ * LastEditTime: 2022-06-29 09:53:36 */ import React, { Component } from "react"; -import { Icon, Tooltip, Button, message, Modal, Spin } from "antd"; +import { Button, Icon, message, Modal, Spin, Tooltip } from "antd"; import { inject, observer } from "mobx-react"; import { toJS } from "mobx"; -import { - WeaBrowser, - WeaTable, - WeaPopoverHrm, - WeaDialog, - WeaInputSearch -} from "ecCom"; +import { WeaDialog, WeaInputSearch, WeaTable } from "ecCom"; import { getSearchs } from "../../../../util"; import { getQueryString } from "../../../../util/url"; import _ from "lodash"; @@ -57,10 +51,10 @@ export default class NormalIndex extends Component { nextProps.selectedKey === "1" ? this.getNormalList({ billMonth, current, paymentOrganization }) : this.getSupplementaryList({ - billMonth, - current, - paymentOrganization - }); + billMonth, + current, + paymentOrganization + }); } } @@ -69,17 +63,17 @@ export default class NormalIndex extends Component { const { current } = this.state; selectedKey === "1" ? this.getNormalList({ - billMonth, - current: 1, - paymentOrganization, - userName: value - }) + billMonth, + current: 1, + paymentOrganization, + userName: value + }) : this.getSupplementaryList({ - billMonth, - current: 1, - paymentOrganization, - userName: value - }); + billMonth, + current: 1, + paymentOrganization, + userName: value + }); } handleSave = () => { @@ -180,7 +174,7 @@ export default class NormalIndex extends Component { } return { ...it, - title: , + title: , width: 150 }; }); @@ -217,7 +211,7 @@ export default class NormalIndex extends Component { } return { ...it, - title: , + title: , width: 150 }; }); @@ -258,18 +252,19 @@ export default class NormalIndex extends Component { this.setState({ selectedRowKeys: [] }); selectedKey === "1" ? this.getNormalList({ - billMonth, - paymentOrganization, - current: this.state.current - }) + billMonth, + paymentOrganization, + current: this.state.current + }) : this.getSupplementaryList({ - billMonth, - current: this.state.current, - paymentOrganization - }); + billMonth, + current: this.state.current, + paymentOrganization + }); }); }, - onCancel: () => {} + onCancel: () => { + } }); } }; @@ -299,21 +294,35 @@ export default class NormalIndex extends Component { const { commonAccount } = this.props.standingBookStore; commonAccount({ billMonth, + paymentOrganization, includes: [] }).then(() => { + message.success("核算成功"); selectedKey === "1" ? this.getNormalList({ - billMonth, - paymentOrganization, - current: this.state.current - }) + billMonth, + paymentOrganization, + current: this.state.current + }) : this.getSupplementaryList({ - billMonth, - paymentOrganization, - current: this.state.current - }); + billMonth, + paymentOrganization, + current: this.state.current + }); }); } + + handleExport = () => { + const { billMonth, selectedKey, paymentOrganization } = this.props; + const urlObj = { + "1": "/api/bs/hrmsalary/welfare/common/export", + "3": "/api/bs/hrmsalary/welfare/supplementary/export" + }; + const url = `${window.location + .origin}${urlObj[selectedKey]}?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`; + window.open(url, "_self"); + }; + render() { const { remarks, billMonth, selectedKey, paymentOrganization } = this.props; const { selectedRowKeys, addProps, date } = this.state; @@ -337,10 +346,10 @@ export default class NormalIndex extends Component { selectedKey === "1" ? this.getNormalList({ billMonth, current, paymentOrganization }) : this.getSupplementaryList({ - billMonth, - current, - paymentOrganization - }); + billMonth, + current, + paymentOrganization + }); } }; return ( @@ -351,7 +360,7 @@ export default class NormalIndex extends Component { 账单月份 - + @@ -367,18 +376,19 @@ export default class NormalIndex extends Component { }
{this.props.type !== "detail" && this.props.selectedKey == "3" - ? + ? - + - : } + : } {addProps.visible && */} - {/* {selectedKey === "1" && this.props.type !== "detail" && } */} - + {selectedKey === "1" && this.props.type !== "detail" && } + + + { @@ -432,7 +447,7 @@ export default class NormalIndex extends Component { loading={loading} pagination={pagination} rowSelection={rowSelection} - scroll={{ x: 1200, y: 300 }} + scroll={{ x: 1200, y: "calc(100vh - 233px)" }} />
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/overView.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/overView.js index 11068edf..db56d265 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/overView.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/overView.js @@ -5,9 +5,9 @@ * LastEditTime: 2022-05-09 15:07:56 */ import React, { Component } from "react"; -import { Icon, Tooltip, Button, Spin } from "antd"; +import { Button, Icon, Spin, Tooltip } from "antd"; import { inject, observer } from "mobx-react"; -import { WeaInputSearch, WeaTable } from "ecCom"; +import { WeaTable } from "ecCom"; import "./index.less"; @inject("standingBookStore") @@ -20,8 +20,8 @@ export default class OverViewIndex extends Component { tableData: { list: [], columns: [], - total: 0, - }, + total: 0 + } }; } @@ -48,7 +48,7 @@ export default class OverViewIndex extends Component { ...it, title: ( - ), + ) }; } ); @@ -56,12 +56,19 @@ export default class OverViewIndex extends Component { tableData: { list, columns, - total, - }, + total + } }); } ); }; + handleExport = () => { + const { billMonth, paymentOrganization } = this.props; + const url = `${window.location + .origin}/api/bs/hrmsalary/welfare/overView/export?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`; + window.open(url, "_self"); + }; + render() { const { remarks, billMonth, selectedKey, paymentOrganization } = this.props; const { selectedRowKeys } = this.state; @@ -75,7 +82,7 @@ export default class OverViewIndex extends Component { }, onChange(current) { console.log("Current: ", current); - }, + } }; return (
@@ -86,15 +93,15 @@ export default class OverViewIndex extends Component { - + {billMonth}
- {/*
- -
*/} +
+ +
{/* table */}
@@ -104,7 +111,7 @@ export default class OverViewIndex extends Component { dataSource={list} loading={loading} pagination={pagination} - scroll={{ x: 1200 }} + scroll={{ x: 1200, y: "calc(100vh - 200px)" }} />
diff --git a/pc4mobx/hrmSalary/stores/ledger.js b/pc4mobx/hrmSalary/stores/ledger.js index cf9a0d38..b7443399 100644 --- a/pc4mobx/hrmSalary/stores/ledger.js +++ b/pc4mobx/hrmSalary/stores/ledger.js @@ -375,10 +375,10 @@ export class LedgerStore { //保存薪资帐套基本信息 @action saveLedgerBasic = params => { - if (!this.validateBaseFrom(params)) { - return; - } return new Promise((resolve, reject) => { + if (!this.validateBaseFrom(params)) { + reject("保存失败"); + } API.saveLedgerBasic(params).then(res => { if (res.status) { this.salarySobId = res.data;