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

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

This commit is contained in:
lys 2025-03-27 13:51:01 +08:00
parent 0d55c14f0b b443a56679
commit c3284fa160
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
View File

@ -53,6 +53,10 @@ class Index extends Component {
} = payrollTempForm.getFormParams(),
{ ackFeedbackStatus, feedbackStatus, autoAckDays, ...extraFb } = payrollTempFeedbackForm.getFormParams(),
{ formData, smsSettingDialog } = this.tmpBaseSetRef.state;
if (autoSendStatus !== "1" && emailStatus !== "1" && msgStatus !== "1" && smsStatus !== 1) {
message.warning(getLabel(111, "工资单模板至少开启一个发送通道"));
return;
}
const payload = {
...toJS(tmplDataSource), ...extraFb, ...formData, ...extraBs,
ackFeedbackStatus: ackFeedbackStatus === "1",

9
pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
View File

@ -197,6 +197,15 @@ export const conditions = [
lanId: 111,
labelcol: 8,
viewAttr: 2
},
{
conditionType: "SWITCH",
domkey: ["SALARY_ACCT_SYNC_TYPE"],
fieldcol: 10,
label: "是否采用线程池",
lanId: 111,
labelcol: 8,
viewAttr: 2
}
],
title: "薪资核算",

4
pc4mobx/hrmSalary/pages/ruleConfig/form.js
View File

@ -25,8 +25,8 @@ export const renderRuleForm = (form, condition, onChange) => {
tipPosition="bottom">
<WeaSwitch
fieldConfig={fields} form={form} formParams={formParams}
onChange={v => getKey(fields) !== "salaryAcctFixedColumns" && onChange(v)}
onBlur={(v) => getKey(fields) === "salaryAcctFixedColumns" && onChange({ salaryAcctFixedColumns: { value: v } })}
onChange={v => !["INPUT", "INPUTNUMBER", "TEXTAREA"].includes(fields.conditionType) && onChange(v)}
onBlur={v => ["INPUT", "INPUTNUMBER", "TEXTAREA"].includes(fields.conditionType) && onChange({ [getKey(fields)]: { value: v } })}
/>
</WeaFormItem>),
colSpan: 1,

4
pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
View File

@ -104,7 +104,7 @@ class RuleConfig extends Component {
form.updateFields({ [item]: { value: sysinfo[item] === "0" ? "0" : (sysinfo[item] || "0") } });
} else if (item === "taxAgentShowStatus" || item === "salaryShowStatus" || item === "adjustShowStatus") {
form.updateFields({ [item]: { value: sysinfo[item] || "1" } });
} else if (item === "OPEN_APPLICATION_ENCRYPT") {
} else if (item === "OPEN_APPLICATION_ENCRYPT" || item === "SALARY_ACCT_SYNC_TYPE") {
form.updateFields({ [item]: { value: _.isNil(sysinfo[item]) ? "1" : (sysinfo[item] || "") } });
} else if (
item === "APPROVAL_CAN_MANUAL_FILE_STATUS" || item === "APPROVAL_CAN_RE_CALC_STATUS" || item === "APPROVAL_CAN_EDIT_RESULT_STATUS"
@ -163,6 +163,7 @@ class RuleConfig extends Component {
case "ATTENDANCE_SERIAL_COLLECTION_BTN":
case "TAX_DECLARATION_DATE_TYPE":
case "SHOT_EMP_BTN":
case "SALARY_ACCT_SYNC_TYPE":
if (!this.handleDebounce) {
this.handleDebounce = _.debounce(() => {
const confTitle = {
@ -183,6 +184,7 @@ class RuleConfig extends Component {
ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据"),
TAX_DECLARATION_DATE_TYPE: getLabel(111, "申报日期类型"),
SHOT_EMP_BTN: getLabel(111, "启用组织快照"),
SALARY_ACCT_SYNC_TYPE: getLabel(111, "是否采用线程池")
};
this.unifiedSettings(key, confTitle[key]);
this.handleDebounce = null;