From 99ebca78d0d25c8a4bfc699217ceb75552287a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 13 Sep 2024 15:45:43 +0800 Subject: [PATCH 1/3] hotfix/2.15.1.2407.01 --- .../pages/reportView/components/condition.js | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/reportView/components/condition.js b/pc4mobx/hrmSalary/pages/reportView/components/condition.js index d6668459..0cda350a 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/condition.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/condition.js @@ -91,36 +91,36 @@ export const condition = [ labelcol: 6, viewAttr: 2 }, - // { - // browserConditionParam: { - // completeParams: {}, - // conditionDataParams: {}, - // dataParams: {}, - // destDataParams: {}, - // hasAddBtn: false, - // hasAdvanceSerach: true, - // idSeparator: ",", - // isAutoComplete: 1, - // isDetail: 0, - // isMultCheckbox: false, - // isSingle: false, - // linkUrl: "", - // pageSize: 10, - // quickSearchName: "", - // replaceDatas: [], - // title: getLabel(111, "岗位"), - // type: "278", - // viewAttr: 2 - // }, - // colSpan: 2, - // conditionType: "BROWSER", - // domkey: ["position"], - // fieldcol: 18, - // isQuickSearch: false, - // label: getLabel(111, "岗位"), - // labelcol: 6, - // viewAttr: 2 - // }, + { + browserConditionParam: { + completeParams: {}, + conditionDataParams: {}, + dataParams: {}, + destDataParams: {}, + hasAddBtn: false, + hasAdvanceSerach: true, + idSeparator: ",", + isAutoComplete: 1, + isDetail: 0, + isMultCheckbox: false, + isSingle: false, + linkUrl: "", + pageSize: 10, + quickSearchName: "", + replaceDatas: [], + title: getLabel(111, "岗位"), + type: "278", + viewAttr: 2 + }, + colSpan: 2, + conditionType: "BROWSER", + domkey: ["position"], + fieldcol: 18, + isQuickSearch: false, + label: getLabel(111, "岗位"), + labelcol: 6, + viewAttr: 2 + }, { browserConditionParam: { completeParams: {}, From f780662b1b13c7f297e17f8475bee1985b7af8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 13 Sep 2024 15:52:15 +0800 Subject: [PATCH 2/3] hotfix/2.15.1.2407.01 --- .../reportView/components/statisticalMicroSettingsSlide.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js index e82f2eaa..45ee98bb 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js +++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js @@ -149,7 +149,7 @@ class StatisticalMicroSettingsSlide extends Component { hiredate: extra["hiredate1__hiredate2"].value || [], department: _.map(department.valueObj, it => ({ id: it.id, name: it.name })), employee: _.map(employee.valueObj, it => ({ id: it.id, name: it.name })), - // position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })), + position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })), subCompany: _.map(subCompany.valueObj, it => ({ id: it.id, name: it.name })), taxAgent: value ? _.map(value.split(","), (it, idx) => ({ id: it, name: valueSpan.split(",")[idx] })) : [], status: statusVal ? _.map(statusVal.split(","), (it, idx) => ({ From 1c1aac66d7915b71a873f6c6a8d3b91a34891138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Sat, 14 Sep 2024 11:15:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?hotfix/2.15.1.2409.01=20=E6=B5=AE=E5=8A=A8?= =?UTF-8?q?=E8=96=AA=E9=85=AC=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/variableSalary/components/salaryItemList/index.js | 2 +- pc4mobx/hrmSalary/pages/variableSalary/index.js | 4 ++-- pc4mobx/hrmSalary/pages/variableSalary/index.less | 1 - pc4mobx/hrmSalary/style/index.less | 4 ++++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js index 210df203..bceb4585 100644 --- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js +++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js @@ -105,7 +105,7 @@ class Index extends Component { }; return ( + pagination={pagination} scroll={{ y: `calc(100vh - 170px)` }}/> ); } } diff --git a/pc4mobx/hrmSalary/pages/variableSalary/index.js b/pc4mobx/hrmSalary/pages/variableSalary/index.js index 115aa93e..76e364e4 100644 --- a/pc4mobx/hrmSalary/pages/variableSalary/index.js +++ b/pc4mobx/hrmSalary/pages/variableSalary/index.js @@ -97,7 +97,7 @@ class Index extends Component { const { taxAgentStore: { showOperateBtn }, baseTableStore: { VSSalaryItemForm } } = this.props; const tabs = [ { - title: getLabel(111, "薪资档案"), key: "salaryFile", showDropIcon: true, + title: getLabel(111, "浮动数据"), key: "salaryFile", showDropIcon: true, dropMenuDatas: showOperateBtn ? [ { key: "export", icon: , content: getLabel(111, "导出") }, { key: "custom_cols", icon: , content: getLabel(32535, "显示列定制") } @@ -125,7 +125,7 @@ class Index extends Component { onViewSalaryFile={(data) => this.handleOperate("create", data)}/> }, { - title: getLabel(111, "薪资项目"), key: "salaryItem", showDropIcon: false, dropMenuDatas: [], + title: getLabel(111, "字段管理"), key: "salaryItem", showDropIcon: false, dropMenuDatas: [], buttons: showOperateBtn ? [