hotfix/2.15.1.2407.01

pc4mobx/hrmSalary/components/PersonalScopeModal/index.js

@@ -5,13 +5,24 @@
  * Date: 2022/11/30
  */
 import React, { Component } from "react";
-import { WeaBrowser, WeaDialog, WeaFormItem, WeaSearchGroup, WeaSelect, WeaTextarea } from "ecCom";
+import {
+  WeaBrowser,
+  WeaDialog,
+  WeaFormItem,
+  WeaHelpfulTip,
+  WeaLocaleProvider,
+  WeaSearchGroup,
+  WeaSelect,
+  WeaTextarea
+} from "ecCom";
 import { Button, message, Modal } from "antd";
 import { getTaxAgentRangeForm } from "../../apis/taxAgent";
 import { commonEnumList } from "../../apis/ruleconfig";
 import { SelectWithAll } from "../../pages/socialSecurityBenefits/standingBookDetail/components/regAddEmployee";
 import "./index.less";
 
+const getLabel = WeaLocaleProvider.getLabel;
+
 class PersonalScopeModal extends Component {
   constructor(props) {
     super(props);
@@ -164,8 +175,11 @@ class PersonalScopeModal extends Component {
         browserType = { ...browserType, type: 278, title: "岗位选择" };
         break;
       case "SQL":
-        return <WeaTextarea minRows={2} viewAttr={3} style={{ width: 290 }} value={targetTypeIds}
-                            onChange={val => this.setState({ targetTypeIds: val, targetTypeIdsNames: val })}/>;
+        return <div style={{ display: "flex", alignItems: "center" }}>
+          <WeaTextarea minRows={2} viewAttr={3} style={{ width: 270, marginRight: 10 }} value={targetTypeIds}
+                       onChange={val => this.setState({ targetTypeIds: val, targetTypeIdsNames: val })}/>
+          <WeaHelpfulTip width={200} placement="topLeft" title={<SQLHelpTip/>}/>
+        </div>;
       default:
         break;
     }
@@ -269,3 +283,13 @@ class PersonalScopeModal extends Component {
 }
 
 export default PersonalScopeModal;
+
+export const SQLHelpTip = () => {
+  return <div>
+    <p>{getLabel(111, "注意事项：")}</p>
+    <p>{getLabel(111, "1、sql需返回人员id")}</p>
+    <p>{getLabel(111, "2、sql结尾不需要 ; go /等符号")}</p>
+    <p>{getLabel(111, "使用例子：定义获取岗位是开发的人员")}</p>
+    <p>{getLabel(111, "select id from hrmresource where JOBTITLE = 17")}</p>
+  </div>;
+};

pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js

@@ -1,6 +1,16 @@
 import React from "react";
 import { Button, Col, Row } from "antd";
-import { WeaBrowser, WeaCheckbox, WeaDialog, WeaError, WeaLocaleProvider, WeaSelect, WeaTextarea } from "ecCom";
+import {
+  WeaBrowser,
+  WeaCheckbox,
+  WeaDialog,
+  WeaError,
+  WeaHelpfulTip,
+  WeaLocaleProvider,
+  WeaSelect,
+  WeaTextarea
+} from "ecCom";
+import { SQLHelpTip } from "../../components/PersonalScopeModal";
 import "../ledger/index.less";
 
 const { getLabel } = WeaLocaleProvider;
@@ -188,8 +198,11 @@ export default class AddTaxAgentModal extends React.Component {
                             style={{ width: "100%" }}
                             ref="weaError"
                             error={getLabel(111, "请输入SQL")}>
-                    <WeaTextarea minRows={2} viewAttr={3} style={{ width: 290 }} value={this.state.ids}
-                                 onChange={ids => this.setState({ ids })}/>
+                    <div style={{ display: "flex", alignItems: "center" }}>
+                      <WeaTextarea minRows={2} viewAttr={3} style={{ width: 270 }} value={this.state.ids}
+                                   onChange={ids => this.setState({ ids })}/>
+                      <WeaHelpfulTip width={280} placement="topLeft" title={<SQLHelpTip/>}/>
+                    </div>
                   </WeaError>
                 )}
               </div>