qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.12.1.2404.02' into release/2.12.1.2404.02-个税

This commit is contained in:
黎永顺 2024-05-08 14:06:43 +08:00
parent 6c72f335cc 70d7449602
commit 781bf21dd7
14 changed files with 74 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pc4mobx/hrmSalary/apis/mySalaryBenefits.js
View File

@ -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);
};

3
pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/condition.js
View File

@ -22,6 +22,9 @@ export const calculateConditions = [
lanId: 519146,
labelcol: 6,
options: [],
otherParams: {
showSearch: true, optionFilterProp: "children"
},
rules: "required|string",
viewAttr: 3
},

34
pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
View File

@ -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 (
<Layout title="累计专项附加扣除" btns={this.getTopBtns()} leftComp={this.getScreen()}
onResizeWindowInnerWidth={this.handleResize} slidePayload={slidePayload}
@ -590,10 +591,13 @@ export const DataCollectionDatePicker = (props) => {
</WeaFormItem>;
};
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 <WeaFormItem label={label} labelCol={{ span: labelCol }} wrapperCol={{ span: wrapperCol }}>
<WeaSelect value={value} onChange={(val) => onChange({ key, value: val })} options={options}
viewAttr={viewAttr}/>
viewAttr={viewAttr} multiple={multiple}/>
</WeaFormItem>;
};

4
pc4mobx/hrmSalary/pages/dataAcquisition/index.less
View File

@ -81,6 +81,10 @@
.wea-helpful-tip {
padding-left: 10px;
}
.wea-form-item-wrapper {
display: inline-block !important;
}
}
.screenSituationWrapper {

16
pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
View File

@ -119,22 +119,6 @@ class Layout extends Component {
importOpts={importOpts} importResult={importResult} templateLink={templateLink}
previewUrl={previewUrl} onImportFile={onImportFile}
/>
{/*<ImportModal*/}
{/* needimportSelected //下载模板需要带上导入所选项*/}
{/* columns={columns}*/}
{/* params={importOpts}*/}
{/* step={step}*/}
{/* setStep={onImportSetStep}*/}
{/* importResult={importResult}*/}
{/* onFinish={() => onCancel(true)}*/}
{/* slideDataSource={slideDataSource}*/}
{/* previewImport={onPreviewImport}*/}
{/* importFile={onImportFile}*/}
{/* templateLink={templateLink}*/}
{/* renderFormComponent={() => importFormComponent}*/}
{/* visiable={importVisiable}*/}
{/* onCancel={onCancel}*/}
{/*/>*/}
{/* 新增-编辑-详情弹框 */}
<WeaSlideModal
className="slideOuterWrapper"

1
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
View File

@ -55,6 +55,7 @@ class LedgerSalaryItemBaseInfo extends Component {
const options = _.map(empFieldListOptions, o => ({
...o, disabled: _.map(dataSource, g => g.fieldId).includes(o.key)
}));
if (_.isEmpty(dataSource) || _.isEmpty(options)) return null;
return (
<WeaSearchGroup needTigger={false} showGroup title={<TitleComp onPreview={onPreview}/>}>
<div className="userInfoWrapper">

7
pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
View File

@ -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") {

1
pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
View File

@ -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 (
<div className="salaryItemSettingWrapper">
<WeaSortable

6
pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
View File

@ -45,7 +45,7 @@ class Index extends Component {
}
componentDidMount() {
this.getSalaryFileList(this.props);
this.getSalaryFileList(this.props, true);
window.addEventListener("message", this.handleReceive, false);
window.addEventListener("resize", this.handleResize, false);
}
@ -152,7 +152,7 @@ class Index extends Component {
const childFrameObj = document.getElementById("atdTable");
childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
};
getSalaryFileList = (props) => {
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 }));

24
pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js
View File

@ -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 || {};

2
pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
View File

@ -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) => {

4
pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
View File

@ -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"
})) : []
})),

6
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
View File

@ -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

24
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
View File

@ -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 });