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

!60 fix 

Merge pull request !60 from reset/feature/cl
This commit is contained in:
reset 2022-08-05 01:25:25 +00:00 committed by Gitee
parent f619a3cce0 68af2808dd
commit 5830d46577
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pc4mobx/organization/components/department/department.js
View File

@ -1,7 +1,7 @@
/** /**
* @Author: 程亮 * @Author: 程亮
* @Date: 2022-06-02 09:19:37 * @Date: 2022-06-02 09:19:37
* @LastEditTime: 2022-07-08 16:50:58 * @LastEditTime: 2022-08-03 15:11:19
* @Description: * @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
*/ */
@ -177,14 +177,15 @@ export default class Department extends React.Component {
window.open(`/spa/organization/static/index.html#/main/organization/departmentExtend/${id}`, "_blank") window.open(`/spa/organization/static/index.html#/main/organization/departmentExtend/${id}`, "_blank")
} }
copy() { copy(id) {
const { const {
department department
} = this.props; } = this.props;
const { const {
selectedRowKeys selectedRowKeys
} = department; } = department;
let keys = toJS(selectedRowKeys).toString();
let keys = id == undefined ? toJS(selectedRowKeys).toString() : id;
department.setIds(keys); department.setIds(keys);
confirm({ confirm({
title: i18n.confirm.defaultTitle(), title: i18n.confirm.defaultTitle(),
@ -377,6 +378,9 @@ export default class Department extends React.Component {
<Menu.Item key="4"> <Menu.Item key="4">
<a href='javascript:void(0);' onClick={() => { _this.select(record.id) }}>联查岗位</a> <a href='javascript:void(0);' onClick={() => { _this.select(record.id) }}>联查岗位</a>
</Menu.Item> </Menu.Item>
<Menu.Item key="5">
<a href='javascript:void(0);' onClick={() => { _this.copy(record.id) }}>复制</a>
</Menu.Item>
</Menu> </Menu>
) )
return <Dropdown overlay={menu}> return <Dropdown overlay={menu}>

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

@ -1,7 +1,7 @@
/** /**
* @Author: 程亮 * @Author: 程亮
* @Date: 2022-05-26 14:05:59 * @Date: 2022-05-26 14:05:59
* @LastEditTime: 2022-07-15 14:36:46 * @LastEditTime: 2022-08-03 15:13:55
* @Description: * @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/job/Job.js * @FilePath: /trunk/src4js/pc4mobx/organization/components/job/Job.js
*/ */
@ -160,14 +160,14 @@ export default class Job extends React.Component {
} }
copy() { copy(id) {
const { const {
job job
} = this.props; } = this.props;
const { const {
selectedRowKeys, selectedRowKeys,
} = job; } = job;
let keys = toJS(selectedRowKeys).toString(); let keys = id == undefined ? toJS(selectedRowKeys).toString() : id;
job.setIds(keys); job.setIds(keys);
confirm({ confirm({
title: i18n.confirm.defaultTitle(), title: i18n.confirm.defaultTitle(),
@ -352,6 +352,9 @@ export default class Job extends React.Component {
<Menu.Item key="3"> <Menu.Item key="3">
<a href='javascript:void(0);' onClick={() => { _this.merge(record.id) }}>合并</a> <a href='javascript:void(0);' onClick={() => { _this.merge(record.id) }}>合并</a>
</Menu.Item> </Menu.Item>
<Menu.Item key="4">
<a href='javascript:void(0);' onClick={() => { _this.copy(record.id) }}>复制</a>
</Menu.Item>
</Menu> </Menu>
) )
return <Dropdown overlay={menu}> return <Dropdown overlay={menu}>

12
pc4mobx/organization/stores/jobgrade.js
View File

@ -301,12 +301,12 @@ export class JobGradeStore {
currenttime: currenttime, currenttime: currenttime,
[id_key]:"''" [id_key]:"''"
} }
// this.condition[0].items[4].browserConditionParam.dataParams = { this.condition[0].items[4].browserConditionParam.dataParams = {
// ...this.condition[0].items[4].browserConditionParam.dataParams, ...this.condition[0].items[4].browserConditionParam.dataParams,
// [key]: val, [key]: val,
// currenttime: currenttime, currenttime: currenttime,
// [id_key]:"''" [id_key]:"''"
// } }
this.condition[0].items[4].browserConditionParam.destDataParams = { this.condition[0].items[4].browserConditionParam.destDataParams = {
...this.condition[0].items[4].browserConditionParam.destDataParams, ...this.condition[0].items[4].browserConditionParam.destDataParams,
[key]: val, [key]: val,