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

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

# Conflicts:
#	pc4mobx/hrmSalary/components/FormInfo/index.js
This commit is contained in:
lys 2024-12-25 17:25:31 +08:00
parent e8f820058b 8b8f4cd610
commit fa3d3a283e
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js
View File

@ -46,8 +46,8 @@ class Index extends Component {
const payload = { const payload = {
...pageInfo, ...extra, ...pageInfo, ...extra,
departmentIds: departmentIds ? departmentIds.split(",") : [], departmentIds: departmentIds ? departmentIds.split(",") : [],
positionIds: departmentIds ? departmentIds.split(",") : [], positionIds: positionIds ? positionIds.split(",") : [],
operatorIds: departmentIds ? departmentIds.split(",") : [], operatorIds: operatorIds ? operatorIds.split(",") : [],
effectiveTime: effectiveTime1 ? [effectiveTime1, effectiveTime2] : [], effectiveTime: effectiveTime1 ? [effectiveTime1, effectiveTime2] : [],
operateTime: operateTime1 ? [operateTime1, operateTime2] : [] operateTime: operateTime1 ? [operateTime1, operateTime2] : []
}; };

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

@ -182,7 +182,7 @@ class LedgerSalaryItemNormal extends Component {
> >
<LedgerSalaryItemTable <LedgerSalaryItemTable
tableData={items} tableData={items}
dataSource={_.find(dataSource, childItem => childItem.id === id || childItem.uuid === uuid).items} dataSource={_.find(newDateSource, childItem => childItem.uuid === uuid).items}
salarySobId={editId || saveSalarySobId} salarySobId={editId || saveSalarySobId}
selectedRowKeys={field.selectedRowKeys || []} selectedRowKeys={field.selectedRowKeys || []}
onDropCategoryItem={(data) => onDropCategoryItem(field, data)} onDropCategoryItem={(data) => onDropCategoryItem(field, data)}

2
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
View File

@ -116,7 +116,7 @@ class Index extends Component {
} else if (getKey(g).indexOf("StartTime") !== -1) { } else if (getKey(g).indexOf("StartTime") !== -1) {
return { return {
...g, label: getLabel(g.lanId, g.label), ...g, label: getLabel(g.lanId, g.label),
viewAttr: (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr
}; };
} }
return { return {

2
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js
View File

@ -84,7 +84,7 @@ class PlanSetTable extends Component {
com: [{ com: [{
type: "custom", type: "custom",
key: "custom", key: "custom",
render: text => (<span>{text}</span>) render: text => (<span className="text-td-elli" title={text}>{text}</span>)
}] }]
}, },
{ {

8
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
View File

@ -232,6 +232,14 @@
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
.text-td-elli {
display: inline-block;
width: 120px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
} }
} }
} }