From 223effab98e35a1fb99405d2013eec390bdcc0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 31 Jul 2023 11:20:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=8F=91=E6=94=BE=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js | 2 ++
 pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js    | 2 +-
 pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
index 0e5803e5..cb3e598c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@@ -125,6 +125,7 @@ class SalaryItemSettings extends Component {
   };
   getAvailableSalaryItemSet = (record, title) => {
     const payload = {
+      salaryTemplateId: this.props.salaryTemplateId,
       salarySobId: this.props.salarySobId,
       existSalaryItemIds: _.map(record.items, it => it.id),
       groupId: record.groupId,
@@ -149,6 +150,7 @@ class SalaryItemSettings extends Component {
     const { dataList } = this.state;
     const payload = {
       salarySobId,
+      salaryTemplateId: this.props.salaryTemplateId,
       existSalaryGroupIds: _.map(dataList, it => it.groupId),
       isReplenish: this.props.isReplenish
     };
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
index 7cfd9404..03740472 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
@@ -148,7 +148,7 @@ export default class ShowSettingForm extends React.Component {
         >
           <SalaryItemSettings
             ref={dom => this.salaryItemSettingsRef = dom}
-            dataSource={salaryItemSet}
+            dataSource={salaryItemSet} salaryTemplateId={this.props.id || ""}
             onChangeSalaryItem={this.handleChangeSalaryItem}
             onChangeSalaryItemShowNamesetting={this.handleChangeSalaryItemShowNamesetting}
             salarySobId={toJS(templateBaseData).salarySob}
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js
index ce64f1e4..1636a0da 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js
@@ -44,6 +44,7 @@ export default class TemplateSettingForm extends React.Component {
             onChangeSalaryItem={this.handleChangeSalaryItem}
             onChangeSalaryItemShowNamesetting={this.handleChangeSalaryItemShowNamesetting}
             salarySobId={toJS(templateBaseData).salarySob}
+            salaryTemplateId={this.props.id || ""}
             isReplenish={true} salaryBillItemNameSet={salaryBillItemNameSet}
           />
         </WeaSearchGroup>