diff --git a/pc4mobx/hrmSalary/apis/archive.js b/pc4mobx/hrmSalary/apis/archive.js index fe9af3ed..6faaad01 100644 --- a/pc4mobx/hrmSalary/apis/archive.js +++ b/pc4mobx/hrmSalary/apis/archive.js @@ -5,6 +5,10 @@ import { postFetch } from "../util/request"; export const getArchiveList = params => { return postFetch("/api/bs/hrmsalary/salaryArchive/list", params); }; +//薪资档案的高级搜索 +export const getSaCondition = params => { + return WeaTools.callApi("/api/bs/hrmsalary/archives/getSearchCondition", "get", params); +}; //薪资档案-获取薪资档案详情表单 export const getArchiveForm = params => { return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getForm", "get", params); @@ -100,7 +104,3 @@ export const getSingleSalaryItemInfo = (params) => { export const editSingleSalaryItem = (params) => { return postFetch("/api/bs/hrmsalary/salaryArchive/adjustRecord/editSingleSalaryItem", params); }; -// 基数调整记录列表 -export const getAdjustHistoryList = (params) => { - return postFetch("/api/bs/hrmsalary/archives/getAdjustHistoryList", params); -}; diff --git a/pc4mobx/hrmSalary/apis/welfareArchive.js b/pc4mobx/hrmSalary/apis/welfareArchive.js index 63153659..b204dfac 100644 --- a/pc4mobx/hrmSalary/apis/welfareArchive.js +++ b/pc4mobx/hrmSalary/apis/welfareArchive.js @@ -105,5 +105,8 @@ export const exportArchives = (ids) => { window.URL.revokeObjectURL(url); })); }; - +// 基数调整记录列表 +export const getAdjustHistoryList = (params) => { + return postFetch("/api/bs/hrmsalary/archives/getAdjustHistoryList", params); +}; diff --git a/pc4mobx/hrmSalary/components/mobileTemplate/index.js b/pc4mobx/hrmSalary/components/mobileTemplate/index.js index aeb0898e..7d2106ce 100644 --- a/pc4mobx/hrmSalary/components/mobileTemplate/index.js +++ b/pc4mobx/hrmSalary/components/mobileTemplate/index.js @@ -25,10 +25,10 @@ class Index extends Component {
{theme || ""}
{moment().format("YYYY-MM-DD HH:mm:ss")}
- { - background && -
logo
- } + {/*{*/} + {/* background &&*/} + {/*
logo
*/} + {/*}*/}
{ !onlyOneGrup && tipPosi === "1" && tip && diff --git a/pc4mobx/hrmSalary/components/pcTemplate/content.js b/pc4mobx/hrmSalary/components/pcTemplate/content.js index a294e2df..b4b63874 100644 --- a/pc4mobx/hrmSalary/components/pcTemplate/content.js +++ b/pc4mobx/hrmSalary/components/pcTemplate/content.js @@ -17,10 +17,10 @@ class Content extends Component {
{moment(sendTime).format("YYYY-MM-DD HH:mm:ss")}
- { - background && -
logo
- } + {/*{*/} + {/* background &&*/} + {/*
logo
*/} + {/*}*/} { !onlyOneGrup && tipPosi.toString() === "1" && tip &&
{tip}
diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 8632db09..d246f2ed 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -4,7 +4,8 @@ import { WeaLocaleProvider } from "ecCom"; import MySalaryMobile from "./pages/mySalaryMobile"; import MySalary from "./pages/mySalaryBenefits"; import Programme from "./pages/socialSecurityBenefits/programme"; -import Archives from "./pages/socialSecurityBenefits/archives"; +import Archivess from "./pages/socialSecurityBenefits/archives"; +import Archives from "./pages/socialSecurityBenefits/welfareArchive"; //社保福利档案重构页面 import StandingBook from "./pages/socialSecurityBenefits/standingBook"; import StandingBookDetail from "./pages/socialSecurityBenefits/standingBookDetail"; import StandingBookOfflineComparison from "./pages/socialSecurityBenefits/standingBookOfflineComparison"; @@ -22,7 +23,8 @@ import Calculate from "./pages/calculate/calculate"; //重构的薪资核算页 import Payroll from "./pages/payrollRelease"; //重构的工资单发放页面 import PayrollGrant from "./pages/payroll/payrollGrant"; import PayrollDetail from "./pages/payroll/payrollDetail"; -import Declare from "./pages/declare"; +// import Declare from "./pages/declare"; +import Declare from "./pages/declare/declare"; //重构的个税申报表 import TaxRate from "./pages/taxRate"; import TaxAgent from "./pages/taxAgent"; import CalculateDetail from "./pages/calculateDetail"; @@ -46,6 +48,7 @@ import MySalaryView from "./pages/mySalary/mySalaryView"; import WatermarkPreview from "./pages/payroll/watermarkPreview"; import ExternalPersonManage from "./pages/externalPersonManage"; import AdjustSalaryManage from "./pages/adjustSalaryManage"; +import TopologyMap from "./pages/topologyMap"; import stores from "./stores"; import "./style/index"; @@ -117,6 +120,7 @@ const Routes = ( component={SocialSecurityBenefits}> + + ); diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 413bbd25..429ea550 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -70,13 +70,23 @@ class EditCalcTable extends Component { salaryCalcSlide: { visible: true, id: salaryCalcId } }); break; + case "DIAGRAM": + const { salarySobId } = this.props; + const { salaryItemId: itemid, acctEmpId } = params; + window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${itemid}?acctEmpId=${acctEmpId}`, "_blank"); + break; default: break; } } }; updateLockStatus = (payload) => { - const { lockStatus } = payload; + const { salarySobId } = this.props; + const { lockStatus, salaryItemId } = payload; + if (lockStatus === "DIAGRAM") { + window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${salaryItemId}`, "_blank"); + return; + } Modal.confirm({ title: getLabel(131329, "信息确认"), content:
@@ -169,7 +179,8 @@ class EditCalcTable extends Component { "当前状态未锁定，点击锁定": getLabel(111, "当前状态未锁定，点击锁定"), "共": getLabel(18609, "共"), "条": getLabel(18256, "条"), "总计": getLabel(523, "总计"), "批量解锁": getLabel(111, "批量解锁"), - "批量锁定": getLabel(111, "批量锁定"), "批量更新": getLabel(111, "批量更新") + "批量锁定": getLabel(111, "批量锁定"), "批量更新": getLabel(111, "批量更新"), + "查看拓扑图": getLabel(111, "查看拓扑图") }; this.setState({ originPayloadData: { ...payload, i18n } }); const childFrameObj = document.getElementById("atdTable"); diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js index 5a3b1c58..d2b8ae4a 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js @@ -150,6 +150,7 @@ class Index extends Component { />
this.calcTableRef = dom} selectedKey={selectedKey} + salarySobId={salarySobCycle.salarySobId} {...this.props} showTotalCell={showTotalCell} onShowFormulaTd={this.handleShowFormulaTa}/> {/*陕西万众项目-创建薪资核算模板弹框*/} diff --git a/pc4mobx/hrmSalary/pages/declare/columns.js b/pc4mobx/hrmSalary/pages/declare/columns.js deleted file mode 100644 index cb5e65d3..00000000 --- a/pc4mobx/hrmSalary/pages/declare/columns.js +++ /dev/null @@ -1,37 +0,0 @@ -export const columns = [ - { - title: "姓名", - dataIndex: 'title', - key: 'title', - }, - { - title: "个税扣缴义务人", - dataIndex: 'title', - key: 'title', - }, - { - title: "部门", - dataIndex: 'title', - key: 'title', - }, - { - title: "手机号", - dataIndex: 'title', - key: 'title', - }, - { - title: "员工状态", - dataIndex: 'title', - key: 'title', - }, - { - title: "基本工资", - dataIndex: 'title', - key: 'title', - }, - { - title: "操作", - dataIndex: 'cz', - key: 'cz', - } -] diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/condition.js b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/condition.js new file mode 100644 index 00000000..d880c3f1 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/condition.js @@ -0,0 +1,43 @@ +export const declareConditions = [ + { + items: [ + { + colSpan: 1, + conditionType: "MONTHPICKER", + domkey: ["salaryMonthStr"], + fieldcol: 14, + label: "薪资所属月", + lanId: 542604, + labelcol: 6, + value: "", + rules: "required|string", + viewAttr: 3 + }, + { + colSpan: 1, + conditionType: "SELECT", + domkey: ["taxAgentId"], + fieldcol: 14, + label: "个税扣缴义务人", + lanId: 537996, + labelcol: 6, + options: [], + rules: "required|string", + viewAttr: 3, + }, + { + colSpan: 1, + conditionType: "INPUT", + domkey: ["description"], + fieldcol: 14, + label: "备注", + lanId: 536726, + labelcol: 6, + value: "", + viewAttr: 2 + } + ], + defaultshow: true, + title: "" + } +]; diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js new file mode 100644 index 00000000..a2ce2936 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js @@ -0,0 +1,92 @@ +/* + * Author: 黎永顺 + * name: 个税申报重构- 申报 + * Description: + * Date: 2023/10/12 + */ +import React, { Component } from "react"; +import { inject, observer } from "mobx-react"; +import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom"; +import { Button, message } from "antd"; +import { getSearchs } from "../../../../util"; +import { getTaxAgentSelectListAsAdmin } from "../../../../apis/taxAgent"; +import { saveDeclare } from "../../../../apis/declare"; +import { declareConditions } from "./condition"; + +const getKey = WeaTools.getKey; +const getLabel = WeaLocaleProvider.getLabel; + +@inject("declareStore") +@observer +class Index extends Component { + constructor(props) { + super(props); + this.state = { + conditions: [], loading: false + }; + } + + componentWillReceiveProps(nextProps, nextContext) { + if (nextProps.visible !== this.props.visible && nextProps.visible) this.getTaxAgentSelectListAsAdmin(nextProps); + if (nextProps.visible !== this.props.visible && !nextProps.visible) this.props.declareStore.initDeclareForm(); + } + + getTaxAgentSelectListAsAdmin = (props) => { + const { declareStore: { declareForm } } = props; + getTaxAgentSelectListAsAdmin().then(({ status, data }) => { + if (status) { + this.setState({ + conditions: _.map(declareConditions, item => ({ + ...item, + items: _.map(item.items, o => { + if (getKey(o) === "taxAgentId") { + return { + ...o, options: _.map(data, g => ({ key: g.id, showname: g.content })) + // helpfulTitle: getLabel(563420, "提示：可选择单个个税扣缴义务人进行申报，若不选择，则批量对管理下的所有个税扣缴义务人进行申报；") + }; + } + return { ...o }; + }) + })) + }, () => declareForm.initFormFields(this.state.conditions)); + } + }); + }; + save = () => { + const { declareStore: { declareForm } } = this.props; + declareForm.validateForm().then(f => { + if (f.isValid) { + const payload = declareForm.getFormParams(); + this.setState({ loading: true }); + saveDeclare({ ...payload }).then(({ status, errormsg }) => { + this.setState({ loading: false }); + if (status) { + message.success(getLabel(30700, "操作成功")); + this.props.onCancel("refresh"); + } else { + message.error(errormsg); + } + }).catch(() => this.setState({ loading: false })); + } else { + f.showErrors(); + } + }); + }; + + render() { + const { conditions, loading } = this.state; + const { declareStore: { declareForm } } = this.props; + return ( + {getLabel(543618, "生成申报表")} + ]} + > +
{getSearchs(declareForm, conditions, 1, false)}
+ + ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js new file mode 100644 index 00000000..f5627a0c --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js @@ -0,0 +1,34 @@ +/* + * Author: 黎永顺 + * name: 个税申报表重构-查询 + * Description: + * Date: 2023/10/12 + */ +import React, { Component } from "react"; +import { WeaInputSearch, WeaLocaleProvider } from "ecCom"; +import { MonthRangePicker } from "../../../reportView/components/statisticalMicroSettingsSlide"; + +const getLabel = WeaLocaleProvider.getLabel; + +class Index extends Component { + render() { + const { queryParams } = this.props; + const { dateRange, name } = queryParams; + return ( +
+
+ {getLabel(543549, "薪资所属月：")} + this.props.onChange({ dateRange: v })}/> +
+ this.props.onChange({ taxAgentName: v })} + onSearch={this.props.onSearch} + /> +
+ ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js new file mode 100644 index 00000000..5ee8b1b4 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js @@ -0,0 +1,144 @@ +/* + * Author: 黎永顺 + * name: 个税申报重构-列表 + * Description: + * Date: 2023/10/12 + */ +import React, { Component } from "react"; +import { WeaLocaleProvider, WeaTable } from "ecCom"; +import { message, Modal } from "antd"; +import { getDeclareList, withDrawTaxDeclaration } from "../../../../apis/declare"; +import { sysConfCodeRule } from "../../../../apis/ruleconfig"; + +const getLabel = WeaLocaleProvider.getLabel; + +class Index extends Component { + constructor(props) { + super(props); + this.state = { + loading: false, columns: [], dataSource: [], showWithDrawBtn: false, + pageInfo: { current: 1, pageSize: 10, total: 0 } + }; + } + + componentDidMount() { + this.getDeclareList(this.props); + this.sysConfCodeRule(); + } + + componentWillReceiveProps(nextProps, nextContext) { + if (nextProps.isRefresh !== this.props.isRefresh) this.getDeclareList(nextProps); + } + + sysConfCodeRule = () => { + sysConfCodeRule({ code: "WITHDRAW_TAX_DECLARATION" }).then(({ status, data }) => { + if (status && data === "1") this.setState({ showWithDrawBtn: data === "1" }); + }); + }; + getDeclareList = (props) => { + const { pageInfo } = this.state; + const { queryParams } = props; + const { dateRange, ...extra } = queryParams; + const [fromSalaryMonthStr, endSalaryMonthStr] = dateRange || []; + const params = { fromSalaryMonthStr, endSalaryMonthStr, ...extra }; + const payload = { ...pageInfo, ...params }; + this.setState({ loading: true }); + getDeclareList(payload).then(({ status, data }) => { + this.setState({ loading: false }); + if (status) { + const { columns, list: dataSource, pageNum, pageSize, total } = data; + this.setState({ + dataSource, pageInfo: { ...pageInfo, pageNum, pageSize, total }, + columns: _.map(columns, o => { + const { dataIndex } = o; + let width = ""; + switch (dataIndex) { + case "taxAgentName": + case "operateTime": + width = "15%"; + break; + case "description": + width = "20%"; + break; + default: + width = "10%"; + break; + } + return { ...o, width }; + }) + }); + } + }).catch(() => this.setState({ loading: false })); + }; + taxdeclarationDelete = (taxDeclarationId) => { + withDrawTaxDeclaration({ taxDeclarationId }).then(({ status, errormsg }) => { + if (status) { + message.success(getLabel(505793, "撤回成功")); + this.getDeclareList(this.props); + } else { + message.error(errormsg); + } + }); + }; + + render() { + const { loading, dataSource, columns, pageInfo, showWithDrawBtn } = this.state; + const pagination = { + ...pageInfo, + showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`, + showQuickJumper: true, + showSizeChanger: true, + pageSizeOptions: ["10", "20", "50", "100"], + onShowSizeChange: (current, pageSize) => { + this.setState({ + pageInfo: { ...pageInfo, current, pageSize } + }, () => this.getDeclareList(this.props)); + }, + onChange: current => { + this.setState({ + pageInfo: { ...pageInfo, current } + }, () => this.getDeclareList(this.props)); + } + }; + return ( + { + const { id } = record; + return + + {getLabel(83110, "查看详情")} + + { + showWithDrawBtn && + { + Modal.confirm({ + title: getLabel(131329, "信息确认"), + content: getLabel(543848, "确认撤回该条数据吗?"), + onOk: () => this.taxdeclarationDelete(id) + }); + }} + > + {getLabel(32025, "撤回")} + + } + ; + } + } + ]} + /> + ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/pages/declare/declare.js b/pc4mobx/hrmSalary/pages/declare/declare.js new file mode 100644 index 00000000..0fa5dc90 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/declare/declare.js @@ -0,0 +1,81 @@ +/* + * Author: 黎永顺 + * name: 个税申报表-重构页面 + * Description: + * Date: 2023/10/12 + */ +import React, { Component } from "react"; +import { inject, observer } from "mobx-react"; +import { WeaHelpfulTip, WeaLocaleProvider, WeaTop } from "ecCom"; +import { Button } from "antd"; +import moment from "moment"; +import DeclareQuery from "./components/declareQuery"; +import DeclareTablelist from "./components/declareTablelist"; +import DeclareDialog from "./components/declareDialog"; +import "./index.less"; + +const getLabel = WeaLocaleProvider.getLabel; + +@inject("taxAgentStore") +@observer +class Calculate extends Component { + constructor(props) { + super(props); + this.state = { + queryParams: { + taxAgentName: "", + dateRange: [ + moment(new Date()).startOf("year").format("YYYY-MM"), + moment(new Date()).startOf("month").format("YYYY-MM") + ] + }, isRefresh: false, + declareDaialog: { visible: false, title: "" } + }; + this.handleDebounce = null; + } + + renderCalculateOpts = () => { + const { taxAgentStore: { showOperateBtn } } = this.props; + const { queryParams, isRefresh } = this.state; + let calculateOpts = [ + , + this.setState({ + isRefresh: _.keys(v)[0] === "taxAgentName" ? isRefresh : !isRefresh, + queryParams: { ...queryParams, ...v } + })} onSearch={() => this.setState({ isRefresh: !isRefresh })}/> + ]; + return !showOperateBtn ? calculateOpts.slice(1) : calculateOpts; + }; + + render() { + const { queryParams, isRefresh, declareDaialog } = this.state; + return ( + } iconBgcolor="#F14A2D" + buttons={this.renderCalculateOpts()} className="declare-main-layout" + > +
+ + this.setState({ + declareDaialog: { ...declareDaialog, visible: false }, + isRefresh: bool === "refresh" ? !isRefresh : isRefresh + })} + /> +
+ + ); + } +} + +export default Calculate; diff --git a/pc4mobx/hrmSalary/pages/declare/index.less b/pc4mobx/hrmSalary/pages/declare/index.less index 81e72b6f..52564e0a 100644 --- a/pc4mobx/hrmSalary/pages/declare/index.less +++ b/pc4mobx/hrmSalary/pages/declare/index.less @@ -24,3 +24,67 @@ } } } + +//个税申报表页面-重构 +.declare-main-layout { + .wea-new-top-content { + overflow-y: hidden; + } + + .declare-body { + height: 100%; + width: 100%; + padding: 16px; + overflow-y: auto; + + .wea-new-table { + background: #fff; + } + + .ant-table-tbody { + td { + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + + } +} + +.declare-dialog-layout { + background: #f6f6f6; + + .wea-search-group { + padding: 16px; + } + + .wea-select, .ant-select-selection, .ant-select { + width: 100%; + } + + .wea-select { + display: inline-block; + position: relative; + } + + .ant-select-selection { + height: 30px; + border-radius: 0; + } + + .wea-content { + padding: 0; + + .wea-form-cell-wrapper { + background: #FFF; + border: 1px solid #e5e5e5; + border-bottom: none; + + .wea-form-cell { + border-bottom: 1px solid #e5e5e5; + } + } + } +} diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 423a7fe7..63421981 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -251,7 +251,13 @@ class LedgerSalaryItemTable extends Component { { title: "名称", dataIndex: "name", - key: "name" + key: "name", + render: (text, record) => { + const { salarySobId, salaryItemId } = record; + return {text}; + } }, { title: diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js index 36bf1bec..5692c526 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js @@ -266,7 +266,7 @@ class LedgerSlide extends Component { className="slideOuterWrapper" visible={visible} top={0} - width={65} + width={100} height={100} direction="right" measure="%" diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js index f857ff41..f857c6d6 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js @@ -82,7 +82,7 @@ class PassSetDialog extends Component { return; } if (secondaryPwd1 !== secondaryPwd2) { - message.error(getLabel("504376", "密码确认不正确！")); + message.error(getLabel(504376, "密码确认不正确！")); return; } } else { diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js index 7d6d9fb8..d2be756f 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js @@ -105,7 +105,6 @@ export default class BaseInformForm extends React.Component { ackFeedbackStatus, autoAckDays, feedbackUrl, autoSendStatus, autoSendDayOfMonth, autoSendTimeOfDay, autoSendCycleType } = request; - return ( diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js index 6a2bf87a..893afa11 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js @@ -38,7 +38,8 @@ export default class Index extends Component { confValue: "0", withDrawTaxDeclaration: "0", extEmpsWitch: "0", - salaryAcctFixedColumns: 0 + salaryAcctFixedColumns: 0, + welBaseDiffByPerAndCom: "0", }, showEncryptOperationButton: "", progressVisible: false, @@ -66,7 +67,8 @@ export default class Index extends Component { ascOrDesc = "", orderRule = "", showEncryptOperationButton, matchEmployeeMode: rule = "", taxDeclarationFunction: operateTaxDeclaration = "1", salaryArchiveDelete: confValue, salaryAcctEmployeeRule: matchRule, WITHDRAW_TAX_DECLARATION: withDrawTaxDeclaration = "0", - OPEN_APPLICATION_ENCRYPT: enctry = "1", extEmpsWitch = "0", salaryAcctFixedColumns = "0" + OPEN_APPLICATION_ENCRYPT: enctry = "1", extEmpsWitch = "0", salaryAcctFixedColumns = "0", + welBaseDiffByPerAndCom = "0", } } = sysInfo; // const { data: { ascOrDesc, orderRule } } = orderRules; @@ -87,7 +89,8 @@ export default class Index extends Component { saveParams: { ...saveParams, ascOrDesc, orderRule, rule, enctry, matchRule, confValue, withDrawTaxDeclaration, salaryAcctFixedColumns, - extEmpsWitch, operateTaxDeclaration: (operateTaxDeclaration && operateTaxDeclaration !== "0") ? "1" : "0" + extEmpsWitch, operateTaxDeclaration: (operateTaxDeclaration && operateTaxDeclaration !== "0") ? "1" : "0", + welBaseDiffByPerAndCom } }); } @@ -307,6 +310,13 @@ export default class Index extends Component { confValue: !_.isNil(val) ? val.toString() : "0" }); break; + case "welBaseDiffByPerAndCom": + this.saveSysOperate({ + title: getLabel(111, "福利档案基数区分个人和公司"), + module: "basic", confKey: key, + confValue: val + }); + break; default: break; } @@ -342,7 +352,8 @@ export default class Index extends Component { confValue, withDrawTaxDeclaration, extEmpsWitch, - salaryAcctFixedColumns + salaryAcctFixedColumns, + welBaseDiffByPerAndCom } = saveParams; return (
@@ -398,6 +409,12 @@ export default class Index extends Component { onChange={val => this.handleChange("confValue", val)}/> + + + this.handleChange("welBaseDiffByPerAndCom", val)}/> + + this.handleChangeSalaryFiledItems(key, v)}/> - {key === "width" && + {key === "width" && display && px} : null diff --git a/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js b/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js new file mode 100644 index 00000000..710a6387 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/salaryItemDiagram/index.js @@ -0,0 +1,22 @@ +/* + * Author: 黎永顺 + * name: 薪资档案拓扑图 + * Description: + * Date: 2023/10/19 + */ +import React, { Component } from "react"; + +class Index extends Component { + render() { + return ( +