{getLabel(537558, "确定")}]}
>
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js
index 84bcb6ff..e4e94622 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/config/index.js
@@ -1,3 +1,10 @@
+import { WeaSwitch } from "comsMobx";
+import { Button } from "antd";
+import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
+
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
export const tabCondition = [
{
color: "#000000",
@@ -33,5 +40,99 @@ export const tabCondition = [
showcount: true,
title: "非系统人员",
viewcondition: "ext"
- },
+ }
];
+export const logConditions = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ conditionType: "BROWSER",
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: true,
+ linkUrl: "/hrm/resource/HrmResource.jsp?id=",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: "",
+ type: "1"
+ },
+ domkey: ["employeeId"],
+ fieldcol: 17,
+ label: "对象",
+ lanId: 106,
+ labelcol: 7,
+ value: ""
+ },
+ {
+ colSpan: 1,
+ conditionType: "BROWSER",
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: true,
+ linkUrl: "/hrm/resource/HrmResource.jsp?id=",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: "",
+ type: "1"
+ },
+ domkey: ["operator"],
+ fieldcol: 17,
+ label: "操作人",
+ lanId: 111,
+ labelcol: 7,
+ value: ""
+ }
+ ],
+ defaultshow: true
+ }
+];
+export const getLogSearchsForm = (form, condition, onSearch = () => void (0)) => {
+ const { isFormInit } = form;
+ const formParams = form.getFormParams();
+ let group = [];
+ isFormInit && condition && condition.map(c => {
+ let items = [];
+ c.items.map(fields => {
+ items.push({
+ com: (
+
+
+ {
+ getKey(fields) === "operator" &&
+
+ }
+ ),
+ colSpan: 1
+ });
+ });
+ group.push(
+ );
+ });
+ return group;
+};
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
index 66ce8099..e676e5c4 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
@@ -17,6 +17,7 @@ import UnifiedTable from "../../../components/UnifiedTable";
import { convertToUrlString, getURLParameters } from "../../../util/url";
import { salaryArchiveDelete } from "../../../apis/payrollFiles";
import ImportDialog from "../../../components/importDialog";
+import OperateLogDialog from "./operateLogDialog";
import "./index.less";
import { sysinfo } from "../../../apis/ruleconfig";
@@ -66,7 +67,8 @@ export default class Archives extends React.Component {
link: "", importResult: {}, imageId: "",
previewUrl: "/api/bs/hrmsalary/scheme/preview"
},
- extEmpsWitch: "1" //非系统人员开关, 1: 开启, 0:关闭
+ extEmpsWitch: "1", //非系统人员开关, 1: 开启, 0:关闭
+ logDialog: { visible: false }
};
this.record = {};
}
@@ -627,7 +629,8 @@ export default class Archives extends React.Component {
tabCount,
loading,
importDialog,
- extEmpsWitch
+ extEmpsWitch,
+ logDialog
} = this.state;
const {
form, condition, showSearchAd, setShowSearchAd,
@@ -814,10 +817,15 @@ export default class Archives extends React.Component {
return (
} // 左侧图标
- iconBgcolor="#F14A2D" // 左侧图标背景色
- showDropIcon={false} // 是否显示下拉按钮
+ title="社保福利档案" icon={} iconBgcolor="#F14A2D" showDropIcon={true}
+ dropMenuDatas={[
+ {
+ key: "log",
+ icon: ,
+ content: getLabel(111, "操作日志"),
+ onClick: key => this.setState({ logDialog: { ...logDialog, visible: true } })
+ }
+ ]}
>
+ {/*操作日志*/}
+ this.setState({ logDialog: { ...logDialog, visible: false } })}
+ />
{
this.state.editSlideVisible &&
({
+ ...it, items: _.map(it.items, o => ({ ...o, label: getLabel(o.lanId, o.label) }))
+ }))
+ }, () => logForm.initFormFields(this.state.conditions));
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) this.getAdjustHistoryList();
+ if (nextProps.visible !== this.props.visible && !nextProps.visible) {
+ this.setState({
+ dataSource: [], columns: [], pageInfo: { current: 0, pageSize: 10, total: 0 },
+ loading: false
+ });
+ }
+ }
+
+ getAdjustHistoryList = (extra = {}) => {
+ const { pageInfo } = this.state;
+ const { archivesStore: { logForm } } = this.props;
+ const payload = { ...pageInfo, ...logForm.getFormParams(), ...extra };
+ this.setState({ loading: true });
+ getAdjustHistoryList(payload).then(({ status, data }) => {
+ this.setState({ loading: false });
+ if (status) {
+ const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize, total },
+ dataSource, columns: _.map(columns, it => {
+ if (it.dataIndex === "operateTime") {
+ return { ...it, render: (text) => ({moment(text).format("YYYY-MM-DD")}) };
+ }
+ return { ...it };
+ })
+ });
+ }
+ }).catch(() => this.setState({ loading: false }));
+ };
+
+ render() {
+ const { loading, dataSource, columns, pageInfo, conditions } = this.state;
+ const { archivesStore: { logForm } } = this.props;
+ const pagination = {
+ ...pageInfo,
+ showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+ showQuickJumper: true,
+ showSizeChanger: true,
+ pageSizeOptions: ["10", "20", "50", "100"],
+ onShowSizeChange: (current, pageSize) => {
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize }
+ }, () => this.getAdjustHistoryList());
+ },
+ onChange: current => {
+ this.setState({
+ pageInfo: { ...pageInfo, current }
+ }, () => this.getAdjustHistoryList());
+ }
+ };
+ const scrollHeight = this.logRef ? this.logRef.state.height - 210 : 606.6;
+ return (
+ this.logRef = dom} className="logDialog" initLoadCss
+ style={{
+ width: 1150,
+ height: 606.6,
+ minHeight: 200,
+ minWidth: 380,
+ maxHeight: "90%",
+ maxWidth: "90%",
+ overflow: "hidden",
+ transform: "translate(0px, 0px)"
+ }}
+ >
+
+ {getLogSearchsForm(logForm, conditions, () => this.getAdjustHistoryList({ current: 1 }))}
+
+
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/stores/archives.js b/pc4mobx/hrmSalary/stores/archives.js
index 383e585d..096a5ab7 100644
--- a/pc4mobx/hrmSalary/stores/archives.js
+++ b/pc4mobx/hrmSalary/stores/archives.js
@@ -8,6 +8,13 @@ import * as API from "../apis/welfareArchive"; // 引入API接口文件
const { TableStore } = WeaTableNew;
export class ArchivesStore {
+ @observable logForm = new WeaForm(); // 社保福利档案重构-日志查询条件log
+
+
+
+
+
+
@observable tableStore = new TableStore(
// {dataHandle: (datas) => {
// return dataSource;
diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js
index 7e7925bc..54a84562 100644
--- a/pc4mobx/hrmSalary/stores/salaryItem.js
+++ b/pc4mobx/hrmSalary/stores/salaryItem.js
@@ -309,7 +309,7 @@ export class SalaryItemStore {
if (!continueFlag) {
this.editSlideVisible = false;
}
- this.initRequest();
+ ((!params.id && continueFlag) || !continueFlag) && this.initRequest();
message.success("保存成功");
resolve();
} else {