From 5c8f045373068ef3edde34d88836f7c9c692cd6d Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 4 Dec 2024 17:39:23 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.17.1.2411.01-=E8=96=AA=E9=85=AC?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/salaryDetails.js                      |  2 +-
 .../components/salaryDetailsTempDialog.js            | 12 ++++++------
 .../components/salaryTempMangerDialog.js             |  5 ++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index 352d2571..657c4dfb 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -308,7 +308,7 @@ class SalaryDetails extends Component {
                                    onSuccess={this.getPageListTemplatelist}/>
           {/*薪资明细自定义列模板管理*/}
           <SalaryTempMangerDialog {...tempManageDialog} onDelete={this.handleDelTemp} isQuery={tempManageQuery}
-                                  onClick={this.handelAddTemp} onCancel={() => this.setState({
+                                  onSuccess={this.getPageListTemplatelist} onCancel={() => this.setState({
             tempManageDialog: { ...tempManageDialog, completeURL: "", visible: false }
           })}/>
         </div>
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetailsTempDialog.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetailsTempDialog.js
index f89e5969..5fc57e80 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetailsTempDialog.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetailsTempDialog.js
@@ -45,15 +45,15 @@ class SalaryDetailTempDialog extends Component {
             ...item, items: _.map(item.items, o => {
               if (getKey(o) === "sharedType") {
                 return {
-                  ...o, label: getLabel(o.lanId, o.label), value: id ? String(template["sharedType"]) : "0",
+                  ...o, label: getLabel(o.lanId, o.label), value: id ? String(template["sharedType"]) : "1",
                   options: [
-                    { key: "0", showname: getLabel(111, "公共") },
-                    { key: "1", showname: getLabel(111, "私有") }
+                    { key: "1", showname: getLabel(111, "私有") },
+                    { key: "0", showname: getLabel(111, "共享") }
                   ]
                 };
               } else if (getKey(o) === "limitIds") {
                 return {
-                  ...o, label: getLabel(o.lanId, o.label), hide: !id || (id && template["sharedType"] === 0),
+                  ...o, label: getLabel(o.lanId, o.label), hide: !id || (id && template["sharedType"] === 1),
                   value: id ? template["limitIds"].join(",") : "",
                   options: _.map(data, o => ({ key: o.id, showname: o.content }))
                 };
@@ -98,8 +98,8 @@ class SalaryDetailTempDialog extends Component {
         ...item, items: _.map(item.items, o => {
           if (key === "sharedType" && getKey(o) === "limitIds") {
             return {
-              ...o, hide: value !== "1", viewAttr: value === "1" ? 3 : 1,
-              rules: value === "1" ? "required|string" : ""
+              ...o, hide: value !== "0", viewAttr: value === "0" ? 3 : 1,
+              rules: value === "0" ? "required|string" : ""
             };
           }
           return { ...o };
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempMangerDialog.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempMangerDialog.js
index 5995a9c5..4f5696c9 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempMangerDialog.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempMangerDialog.js
@@ -80,7 +80,10 @@ class SalaryTempMangerDialog extends Component {
                                }, () => callback && callback())}
                                onSuccess={() => this.setState({
                                  tempAdminDialog: { visible: false, dataParams: { page: "salary_details_report" } }
-                               }, () => this.tempManageRef.getData())}/>
+                               }, () => {
+                                 this.props.onSuccess();
+                                 this.tempManageRef.getData();
+                               })}/>
     </CustomTransferDialog>);
   }
 }