diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js
index df668ac..13c7358 100644
--- a/pc4mobx/organization/components/department/department.js
+++ b/pc4mobx/organization/components/department/department.js
@@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:19:37
- * @LastEditTime: 2022-07-08 16:50:58
+ * @LastEditTime: 2022-08-03 15:11:19
* @Description:
* @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")
}
- copy() {
+ copy(id) {
const {
department
} = this.props;
const {
selectedRowKeys
} = department;
- let keys = toJS(selectedRowKeys).toString();
+
+ let keys = id == undefined ? toJS(selectedRowKeys).toString() : id;
department.setIds(keys);
confirm({
title: i18n.confirm.defaultTitle(),
@@ -377,6 +378,9 @@ export default class Department extends React.Component {
{ _this.select(record.id) }}>联查岗位
+
+ { _this.copy(record.id) }}>复制
+
)
return
diff --git a/pc4mobx/organization/components/job/Job.js b/pc4mobx/organization/components/job/Job.js
index 926b46b..960174c 100644
--- a/pc4mobx/organization/components/job/Job.js
+++ b/pc4mobx/organization/components/job/Job.js
@@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-26 14:05:59
- * @LastEditTime: 2022-07-15 14:36:46
+ * @LastEditTime: 2022-08-03 15:13:55
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/job/Job.js
*/
@@ -160,14 +160,14 @@ export default class Job extends React.Component {
}
- copy() {
+ copy(id) {
const {
job
} = this.props;
const {
selectedRowKeys,
} = job;
- let keys = toJS(selectedRowKeys).toString();
+ let keys = id == undefined ? toJS(selectedRowKeys).toString() : id;
job.setIds(keys);
confirm({
title: i18n.confirm.defaultTitle(),
@@ -352,6 +352,9 @@ export default class Job extends React.Component {
{ _this.merge(record.id) }}>合并
+
+ { _this.copy(record.id) }}>复制
+
)
return
diff --git a/pc4mobx/organization/stores/jobgrade.js b/pc4mobx/organization/stores/jobgrade.js
index 489b9bb..242e4a8 100644
--- a/pc4mobx/organization/stores/jobgrade.js
+++ b/pc4mobx/organization/stores/jobgrade.js
@@ -301,12 +301,12 @@ export class JobGradeStore {
currenttime: currenttime,
[id_key]:"''"
}
- // this.condition[0].items[4].browserConditionParam.dataParams = {
- // ...this.condition[0].items[4].browserConditionParam.dataParams,
- // [key]: val,
- // currenttime: currenttime,
- // [id_key]:"''"
- // }
+ this.condition[0].items[4].browserConditionParam.dataParams = {
+ ...this.condition[0].items[4].browserConditionParam.dataParams,
+ [key]: val,
+ currenttime: currenttime,
+ [id_key]:"''"
+ }
this.condition[0].items[4].browserConditionParam.destDataParams = {
...this.condition[0].items[4].browserConditionParam.destDataParams,
[key]: val,