@@ -100,7 +125,7 @@ export default class LogView extends React.Component {
return
{
if (e.keyCode == 13 && e.target.tagName === "INPUT") {
logViewStore.getTableInfo();
- logViewStore.setPanelStatus(false)
+ this.setState({ showSearchAd: false })
}
}}>{arr}
}
@@ -116,9 +141,9 @@ export default class LogView extends React.Component {
} = logViewStore;
const btn = [
- (
),
+ (
),
(
),
- (
),
+ (
),
];
return btn;
@@ -130,38 +155,58 @@ export default class LogView extends React.Component {
const {
visible, onCancel, logViewStore
} = this.props, {
- tableStore,isPanelShow,conditionNum
+ tableStore, conditionNum
} = logViewStore, {
- height, dialogTitle, width,
+ height, dialogTitle, width, showSearchAd, detailDialogTitle, detailVisible,record
} = this.state;
-
return (
-
onCancel()}
- style={{ height: height, width: width }}
- >
- logViewStore.setPanelStatus(bool)}
- hideSearchAd={() => logViewStore.setPanelStatus(false)}
- searchsAd={isPanelShow ? this.getPanelComponents() : }
- advanceHeight={Math.ceil(conditionNum / 2) * 52 + 20}
- hasMask={false}
- buttonsAd={this.getTabBtn()}
- onSearch={() => logViewStore.getTableInfo()}
- />
-
- )
+
+
onCancel()}
+ style={{ height: height, width: width }}
+ >
+ { this.setState({ showSearchAd: bool }) }}
+ advanceHeight={161}
+ searchsAd={showSearchAd ? this.getPanelComponents() : }
+ buttonsAd={this.getTabBtn()}
+ />
+ this.reRenderColumns(c)}
+ />
+
+
this.setState({
+ detailVisible: false
+ })}
+ style={{ height: 676, width: 1000 }}
+ >
+
+
+
+
+ )
}
}
\ No newline at end of file
diff --git a/pc4mobx/organization/components/office/officeManage.js b/pc4mobx/organization/components/office/officeManage.js
index 48df78f..d228ae6 100644
--- a/pc4mobx/organization/components/office/officeManage.js
+++ b/pc4mobx/organization/components/office/officeManage.js
@@ -58,6 +58,13 @@ export default class OfficeManage extends Component {
return menus;
};
+ showlog = () => {
+ window.setLogViewProp({
+ logMoudleType: 6,
+ keys: new Date().getTime(),
+ });
+ }
+
handleMenuClick = key => {
const { officeManageStore } = this.props;
const { isPanelShow, tableStore } = officeManageStore;
@@ -68,6 +75,9 @@ export default class OfficeManage extends Component {
officeManageStore.setVisible(true);
officeManageStore.setNeDialogTitle(i18n.label.newOfficeName());
break;
+ case "log":
+ this.showlog();
+ break;
case "custom":
tableStore.setColSetVisible(true);
tableStore.tableColSet(true);
@@ -235,7 +245,7 @@ export default class OfficeManage extends Component {
let _this = this;
columns.forEach((c, index) => {
if (c.dataIndex == "forbidden_tag") {
- c.render = function(text, record) {
+ c.render = function (text, record) {
return (
{
+ window.setLogViewProp({
+ logMoudleType: 3,
+ keys: new Date().getTime(),
+ });
+ }
+
getPanelComponents() {
const {
jobGrade
diff --git a/pc4mobx/organization/components/postionrank/JobLevel.js b/pc4mobx/organization/components/postionrank/JobLevel.js
index a8959f0..0b1a491 100644
--- a/pc4mobx/organization/components/postionrank/JobLevel.js
+++ b/pc4mobx/organization/components/postionrank/JobLevel.js
@@ -361,6 +361,12 @@ export default class JobLevel extends React.Component {
}
+ log = () => {
+ window.setLogViewProp({
+ logMoudleType: 2,
+ keys: new Date().getTime(),
+ });
+ }
render() {
diff --git a/pc4mobx/organization/components/postionrank/RankScheme.js b/pc4mobx/organization/components/postionrank/RankScheme.js
index 4008a37..24883d9 100644
--- a/pc4mobx/organization/components/postionrank/RankScheme.js
+++ b/pc4mobx/organization/components/postionrank/RankScheme.js
@@ -287,6 +287,14 @@ export default class RankScheme extends React.Component {
}
+ log = () => {
+ window.setLogViewProp({
+ logMoudleType: 1,
+ keys: new Date().getTime(),
+ });
+ }
+
+
handleSave() {
const {
rankScheme
diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index 8b8fe2a..2914f81 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -163,6 +163,14 @@ export default class Resource extends React.Component {
this[item.menuFun] && this[item.menuFun]();
}
+
+ log = () => {
+ window.setLogViewProp({
+ logMoudleType: 11,
+ keys: new Date().getTime(),
+ });
+ }
+
new() {
const {
resource
diff --git a/pc4mobx/organization/components/sequence/Sequence.js b/pc4mobx/organization/components/sequence/Sequence.js
index 75ec848..c5f85ee 100644
--- a/pc4mobx/organization/components/sequence/Sequence.js
+++ b/pc4mobx/organization/components/sequence/Sequence.js
@@ -362,6 +362,12 @@ export default class Sequence extends React.Component {
+ log = () => {
+ window.setLogViewProp({
+ logMoudleType: 4,
+ keys: new Date().getTime(),
+ });
+ }
render() {
diff --git a/pc4mobx/organization/components/staff/Staff.js b/pc4mobx/organization/components/staff/Staff.js
index 8c5ab4f..555ed9c 100644
--- a/pc4mobx/organization/components/staff/Staff.js
+++ b/pc4mobx/organization/components/staff/Staff.js
@@ -118,6 +118,14 @@ export default class Staff extends React.Component {
staff.getForm();
}
+
+ log = () => {
+ window.setLogViewProp({
+ logMoudleType: 13,
+ keys: new Date().getTime(),
+ });
+ }
+
batchDelete() {
const {
staff
diff --git a/pc4mobx/organization/components/staff/StaffScheme.js b/pc4mobx/organization/components/staff/StaffScheme.js
index c527d33..c6795c6 100644
--- a/pc4mobx/organization/components/staff/StaffScheme.js
+++ b/pc4mobx/organization/components/staff/StaffScheme.js
@@ -267,7 +267,7 @@ export default class StaffScheme extends React.Component {
log = () => {
window.setLogViewProp({
- logMoudleType: '0',
+ logMoudleType: 12,
keys: new Date().getTime(),
});
}
diff --git a/pc4mobx/organization/stores/job.js b/pc4mobx/organization/stores/job.js
index fc23b6d..d3e0666 100644
--- a/pc4mobx/organization/stores/job.js
+++ b/pc4mobx/organization/stores/job.js
@@ -63,7 +63,8 @@ export class JobStore {
@observable defaultShowLeft = true;
@observable companysId = 1
@observable hasRight = '';
-
+ @observable key = '';
+ @observable key1 = '';
@observable selectTreeNodeInfo;
saveAndSetting = false;
@@ -304,10 +305,96 @@ export class JobStore {
}
updateConditions(data) {
- const label = "等级方案"
- const index = findIndex(this.condition[0].items, { label });
- this.condition[0].items[index].browserConditionParam.replaceDatas = [{ name: data.sequence_id.valueObj[0].scheme_ids, id: data.sequence_id.valueObj[0].scheme_values }];
- this.setCondition(this.condition,false);
+ if (data.sequence_id) {
+ let label = "等级方案"
+ const index = findIndex(this.condition[1].items, { label });
+ const schemeId = data.sequence_id.valueObj[0].scheme_values;
+ this.condition[1].items[index].browserConditionParam.replaceDatas = [{ name: data.sequence_id.valueObj[0].scheme_ids, id: schemeId }];
+ //清空职等并限制范围
+ label = "职等"
+ const index1 = findIndex(this.condition[1].items, { label });
+ let currenttime = Date.now();
+ let key = `scheme_id_${currenttime}`;
+ const lastKey = this.key;
+ this.setKey(key);
+
+ Reflect.deleteProperty(this.condition[1].items[index1].browserConditionParam.completeParams, lastKey);
+ Reflect.deleteProperty(this.condition[1].items[index1].browserConditionParam.conditionDataParams, lastKey);
+ Reflect.deleteProperty(this.condition[1].items[index1].browserConditionParam.dataParams, lastKey);
+ Reflect.deleteProperty(this.condition[1].items[index1].browserConditionParam.destDataParams, lastKey);
+
+ this.condition[1].items[index1].browserConditionParam.completeParams = {
+ [key]: schemeId,
+ ...this.condition[1].items[index1].browserConditionParam.completeParams,
+ currenttime: currenttime
+ }
+ this.condition[1].items[index1].browserConditionParam.conditionDataParams = {
+ [key]: schemeId,
+ ...this.condition[1].items[index1].browserConditionParam.conditionDataParams,
+ currenttime: currenttime
+ }
+ this.condition[1].items[index1].browserConditionParam.dataParams = {
+ [key]: schemeId,
+ ...this.condition[1].items[index1].browserConditionParam.dataParams,
+ currenttime: currenttime
+ }
+ this.condition[1].items[index1].browserConditionParam.destDataParams = {
+ [key]: schemeId,
+ ...this.condition[1].items[index1].browserConditionParam.destDataParams,
+ currenttime: currenttime
+ }
+
+ this.form.updateFields({
+ levelId: {
+ value: ''
+ },
+ grade_id: {
+ value: ''
+ }
+ });
+ } else {
+
+ //清空职级并限制范围
+ let label = "职级"
+ const index2 = findIndex(this.condition[1].items, { label });
+ let currenttime = Date.now();
+ let key1 = `level_id_${currenttime}`;
+ const lastKey = this.key1;
+ this.key1 = key1;
+ const levelId = data.level_id.value;
+ Reflect.deleteProperty(this.condition[1].items[index2].browserConditionParam.completeParams, lastKey);
+ Reflect.deleteProperty(this.condition[1].items[index2].browserConditionParam.conditionDataParams, lastKey);
+ Reflect.deleteProperty(this.condition[1].items[index2].browserConditionParam.dataParams, lastKey);
+ Reflect.deleteProperty(this.condition[1].items[index2].browserConditionParam.destDataParams, lastKey);
+
+ this.condition[1].items[index2].browserConditionParam.completeParams = {
+ [key1]: levelId,
+ ...this.condition[1].items[index2].browserConditionParam.completeParams,
+ currenttime: currenttime
+ }
+ this.condition[1].items[index2].browserConditionParam.conditionDataParams = {
+ [key1]: levelId,
+ ...this.condition[1].items[index2].browserConditionParam.conditionDataParams,
+ currenttime: currenttime
+ }
+ this.condition[1].items[index2].browserConditionParam.dataParams = {
+ [key1]: levelId,
+ ...this.condition[1].items[index2].browserConditionParam.dataParams,
+ currenttime: currenttime
+ }
+ this.condition[1].items[index2].browserConditionParam.destDataParams = {
+ [key]: levelId,
+ ...this.condition[1].items[index2].browserConditionParam.destDataParams,
+ currenttime: currenttime
+ }
+
+ this.form.updateFields({
+ grade_id: {
+ value: ''
+ }
+ });
+ }
+ this.setCondition(this.condition, false);
this.form1.initFormFields(this.condition);
}
@@ -478,4 +565,8 @@ export class JobStore {
this.mergeCondition = mergeCondition;
}
+ setKey(key) {
+ this.key = key;
+ }
+
}
\ No newline at end of file
diff --git a/pc4mobx/organization/stores/logview.js b/pc4mobx/organization/stores/logview.js
index 88cef75..6e229a9 100644
--- a/pc4mobx/organization/stores/logview.js
+++ b/pc4mobx/organization/stores/logview.js
@@ -26,14 +26,13 @@ const {
export class LogViewStore {
@observable tableStore = new TableStore();
@observable searchCondition = [];
- @observable isPanelShow = false; //高级搜索面板
@observable form = new WeaForm();
@observable conditionNum = 20;
- @observable searchConditionLoading = true;
+ @observable searchConditionLoading = false;
@observable visible = false;
@observable dialogLoading = false;
@observable moduleType = ""; //模块类型
-
+
init(logMoudleType) {
this.setModuleType(logMoudleType);
this.getTableInfo();
@@ -43,9 +42,9 @@ export class LogViewStore {
@action getTableInfo() {
let params = {
...this.form.getFormParams(),
- moduleType:this.moduleType
+ moduleType: this.moduleType
}
- this.tableStore = new TableStore();
+ this.tableStore = new TableStore();
Api.getLogList(params).then(res => {
if (res.code === 200) {
res.data.datas && this.tableStore.getDatas(res.data.datas, 1);
@@ -58,12 +57,11 @@ export class LogViewStore {
}
-
@action getSearchCondition() {
- this.setDialogLoading(true);
+ this.setSearchConditionLoading(true);
Api.getAdvanceSearchCondition().then(res => {
if (res.code === 200) {
- this.setDialogLoading(false);
+ this.setSearchConditionLoading(false);
res.data.conditions && this.setSearchCondition(res.data.conditions);
res.data.conditions && this.form.initFormFields(res.data.conditions);
} else {
@@ -75,18 +73,11 @@ export class LogViewStore {
}
-
+
setDialogLoading(bool) {
this.dialogLoading = bool;
}
- setPanelStatus(bool) {
- this.isPanelShow = bool;
- bool && this.getSearchCondition();
- if (!bool) {
- this.scLoadingReset();
- }
- }
isEmptyObject(obj) {
for (let key in obj) {
@@ -99,6 +90,10 @@ export class LogViewStore {
this.searchCondition = searchCondition;
}
+ setSearchConditionLoading(bool) {
+ this.searchConditionLoading = bool;
+ }
+
scLoadingReset() {
this.searchConditionLoading = true;
}