hotfix/2.15.1.2409.01

规则设置修改
This commit is contained in:
黎永顺 2024-10-08 13:21:55 +08:00
parent 9c318d22b7
commit 53d45c2069
2 changed files with 127 additions and 118 deletions

View File

@ -4,6 +4,21 @@ import { WeaLocaleProvider } from "ecCom";
const getLabel = WeaLocaleProvider.getLabel;
export const conditions = [
{
items: [
{
conditionType: "SELECT",
domkey: ["rule"],
fieldcol: 10,
label: getLabel(543352, "人员字段"),
labelcol: 8,
options: [],
viewAttr: 2
}
],
title: getLabel(543357, "人员校验规则"),
defaultshow: true
},
{
items: [
{
@ -28,21 +43,6 @@ export const conditions = [
title: getLabel(543356, "排序规则"),
defaultshow: true
},
{
items: [
{
conditionType: "SELECT",
domkey: ["rule"],
fieldcol: 10,
label: getLabel(543352, "人员字段"),
labelcol: 8,
options: [],
viewAttr: 2
}
],
title: getLabel(543357, "人员校验规则"),
defaultshow: true
},
{
items: [
{
@ -57,107 +57,6 @@ export const conditions = [
title: getLabel(543358, "加密规则"),
defaultshow: true
},
{
items: [
{
conditionType: "SWITCH",
domkey: ["taxDeclarationFunction"],
fieldcol: 10,
label: getLabel(111, "系统算税"),
labelcol: 8,
viewAttr: 1
},
{
conditionType: "SWITCH",
domkey: ["WITHDRAW_TAX_DECLARATION"],
fieldcol: 10,
label: getLabel(111, "撤回申报表"),
labelcol: 8,
viewAttr: 2
}
],
title: getLabel(111, "算税规则"),
defaultshow: true
},
{
items: [
{
conditionType: "SWITCH",
domkey: ["salaryArchiveDelete"],
fieldcol: 10,
label: getLabel(111, "允许删除档案"),
labelcol: 8,
viewAttr: 2
}
],
title: getLabel(538004, "薪资档案"),
defaultshow: true
},
{
items: [
{
conditionType: "SWITCH",
domkey: ["welBaseDiffByPerAndCom"],
fieldcol: 10,
label: getLabel(111, "区分个人和公司"),
labelcol: 8,
viewAttr: 2
},
{
conditionType: "SWITCH",
domkey: ["welBaseAutoAdjust"],
fieldcol: 10,
label: getLabel(111, "导入基数自动调整上/下限"),
labelcol: 8,
viewAttr: 2
}
],
title: getLabel(111, "福利档案基数"),
defaultshow: true
},
{
items: [
{
conditionType: "SELECT",
domkey: ["matchRule"],
fieldcol: 10,
label: getLabel(111, "匹配规则"),
options: [],
labelcol: 8,
viewAttr: 2
}
],
title: getLabel(111, "薪资核算人员匹配规则"),
defaultshow: true
},
{
items: [
{
conditionType: "INPUTNUMBER",
domkey: ["salaryAcctFixedColumns"],
fieldcol: 10,
label: getLabel(111, "固定数"),
labelcol: 8,
viewAttr: 2
}
],
title: getLabel(111, "薪资核算固定列头数"),
defaultshow: true
},
// {
// items: [
// {
// conditionType: "SWITCH",
// domkey: ["extEmpsWitch"],
// fieldcol: 10,
// label: getLabel(111, "开启非系统人员"),
// labelcol: 8,
// viewAttr: 2
// }
// ],
// title: getLabel(111, "非系统人员"),
// defaultshow: true
// },
{
items: [
{
@ -187,7 +86,117 @@ export const conditions = [
],
title: getLabel(111, "我的薪资福利设置"),
defaultshow: true
}
},
{
items: [
{
conditionType: "SWITCH",
domkey: ["welBaseDiffByPerAndCom"],
fieldcol: 10,
label: getLabel(111, "区分个人和公司"),
labelcol: 8,
viewAttr: 2
},
{
conditionType: "SWITCH",
domkey: ["welBaseAutoAdjust"],
fieldcol: 10,
label: getLabel(111, "导入基数自动调整上/下限"),
labelcol: 8,
viewAttr: 2
}
],
title: getLabel(111, "福利档案基数"),
defaultshow: true
},
{
items: [
{
conditionType: "SWITCH",
domkey: ["salaryArchiveDelete"],
fieldcol: 10,
label: getLabel(111, "允许删除档案"),
labelcol: 8,
viewAttr: 2
}
],
title: getLabel(538004, "薪资档案"),
defaultshow: true
},
{
items: [
{
conditionType: "SELECT",
domkey: ["matchRule"],
fieldcol: 10,
label: getLabel(111, "匹配规则"),
options: [],
labelcol: 8,
viewAttr: 2
},
{
conditionType: "INPUTNUMBER",
domkey: ["salaryAcctFixedColumns"],
fieldcol: 10,
label: getLabel(111, "固定数"),
labelcol: 8,
viewAttr: 2
}
],
title: getLabel(111, "薪资核算"),
defaultshow: true
},
{
items: [
{
conditionType: "SWITCH",
domkey: ["taxDeclarationFunction"],
fieldcol: 10,
label: getLabel(111, "系统算税"),
labelcol: 8,
viewAttr: 1
},
{
conditionType: "SWITCH",
domkey: ["WITHDRAW_TAX_DECLARATION"],
fieldcol: 10,
label: getLabel(111, "撤回申报表"),
labelcol: 8,
viewAttr: 2
}
],
title: getLabel(111, "算税规则"),
defaultshow: true
},
{
items: [
{
conditionType: "SELECT",
domkey: ["abc"],
fieldcol: 10,
label: getLabel(111, "组织信息"),
options: [],
labelcol: 8,
viewAttr: 2
}
],
title: getLabel(111, "薪资报表"),
defaultshow: true
},
// {
// items: [
// {
// conditionType: "SWITCH",
// domkey: ["extEmpsWitch"],
// fieldcol: 10,
// label: getLabel(111, "开启非系统人员"),
// labelcol: 8,
// viewAttr: 2
// }
// ],
// title: getLabel(111, "非系统人员"),
// defaultshow: true
// },
];
export const payloadList = [
{ enumClass: "com.engine.salary.sys.enums.SalaryAcctEmployeeRuleEnum" },

View File

@ -3,7 +3,7 @@
overflow: hidden !important;
.ruleWrapper {
padding: 16px;
padding: 8px 16px 0;
background: #e5e5e5;
height: 100%;
overflow: hidden auto;