liang.cheng
/
trunk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '岗位管理名称搜索BUG修复' (#36) from feature/dxfeng into dev 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/36
This commit is contained in:
dxfeng 2023-03-13 11:23:18 +08:00
parent 3eebf5cb54 0fac5a03a4
commit 8e82c0e781
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/organization/components/job/Job.js
View File

@ -561,7 +561,7 @@ export default class Job extends React.Component {
job job
} = this.props; } = this.props;
const { const {
isPanelShow, jobName, conditionNum, visible, condition, form, isPanelShow, jobTitleName, conditionNum, visible, condition, form,
tableStore, dataSource, columns, loading, date, nEdialogTitle, dialogLoading, tableStore, dataSource, columns, loading, date, nEdialogTitle, dialogLoading,
form1, isEdit, newVisible,selectedRowKeys, total, current, pageSize, init, form1, isEdit, newVisible,selectedRowKeys, total, current, pageSize, init,
defaultShowLeft,form2,hasRight defaultShowLeft,form2,hasRight
@ -618,7 +618,7 @@ export default class Job extends React.Component {
<WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`} <WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`}
searchType={['base', 'advanced']} searchType={['base', 'advanced']}
showSearchAd={isPanelShow} showSearchAd={isPanelShow}
searchsBaseValue={this.isEmptyObject(form.getFormParams()) ? jobName : form.getFormParams().jobName} searchsBaseValue={this.isEmptyObject(form.getFormParams()) ? jobTitleName : form.getFormParams().jobTitleName}
setShowSearchAd={bool => job.setPanelStatus(bool)} setShowSearchAd={bool => job.setPanelStatus(bool)}
hideSearchAd={() => job.setPanelStatus(false)} hideSearchAd={() => job.setPanelStatus(false)}
searchsAd={isPanelShow ? this.getPanelComponents() : <div></div>} searchsAd={isPanelShow ? this.getPanelComponents() : <div></div>}

8
pc4mobx/organization/stores/job.js
View File

@ -45,7 +45,7 @@ export class JobStore {
@observable form = new WeaForm(); @observable form = new WeaForm();
@observable form1 = new WeaForm(); //新增主表表单 @observable form1 = new WeaForm(); //新增主表表单
@observable form2 = new WeaForm(); //复制表单 合并表单 @observable form2 = new WeaForm(); //复制表单 合并表单
@observable jobName = ''; @observable jobTitleName = '';
@observable conditionNum = 6; @observable conditionNum = 6;
@observable ids = ''; //选择行id @observable ids = ''; //选择行id
@observable id = ''; //页面跳转参数id @observable id = ''; //页面跳转参数id
@ -86,7 +86,7 @@ export class JobStore {
if (this.isEmptyObject(this.form.getFormParams())) { if (this.isEmptyObject(this.form.getFormParams())) {
params = { params = {
...params, ...params,
jobName: this.jobName, jobTitleName: this.jobTitleName,
}; };
} else { } else {
params = { params = {
@ -325,7 +325,7 @@ export class JobStore {
updateFields(val) { updateFields(val) {
this.form.updateFields({ this.form.updateFields({
jobName: { jobTitleName: {
value: val value: val
} }
}); });
@ -348,7 +348,7 @@ export class JobStore {
} }
setJobName(val) { setJobName(val) {
this.jobName = val; this.jobTitleName = val;
} }
isEmptyObject(obj) { isEmptyObject(obj) {