@@ -52,7 +52,7 @@ class EditSalaryCalcSlide extends Component {
{
viewAttr === 2 &&
-
+
}
;
From b0e7cbfc419c4c95e254c2695d68452af44c30c9 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 12 Jun 2025 10:37:23 +0800
Subject: [PATCH 03/20] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
=?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hrmSalary/pages/declare/generateDeclarationDetail.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
index 91a1a88f..928f715b 100644
--- a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
+++ b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
@@ -73,9 +73,9 @@ export default class GenerateDeclarationDetail extends React.Component {
render() {
const { loading, pageInfo, columns, dataSource } = this.state;
- const { taxAgentStore: { showOperateBtn } } = this.props;
- const buttons = showOperateBtn ? [
] : [];
+ const { taxAgentStore: { PageAndOptAuth } } = this.props;
+ const buttons = !!PageAndOptAuth.opts.length ? [
] : [];
const pagination = {
...pageInfo,
showTotal: (total) => `共 ${total} 条`,
From c356c4f0db2947b451ed600697c6d5ef9d3e9e70 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 18 Jun 2025 09:29:55 +0800
Subject: [PATCH 04/20] release/2.19.1.2501.01
---
.../components/welfareAdvanceSearchPannel/index.js | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js
index 334b851e..fd5a783a 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js
@@ -54,6 +54,12 @@ class WelfareAdvanceSearchPannel extends Component {
viewAttr: 2
}
};
+ } else if (getKey(o) === "siSchemeId" || getKey(o) === "fundSchemeId" || getKey(o) === "otherSchemeId" || getKey(o) === "taxAgentId") {
+ return {
+ ...o, otherParams: {
+ showSearch: true, optionFilterProp: "children"
+ }
+ };
}
return { ...o };
})
From 0ec1cd1cb1d1944d8c0d4ec0b24e9f459e131c4f Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 19 Jun 2025 13:43:35 +0800
Subject: [PATCH 05/20] release/2.19.1.2501.01
---
pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js | 3 ++-
.../components/welfareEditArchiveSlide/index.js | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index 4a1ed275..6027fcec 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -30,7 +30,7 @@ class SalaryItemForm extends Component {
componentDidMount() {
const { salaryItemFieldsList } = this.state;
const { request, editable, record, isAdd = false, taxAgentAdminOption, isLedger = false } = this.props;
- const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType } = request;
+ const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType, pattern } = request;
this.setState({
salaryItemFieldsList: _.map(salaryItemFieldsList, item => {
const { key } = item;
@@ -87,6 +87,7 @@ class SalaryItemForm extends Component {
case "defaultValue":
return {
...item,
+ precision: pattern ? pattern : item.precision,
type: dataType === "number" ? "INPUTNUMBER" : "INPUT",
display: valueType && valueType.toString() === "1" && useInEmployeeSalary == 0,
viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
index e00b4f83..98e7009f 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
@@ -111,7 +111,10 @@ class Index extends Component {
return {
...g, label: getLabel(g.lanId, g.label),
viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : g.viewAttr,
- options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options
+ options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options,
+ otherParams: {
+ showSearch: true, optionFilterProp: "children"
+ }
};
} else if (getKey(g).indexOf("StartTime") !== -1) {
return {
From f3e2d878d07f7cfc5a25dfe8f61570d5215b4813 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 8 Jul 2025 10:18:34 +0800
Subject: [PATCH 06/20] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
=?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CustomBrowser/components/associativeSearchMult.js | 2 +-
.../CustomBrowser/components/customBrowserDialog.js | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js b/pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
index 562ea657..ffb8b96f 100644
--- a/pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
@@ -127,7 +127,7 @@ class AssociativeSearchMult extends Component {
}
let options = data.map(d =>
);
!tags && selectedValues && selectedValues.map((v) => {
- v && options.unshift(
);
+ v && datas[v] && options.unshift(
);
});
const select =
-