From 4f00d117d6cf928c30cc146cada75b7357f93224 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, 4 Dec 2023 10:40:07 +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

---
 .../importModal/addHeaderFieldsModal.js       |  2 +-
 ...atisticsItemsModal-统计范围设置弹框重构.js | 34 +++++++++----------
 .../statisticalMicroSettingsSlide.js          |  6 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/addHeaderFieldsModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/addHeaderFieldsModal.js
index 0670d427..e83e0730 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/addHeaderFieldsModal.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/addHeaderFieldsModal.js
@@ -87,7 +87,7 @@ class AddHeaderFieldsModal extends Component {
           <React.Fragment>
             <WeaCheckbox content={getLabel(543378, "只显示已选中字段")}
                          onChange={this.handleShowOnlyChecked}/>
-            <WeaCheckbox content={getLabel(111, "全部选中")} style={{ marginLeft: 10 }}
+            <WeaCheckbox content={getLabel(545102, "全部选中")} style={{ marginLeft: 10 }}
                          onChange={this.handleSelectAll}/>
           </React.Fragment>
         }
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal-统计范围设置弹框重构.js b/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal-统计范围设置弹框重构.js
index 49f5a462..0565f922 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal-统计范围设置弹框重构.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal-统计范围设置弹框重构.js
@@ -75,23 +75,23 @@ class CustomStatisticsItemsModal extends Component {
       return;
     }
     if (!isNoRules) {
-      message.warning(getLabel(111, "请至少设置一个统计规则"));
+      message.warning(getLabel(543395, "请至少设置一个统计规则"));
       return;
     }
     if (isChainRequired) {
-      message.warning(getLabel(111, "请完善环比增幅正常区间设置上下限"));
+      message.warning(getLabel(543397, "请完善环比增幅正常区间设置上下限"));
       return;
     }
     if (isChainValRight) {
-      message.warning(getLabel(111, "环比增幅上下限设置错误"));
+      message.warning(getLabel(543398, "环比增幅上下限设置错误"));
       return;
     }
     if (isYoyRequired) {
-      message.warning(getLabel(111, "请完善同比增幅正常区间设置上下限"));
+      message.warning(getLabel(543396, "请完善同比增幅正常区间设置上下限"));
       return;
     }
     if (isYoyValRight) {
-      message.warning(getLabel(111, "同比增幅上下限设置错误"));
+      message.warning(getLabel(543399, "同比增幅上下限设置错误"));
       return;
     }
     let payload = { statReportId, itemValue: itemValue.split(","), itemName };
