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 1/6] 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 2/6] 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 3/6] =?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 => <Option key={d.id} title={d.name}>{d.name}</Option>);
     !tags && selectedValues && selectedValues.map((v) => {
-      v && options.unshift(<Option key={v} title={datas[v].name}>{datas[v].name}</Option>);
+      v && datas[v] && options.unshift(<Option key={v} title={datas[v].name}>{datas[v].name}</Option>);
     });
     const select = <Select
       {...this.props}
diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js b/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
index 28193704..3b070645 100644
--- a/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
@@ -91,11 +91,11 @@ class CustomBrowserDialog extends Component {
     this.props.onCancel && this.props.onCancel();
   };
   getItemById = (id) => {
-    const { listDatas } = this.state;
+    const { listDatas } = this.state, dataSource = [...listDatas, ..._.values(this.props.datas)];
     if (this.selectedData[id]) return this.selectedData[id];
-    if (!_.isEmpty(listDatas)) {
-      for (let i = 0; i < listDatas.length; i++) {
-        if (String(id) === String(listDatas[i].id)) return listDatas[i];
+    if (!_.isEmpty(dataSource)) {
+      for (let i = 0; i < dataSource.length; i++) {
+        if (String(id) === String(dataSource[i].id)) return dataSource[i];
       }
     }
   };

From 2871043810dd6b0263964f947e3122195539b9ce Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 17 Jul 2025 17:28:48 +0800
Subject: [PATCH 4/6] release/2.19.1.2501.01

---
 .../pages/socialSecurityBenefits/standingBook/columns.js         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js
index bc9c1816..c42f0ec4 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js
@@ -22,6 +22,7 @@ export const socialAccountConditions = [
         lanId: 537996,
         labelcol: 6,
         options: [],
+        multiple: true,
         rules: "required|string",
         viewAttr: 3
       },

From 3d8b24288910186a1f6652cccd434f72445e4f16 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 24 Jul 2025 16:51:19 +0800
Subject: [PATCH 5/6] release/2.19.1.2501.01

---
 .../pages/socialSecurityBenefits/standingBook/columns.js      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js
index c42f0ec4..84caeb48 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js
@@ -22,7 +22,9 @@ export const socialAccountConditions = [
         lanId: 537996,
         labelcol: 6,
         options: [],
-        multiple: true,
+        otherParams: {
+          showSearch: true, optionFilterProp: "children"
+        },
         rules: "required|string",
         viewAttr: 3
       },

From 5da8661bbdbf1df79ba33ba6048ba13e89761ffa Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 26 Aug 2025 14:25:26 +0800
Subject: [PATCH 6/6] =?UTF-8?q?0release/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

---
 .../reportView/components/statisticalMicroSettingsSlide.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 9d1f5d7c..6124375d 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -70,10 +70,10 @@ class StatisticalMicroSettingsSlide extends Component {
 
   getTaxAgentSelectList = async (props) => {
     const [salarySobList, empStatusList] = await Promise.all([
-      postFetch("/api/bs/hrmsalary/salarysob/listAuth", { filterType: "QUERY_DATA" }),
+      postFetch("/api/bs/hrmsalary/salarysob/listAuth", { filterType: "QUERY_DATA", isShare: props.isShare }),
       commonEnumList({ enumClass: "com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum" })
     ]);
-    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" })
+    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA", isShare: props.isShare })
       .then(({ status, data }) => {
         if (status) {
           const conditions = _.map(condition, item => {