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}/> } + { + personScopeForm.getFormParams().targetType === "SQL" && getKey(fields) === "targetType" && + 1、sql需返回人员id
2、sql结尾不需要 ; go /等符号
使用例子:定义获取岗位是开发的人员
select id from hrmresource where JOBTITLE = 17") }}/> + }/> + } ), hide: fields.hide });