From 1f332adcff080a69cde63fc51c65cb342e3732f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 14 Dec 2023 16:45:09 +0800
Subject: [PATCH] =?UTF-8?q?feature/V2-dev=E5=90=88=E5=B9=B6=E5=A4=9A?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/archive.js                     |  5 +++++
 pc4mobx/hrmSalary/components/pcTemplate/content.js    | 11 +++++++----
 pc4mobx/hrmSalary/components/pcTemplate/index.js      |  5 +----
 pc4mobx/hrmSalary/pages/mobilePayroll/index.js        |  2 +-
 .../components/payrollTempBaseSet/smsSettingDialog.js | 11 ++++++++---
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/archive.js b/pc4mobx/hrmSalary/apis/archive.js
index a8a0516b..6faaad01 100644
--- a/pc4mobx/hrmSalary/apis/archive.js
+++ b/pc4mobx/hrmSalary/apis/archive.js
@@ -1,9 +1,14 @@
 import { WeaTools } from "ecCom";
+import { postFetch } from "../util/request";
 
 //薪资档案-薪资档案列表
 export const getArchiveList = params => {
   return postFetch("/api/bs/hrmsalary/salaryArchive/list", params);
 };
+//薪资档案的高级搜索
+export const getSaCondition = params => {
+  return WeaTools.callApi("/api/bs/hrmsalary/archives/getSearchCondition", "get", params);
+};
 //薪资档案-获取薪资档案详情表单
 export const getArchiveForm = params => {
   return WeaTools.callApi("/api/bs/hrmsalary/salaryArchive/getForm", "get", params);
diff --git a/pc4mobx/hrmSalary/components/pcTemplate/content.js b/pc4mobx/hrmSalary/components/pcTemplate/content.js
index a294e2df..398c0132 100644
--- a/pc4mobx/hrmSalary/components/pcTemplate/content.js
+++ b/pc4mobx/hrmSalary/components/pcTemplate/content.js
@@ -1,9 +1,11 @@
 import React, { Component } from "react";
-import { WeaLocaleProvider } from "ecCom";
+import { WeaInputLocale, WeaLocaleProvider } from "ecCom";
 import moment from "moment";
 import { dealTemplate } from "./index";
 
 const getLabel = WeaLocaleProvider.getLabel;
+const getMultiStrFromBase64 = WeaInputLocale.getMultiStrFromBase64;
+const getCurrentLabel = WeaInputLocale.getCurrentLabel;
 
 class Content extends Component {
   render() {
@@ -34,12 +36,13 @@ class Content extends Component {
                   return (
                     <div className="salary-group" key={groupId || index}>
                       {
-                        groupName ? <div className="group-title">{groupName}</div> : null
+                        groupName ? <div
+                          className="group-title">{groupName.indexOf("base64") !== -1 ? getCurrentLabel(getMultiStrFromBase64(groupName)) : getCurrentLabel(groupName)}</div> : null
                       }
                       <div className="group-list">
                         {
                           (onlyOneGrup && tipPosi.toString() === "1" && tip) && (<div className="send-tip top">
-                            <div className="label">{getLabel(111, "发放说明")}</div>
+                            <div className="label">{getLabel(544304, "发放说明")}</div>
                             <div className="detail">{tip}</div>
                           </div>)
                         }
@@ -58,7 +61,7 @@ class Content extends Component {
                         }
                         {
                           (onlyOneGrup && tipPosi.toString() === "2" && tip) && (<div className="send-tip bottom">
-                            <div className="label">{getLabel(111, "发放说明")}</div>
+                            <div className="label">{getLabel(544304, "发放说明")}</div>
                             <div className="detail">{tip}</div>
                           </div>)
                         }
diff --git a/pc4mobx/hrmSalary/components/pcTemplate/index.js b/pc4mobx/hrmSalary/components/pcTemplate/index.js
index 90fdb781..b8485277 100644
--- a/pc4mobx/hrmSalary/components/pcTemplate/index.js
+++ b/pc4mobx/hrmSalary/components/pcTemplate/index.js
@@ -1,12 +1,9 @@
 import React, { Component } from "react";
-import { WeaInputLocale, WeaLocaleProvider } from "ecCom";
-import moment from "moment";
+import { WeaLocaleProvider } from "ecCom";
 import Content from "./content";
 import "./index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
-const getMultiStrFromBase64 = WeaInputLocale.getMultiStrFromBase64;
-const getCurrentLabel = WeaInputLocale.getCurrentLabel;
 
 class Index extends Component {
   render() {
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 2a42fa33..c5fa8830 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -213,7 +213,7 @@ export default class MobilePayroll extends React.Component {
           type === "phone" ?
             <Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
                        store={this.props.mySalaryStore}>
-              <MobileTemplate {...salaryProps} title={getLabel(111, "工资单查看")}>
+              <MobileTemplate {...salaryProps} title={getLabel(545935, "工资单查看")}>
                 {
                   (_.isNil(confirmStatus) || confirmStatus === "0") &&
                   <ConfirmBtns
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/smsSettingDialog.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/smsSettingDialog.js
index 36dfcdcb..e1e1e372 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/smsSettingDialog.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/smsSettingDialog.js
@@ -5,7 +5,7 @@
  * Date: 2023/11/23
  */
 import React, { Component } from "react";
-import { WeaDialog, WeaLocaleProvider } from "ecCom";
+import { WeaDialog, WeaInputLocale, WeaLocaleProvider } from "ecCom";
 import { Button, Col, Row, Tree } from "antd";
 import uuidV4 from "uuid/v4";
 import { getSmsSalaryItemSet } from "../../../../apis/payroll";
@@ -16,6 +16,8 @@ import "codemirror/mode/javascript/javascript.js";
 
 const TreeNode = Tree.TreeNode;
 const getLabel = WeaLocaleProvider.getLabel;
+const getMultiStrFromBase64 = WeaInputLocale.getMultiStrFromBase64;
+const getCurrentLabel = WeaInputLocale.getCurrentLabel;
 
 class SmsSettingDialog extends Component {
   constructor(props) {
@@ -38,7 +40,8 @@ class SmsSettingDialog extends Component {
     getSmsSalaryItemSet({ salarySobId: props.salarySobId }).then(({ status, data }) => {
       if (status) this.setState({
         variableList: _.map(data, item => ({
-          key: item.groupId, value: item.groupName,
+          key: item.groupId,
+          value: item.groupName.indexOf("base64") !== -1 ? getCurrentLabel(getMultiStrFromBase64(item.groupName)) : getCurrentLabel(item.groupName),
           children: item.items
         }))
       });
@@ -131,7 +134,9 @@ class SmsSettingDialog extends Component {
                         {
                           _.map(children, child => {
                             const { name, id } = child;
-                            return (<TreeNode title={name} key={id || uuidV4()}/>);
+                            return (<TreeNode
+                              title={name.indexOf("base64") !== -1 ? getCurrentLabel(getMultiStrFromBase64(name)) : getCurrentLabel(name)}
+                              key={id || uuidV4()}/>);
                           })
                         }
                       </TreeNode>;