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

Merge branch 'hotfix/V2-0209' into develop

This commit is contained in:
黎永顺 2023-02-08 17:54:22 +08:00
parent 5fc373c540 0d70495c4f
commit 2434cde0bd
10 changed files with 71 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc4mobx/hrmSalary/index.js
View File

@ -77,6 +77,7 @@ const DataAcquisition = (props) => props.children;
// sysconfig 系統配置
// sysconfig-1 规则配置
// appconfig 应用配置
// fieldManagement 字段管理
const Routes = (
<Route

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

@ -1,11 +1,13 @@
.dataList-wrapper {
.ant-modal-body{
.ant-modal-body {
padding: 16px 120px
}
.formItem {
.wea-select, .ant-select {
width: 100%;
}
.ant-select-selection {
width: 100%;
height: 30px;
@ -14,15 +16,21 @@
}
}
.salarySobNameWrapper{
.salarySobNameWrapper {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
.salarySobNameTagWrapper{
& > span {
flex: 1;
}
.salarySobNameTagWrapper {
display: flex;
align-items: center;
i{
i {
color: #5d9cec;
margin-right: 10px;
cursor: pointer;

16
pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
View File

@ -42,6 +42,20 @@ export default class PlaceOnFileDetail extends React.Component {
if (type === "PR") {
if (id === "BATCHDELETE") {
this.setState({ selectedRowKeys: record });
}else if (id === "PAGEINFO") {
const { pageNum: current, size: pageSize } = record;
this.pageInfo = { current, pageSize };
const payload = {
type: "PR",
listType: "",
url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
queryParams: {
salaryAcctRecordId,
employeeName: this.state.searchValue,
current, pageSize
}
};
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
}
} else {
const payload = {
@ -54,7 +68,7 @@ export default class PlaceOnFileDetail extends React.Component {
employeeName: this.state.searchValue
}
};
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
type && childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
}
};

2
pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
View File

@ -111,7 +111,7 @@ export default class SalaryDetail extends React.Component {
employeeName: this.props.employeeName
}
};
childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
type && childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
}
};

6
pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
View File

@ -168,7 +168,7 @@ class FieldSlide extends Component {
className="slideOuterWrapper"
visible={visible}
top={0}
width={55}
width={50}
height={100}
direction="right"
measure="%"
@ -186,6 +186,7 @@ class FieldSlide extends Component {
<div className="wea-form-item-group">
<WeaFormItem label="名称" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
<WeaInput viewAttr={3} value={name}
style={{ width: "80%" }}
onChange={value => this.handleChangeFields("name", value)}/>
</WeaFormItem>
<WeaFormItem label="默认使用" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
@ -232,6 +233,7 @@ class FieldSlide extends Component {
<WeaSelect
value={roundingMode}
options={roundingModeOptions}
style={{ width: 200 }}
onChange={value => this.handleChangeFields("roundingMode", value)}
/>
</WeaFormItem>
@ -239,12 +241,14 @@ class FieldSlide extends Component {
<WeaSelect
value={pattern}
options={patternOptions}
style={{ width: 200 }}
onChange={value => this.handleChangeFields("pattern", value)}
/>
</WeaFormItem>
<WeaFormItem label="备注" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
<WeaTextarea
value={description}
style={{ width: "80%" }}
onChange={value => this.handleChangeFields("description", value)}
/>
</WeaFormItem>

13
pc4mobx/hrmSalary/pages/fieldManagement/index.less
View File

@ -1,7 +1,16 @@
.slideOuterWrapper {
.wea-form-item-group{
padding: 56px 80px;
.wea-form-item-group {
margin: 16px;
border: 1px solid #e5e5e5;
border-bottom: none;
& > div {
border-bottom: 1px solid #e5e5e5;
margin-bottom: 0;
padding: 5px 16px
}
}
.wea-slide-modal-title {
height: initial;
line-height: initial;

24
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js
View File

@ -38,7 +38,7 @@ class LedgerSalaryItem extends Component {
if (status) {
const { empFields, itemGroups, items, incomeCategories } = data;
const obj = {
id: itemGroups.length,
uuid: itemGroups.length.toString(),
itemHide: null,
items,
name: "未分类",
@ -48,7 +48,7 @@ class LedgerSalaryItem extends Component {
this.setState({
empFields,
incomeCategoriesTitleName: incomeCategories[0].name,
itemGroups: [...itemGroups, obj]
itemGroups: [..._.map(itemGroups, it => ({ ...it, uuid: it.id })), obj]
}, () => {
const { empFields, itemGroups } = this.state;
const { onSaveSalaryItem } = this.props;
@ -81,15 +81,19 @@ class LedgerSalaryItem extends Component {
if (payload.id) {
this.setState({
itemGroups: _.map(itemGroups, it => {
if (it.id === payload.id) {
if (it.uuid === payload.id) {
return { ...it, name: payload.name };
}
return { ...it };
})
}, () => {
const { empFields, itemGroups } = this.state;
const { onSaveSalaryItem } = this.props;
onSaveSalaryItem(empFields, itemGroups);
});
} else {
const obj = {
id: new Date().getTime(),
uuid: new Date().getTime().toString(),
itemHide: null,
items: [],
name: payload.name
@ -112,7 +116,7 @@ class LedgerSalaryItem extends Component {
handleDeleteCategroy = (id) => {
const { itemGroups } = this.state;
this.setState({
itemGroups: _.filter(itemGroups, it => it.id !== id)
itemGroups: _.filter(itemGroups, it => it.uuid !== id)
}, () => {
const { empFields, itemGroups } = this.state;
const { onSaveSalaryItem } = this.props;
@ -129,7 +133,7 @@ class LedgerSalaryItem extends Component {
const { itemGroups } = this.state;
this.setState({
itemGroups: _.map(itemGroups, item => {
if (item.id === id) {
if (item.uuid === id) {
return {
...item,
items: _.filter(item.items, it => !selectedRowKeys.includes(it.id)),
@ -204,7 +208,7 @@ class LedgerSalaryItem extends Component {
const { itemGroups } = this.state;
this.setState({
itemGroups: _.map(itemGroups, it => {
if (filed.id === it.id) {
if (filed.uuid === it.uuid) {
return {
...it,
items: _.map(data, (child, childIndex) => {
@ -233,7 +237,7 @@ class LedgerSalaryItem extends Component {
const { itemGroups } = this.state;
this.setState({
itemGroups: _.map(itemGroups, it => {
if (filed.id === it.id) {
if (filed.uuid === it.uuid) {
return { ...it, selectedRowKeys: data };
}
return { ...it };
@ -254,7 +258,7 @@ class LedgerSalaryItem extends Component {
const { itemGroups } = this.state;
this.setState({
itemGroups: _.map(itemGroups, it => {
if (id === it.id) {
if (id === it.uuid) {
return { ...it, items: [...it.items, ...items] };
}
return { ...it };
@ -275,7 +279,7 @@ class LedgerSalaryItem extends Component {
const { itemGroups } = this.state;
this.setState({
itemGroups: _.map(itemGroups, it => {
if (id === it.id) {
if (id === it.uuid) {
return { ...it, items };
}
return { ...it };

2
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
View File

@ -82,7 +82,7 @@ export default class LedgerSalaryItemAddModal extends React.Component {
handleAdd = () => {
const { dataSource, selectedRowKeys } = this.state;
const { onAddSalaryItems, id, onCancel, itemGroups } = this.props;
const arrItems = _.find(itemGroups, it => it.id === id).items || [];
const arrItems = _.find(itemGroups, it => it.uuid === id).items || [];
let selectItems = [];
dataSource.map((item) => {
item = { ...item };

12
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
View File

@ -66,7 +66,7 @@ class LedgerSalaryItemNormal extends Component {
}
return { ...it };
});
onSaveFormnul(formnulField.id, formnulData);
onSaveFormnul(formnulField.uuid, formnulData);
};
handleAddCategory = (name = "", id = "") => {
const { categoryModal } = this.state;
@ -214,7 +214,7 @@ export default LedgerSalaryItemNormal;
const TitleNormalComp = (props) => {
const {
name, onEditCategory, onDeleteCategory,
sortedIndex, dataSourceLen, id, onUpgo,
sortedIndex, dataSourceLen, uuid, onUpgo,
onDowngo, selectedRowKeys = [], onDeleteCategoryItems,
onAddCategoryItems
} = props;
@ -223,11 +223,11 @@ const TitleNormalComp = (props) => {
<span>{name}</span>
{
name !== "未分类" &&
<i className="icon-coms-edit" title="编辑" onClick={() => onEditCategory(name, id)}/>
<i className="icon-coms-edit" title="编辑" onClick={() => onEditCategory(name, uuid)}/>
}
{
name !== "未分类" &&
<i className="icon-coms-Delete" title="删除" onClick={() => onDeleteCategory(id)}/>
<i className="icon-coms-Delete" title="删除" onClick={() => onDeleteCategory(uuid)}/>
}
{
sortedIndex !== 0 &&
@ -240,8 +240,8 @@ const TitleNormalComp = (props) => {
</div>
<div className="titleBtnWrapper">
<WeaButtonIcon buttonType="del" type="primary" disabled={_.isEmpty(selectedRowKeys)}
onClick={() => onDeleteCategoryItems(id, selectedRowKeys)}/>
<WeaButtonIcon buttonType="add" type="primary" onClick={() => onAddCategoryItems(id)}/>
onClick={() => onDeleteCategoryItems(uuid, selectedRowKeys)}/>
<WeaButtonIcon buttonType="add" type="primary" onClick={() => onAddCategoryItems(uuid)}/>
</div>
</div>;
};

5
pc4mobx/hrmSalary/pages/taxAgent/columns.js
View File

@ -41,6 +41,11 @@ export const importEmployColumns = [
dataIndex: "mobile",
key: "mobile"
},
{
title: "员工状态",
dataIndex: "employeeStatus",
key: "employeeStatus"
},
];