diff --git a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js index 0cb56cfe..b79a6718 100644 --- a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js +++ b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js @@ -42,6 +42,9 @@ export const doSecondAuth = (params, headers) => { return formHeaderPost("/api/encrypt/secondauthsetting/doSecondAuth", "POST", params, headers); // return WeaTools.callApi("/api/encrypt/secondauthsetting/doSecondAuth", "POST", params); }; +export const getPasswordForm = params => { + return WeaTools.callApi("/api/hrm/secondarypwd/getPasswordForm", "GET", params); +}; export const checkPassword = params => { return WeaTools.callApi("/api/hrm/secondarypwd/checkPassword", "POST", params); }; diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js index 3274d070..be20527a 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js @@ -22,6 +22,9 @@ export const calculateConditions = [ lanId: 519146, labelcol: 6, options: [], + otherParams: { + showSearch: true, optionFilterProp: "children" + }, rules: "required|string", viewAttr: 3 }, diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 3ec7eb01..980ee789 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -97,17 +97,18 @@ class Index extends Component { * Date: 2023/2/17 */ autoAddAll = () => { - const { declareMonth } = this.state; + const { declareMonth, taxAgentId } = this.state; this.setState({ addAllLoading: true }); - autoAddAll({ yearMonth: declareMonth }).then(({ status, data, errormsg }) => { - this.setState({ addAllLoading: false }); - if (status) { - message.success(data || "操作成功"); - this.tableRef.getTableDate(); - } else { - message.error(errormsg || "操作失败"); - } - }).catch(() => this.setState({ addAllLoading: false })); + autoAddAll({ yearMonth: declareMonth, taxAgentIds: taxAgentId ? taxAgentId.split(",") : [] }) + .then(({ status, data, errormsg }) => { + this.setState({ addAllLoading: false }); + if (status) { + message.success(data || "操作成功"); + this.tableRef.getTableDate(); + } else { + message.error(errormsg || "操作失败"); + } + }).catch(() => this.setState({ addAllLoading: false })); }; /* * Author: 黎永顺 @@ -376,8 +377,8 @@ class Index extends Component { label: "个税扣缴义务人", value: taxAgentId, onChange: this.screenChange, - options: [{ key: "", showname: "全部" }, ...taxAgentOption], - key: "taxAgentId" + options: taxAgentOption, + key: "taxAgentId", multiple: true }) } ]; @@ -541,7 +542,7 @@ class Index extends Component { declareMonth, taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition, importPayload, exportPayloadType, cumTaxPeriodDialog, targetid } = this.state; - const tablePayload = { declareMonth: [declareMonth], taxAgentId }; + const tablePayload = { declareMonth: [declareMonth], taxAgentIds: taxAgentId ? taxAgentId.split(",") : [] }; return ( { ; }; export const DataCollectionSelect = (props) => { - const { value, label, onChange, options, key, labelCol = 10, wrapperCol = 14, viewAttr = 2 } = props; + const { + value, label, onChange, options, key, labelCol = 10, + wrapperCol = 14, viewAttr = 2, multiple = false + } = props; return onChange({ key, value: val })} options={options} - viewAttr={viewAttr}/> + viewAttr={viewAttr} multiple={multiple}/> ; }; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less index a580739f..f5272aed 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less @@ -81,6 +81,10 @@ .wea-helpful-tip { padding-left: 10px; } + + .wea-form-item-wrapper { + display: inline-block !important; + } } .screenSituationWrapper { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js index 8c73c758..996fd07a 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js @@ -119,22 +119,6 @@ class Layout extends Component { importOpts={importOpts} importResult={importResult} templateLink={templateLink} previewUrl={previewUrl} onImportFile={onImportFile} /> - {/* onCancel(true)}*/} - {/* slideDataSource={slideDataSource}*/} - {/* previewImport={onPreviewImport}*/} - {/* importFile={onImportFile}*/} - {/* templateLink={templateLink}*/} - {/* renderFormComponent={() => importFormComponent}*/} - {/* visiable={importVisiable}*/} - {/* onCancel={onCancel}*/} - {/*/>*/} {/* 新增-编辑-详情弹框 */} ({ ...o, disabled: _.map(dataSource, g => g.fieldId).includes(o.key) })); + if (_.isEmpty(dataSource) || _.isEmpty(options)) return null; return ( }>
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js index f857c6d6..5e72cc72 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js @@ -10,7 +10,7 @@ import { WeaSwitch } from "comsMobx"; import { condition, loginCondition } from "./pwdCondtion"; import { Button, message } from "antd"; import { RSAEcrypt } from "../../util/RSAUtil"; -import { checkPassword, saveSecondaryPwd } from "../../apis/mySalaryBenefits"; +import { checkPassword, getPasswordForm, saveSecondaryPwd } from "../../apis/mySalaryBenefits"; import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; @@ -72,7 +72,8 @@ class PassSetDialog extends Component { }); return group; }; - saveSecondaryPassword = () => { + saveSecondaryPassword = async () => { + const { openRSA } = await getPasswordForm(); const { isPassLoginPassword } = this.state; const { form } = this.props; const { secondaryPwd1, secondaryPwd2, validatecode, password } = form.getFormParams(); @@ -92,7 +93,7 @@ class PassSetDialog extends Component { } } const params = isPassLoginPassword ? { secondaryPwd1, secondaryPwd2 } : { password }; - RSAEcrypt("1", params).then(RSAParam => { + RSAEcrypt(openRSA, params).then(RSAParam => { isPassLoginPassword ? saveSecondaryPwd({ ...RSAParam, validatecode }).then(({ sign, message: msg }) => { if (sign === "1") { diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js index ba853f81..e1f85aca 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js @@ -290,6 +290,7 @@ class SalaryItemSettings extends Component { render() { const { onChangeSalaryItem, salaryBillItemNameSet } = this.props; const { dataList, modalPayload, checkedValue } = this.state; + if (_.isEmpty(dataList)) return null; return (
{ + getSalaryFileList = (props, init = false) => { const { pageInfo } = this.state; const { payrollFilesStore: { salaryFileQueryForm, queryList }, selectedKey, onChangeTopTabCount @@ -166,7 +166,7 @@ class Index extends Component { this.setState({ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource }, () => { - onChangeTopTabCount(selectedKey, total); + onChangeTopTabCount(selectedKey, total, init); }); } }).catch(() => this.setState({ loading: false })); diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js index 59fed35e..344a3284 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js @@ -85,15 +85,21 @@ class SalaryFiles extends Component { break; } }; - queryInsuranceTabTotal = (active, total) => { - API.queryTabTotal().then(({ status, data }) => { - if (status) { - const key = _.find(tabList, o => o.viewcondition === active).groupid; - this.setState({ - topTabCount: { ...this.state.topTabCount, ...data, [key]: total } - }); - } - }); + queryInsuranceTabTotal = (active, total, init) => { + const key = _.find(tabList, o => o.viewcondition === active).groupid; + if (init) { + API.queryTabTotal().then(({ status, data }) => { + if (status) { + this.setState({ + topTabCount: { ...this.state.topTabCount, ...data, [key]: total } + }); + } + }); + } else { + this.setState({ + topTabCount: { ...this.state.topTabCount, [key]: total } + }); + } }; handleReqBtnsCLick = (type, importType) => { const { state, handleSalaryOpts } = this.salaryFileListRef.wrappedInstance || {}; diff --git a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js index 9f9bddf7..6a80e8fb 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js @@ -77,7 +77,7 @@ class PovitpivotChartModal extends Component { const childFrameObj = document.getElementById("commonTable"); const { dataSource, showSum = false, pageInfo, columns } = payload; childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ - dataSource, columns, showSum, pageInfo + dataSource, showSum, pageInfo, columns: _.map(columns, o => ({ ...o, width: o.oldWidth, ellipsis: true })) }), "*"); }; getDataPerspective = (payload) => { diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js index 37700a22..a7808410 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js @@ -98,11 +98,11 @@ class ReportContent extends Component { countResult, columns: _.map(columns, it => ({ ...it, - dataIndex: it.column, width: 150, + dataIndex: it.column, width: it.width ? it.width + "px" : 150, title: it.text, align: "center", children: !_.isNil(it.children) ? _.map(it.children, child => ({ ...child, - dataIndex: child.column, width: 150, + dataIndex: child.column, width: child.width ? child.width + "px" : 150, title: child.text, align: "center" })) : [] })), diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js index 6d5e4468..a9029a86 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js @@ -68,7 +68,7 @@ class Index extends Component { handleReceive = async ({ data }) => { const { type, payload: { id, params } = {} } = data; if (type === "init") { - this.getWelfareList(this.props); + this.getWelfareList(this.props, true); } else if (type === "turn") { const { record: { baseInfo, employeeId, paymentOrganization } = {}, interfaceParams = {} } = params; const { runStatuses, showOperateBtn } = this.props; @@ -154,7 +154,7 @@ class Index extends Component { getPaymentForm = async (props) => { return API.getPaymentForm({ ...props }); }; - getWelfareList = (props) => { + getWelfareList = (props, init = false) => { const { pageInfo } = this.state; const { archivesStore: { welfareForm }, runStatuses, onChangeTopTabCount, showOperateBtn } = props; const params = { ...pageInfo, ...welfareForm.getFormParams() }; @@ -182,7 +182,7 @@ class Index extends Component { }) }, () => { const { pageInfo, selectedRowKeys, columns, dataSource } = this.state; - onChangeTopTabCount(runStatuses, total); + onChangeTopTabCount(runStatuses, total, init); this.postMessageToChild({ dataSource, pageInfo, selectedRowKeys, runStatuses, columns, showOperateBtn diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js index 76d00398..4da87e27 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js @@ -46,15 +46,21 @@ class Index extends Component { this.setState({ showExtEmpsWitch: extEmpsWitch === "1" }); } - queryInsuranceTabTotal = (active, total) => { - API.queryInsuranceTabTotal().then(({ status, data }) => { - if (status) { - const key = _.find(tabList, o => o.viewcondition === active).groupid; - this.setState({ - topTabCount: { ...this.state.topTabCount, ...data, [key]: total } - }); - } - }); + queryInsuranceTabTotal = (active, total, init) => { + const key = _.find(tabList, o => o.viewcondition === active).groupid; + if (init) { + API.queryInsuranceTabTotal().then(({ status, data }) => { + if (status) { + this.setState({ + topTabCount: { ...this.state.topTabCount, ...data, [key]: total } + }); + } + }); + } else { + this.setState({ + topTabCount: { ...this.state.topTabCount, [key]: total } + }); + } }; handleOpenAdvanceSearch = () => this.setState({ showSearchAd: true }); handleAdvanceSearch = () => this.setState({ isQuery: !this.state.isQuery });