From 53d45c2069f9d4325698a0e57015ff0702afb7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 8 Oct 2024 13:21:55 +0800 Subject: [PATCH] =?UTF-8?q?hotfix/2.15.1.2409.01=20=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/pages/ruleConfig/conditions.js | 243 +++++++++--------- pc4mobx/hrmSalary/pages/ruleConfig/index.less | 2 +- 2 files changed, 127 insertions(+), 118 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js index d7340658..feaf423d 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js @@ -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" }, diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.less b/pc4mobx/hrmSalary/pages/ruleConfig/index.less index a4599477..a7a7c267 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.less +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.less @@ -3,7 +3,7 @@ overflow: hidden !important; .ruleWrapper { - padding: 16px; + padding: 8px 16px 0; background: #e5e5e5; height: 100%; overflow: hidden auto;