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

Merge branch 'hotfix/2.9.42311.02' into release/2.9.42311.02-个税

This commit is contained in:
黎永顺 2023-11-17 13:47:56 +08:00
parent 3ec45fc1ba 373b0aad56
commit 4ffd2731ee
12 changed files with 90 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcList.js
View File

@ -84,7 +84,7 @@ class SalaryCalcOcList extends Component {
render: (__, record) => {
const formulaDesc = record["customParameters"][`${o["dataIndex"]}`];
const showDifference = record[`${o["dataIndex"]}_type`] === "number";
const { acctResultValue, excelResultValue } = record[o["dataIndex"]];
const { acctResultValue, excelResultValue } = record[o["dataIndex"]] || {};
return <div className="comparison-column-item-container"
onClick={() => this.setState({ formulaDesc })}>
<div className="comparison-single-row">

7
pc4mobx/hrmSalary/pages/calculate/calcOc/index.js
View File

@ -9,6 +9,7 @@ import { Button } from "antd";
import { WeaCheckbox, WeaInputSearch, WeaLocaleProvider } from "ecCom";
import SalaryCalcOcList from "./components/salaryCalcOcList";
import SalaryCalcOcImport from "./components/salaryCalcOcImport";
import { convertToUrlString } from "../../../util/url";
import Layout from "../doCalc/layout";
import "./index.less";
@ -34,8 +35,12 @@ class Index extends Component {
};
handleExportClick = () => {
const { form: { onlyDiffEmployee, onlyDiffSalaryItem } } = this.state;
const { routeParams: { salaryAcctRecordId } } = this.props;
window.open(`/api/bs/hrmsalary/salaryacct/comparisonresult/export?salaryAcctRecordId=${salaryAcctRecordId}`, "_blank");
const payload = {
salaryAcctRecordId, onlyDiffEmployee, onlyDiffSalaryItem
};
window.open(`/api/bs/hrmsalary/salaryacct/comparisonresult/export?${convertToUrlString(payload)}`, "_blank");
};
handleImportClick = () => {
const { routeParams: { salaryAcctRecordId } } = this.props;

4
pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
View File

@ -114,7 +114,7 @@ class Index extends Component {
}
};
}
return { ...o, width };
return { ...o, width, render: (txt) => (<span title={txt}>{txt}</span>) };
})
});
}
@ -142,7 +142,7 @@ class Index extends Component {
};
return (
<WeaTable
rowKey="id"
rowKey="id" scroll={{ y: "calc(100vh - 152px)" }}
dataSource={dataSource} loading={loading}
pagination={pagination} columns={columns}
/>

2
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js
View File

@ -210,7 +210,7 @@ class Index extends Component {
},
{
title: <React.Fragment>
<span>{getLabel(542308, "环比上月增加人员")}</span>
<span>{getLabel(542309, "环比上月增加人员")}</span>
<WeaHelpfulTip
width={200} placement="topLeft"
title={getLabel(543553, "提示：环比上期当前选择的账套归档的各个税扣缴义务人下增加的人员")}

4
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
View File

@ -40,10 +40,10 @@ class EditSalaryBaseInfo extends Component {
"esf-form-last-item": (index === baseInfo.length - 1 && (index + 1) % 2 === 1)
})}>
<Col span={(index === baseInfo.length - 1 && (index + 1) % 2 === 1) ? 3 : 6}>
<span className="label">{fieldName}</span>
<span className="label" title={fieldName}>{fieldName}</span>
</Col>
<Col span={(index === baseInfo.length - 1 && (index + 1) % 2 === 1) ? 21 : 18}>
<span className="value">{fieldValue}</span>
<span className="value" title={fieldValue}>{fieldValue}</span>
</Col>
</Row>
</Col>

4
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
View File

@ -168,6 +168,10 @@
display: inline-block;
line-height: 24px;
padding: 8px 16px;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}

3
pc4mobx/hrmSalary/pages/calculate/index.less
View File

