qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature/2.10.1.2401.01-页面操作日志添加

This commit is contained in:
黎永顺 2024-01-31 10:24:15 +08:00
parent 169f90d44b
commit a6f382a36b
18 changed files with 276 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js
View File

@ -12,9 +12,9 @@ import AdvanceInputBtn from "./components/advanceInputBtn";
import AdjustAdvanceSearchPannel from "./components/adjustAdvanceSearchPannel";
import cs from "classnames";
import { Button } from "antd";
import "./index.less";
import { convertToUrlString } from "../../util/url";
import LogDialog from "../../components/logViewModal";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
@ -25,7 +25,7 @@ class Index extends Component {
super(props);
this.state = {
loading: false, columns: [], dataSource: [], showSearchAd: false,
pageInfo: { current: 1, pageSize: 10, total: 0 }
pageInfo: { current: 1, pageSize: 10, total: 0 }, logDialogVisible: false
};
}
@ -88,9 +88,18 @@ class Index extends Component {
}
this.handleDebounce();
};
onDropMenuClick = (key) => {
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
break;
default:
break;
}
};
render() {
const { loading, dataSource, columns, pageInfo, showSearchAd } = this.state;
const { loading, dataSource, columns, pageInfo, showSearchAd, logDialogVisible } = this.state;
const pagination = {
...pageInfo,
showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
@ -111,11 +120,17 @@ class Index extends Component {
return (
<WeaTop
title={getLabel(111, "调薪管理")} buttonSpace={10} className="adjustManageLayout"
icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D" showDropIcon
buttons={[
<Button type="primary" onClick={this.adjustExport}>{getLabel(17416, "导出")}</Button>,
<AdvanceInputBtn onOpenAdvanceSearch={() => this.openAdvanceSearch()}
onAdvanceSearch={this.adjustRecordItemList}/>
]} onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
<div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
@ -129,6 +144,9 @@ class Index extends Component {
dataSource={dataSource} loading={loading}
pagination={pagination} columns={columns}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salarcitemadj"
onCancel={() => this.setState({ logDialogVisible: false })}/>
</WeaTop>
);
}

8
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/statisticsModal.js
View File

@ -20,6 +20,14 @@ class StatisticsModal extends Component {
};
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) {
document.querySelector(".xc_tj_fx_wrapper").classList.add("zIndex0-statistics");
} else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
document.querySelector(".xc_tj_fx_wrapper").classList.remove("zIndex0-statistics");
}
}
handleSaveReportList = () => {
const { form, id, onCancel } = this.props;
form.validateForm().then(f => {

30
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
View File

@ -19,6 +19,7 @@ import ReportList from "./components/reportList";
import ReportForm from "./components/reportForm";
import moment from "moment";
import "./index.less";
import LogDialog from "../../components/logViewModal";
const { getLabel } = WeaLocaleProvider;
@ -41,7 +42,8 @@ class Index extends Component {
modalReq: {
title: "", visible: false,
typeKey: "", id: ""
}
},
logDialogVisible: false
};
}
@ -243,10 +245,22 @@ class Index extends Component {
initTable && this.dimensionTableRef.dimensionList();
});
};
onDropMenuClick = (key) => {
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
break;
default:
break;
}
};
render() {
const { taxAgentStore: { statisticsReportBtn }, attendanceStore: { statisticsForm, reportForm } } = this.props;
const { selectedKey, modalReq, slideReq, conditions, reportConditions, reportName, keyword, year } = this.state;
const {
selectedKey, modalReq, slideReq, conditions, reportConditions,
reportName, keyword, year, logDialogVisible
} = this.state;
const buttons = selectedKey === "statistics" ? [
<Button type="primary" onClick={() => this.handleReqBtnsClick("addReport")}>{getLabel(111, "新建报表")}</Button>,
<Button type="ghost"
@ -272,9 +286,16 @@ class Index extends Component {
return (
<WeaReqTop
title={getLabel(111, "薪酬统计报表")} icon={<i className="icon-coms-fa"/>} selectedKey={selectedKey}
iconBgcolor="#F14A2D" tabDatas={tabs} className="xc_tj_fx_wrapper" showDropIcon={false}
iconBgcolor="#F14A2D" tabDatas={tabs} className="xc_tj_fx_wrapper" showDropIcon
buttons={(!statisticsReportBtn && selectedKey === "statistics") ? buttons.slice(-1) : buttons} buttonSpace={10}
onChange={selectedKey => this.setState({ selectedKey }, () => this.state.selectedKey === "statistics" && this.initReportFormCondition())}
onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
{
selectedKey === "statistics" ?
@ -306,6 +327,9 @@ class Index extends Component {
form={statisticsForm} condition={conditions}
initCondition={this.initCondition} onChangeCondition={this.handleChangeCondition}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="statreport"
onCancel={() => this.setState({ logDialogVisible: false })}/>
</WeaReqTop>
);
}

9
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
View File

@ -1,8 +1,4 @@
.xc_tj_fx_wrapper {
.wea-new-top-req {
z-index: 0 !important;
}
.search {
top: -3px;
margin-right: 10px;
@ -167,6 +163,11 @@
}
}
.zIndex0-statistics {
.wea-new-top-req {
z-index: 0 !important;
}
}
//统计维度弹框
.dimensionModalWrapper, .dimensionSlideWrapper {

30
pc4mobx/hrmSalary/pages/calculate/calculate.js
View File

@ -12,9 +12,10 @@ import moment from "moment";
import CalculateQuery from "./components/calculateQuery";
import CalculateTablelist from "./components/calculateTablelist";
import CalculateDialog from "./components/calculateDialog";
import ProgressModal from "../../components/progressModal";
import LogDialog from "../../components/logViewModal";
import { backCalculate, deleteSalaryacct, fileSalaryAcct, reAccounting } from "../../apis/calculate";
import "./index.less";
import ProgressModal from "../../components/progressModal";
const getLabel = WeaLocaleProvider.getLabel;
@ -27,10 +28,10 @@ class Calculate extends Component {
queryParams: {
name: "",
dateRange: [
moment(new Date()).subtract(1, 'year').startOf("year").format("YYYY-MM"),
moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"),
moment(new Date()).endOf("year").format("YYYY-MM")
]
}, isRefresh: false,
}, isRefresh: false, logDialogVisible: false,
progressModule: { visible: false, progress: 0, title: getLabel(111, "正在归档中请稍后") },
calcDaialog: { visible: false, title: "" }
};
@ -169,12 +170,28 @@ class Calculate extends Component {
break;
}
};
onDropMenuClick = (key) => {
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
break;
default:
break;
}
};
render() {
const { queryParams, isRefresh, calcDaialog, progressModule } = this.state;
const { queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible } = this.state;
return (
<WeaTop title={getLabel(538011, "薪资核算")} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
buttons={this.renderCalculateOpts()} className="calculate-main-layout"
buttons={this.renderCalculateOpts()} className="calculate-main-layout" showDropIcon
onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
<div className="calculate-body">
<CalculateTablelist queryParams={queryParams} isRefresh={isRefresh} onCalcOpts={this.handleCalcOpts}/>
@ -184,6 +201,9 @@ class Calculate extends Component {
isRefresh: bool === "refresh" ? !isRefresh : isRefresh
}, () => bool === "refresh" && window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/calculate/${id}`))}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="acctrecord"
onCancel={() => this.setState({ logDialogVisible: false })}/>
{/* 归档进度条*/}
{
progressModule.visible &&

28
pc4mobx/hrmSalary/pages/declare/declare.js
View File

@ -12,6 +12,7 @@ import moment from "moment";
import DeclareQuery from "./components/declareQuery";
import DeclareTablelist from "./components/declareTablelist";
import DeclareDialog from "./components/declareDialog";
import LogDialog from "../../components/logViewModal";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
@ -25,11 +26,12 @@ class Calculate extends Component {
queryParams: {
taxAgentName: "",
dateRange: [
moment(new Date()).subtract(1, 'year').startOf("year").format("YYYY-MM"),
moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"),
moment(new Date()).endOf("year").format("YYYY-MM")
]
}, isRefresh: false,
declareDaialog: { visible: false, title: "" }
declareDaialog: { visible: false, title: "" },
logDialogVisible: false
};
this.handleDebounce = null;
}
@ -57,13 +59,26 @@ class Calculate extends Component {
];
return !showOperateBtn ? calculateOpts.slice(1) : calculateOpts;
};
onDropMenuClick = (key) => {
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
break;
default:
break;
}
};
render() {
const { queryParams, isRefresh, declareDaialog } = this.state;
const { queryParams, isRefresh, declareDaialog, logDialogVisible } = this.state;
return (
<WeaTop title={getLabel(543353, "个税申报")} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
buttons={this.renderCalculateOpts()} className="declare-main-layout"
>
buttons={this.renderCalculateOpts()} className="declare-main-layout" showDropIcon
onDropMenuClick={this.onDropMenuClick} dropMenuDatas={[{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}>
<div className="declare-body">
<DeclareTablelist queryParams={queryParams} isRefresh={isRefresh}/>
<DeclareDialog {...declareDaialog}
@ -72,6 +87,9 @@ class Calculate extends Component {
isRefresh: bool === "refresh" ? !isRefresh : isRefresh
})}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="taxdecla"
onCancel={() => this.setState({ logDialogVisible: false })}/>
</div>
</WeaTop>
);

25
pc4mobx/hrmSalary/pages/externalPersonManage/index.js
View File

@ -14,6 +14,7 @@ import { getSearchs } from "../../util";
import { condition, searchCondition } from "./conditions";
import { deleteExtEmp, listPage } from "../../apis/externalPersonManage";
import "./index.less";
import LogDialog from "../../components/logViewModal";
const getLabel = WeaLocaleProvider.getLabel;
@ -23,7 +24,7 @@ class Index extends Component {
constructor(props) {
super(props);
this.state = {
loading: false,
loading: false, logDialogVisible: false,
selectedRowKeys: [],
pageInfo: { current: 1, pageSize: 10, total: 0 },
showSearchAd: false,
@ -103,10 +104,19 @@ class Index extends Component {
}
}));
};
onDropMenuClick = (key) => {
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
break;
default:
break;
}
};
render() {
const {
showSearchAd, externalPersonManagePayload, loading,
showSearchAd, externalPersonManagePayload, loading, logDialogVisible,
pageInfo, selectedRowKeys, dataSource, externalPersonImportPayload
} = this.state;
const {
@ -136,7 +146,13 @@ class Index extends Component {
<div className="externalPerWrapper">
<WeaTop
title="非系统人员管理" icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D" showDropIcon={false}
iconBgcolor="#F14A2D" showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
<div className="externalPerCont">
<WeaTab
@ -222,6 +238,9 @@ class Index extends Component {
/>
}
</div>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="extemployee"
onCancel={() => this.setState({ logDialogVisible: false })}/>
</WeaTop>
</div>
);

34
pc4mobx/hrmSalary/pages/fieldManagement/index.js
View File

@ -7,20 +7,22 @@
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { Button, message, Modal } from "antd";
import { WeaInputSearch, WeaTop } from "ecCom";
import { WeaInputSearch, WeaLocaleProvider, WeaTop } from "ecCom";
import FieldTable from "./components/fieldTable";
import FieldSlide from "./components/fieldSlide";
import { deleteSalaryField } from "../../apis/fieldManage";
import LogDialog from "../../components/logViewModal";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
@inject("taxAgentStore")
@observer
class FieldManagement extends Component {
constructor(props) {
super(props);
this.state = {
searchVal: "",
doSearch: false,
searchVal: "", doSearch: false, logDialogVisible: false,
slideparams: {
visible: false,
title: "新建字段",
@ -67,9 +69,18 @@ class FieldManagement extends Component {
}
});
};
onDropMenuClick = (key) => {
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
break;
default:
break;
}
};
render() {
const { searchVal, doSearch, slideparams } = this.state;
const { searchVal, doSearch, slideparams, logDialogVisible } = this.state;
const { taxAgentStore } = this.props;
const { showSalaryItemBtn, showOperateBtn } = taxAgentStore;
const btns = [
@ -85,11 +96,15 @@ class FieldManagement extends Component {
];
return (
<WeaTop
title="字段管理"
icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D"
showDropIcon={false}
title="字段管理" icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
buttons={(showSalaryItemBtn || showOperateBtn) ? btns : btns.slice(-1)}
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
<div className="fieldManageWrapper">
<FieldTable name={searchVal} doSearch={doSearch} onEditLedger={this.handleEditField}
@ -105,6 +120,9 @@ class FieldManagement extends Component {
onCancel={this.handleResetField}
onRefreshList={() => this.setState({ doSearch: !doSearch })}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salarcfield"
onCancel={() => this.setState({ logDialogVisible: false })}/>
</div>
</WeaTop>
);

34
pc4mobx/hrmSalary/pages/ledgerPage/index.js
View File

@ -6,21 +6,23 @@
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { WeaTop } from "ecCom";
import { WeaLocaleProvider, WeaTop } from "ecCom";
import { Button } from "antd";
import LedgerTable from "./components/ledgerTable";
import LedgerSlide from "./components/ledgerSlide";
import LedgerSearchComp from "./components/ledgerSearchComp";
import LogDialog from "../../components/logViewModal";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
@inject("taxAgentStore")
@observer
class Index extends Component {
constructor(props) {
super(props);
this.state = {
searchVal: "",
doSearch: false,
searchVal: "", doSearch: false, logDialogVisible: false,
slideparams: {
visible: false,
title: "新建账套",
@ -51,9 +53,18 @@ class Index extends Component {
}
});
};
onDropMenuClick = (key) => {
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
break;
default:
break;
}
};
render() {
const { searchVal, doSearch, slideparams } = this.state;
const { logDialogVisible, doSearch, slideparams } = this.state;
const { taxAgentStore } = this.props;
const { showOperateBtn } = taxAgentStore;
const btns = [
@ -65,11 +76,15 @@ class Index extends Component {
];
return (
<WeaTop
title="薪资账套" className="ledgerOuter"
icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D"
showDropIcon={false}
title="薪资账套" className="ledgerOuter" icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
buttons={showOperateBtn ? btns : btns.slice(-1)}
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
<div className="ledgerWrapper">
<LedgerTable doSearch={doSearch} onEditLedger={this.handleEditLedger}/>
@ -78,6 +93,9 @@ class Index extends Component {
onCancel={this.handleResetLedger}
onRefreshList={() => this.setState({ doSearch: !doSearch })}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salarysob"
onCancel={() => this.setState({ logDialogVisible: false })}/>
</div>
</WeaTop>
);

4
pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
View File

@ -100,6 +100,10 @@ export const renderDropMenuDatas = (selectedKey, showOperateBtn) => {
key: "custom_cols",
icon: <i className="icon-coms-Custom"/>,
content: getLabel(32535, "显示列定制")
}, {
key: "log",
icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}];
switch (selectedKey) {
case "pending":

11
pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js
View File

@ -15,6 +15,7 @@ import SalaryFileList from "./components/salaryFileList";
import * as API from "../../apis/payrollFiles";
import { sysinfo } from "../../apis/ruleconfig";
import { convertToUrlString } from "../../util/url";
import LogDialog from "../../components/logViewModal";
import cs from "classnames";
import "./index.less";
@ -29,7 +30,7 @@ class SalaryFiles extends Component {
selectedKey: "pending", showSearchAd: false, isQuery: false, showDelSalaryFileBtn: false,
topTabCount: { PENDING: 0, FIXED: 0, SUSPEND: 0, STOP: 0, EXT: 0 }, showExtEmpsWitch: false,
salaryFileImpDialog: { visible: false, title: getLabel(24023, "数据导入"), importType: "", isExtEmp: false },
salaryImportTypes: []
salaryImportTypes: [], logDialogVisible: false
};
this.salaryFileListRef = null;
}
@ -51,6 +52,9 @@ class SalaryFiles extends Component {
onDropMenuClick = (key) => {
const { state, handleSalaryOpts } = this.salaryFileListRef.wrappedInstance || {};
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
break;
case "custom_cols":
const { payrollFilesStore: { tableStore } } = this.props;
tableStore.setColSetVisible(true);
@ -225,7 +229,7 @@ class SalaryFiles extends Component {
render() {
const {
selectedKey, topTabCount, showSearchAd, isQuery, showDelSalaryFileBtn, showExtEmpsWitch,
salaryFileImpDialog, salaryImportTypes
salaryFileImpDialog, salaryImportTypes, logDialogVisible
} = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props;
return (
@ -257,6 +261,9 @@ class SalaryFiles extends Component {
showDelSalaryFileBtn={showDelSalaryFileBtn}
onChangeTopTabCount={this.queryInsuranceTabTotal}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salaryarchive"
onCancel={() => this.setState({ logDialogVisible: false })}/>
{/* 导入*/}
<SalaryFileImportDialog {...salaryFileImpDialog}
onCancel={(isFresh) => {

7
pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
View File

@ -30,7 +30,12 @@ class Index extends Component {
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && !nextProps.visible) nextProps.payrollStore.setHasBeenModify(false);
if (nextProps.visible !== this.props.visible && nextProps.visible) {
document.querySelector(".salary-payroll-main-page").classList.add("zIndex0-payroll-release");
} else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
document.querySelector(".salary-payroll-main-page").classList.remove("zIndex0-payroll-release");
nextProps.payrollStore.setHasBeenModify(false);
}
}
save = async () => {

28
pc4mobx/hrmSalary/pages/payrollRelease/index.js
View File

@ -12,6 +12,7 @@ import TemplateQuery from "./components/reqQuery/templateQuery";
import GrantTableList from "./components/grantTableList";
import PayrollTemplateTableList from "./components/payrollTemplateTableList";
import TemplateBaseSettings from "../payroll/templateBaseSettings";
import LogDialog from "../../components/logViewModal";
import { Button } from "antd";
import moment from "moment";
import "./index.less";
@ -28,10 +29,10 @@ class Index extends Component {
queryParams: {
salarySobId: "", name: "",
dateRange: [
moment(new Date()).subtract(1, 'year').startOf("year").format("YYYY-MM"),
moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"),
moment(new Date()).endOf("year").format("YYYY-MM")
]
}
}, logDialogVisible: false
};
this.templateRef = null;
this.baseSetRef = null;
@ -109,9 +110,18 @@ class Index extends Component {
}
return dom;
};
onDropMenuClick = (key) => {
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
break;
default:
break;
}
};
render() {
const { selectedKey, queryParams } = this.state;
const { selectedKey, queryParams, logDialogVisible } = this.state;
const tabs = [
{ key: "grant", title: getLabel(538012, "工资单发放") },
{ key: "template", title: getLabel(543575, "工资单模板设置") },
@ -126,9 +136,19 @@ class Index extends Component {
selectedKey: key,
queryParams: { ...queryParams, name: "", salarySobId: "" }
})}
buttons={this.renderReqBtns()}
buttons={this.renderReqBtns()} showDropIcon={selectedKey !== "watermark"}
onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
<div className="salary-payroll-content">{this.renderContent()}</div>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction={selectedKey === "grant" ? "salarysend" : "salarytemplate"}
onCancel={() => this.setState({ logDialogVisible: false })}/>
</WeaReqTop>
</div>
);

10
pc4mobx/hrmSalary/pages/payrollRelease/index.less
View File

@ -1,3 +1,9 @@
.zIndex0-payroll-release {
.wea-new-top-req {
z-index: 0 !important;
}
}
.salary-payroll-main-page {
min-width: 1000px;
overflow: auto;
@ -14,10 +20,6 @@
}
}
.wea-new-top-req {
z-index: 0 !important;
}
.wea-new-top-req-wapper .wea-new-top-req-title > div:last-child {
right: 16px;
}

28
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
View File

@ -16,6 +16,7 @@ import WelfareRecordList from "./components/welfareRecordList";
import Accountdialog from "./components/accountDialog";
import ProgressModal from "../../../components/progressModal";
import { convertToUrlString } from "../../../util/url";
import LogDialog from "../../../components/logViewModal";
import moment from "moment";
import "./index.less";
@ -32,7 +33,8 @@ class StandingBook extends Component {
endTime: moment(new Date()).endOf("year").format("YYYY-MM"),
taxAgents: ""
}, progressVisible: false, progress: 0,
accountDialog: { visible: false, title: "", loading: false, options: [] }
accountDialog: { visible: false, title: "", loading: false, options: [] },
logDialogVisible: false
};
this.wfListRef = null;
this.timer = null;
@ -102,9 +104,18 @@ class StandingBook extends Component {
});
}
};
onDropMenuClick = (key) => {
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
break;
default:
break;
}
};
render() {
const { accountDialog, queryForm } = this.state;
const { accountDialog, queryForm, logDialogVisible } = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props;
const rightBtns = [<Button type="primary" onClick={() => this.setState({
accountDialog: { ...accountDialog, visible: true, title: getLabel(538780, "核算") }
@ -112,7 +123,15 @@ class StandingBook extends Component {
return (
<div className="salary-welfare-record">
<WeaTop title={getLabel(538002, "社保福利台账")} icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []}>
iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []}
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
<div className="salary-welfare-record-content">
<WelfareRecordQuery
onSearch={(payload) => {
@ -129,6 +148,9 @@ class StandingBook extends Component {
accountDialog: { ...accountDialog, visible: false, title: "", loading: false }
})} onOk={this.handleAccount}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="siAccount"
onCancel={() => this.setState({ logDialogVisible: false })}/>
{/*核算进度条*/}
{
this.state.progressVisible &&

2
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/logDialog/index.js
View File

@ -89,7 +89,7 @@ class Index extends Component {
const scrollHeight = this.logRef ? this.logRef.state.height - 210 : 606.6;
return (
<WeaDialog
{...this.props} title={getLabel(111, "操作日志")}
{...this.props} title={getLabel(111, "基数调整记录")}
ref={dom => this.logRef = dom} className="logDialog" initLoadCss
style={{
width: 1150,

6
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
View File

@ -140,9 +140,13 @@ export const welfareTipList = [
];
export const renderDropMenuDatas = (selectedKey, getLabel, showOperateBtn) => {
let menus = [{
key: "record",
icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(111, "基数调整记录")
},{
key: "log",
icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(111, "操作日志")
content: getLabel(545781, "操作日志")
}];
if (showOperateBtn) {
switch (selectedKey) {

15
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
View File

@ -12,7 +12,8 @@ import WelfareAdvanceSearchPannel from "./components/welfareAdvanceSearchPannel"
import WelfareTableList from "./components/welfareTableList";
import WelfareArchivesImportDialog from "./components/welfareArchivesImportDialog";
import WelfareTip from "./components/welfareTip";
import LogDialog from "./components/logDialog";
import RecordDialog from "./components/logDialog";
import LogDialog from "../../../components/logViewModal";
import * as API from "../../../apis/welfareArchive";
import { sysinfo } from "../../../apis/ruleconfig";
import { optTypeEnum, renderDropMenuDatas, renderReqBtns, tabList, welfareTipList } from "./config";
@ -35,7 +36,7 @@ class Index extends Component {
selectedKey: "1", showSearchAd: false, isQuery: false, logDialogVisible: false,
topTabCount: { stayAdd: 0, paying: 0, stayDel: 0, stopPay: 0, ext: 0 },
welfareImpDialog: { visible: false, title: getLabel(24023, "数据导入"), runStatuses: "" },
showExtEmpsWitch: false
showExtEmpsWitch: false, recordDialogVisible: false
};
}
@ -84,6 +85,9 @@ class Index extends Component {
case "exportSelected":
this.handleExport(key);
break;
case "record":
this.setState({ recordDialogVisible: true });
break;
case "log":
this.setState({ logDialogVisible: true });
break;
@ -127,7 +131,7 @@ class Index extends Component {
render() {
const {
selectedKey, topTabCount, showSearchAd, isQuery,
selectedKey, topTabCount, showSearchAd, isQuery, recordDialogVisible,
logDialogVisible, welfareImpDialog, showExtEmpsWitch
} = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props;
@ -162,8 +166,11 @@ class Index extends Component {
/>
{/*提示*/}
{!_.isEmpty(tipList) && <WelfareTip dataSource={tipList}/>}
{/*基数调整记录*/}
<RecordDialog visible={recordDialogVisible} onCancel={() => this.setState({ recordDialogVisible: false })}/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} onCancel={() => this.setState({ logDialogVisible: false })}/>
<LogDialog visible={logDialogVisible} logFunction="siArchives"
onCancel={() => this.setState({ logDialogVisible: false })}/>
{/* 导入*/}
<WelfareArchivesImportDialog {...welfareImpDialog}
onCancel={(isFresh) => {