From 6aa12027b8441a1ebb2be9bc6da1c60cfcb304c6 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 10 Mar 2025 18:11:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?release/3.0.0.2502.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

---
 .../standingBookDetail/components/regTop.js   | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
index 816f8b98..771cc129 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
@@ -27,7 +27,6 @@ class RegTop extends Component {
   }
 
   renderTopBtns = () => {
-    const { name } = this.state;
     const { onChange, selectKey, type: regtopType } = this.props;
     const type = getQueryString("type");
     let dom = [
@@ -50,18 +49,18 @@ class RegTop extends Component {
     ];
     if (!type) {
       const [dom1, ...extra] = dom;
-      const domBtn = regtopType === "regression" ?
-        [<WeaButtonIcon buttonType="add" type="primary" title={getLabel(111, "添加")}
-                        onClick={() => onChange("add")}/>] :
-        [
-          <WeaButtonIcon buttonType="add" type="primary" title={getLabel(111, "添加")}
-                         onClick={() => onChange("add")}/>,
-          <i className="iconfont icon-import" onClick={() => onChange("import")} title={getLabel(111, "导入")}/>
-        ];
-      dom = [
-        dom1,
+      const domBtn = [<WeaButtonIcon buttonType="add" type="primary" title={getLabel(111, "添加")}
+                                     onClick={() => onChange("add")}/>];
+      dom = regtopType === "regression" ? [
+        dom1, ...extra,
         <WeaButtonIcon buttonType="del" type="primary" title={getLabel(111, "删除")} disabled={_.isEmpty(selectKey)}
-                       onClick={() => onChange("delete")}/>, ...domBtn, ...extra
+                       onClick={() => onChange("delete")}/>, ...domBtn
+      ] : [
+        dom1,
+        <i className="iconfont icon-import" onClick={() => onChange("import")} title={getLabel(111, "导入")}/>,
+        ...extra,
+        <WeaButtonIcon buttonType="del" type="primary" title={getLabel(111, "删除")} disabled={_.isEmpty(selectKey)}
+                       onClick={() => onChange("delete")}/>, ...domBtn
       ];
     }
     return dom;

From 645c9ff5ebd1b25bfd1b9c11755a53d270fbbf3b Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 11 Mar 2025 09:38:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?release/3.0.0.2502.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

---
 pc4mobx/hrmSalary/pages/salary/components/constants.js |  2 +-
 .../pages/salary/components/personalScopeModal.js      | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/salary/components/constants.js b/pc4mobx/hrmSalary/pages/salary/components/constants.js
index dc2422a0..7d6ad232 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/constants.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/constants.js
@@ -297,7 +297,7 @@ export const personScopeConditions = [
       {
         conditionType: "SELECT_LINKAGE",
         domkey: ["targetType"],
-        fieldcol: 18,
+        fieldcol: 16,
         label: "对象类型",
         lanId: 111,
         labelcol: 6,
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
index ce15691d..70a5c202 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
@@ -7,7 +7,7 @@
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { WeaSwitch } from "comsMobx";
-import { WeaCheckbox, WeaDialog, WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
+import { WeaCheckbox, WeaDialog, WeaFormItem, WeaHelpfulTip, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
 import { Button, message } from "antd";
 import { getTaxAgentRangeForm, taxAgentRangeEdit, taxAgentRangeSave } from "../../../apis/taxAgent";
 import { personScopeConditions, scopeSelectLinkageDatas } from "./constants";
@@ -129,6 +129,14 @@ class PersonalScopeModal extends Component {
                              onChange={this.handleChangeAll}/>
               }
               <WeaSwitch fieldConfig={fields} form={personScopeForm} formParams={formParams}/>
+              {
+                personScopeForm.getFormParams().targetType === "SQL" && getKey(fields) === "targetType" &&
+                <WeaHelpfulTip placement="topLeft" style={{ position: "absolute", top: "50%", right: "-35px" }}
+                               width={200} title={
+                  <span
+                    dangerouslySetInnerHTML={{ __html: getLabel(111, "注意事项：<br>1、sql需返回人员id<br>2、sql结尾不需要 ; go /等符号<br>使用例子：定义获取岗位是开发的人员<br>select id from hrmresource where JOBTITLE = 17") }}/>
+                }/>
+              }
             </WeaFormItem>),
           hide: fields.hide
         });