@ -75,7 +75,6 @@
.calculate-body {
height: 100%;
width: 100%;
padding: 16px;
overflow-y: auto;
.wea-new-table {
@ -84,12 +83,14 @@
.ant-table-tbody {
td {
span {
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
}
}

1
pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
View File

@ -114,6 +114,7 @@ class FieldTable extends Component {
pagination={pagination}
loading={loading}
columns={this.getColumns()}
scroll={{ y: "calc(100vh - 152px)" }}
/>
);
}

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

@ -200,6 +200,7 @@ class LedgerTable extends Component {
pagination={pagination}
loading={loading}
columns={this.getColumns()}
scroll={{ y: "calc(100vh - 152px)" }}
/>
<CopyLedgerModal
{...copyLedgerModal}

15
pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
View File

@ -13,10 +13,12 @@ export const loginCondition = [
fieldcol: 18,
label: getLabel(388431, "登录密码"),
labelcol: 6,
detailtype: 3,
detailtype: 1,
rules: "required|string",
type: "password",
viewAttr: 3
viewAttr: 3,
otherParams: {
type: "password"
}
}
],
title: "",
@ -35,10 +37,12 @@ export const condition = [
fieldcol: 18,
label: getLabel(409, "密码"),
labelcol: 6,
detailtype: 3,
detailtype: 1,
rules: "required|string",
viewAttr: 3,
otherParams: {
type: "password"
}
},
{
colSpan: 1,
@ -49,7 +53,10 @@ export const condition = [
labelcol: 6,
rules: "required|string",
viewAttr: 3,
detailtype: 1,
otherParams: {
type: "password"
}
},
{
colSpan: 1,

56
pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js
View File

@ -5,7 +5,7 @@
* Date: 2023/9/4
*/
import React, { Component } from "react";
import { WeaDialog, WeaLocaleProvider, WeaSearchGroup, WeaTableEdit, WeaTools } from "ecCom";
import { WeaDialog, WeaInput, WeaInputNumber, WeaLocaleProvider, WeaSearchGroup, WeaTableEdit, WeaTools } from "ecCom";
import { Button, message, Spin } from "antd";
import {
editSingleSalaryItem,
@ -59,7 +59,13 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component {
const { salaryArchiveItemForm, salaryArchiveItemDetail, canOperator } = data;
const { adjustReasonList } = salaryArchiveItemForm;
this.setState({
canOperator, salaryArchiveItemDetail,
canOperator,
salaryArchiveItemDetail: {
...salaryArchiveItemDetail,
list: _.map(salaryArchiveItemDetail.list, o => ({
...o, dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === o.salaryItem).dataType
}))
},
conditions: _.map(adjCondition, item => {
return {
...item,
@ -100,7 +106,10 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component {
...salaryArchiveItemDetail,
list: _.map(list, o => {
if (o.salaryItem === salaryItemId) {
return { ...o, salaryBefore: data };
return {
...o, salaryBefore: data,
dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === salaryItemId).dataType
};
}
return { ...o };
})
@ -109,6 +118,23 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component {
}
});
};
handleChangeAdjustAfter = (record, v) => {
const { salaryArchiveItemDetail } = this.state;
const { list } = salaryArchiveItemDetail;
this.setState({
salaryArchiveItemDetail: {
...salaryArchiveItemDetail,
list: _.map(list, o => {
if (o.salaryItem === record.salaryItem) {
return {
...o, adjustAfter: v
};
}
return { ...o };
})
}
});
};
save = () => {
const { salaryFileStore: { adjForm, fetchSingleSalaryItemList, getArchiveForm } } = this.props;
const { pass } = this.tableEdit.refs.edit.doRequiredCheck();
@ -201,12 +227,30 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component {
<WeaSearchGroup title={getLabel(543333, "调薪明细")} showGroup needTigger={false}>
<WeaTableEdit
ref={dom => this.tableEdit = dom} deleteConfirm
columns={adjColumns} datas={list} showCopy={false}
showAdd={!id} showDelete={!id}
datas={list} showCopy={false} showAdd={!id} showDelete={!id}
onChange={o => this.setState({
salaryArchiveItemDetail: {
...salaryArchiveItemDetail, list: o
...salaryArchiveItemDetail, list: _.map(o, it => ({ ...it, dataType: "" }))
}
})} columns={_.map(adjColumns, o => {
if (o.dataIndex === "adjustAfter") {
return {
...o, render: (__, record) => {
if (record.dataType === "number") {
return <WeaInputNumber
precision={3} viewAttr={3} value={record["adjustAfter"]}
onChange={v => this.handleChangeAdjustAfter(record, v)}
/>;
} else {
return <WeaInput
value={record["adjustAfter"]} viewAttr={3}
onChange={v => this.handleChangeAdjustAfter(record, v)}
/>;
}
}
};
}
return { ...o };
})}
/>
</WeaSearchGroup>

4
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js
View File

@ -19,7 +19,7 @@ class InputPaymentAmount extends Component {
render: (text, record) => {
return (
<WeaInputNumber
value={record[`${record.insuranceId}_per`]} min={0}
value={record[`${record.insuranceId}_per`]}
precision={2} onChange={(val) => this.handleChangeBaseItem(record, val, type, "per")}
/>
);
@ -30,7 +30,7 @@ class InputPaymentAmount extends Component {
render: (text, record) => {
return (
<WeaInputNumber
value={record[`${record.insuranceId}_com`]} min={0}
value={record[`${record.insuranceId}_com`]}
precision={2} onChange={(val) => this.handleChangeBaseItem(record, val, type, "com")}
/>
);