微博总数
diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index 2525c81..f7b94aa 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -328,7 +328,9 @@ export default class Resource extends React.Component {
} = resource;
const btn = [
- (
),
+ (
),
(
),
(
),
(
),
diff --git a/pc4mobx/organization/components/sequence/Sequence.js b/pc4mobx/organization/components/sequence/Sequence.js
index 61af8ac..adb6171 100644
--- a/pc4mobx/organization/components/sequence/Sequence.js
+++ b/pc4mobx/organization/components/sequence/Sequence.js
@@ -195,7 +195,9 @@ export default class Sequence extends React.Component {
} = sequence;
const btn = [
- (
),
+ (
),
(
),
(
),
];
diff --git a/pc4mobx/organization/components/staff/Staff.js b/pc4mobx/organization/components/staff/Staff.js
index 928feb8..673c641 100644
--- a/pc4mobx/organization/components/staff/Staff.js
+++ b/pc4mobx/organization/components/staff/Staff.js
@@ -217,7 +217,9 @@ export default class Staff extends React.Component {
} = staff;
const btn = [
- (
),
+ (
),
(
),
(
),
];
diff --git a/pc4mobx/organization/components/staff/StaffScheme.js b/pc4mobx/organization/components/staff/StaffScheme.js
index cc24a11..ab931b8 100644
--- a/pc4mobx/organization/components/staff/StaffScheme.js
+++ b/pc4mobx/organization/components/staff/StaffScheme.js
@@ -195,7 +195,9 @@ export default class StaffScheme extends React.Component {
} = staffScheme;
const btn = [
- (
),
+ (
),
(
),
(
),
];
diff --git a/pc4mobx/organization/stores/fieldDefined.js b/pc4mobx/organization/stores/fieldDefined.js
index 0aa675f..ebe72a2 100644
--- a/pc4mobx/organization/stores/fieldDefined.js
+++ b/pc4mobx/organization/stores/fieldDefined.js
@@ -710,7 +710,9 @@ export class FieldDefinedStore extends HrmBaseStore {
this.refreshMainTabComponent = new Date().getTime();
this.spinning = false;
this.refreshMainTabComponent = new Date().getTime();
- }, error => {this.spinning = false;})
+ }, error => {
+this.spinning = false;
+})
}
@@ -873,7 +875,7 @@ export class FieldDefinedStore extends HrmBaseStore {
this.formTarget.typeInfoFrom.validateForm().then(f => {
if (f.isValid) {
let params = {
- ... this.formTarget.typeInfoFrom.getFormParams(),
+ ...this.formTarget.typeInfoFrom.getFormParams(),
id: this.selectedTreeNodeInfo.domid
}
api.changeTypeInfo(this.moduleName, params).then(response => {
diff --git a/pc4mobx/organization/stores/job.js b/pc4mobx/organization/stores/job.js
index f17ebf0..5555b1c 100644
--- a/pc4mobx/organization/stores/job.js
+++ b/pc4mobx/organization/stores/job.js
@@ -68,6 +68,8 @@ export class JobStore {
@observable selectTreeNodeInfo;
saveAndSetting = false;
+ @observable jobtitleVisible = false;
+
@action initData() {
this.getHasRight();
this.refresh();
@@ -208,8 +210,11 @@ export class JobStore {
Api.getJobForm(this.selectTreeNodeInfo).then(res => {
if (res.code === 200) {
this.setDialogLoadingStatus(false);
- res.data.condition && this.setCondition(res.data.condition);
- res.data.condition && this.form1.initFormFields(res.data.condition);
+ if(res.data.condition) {
+ let condition = this.processCondition(res.data.condition)
+ this.setCondition(condition);
+ this.form1.initFormFields(condition);
+ }
} else {
message.warning(res.msg);
}
@@ -218,6 +223,19 @@ export class JobStore {
})
}
+ processCondition = (condition) => {
+ condition.map(c => c.items.map(item => {
+ if (item.domkey[0] === "ec_jobTitle") {
+ item.otherParams = {
+ addOnClick: () => {
+ this.setJobtitleVisible(true);
+ }
+ }
+ }
+ }));
+ return condition;
+ }
+
@action("复制表单") getCopyForm() {
let params = {};
Api.getCopyForm(params).then(res => {
@@ -351,6 +369,10 @@ export class JobStore {
this.jobTitleName = val;
}
+ setJobtitleVisible(val) {
+ this.jobtitleVisible = val;
+ }
+
isEmptyObject(obj) {
for (let key in obj) {
return false;
diff --git a/pc4mobx/organization/util/index.js b/pc4mobx/organization/util/index.js
index f1e4790..ee339f5 100644
--- a/pc4mobx/organization/util/index.js
+++ b/pc4mobx/organization/util/index.js
@@ -98,7 +98,9 @@ export const renderNoData = () => (
//对象非空判断
export const isEmpty = (obj) =>{
- for(var n in obj){return false}
+ for(var n in obj){
+return false
+}
return true;
}