qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/3.0.1.2503.01-合并业务线' into custom-中航富士达

This commit is contained in:
lys 2025-03-11 09:41:32 +08:00
parent 569599ab51 645c9ff5eb
commit a59b2a4126
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/salary/components/constants.js
View File

@ -297,7 +297,7 @@ export const personScopeConditions = [
{
conditionType: "SELECT_LINKAGE",
domkey: ["targetType"],
fieldcol: 18,
fieldcol: 16,
label: "对象类型",
lanId: 111,
labelcol: 6,

10
pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
View File

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

23
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
View File

@ -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;