@@ -157,8 +157,8 @@ class CustomStatisticsItemsModal extends Component {
     };
     if (statisticsItemId) {
       Modal.confirm({
-        title: getLabel(111, "信息确认"),
-        content: getLabel(111, `确定要编辑统计项吗？编辑后，可能需要重新设置分析图设置。`),
+        title: getLabel(131329, "信息确认"),
+        content: getLabel(543400, `确定要编辑统计项吗？编辑后，可能需要重新设置分析图设置。`),
         onOk: () => this.reportStatisticsItemSave(payload)
       });
     } else {
@@ -302,7 +302,7 @@ class CustomStatisticsItemsModal extends Component {
           ...it,
           title: <span>
                   <span style={{ marginRight: 8 }}>{text}</span>
-                  <WeaHelpfulTip title={getLabel(111, "如：增幅>10%,差值和增幅标记为红色，增幅<-10%标记为绿色")}
+                  <WeaHelpfulTip title={getLabel(543393, "如：增幅>10%,差值和增幅标记为红色，增幅<-10%标记为绿色")}
                                  placement="top" width={200}/>
                 </span>,
           render: (txt, record) => {
@@ -319,7 +319,7 @@ class CustomStatisticsItemsModal extends Component {
           ...it,
           title: <span>
                   <span style={{ marginRight: 8 }}>{text}</span>
-                  <WeaHelpfulTip title={getLabel(111, "如：增幅>10%,差值和增幅标记为红色，增幅<-10%标记为绿色")}
+                  <WeaHelpfulTip title={getLabel(543393, "如：增幅>10%,差值和增幅标记为红色，增幅<-10%标记为绿色")}
                                  placement="top" width={200}/>
                 </span>,
           render: (txt, record) => {
@@ -338,10 +338,10 @@ class CustomStatisticsItemsModal extends Component {
         {...this.props} hasScroll buttons={[]} initLoadCss
         title={
           <div className="itemsTitle">
-            <span>{statisticsItemId ? getLabel(111, "编辑自定义统计项目") : getLabel(111, "新建自定义统计项目")}</span>
+            <span>{statisticsItemId ? getLabel(543401, "编辑自定义统计项目") : getLabel(543392, "新建自定义统计项目")}</span>
             {
               !isShare && <Button type="primary" loading={loading}
-                                  onClick={this.handleSaveStatisticalItems}>{getLabel(111, "保存")}</Button>
+                                  onClick={this.handleSaveStatisticalItems}>{getLabel(537558, "保存")}</Button>
             }
           </div>
         }
@@ -349,10 +349,10 @@ class CustomStatisticsItemsModal extends Component {
         className="statisticItemsWrapper"
       >
         <div className="statisticItemsBox">
-          <WeaFormItem label={getLabel(111, "统计项目")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
-            <WeaError tipPosition="bottom" ref="proError" error={getLabel(111, "此项必填")}>
+          <WeaFormItem label={getLabel(386275, "统计项目")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+            <WeaError tipPosition="bottom" ref="proError" error={getLabel(385869, "此项必填")}>
               <WeaBrowser
-                title={getLabel(111, "统计项目")}
+                title={getLabel(386275, "统计项目")}
                 type={162}
                 viewAttr={!isShare ? 3 : 1}
                 isSingle={false}
@@ -385,8 +385,8 @@ class CustomStatisticsItemsModal extends Component {
               />
             </WeaError>
           </WeaFormItem>
-          <WeaFormItem label={getLabel(111, "统计项名称")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
-            <WeaError tipPosition="bottom" ref="nameError" error={getLabel(111, "此项必填")}>
+          <WeaFormItem label={getLabel(532358, "统计项名称")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+            <WeaError tipPosition="bottom" ref="nameError" error={getLabel(385869, "此项必填")}>
               <WeaInput value={itemName} viewAttr={!isShare ? 3 : 1}
                         onChange={itemName => this.setState({ formData: { ...formData, itemName } })}/>
             </WeaError>
@@ -415,7 +415,7 @@ const IntervalSettingsComp = (props) => {
   const { LowerLimit, UpperLimit, onChange, isShare } = props;
   return <div className="intervalSettingsCompWrapper">
     <WeaInputNumber value={LowerLimit} precision={2} onChange={val => onChange("min", val)} disabled={isShare}/>
-    <span className="increaseTitle">{`% <${getLabel(111, "增幅")}<`}</span>
+    <span className="increaseTitle">{`% <${getLabel(543394, "增幅")}<`}</span>
     <WeaInputNumber value={UpperLimit} precision={2} onChange={val => onChange("max", val)} disabled={isShare}/>
     <span className="pecentTitle">%</span>
   </div>;
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index e02d90c3..ac277ffa 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -290,7 +290,7 @@ class StatisticalMicroSettingsSlide extends Component {
           <React.Fragment>
             <WeaSearchGroup title={getLabel(532504, "统计时间范围")} col={2} showGroup needTigger>
               <WeaFormItem label={getLabel(542604, "薪资所属月")} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
-                <WeaError tipPosition="bottom" ref="weaError" error={getLabel(111, "此项必填")}>
+                <WeaError tipPosition="bottom" ref="weaError" error={getLabel(385869, "此项必填")}>
                   <StatisticalScopePicker viewAttr={3} dateRange={salaryMonth} disabled={isShare} timeType={timeType}
                                           onChange={(v, timeType) => this.setState({ salaryMonth: v, timeType })}/>
                 </WeaError>
@@ -349,8 +349,8 @@ const TitleDialog = (props) => {
 };
 const StatisticalScopePicker = (props) => {
   const scopeBtns = [
-    { key: 1, label: getLabel(111, "上月") },
-    { key: 2, label: getLabel(111, "本月") },
+    { key: 1, label: getLabel(17028, "上月") },
+    { key: 2, label: getLabel(15541, "本月") },
     { key: 3, label: getLabel(111, "一季度") },
     { key: 4, label: getLabel(111, "二季度") },
     { key: 5, label: getLabel(111, "三季度") },