release/3.0.0.2502.01-合并业务线

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,

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
         });