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

Merge branch 'feature/2.10.1.2401.01-页面操作日志添加' into release/2.10.1.2402.01 

# Conflicts:
#	pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
#	pc4mobx/hrmSalary/stores/baseForm.js
This commit is contained in:
黎永顺 2024-03-05 14:38:57 +08:00
parent 3f23bc29e5 752eb6b6d1
commit f732bcaafb
54 changed files with 1218 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pc4mobx/hrmSalary/apis/index.js
View File

@ -1,4 +1,5 @@
import { WeaTools } from "ecCom";
import { postFetch } from "../util/request";
// form基础数据
export const getBaseForm = (params) => {
@ -19,3 +20,18 @@ export const getCondition = (params) => {
export const getTableDatas = (params) => {
return WeaTools.callApi("/api/demo03/weatableDemo", "GET", params);
};
//获取日志列表
export const getLogs = params => {
const payload = {
...params, module: "hrsa", dataset: "dataset", authParams: "{}", transMethod: "hrsa",
showColums: "[{\"columName\":\"操作时间\",\"columIndex\":\"createdate\",\"width\":\"5%\"},{\"columName\":\"操作人\",\"columIndex\":\"operatorname\",\"width\":\"2%\"},{\"columName\":\"操作类型\",\"columIndex\":\"operatetypename\",\"width\":\"5%\"},{\"columName\":\"对象\",\"columIndex\":\"targetname\",\"width\":\"4%\"},{\"columName\":\"修改详情\",\"columIndex\":\"operatedesc\",\"width\":\"2%\"},{\"columName\":\"客户端IP\",\"columIndex\":\"clientip\",\"width\":\"5%\"}]"
};
return postFetch("/api/bs/hrmsalary/elog/getLogs", payload);
};
//获取单条操作记录的更新明细
export const getDetailChanges = params => {
const payload = {
...params, module: "hrsa", detailTransMethod: "elogDemoDetail"
};
return postFetch("/api/bs/hrmsalary/elog/getDetailChanges", payload);
};

2
pc4mobx/hrmSalary/apis/standingBook.js
View File

@ -43,7 +43,7 @@ export const inspectList = (params) => {
};
//社会福利台账-删除正常缴纳人员
export const siaccountCommonDelete = (params) => {
return postFetch("/api/bs/hrmsalary/siaccount/common/delete", params);
return postFetch("/api/bs/hrmsalary/siaccount/supplementary/delete", params);
};
//社会福利台账-添加正常缴纳人员
export const siaccountCommonSave = (params) => {

80
pc4mobx/hrmSalary/components/logViewModal/components/detailLogView/index.js Normal file
View File

@ -0,0 +1,80 @@
/*
* Author: 黎永顺
* name: 日志查看-详情
* Description:
* Date: 2024/1/25
*/
import React, { Component } from "react";
import { WeaDialog, WeaLocaleProvider, WeaTransfer } from "ecCom";
import * as API from "../../../../apis";
const getLabel = WeaLocaleProvider.getLabel;
const WeaTransferList = WeaTransfer.list;
class Index extends Component {
constructor(props) {
super(props);
this.state = {
dataSource: [], loading: false
};
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) this.getDetailChanges(nextProps);
if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
dataSource: [],
loading: false
});
}
getDetailChanges = (props) => {
const { mainid, logFunction } = props;
const payload = { function: logFunction, mainid };
this.setState({ loading: true });
API.getDetailChanges(payload).then(({ status, data }) => {
this.setState({ loading: false });
if (status) {
this.setState({
dataSource: _.map(data, (o, i) => ({
...o, index: i + 1,
valueschanges: _.map(o.valueschanges, (g, gi) => ({ id: gi + 1, name: g }))
}))
});
}
}).catch(() => this.setState({ loading: false }));
};
render() {
const { dataSource } = this.state;
const scrollHeight = this.logDetailRef ? this.logDetailRef.state.height - 32 : 606.6;
return (
<WeaDialog
{...this.props} hasScroll className="logDialog" initLoadCss ref={dom => this.logDetailRef = dom}
style={{
width: 750,
height: 606.6,
minHeight: 200,
minWidth: 380,
maxHeight: "90%",
maxWidth: "90%",
overflow: "hidden",
transform: "translate(0px, 0px)"
}}
>
<div className="logDialogContent">
{
_.map(dataSource, item => (!_.isEmpty(item.valueschanges) ? <WeaTransferList
data={item.valueschanges} renderItem={(it) => (<div className="detailBox">
<div className="order">{it.id}</div>
<div className="content" title={it.name}>{it.name}</div>
</div>)}
height={scrollHeight} checkedCb={() => ({})} checkedKeys={[]}
/> : <div className="empty">{getLabel(111, "无数据变更记录")}</div>))
}
</div>
</WeaDialog>
);
}
}
export default Index;

88
pc4mobx/hrmSalary/components/logViewModal/config.js Normal file
View File

@ -0,0 +1,88 @@
import React from "react";
import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
import { WeaSwitch } from "comsMobx";
import { Button } from "antd";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
export const logConditions = [
{
items: [
{
conditionType: "RANGEPICKER",
domkey: ["date"],
fieldcol: 18,
label: "操作时间",
lanId: 111,
labelcol: 6,
value: "",
viewAttr: 2
},
{
conditionType: "INPUT",
domkey: ["operator"],
fieldcol: 18,
label: "操作人",
lanId: 17482,
labelcol: 6,
value: "",
viewAttr: 2
},
{
conditionType: "INPUT",
domkey: ["targetname"],
fieldcol: 18,
label: "对象",
lanId: 106,
labelcol: 6,
value: "",
viewAttr: 2
},
{
conditionType: "INPUT",
domkey: ["operatetypename"],
fieldcol: 18,
label: "操作类型",
lanId: 111,
labelcol: 6,
value: "",
viewAttr: 2
}
],
defaultshow: true,
title: ""
}
];
export const renderLogSearchsForm = (form, condition, onSearch = () => void (0), onReset = () => 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: (
<WeaFormItem
label={`${fields.label}`} labelCol={{ span: `${fields.labelcol}` }}
wrapperCol={{ span: `${fields.fieldcol}` }} error={form.getError(fields)}
tipPosition="bottom"
>
<WeaSwitch fieldConfig={fields} form={form} formParams={formParams}/>
{
getKey(fields) === "operatetypename" &&
<div style={{ position: "absolute", right: "-148px", top: "0" }}>
<Button type="ghost" onClick={onReset} style={{ marginRight: 10 }}>{getLabel(2022, "重置")}</Button>
<Button type="primary" onClick={onSearch}>{getLabel(388113, "搜索")}</Button>
</div>
}
</WeaFormItem>),
colSpan: 1
});
});
group.push(
<WeaSearchGroup col={3} needTigger={true} title={c.title} showGroup={c.defaultshow} items={items} center={false}
/>);
});
return group;
};

221
pc4mobx/hrmSalary/components/logViewModal/index.js
View File

@ -1,99 +1,130 @@
import React from 'react'
import { Button, Modal } from 'antd';
import { WeaInput, WeaRangePicker, WeaTable} from 'ecCom'
import { logColumns, dataSource } from "../../common/columns"
/*
* Author: 黎永顺
* name: 薪酬日志查看
* Description:
* Date: 2024/1/24
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { WeaDialog, WeaLocaleProvider, WeaTable } from "ecCom";
import DetailLogView from "./components/detailLogView";
import { logConditions, renderLogSearchsForm } from "./config";
import * as API from "../../apis/index";
import "./index.less";
export default class LogViewModal extends React.Component {
constructor(props) {
super(props)
this.state ={
value: ""
}
const getLabel = WeaLocaleProvider.getLabel;
@inject("baseFormStore")
@observer
class Index extends Component {
constructor(props) {
super(props);
this.state = {
dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 },
loading: false, conditions: [], logDetailDialog: { visible: false, title: "", logFunction: "", mainid: "" }
};
}
componentDidMount() {
const { baseFormStore: { form } } = this.props;
this.setState({
conditions: _.map(logConditions, it => ({
...it, items: _.map(it.items, o => ({ ...o, label: getLabel(o.lanId, o.label) }))
}))
}, () => form.initFormFields(this.state.conditions));
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) this.getLogs({}, nextProps);
if (nextProps.visible !== this.props.visible && !nextProps.visible) {
this.setState({
dataSource: [], columns: [], pageInfo: { current: 0, pageSize: 10, total: 0 },
loading: false
});
}
render() {
return (
<Modal title="操作日志" visible={this.props.visible}
onOk={() => alert("ok")} onCancel={this.props.onCancel}
className="logViewModal"
style={{ top: 150 }}
width={'80%'} height={'50%'}
>
<div className="searchBar">
<div className="searchBarItem searchDateRange">
<div className="searchBarLabel">操作时间</div>
<div>
<WeaRangePicker
value={["2019-02-03", "2019-03-08"]}
onChange={v => this.setState({ value: v })}
/>
</div>
</div>
<div className="searchBarItem">
<div className="searchBarLabel">操作人</div>
<div>
<WeaInput
id="test"
style={{ width: 200 }}
value={this.state.value}
onChange={value => {
console.log(value);
this.setState({ value });
}}
customBlur={v => {
console.log("custom blur", v);
}}
onFocus={v => console.log("focus", v)}
onBlur={v => console.log("blur", v)}
/>
</div>
</div>
}
<div className="searchBarItem">
<div className='searchBarLabel'>对象</div>
<div>
<WeaInput
id="test"
style={{ width: 200 }}
value={this.state.value}
onChange={value => {
console.log(value);
this.setState({ value });
}}
customBlur={v => {
console.log("custom blur", v);
}}
onFocus={v => console.log("focus", v)}
onBlur={v => console.log("blur", v)}
/>
</div>
</div>
getLogs = (extra = {}, props) => {
const { pageInfo } = this.state;
const { baseFormStore: { form }, logFunction, filterConditions } = props;
const payload = {
...pageInfo, ...extra, searchMap: { ...form.getFormParams() },
function: logFunction, showColums: "", filterConditions
};
this.setState({ loading: true });
API.getLogs(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 === "operatedesc") {
return {
...it, render: (__, record) => (<a href="javascript:void(0);" onClick={() => {
const { operatedesc: title, uuid: mainid } = record;
this.setState({ logDetailDialog: { visible: true, title, logFunction, mainid } });
}}>{getLabel(33564, "查看")}</a>)
};
}
return { ...it };
})
});
}
}).catch(() => this.setState({ loading: false }));
};
<div className="searchBarItem">
<div className='searchBarLabel'>操作类型</div>
<div>
<WeaInput
id="test"
style={{ width: 200 }}
value={this.state.value}
onChange={value => {
console.log(value);
this.setState({ value });
}}
customBlur={v => {
console.log("custom blur", v);
}}
onFocus={v => console.log("focus", v)}
onBlur={v => console.log("blur", v)}
/>
</div>
</div>
<div className="searchBarItem">
<Button type="primary" className="searchBtn">搜索</Button>
</div>
</div>
<WeaTable columns={logColumns} dataSource={dataSource} />
</Modal>
)
}
}
render() {
const { loading, dataSource, columns, pageInfo, conditions, logDetailDialog } = this.state;
const { baseFormStore: { form } } = 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.getLogs({}, this.props));
},
onChange: current => {
this.setState({
pageInfo: { ...pageInfo, current }
}, () => this.getLogs({}, this.props));
}
};
const scrollHeight = this.logRef ? this.logRef.state.height - 254 : 606.6;
return (
<WeaDialog
{...this.props} title={getLabel(111, "操作日志")}
ref={dom => 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)"
}}
>
<div className="logDialogContent">
{renderLogSearchsForm(form, conditions, () => this.getLogs({ current: 1 }, this.props), () => {
form.resetForm();
this.getLogs({ current: 1 }, this.props);
})}
<WeaTable
columns={columns} dataSource={dataSource} loading={loading} className="logTable"
pagination={pagination} scroll={{ y: `${scrollHeight}px` }}
/>
<DetailLogView {...logDetailDialog}
onCancel={() => this.setState({ logDetailDialog: { ...logDetailDialog, visible: false } })}/>
</div>
</WeaDialog>
);
}
}
export default Index;

85
pc4mobx/hrmSalary/components/logViewModal/index.less Normal file
View File

@ -0,0 +1,85 @@
.logDialog {
.wea-dialog-body {
overflow-y: hidden;
}
.logDialogContent {
background: #F6F6F6;
padding: 16px;
width: 100%;
height: 100%;
.empty {
width: 100%;
display: flex;
height: 100%;
justify-content: center;
align-items: center;
background: #ffff;
}
.wea-search-group {
padding: 0;
margin-bottom: 10px;
background: #FFF;
.wea-form-cell {
padding: 0;
.wea-form-item {
padding: 10px;
}
}
}
.logTable {
background: #FFFFFF;
}
.wea-transfer-list-wrapper {
border: none;
.ant-tree-switcher {
display: none;
}
.transfer-tree {
background: #FFF;
border: 1px solid #dadada;
padding: 0;
& > li:not(:last-child) {
.detailBox .content {
border-bottom: 1px solid #dadada;
}
}
& > li {
margin: 0 !important;
.detailBox {
display: flex;
align-items: center;
.order {
width: 35px;
color: #999;
text-align: center;
}
.content {
position: relative;
flex: 1;
min-height: 40px;
line-height: 40px;
color: #000;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
}
}
}
}

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

@ -11,10 +11,10 @@ import { adjustRecordItemList } from "../../apis/adjustManage";
import AdvanceInputBtn from "./components/advanceInputBtn";
import AdjustAdvanceSearchPannel from "./components/adjustAdvanceSearchPannel";
import cs from "classnames";
import { Button } from "antd";
import "./index.less";
import { Button, Dropdown, Menu } from "antd";
import { convertToUrlString } from "../../util/url";
import LogDialog from "../../components/logViewModal";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
@ -25,7 +25,8 @@ 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,
filterConditions: "[]"
};
}
@ -57,12 +58,26 @@ class Index extends Component {
const { columns, list: dataSource, pageNum, pageSize, total } = data;
this.setState({
dataSource, pageInfo: { ...pageInfo, pageNum, pageSize, total },
columns: _.map(columns, o => {
columns: [..._.map(columns, o => {
if (o.dataIndex === "username") {
return { ...o, width: 150, fixed: "left" };
}
return { ...o, width: 150 };
})
}), {
dataIndex: "options", title: getLabel(30585, "操作"),
width: 120, render: (_, record) => (
<Dropdown
overlay={
<Menu>
<Menu.Item>
<a href="javascript:void(0);"
onClick={() => this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)"><i className="icon-coms-more"/></a>
</Dropdown>)
}]
});
}
}).catch(() => this.setState({ loading: false }));
@ -88,9 +103,21 @@ class Index extends Component {
}
this.handleDebounce();
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const { loading, dataSource, columns, pageInfo, showSearchAd } = this.state;
const { loading, dataSource, columns, pageInfo, showSearchAd, logDialogVisible, filterConditions } = this.state;
const pagination = {
...pageInfo,
showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
@ -111,11 +138,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 +162,9 @@ class Index extends Component {
dataSource={dataSource} loading={loading}
pagination={pagination} columns={columns}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salarcitemadj" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
</WeaTop>
);
}

5
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
View File

@ -27,7 +27,10 @@ export const condition = [
labelcol: 6,
options: [],
rules: "required|string",
viewAttr: 3
viewAttr: 3,
otherParams: {
showSearch: true, optionFilterProp: "children"
}
},
{
colSpan: 1,

10
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
View File

@ -52,10 +52,14 @@ class EmployeeDetails extends Component {
columns: [...columns, {
title: "操作",
dataIndex: "operate",
width: 80,
width: 120,
render: (_, record) => {
return <a target="_blank"
href={`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/analysisOfSalaryStatistics/${record.id}?name=${record.name}&dept=${record.department || ""}`}>{getLabel(111, "查看")}</a>;
return <React.Fragment>
<a target="_blank" style={{ marginRight: 10 }}
href={`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/analysisOfSalaryStatistics/${record.id}?name=${record.name}&dept=${record.department || ""}`}>{getLabel(111, "查看")}</a>
<a href="javascript:void(0)"
onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</React.Fragment>;
}
}]
});

3
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
View File

@ -44,6 +44,8 @@ class ReportList extends Component {
message.error(errormsg);
}
});
} else if (key === "log") {
this.props.onFilterLog(key, id);
}
};
reportStatisticsReportDelete = (payload) => {
@ -106,6 +108,7 @@ class ReportList extends Component {
<Menu.Item key="edit">{getLabel(111, "编辑")}</Menu.Item>
<Menu.Item key="copy">{getLabel(77, "复制")}</Menu.Item>
<Menu.Item key="delete">{getLabel(111, "删除")}</Menu.Item>
<Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
</Menu>
}>
<Button type="ghost"><i className="icon-coms-more"/></Button>

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 => {

35
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, filterConditions: "[]"
};
}
@ -243,10 +245,25 @@ class Index extends Component {
initTable && this.dimensionTableRef.dimensionList();
});
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
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, filterConditions
} = this.state;
const buttons = selectedKey === "statistics" ? [
<Button type="primary" onClick={() => this.handleReqBtnsClick("addReport")}>{getLabel(111, "新建报表")}</Button>,
<Button type="ghost"
@ -272,9 +289,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" ?
@ -282,9 +306,11 @@ class Index extends Component {
ref={dom => this.reportListRef = dom}
reportName={reportName}
onEdit={this.handleReqBtnsClick}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/> : <EmployeeDetails
ref={dom => this.employeeListRef = dom}
keyword={keyword} year={year}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/>
}
<StatisticsModal {...modalReq} onCancel={this.handleCancel} form={reportForm} onClose={this.handleCancel}
@ -306,6 +332,9 @@ class Index extends Component {
form={statisticsForm} condition={conditions}
initCondition={this.initCondition} onChangeCondition={this.handleChangeCondition}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="statreport" filterConditions={filterConditions}
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 {

37
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: "" }
};
@ -165,16 +166,39 @@ class Calculate extends Component {
}
});
break;
case "log":
//操作日志
this.onDropMenuClick(key, record.id);
break;
default:
break;
}
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const { queryParams, isRefresh, calcDaialog, progressModule } = this.state;
const { queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible, filterConditions } = 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 +208,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" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
{/* 归档进度条*/}
{
progressModule.visible &&

3
pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
View File

@ -72,7 +72,8 @@ class Index extends Component {
/>
</span>,
render: (__, record) => {
const { operate = [] } = record;
const { operate: opts = [] } = record;
const operate = [...opts, { index: "log", text: getLabel(30586, "查看日志") }];
return <React.Fragment>
{
_.map(operate.slice(0, 2), f => (

27
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
View File

@ -5,8 +5,8 @@
* Date: 2023/2/24
*/
import React, { Component } from "react";
import { WeaTable } from "ecCom";
import { message, Modal } from "antd";
import { WeaLocaleProvider, WeaTable } from "ecCom";
import { Dropdown, Menu, message, Modal } from "antd";
import {
deleteAttendance,
getAttendanceFieldSettingList,
@ -28,6 +28,8 @@ import SelectItemsWrapper from "../../../../components/selectItemsModal/selectIt
import AttendanceRefrenceDataModal from "./attendanceRefrenceDataModal";
import AttendanceDataViewSlide from "./attendanceDataViewSlide";
const getLabel = WeaLocaleProvider.getLabel;
class AttendanceDataComp extends Component {
constructor(props) {
super(props);
@ -364,7 +366,26 @@ class AttendanceDataComp extends Component {
<div className="linkWapper">
<a href="javascript: void(0);" onClick={() => this.handleViewAttendanceData(record)}>查看</a>
{showOperateBtn &&
<a href="javascript: void(0);" onClick={() => this.handleDeleteAttendanceData(record)}>删除</a>
<React.Fragment>
<a href="javascript: void(0);" style={{ marginRight: 10 }}
onClick={() => this.handleDeleteAttendanceData(record)}>删除</a>
<Dropdown
overlay={
<Menu>
<Menu.Item>
<a href="javascript:void(0);"
onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)"><i className="icon-coms-more"/></a>
</Dropdown>
</React.Fragment>
}
{
!showOperateBtn &&
<a href="javascript:void(0)"
onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
}
</div>
);

7
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
View File

@ -29,7 +29,12 @@ class AttendanceDataViewSlide extends Component {
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) this.viewAttendQuote({}, nextProps);
if (nextProps.visible !== this.props.visible && nextProps.visible) {
document.querySelector(".attendanceRefWrapper").classList.add("zIndex0-attendance");
this.viewAttendQuote({}, nextProps);
} else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
document.querySelector(".attendanceRefWrapper").classList.remove("zIndex0-attendance");
}
}
viewAttendQuote = (extraPayload = {}, props) => {

26
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
View File

@ -5,13 +5,15 @@
* Date: 2023/2/24
*/
import React, { Component } from "react";
import { WeaCheckbox, WeaTable } from "ecCom";
import { Col, message, Row } from "antd";
import { WeaCheckbox, WeaLocaleProvider, WeaTable } from "ecCom";
import { Col, Dropdown, Menu, message, Row } from "antd";
import AttendanceCustomFieldsModal from "./attendanceCustomFieldsModal";
import { getAttendanceFieldList, updateAttendanceFieldStatus } from "../../../../apis/attendance";
import TipLabel from "../../../../components/TipLabel";
import { fieldsColumns } from "../columns";
const getLabel = WeaLocaleProvider.getLabel;
class FieldMangComp extends Component {
constructor(props) {
super(props);
@ -71,7 +73,7 @@ class FieldMangComp extends Component {
getColumns = () => {
const { columns } = this.state;
const { showOperateBtn } = this.props;
return _.map(_.filter(columns, item => !!item.display), child => ({
return [..._.map(_.filter(columns, item => !!item.display), child => ({
...child,
render: (text, record) => {
switch (child.dataIndex) {
@ -86,7 +88,23 @@ class FieldMangComp extends Component {
return <div dangerouslySetInnerHTML={{ __html: text }}/>;
}
}
}));
})), {
dataIndex: "options",
title: getLabel(30585, "操作"),
width: 120,
render: (_, record) => (
<Dropdown
overlay={
<Menu>
<Menu.Item>
<a href="javascript:void(0);"
onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)"><i className="icon-coms-more"/></a>
</Dropdown>)
}];
};
render() {

95
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
View File

@ -7,12 +7,14 @@
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { Button, DatePicker } from "antd";
import { WeaFormItem, WeaNewScroll, WeaTab } from "ecCom";
import { WeaFormItem, WeaInputSearch, WeaLocaleProvider, WeaNewScroll, WeaReqTop } from "ecCom";
import AttendanceDataComp from "./components/attendanceDataComp";
import FieldMangComp from "./components/fieldMangComp";
import LogDialog from "../../../components/logViewModal";
import moment from "moment";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
const { MonthPicker } = DatePicker;
@inject("taxAgentStore")
@ -21,9 +23,8 @@ class Index extends Component {
constructor(props) {
super(props);
this.state = {
fieldName: "",
selectedKey: "DATA",
salaryMonth: []
fieldName: "", selectedKey: "DATA", salaryMonth: [],
logDialogVisible: false, filterConditions: "[]"
};
}
@ -67,47 +68,75 @@ class Index extends Component {
visible: true, title: "引用考勤数据"
});
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const { selectedKey, salaryMonth, fieldName } = this.state;
const { selectedKey, salaryMonth, fieldName, logDialogVisible, filterConditions } = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props;
const topTab = [
{ title: "考勤数据", viewcondition: "DATA" },
{ title: "字段管理", viewcondition: "FIELD" }
{ title: "考勤数据", key: "DATA" },
{ title: "字段管理", key: "FIELD" }
];
const buttons = selectedKey === "DATA" ? [
<Button type="primary" onClick={this.handleQuoteAttendanceData}>引用</Button>,
<Button type="ghost" onClick={this.handleImportAttendanceData}>导入</Button>
] : [<Button type="primary" onClick={this.handleAddAttendFileds}>新建</Button>];
] : [
<Button type="primary" onClick={this.handleAddAttendFileds}>新建</Button>,
<WeaInputSearch placeholder={getLabel(511723, "请输入字段名称")}
value={fieldName} onChange={fieldName => this.setState({ fieldName })}
onSearch={() => this.fieldMangRef.getAttendanceFieldList({ fieldName, current: 1 })}/>
];
return (
<div className="attendanceRefWrapper">
<WeaTab
datas={topTab} keyParam="viewcondition" selectedKey={selectedKey} buttons={showOperateBtn ? buttons : []}
searchType={selectedKey === "FIELD" ? ["base"] : []} searchsBasePlaceHolder="请输入字段名称"
onChange={v => this.setState({ selectedKey: v })}
searchsBaseValue={fieldName} onSearchChange={fieldName => this.setState({ fieldName })}
onSearch={() => this.fieldMangRef.getAttendanceFieldList({ fieldName, current: 1 })}
/>
{
selectedKey === "DATA" && this.getAttendanceDataScreen()
}
<div className="tableWrapper">
<WeaNewScroll height="100%">
<WeaReqTop
buttonSpace={10} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
tabDatas={topTab} selectedKey={selectedKey} buttons={showOperateBtn ? buttons : []}
onChange={v => this.setState({ selectedKey: v })} title={getLabel(525196, "考勤数据")}
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
selectedKey === "DATA" ?
<AttendanceDataComp
ref={dom => this.attendanceTableRef = dom}
showOperateBtn={showOperateBtn}
salaryYearMonth={salaryMonth}
/> :
<FieldMangComp
ref={dom => this.fieldMangRef = dom}
showOperateBtn={showOperateBtn}
fieldName={fieldName}
/>
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
</WeaNewScroll>
</div>
]}
>
{
selectedKey === "DATA" && this.getAttendanceDataScreen()
}
<div className="tableWrapper">
<WeaNewScroll height="100%">
{
selectedKey === "DATA" ?
<AttendanceDataComp
ref={dom => this.attendanceTableRef = dom}
showOperateBtn={showOperateBtn}
salaryYearMonth={salaryMonth}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/> :
<FieldMangComp
ref={dom => this.fieldMangRef = dom}
showOperateBtn={showOperateBtn}
fieldName={fieldName}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/>
}
</WeaNewScroll>
</div>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction={selectedKey === "DATA" ? "attendquote" : "attendfield"}
onCancel={() => this.setState({ logDialogVisible: false })} filterConditions={filterConditions}/>
</WeaReqTop>
</div>
);
}

8
pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less
View File

@ -14,6 +14,8 @@
.tableWrapper {
flex: 1;
overflow: hidden;
background: #FFF;
margin: 16px;
}
.linkWapper {
@ -23,6 +25,12 @@
}
}
.zIndex0-attendance {
.wea-new-top-req {
z-index: 0 !important;
}
}
.attendenceImportWrapper {
.wea-dialog-body {

10
pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
View File

@ -66,7 +66,8 @@ class Index extends Component {
},
exportPayloadUrl: "",
exportPayloadType: false,
advanceCondition: null
advanceCondition: null,
targetid: ""
};
this.tableRef = null;
this.addItemRef = null;
@ -358,7 +359,7 @@ class Index extends Component {
const { id } = record;
key === "handleAddData" ? getAddUpDeduction({ id }).then(({ status, data }) => {
if (status) this[key]("编辑", data);
}) : this[key](record);
}) : key === "log" ? this.setState({ targetid: id }) : this[key](record);
};
handleCloseSlide = () => {
const { slidePayload } = this.state;
@ -540,7 +541,7 @@ class Index extends Component {
const { taxAgentStore: { showOperateBtn }, cumDeductStore: { form } } = this.props;
const {
declareMonth, taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition,
importPayload, exportPayloadType
importPayload, exportPayloadType, targetid
} = this.state;
const tablePayload = { declareMonth: [declareMonth], taxAgentId };
return (
@ -548,11 +549,12 @@ class Index extends Component {
onResizeWindowInnerWidth={this.handleResize} slidePayload={slidePayload}
onClose={this.handleCloseSlide} onSave={this.handleSaveData}
slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl}
exportPayloadType={exportPayloadType}
exportPayloadType={exportPayloadType} logFunction="addupdeduction"
form={form} condition={advanceCondition} onAdSearch={this.handleAdSearch}
onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport}
importPayload={importPayload} onImportFile={this.handleImportFile}
onPreviewImport={this.handlePreviewImport} detailOptBtns={this.getDetailOptBtns()}
targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })}
columns={modalColumns}
>
<DataTables

13
pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
View File

@ -64,7 +64,8 @@ class Index extends Component {
},
exportPayloadUrl: "",
exportPayloadType: false,
advanceCondition: null
advanceCondition: null,
targetid: ""
};
this.tableRef = null;
this.addItemRef = null;
@ -175,7 +176,7 @@ class Index extends Component {
const { id } = record;
key === "handleAddData" ? getAddUpSituation({ id }).then(({ status, data }) => {
if (status) this[key]("编辑", data);
}) : this.deleteSelectAddUpSituation(record);
}) : key === "log" ? this.setState({ targetid: id }) : this.deleteSelectAddUpSituation(record);
};
/*
* Author: 黎永顺
@ -544,7 +545,7 @@ class Index extends Component {
const { taxAgentStore: { showOperateBtn }, cumSituationStore: { form } } = this.props;
const {
declareMonth, taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition,
importPayload, year, exportPayloadType
importPayload, year, exportPayloadType, targetid
} = this.state;
const tablePayload = { taxYearMonth: `${year}-${declareMonth}`, year, taxAgentId };
return (
@ -552,13 +553,13 @@ class Index extends Component {
onResizeWindowInnerWidth={this.handleResize} slidePayload={slidePayload}
onClose={this.handleCloseSlide} onSave={this.handleSaveData}
slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl}
exportPayloadType={exportPayloadType}
exportPayloadType={exportPayloadType} logFunction="addupsituation"
form={form} condition={advanceCondition} onAdSearch={this.handleAdSearch}
onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport}
importPayload={{ ...importPayload, importOpts: { taxYearMonth: importPayload.importOpts.declareMonth } }}
onImportFile={this.handleImportFile}
onImportFile={this.handleImportFile} columns={situationModalColumns}
onPreviewImport={this.handlePreviewImport} detailOptBtns={this.getDetailOptBtns()}
columns={situationModalColumns}
targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })}
>
<DataTables
ref={dom => this.tableRef = dom}

17
pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
View File

@ -8,6 +8,9 @@ import React, { Component } from "react";
import UnifiedTable from "../../components/UnifiedTable";
import { getTableDate } from "../../apis/cumDeduct";
import { Menu, Popover } from "antd";
import { WeaLocaleProvider } from "ecCom";
const getLabel = WeaLocaleProvider.getLabel;
class DataTables extends Component {
constructor(props) {
@ -118,6 +121,7 @@ class DataTables extends Component {
placement="bottomRight"
content={<Menu onClick={(e) => onTableOperate(e, record)}>
<Menu.Item key="deleteSelectAddUpDeduction">删除</Menu.Item>
<Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
</Menu>} title="">
<i className="icon-coms-more"/>
</Popover>
@ -132,8 +136,19 @@ class DataTables extends Component {
<React.Fragment>
<a href="javaScript:void(0);" style={{ marginRight: 12 }}
onClick={() => onTableOperate({ key: "handleAddData" }, record)}>编辑</a>
<a href="javaScript:void(0);"
<a href="javaScript:void(0);" style={{ marginRight: 12 }}
onClick={() => onTableOperate({ key: "deleteSelectAddUpDeduction" }, record)}>删除</a>
{
showOperateBtn &&
<Popover
overlayClassName="moreIconWrapper"
placement="bottomRight"
content={<Menu onClick={(e) => onTableOperate(e, record)}>
<Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
</Menu>} title="">
<i className="icon-coms-more"/>
</Popover>
}
</React.Fragment>
}
</React.Fragment>

45
pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
View File

@ -7,11 +7,14 @@
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { toJS } from "mobx";
import { WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
import { WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
import ImportModal from "../../components/importModal";
import SlideModalTitle from "../../components/slideModalTitle";
import { getSearchs } from "../../util";
import "./index.less";
import LogDialog from "../../components/logViewModal";
const getLabel = WeaLocaleProvider.getLabel;
@inject("taxAgentStore")
@observer
@ -19,7 +22,7 @@ class Layout extends Component {
constructor(props) {
super(props);
this.state = {
showSearchAd: false
showSearchAd: false, logDialogVisible: false, filterConditions: "[]"
};
}
@ -39,6 +42,15 @@ class Layout extends Component {
*/
window.open(nextProps.exportPayloadUrl, "_self");
}
if (nextProps.targetid !== this.props.targetid && nextProps.targetid) {
/*
* Author: 黎永顺
* Description:操作日志
* Params:
* Date: 2023/2/20
*/
this.onDropMenuClick("log", nextProps.targetid);
}
}
componentWillUnmount() {
@ -49,14 +61,26 @@ class Layout extends Component {
const { onResizeWindowInnerWidth } = this.props;
onResizeWindowInnerWidth(window.innerWidth);
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const { showSearchAd } = this.state;
const { showSearchAd, logDialogVisible, filterConditions } = this.state;
const {
title, btns, leftComp, children, taxAgentStore: { showOperateBtn },
slidePayload, onClose, onSave, slideLoading, form, condition,
onAdSearch, onCancel, importPayload, onImportSetStep, onImportFile,
onPreviewImport, detailOptBtns, columns
onPreviewImport, detailOptBtns, columns, logFunction, onClearTargrtid
} = this.props;
const { visible, title: subtitle, children: slideChildren } = slidePayload;
const {
@ -66,8 +90,14 @@ class Layout extends Component {
return (
<div className="layoutWrapper">
<WeaTop title={title} buttons={showOperateBtn ? btns : []}
icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D" showDropIcon={false}
icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
/>
<WeaTab
searchType={["base", "advanced"]}
@ -124,6 +154,9 @@ class Layout extends Component {
content={slideChildren}
onClose={onClose}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction={logFunction} filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false }, () => onClearTargrtid())}/>
</div>
</div>
);

10
pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
View File

@ -64,7 +64,8 @@ class Index extends Component {
},
exportPayloadUrl: "",
exportPayloadType: false,
advanceCondition: null
advanceCondition: null,
targetid: ""
};
this.tableRef = null;
this.addItemRef = null;
@ -190,7 +191,7 @@ class Index extends Component {
const { id } = record;
key === "handleAddData" ? getData({ id }).then(({ status, data }) => {
if (status) this[key]("编辑", data);
}) : this.deleteSelectData(record);
}) : key === "log" ? this.setState({ targetid: id }) : this.deleteSelectData(record);
};
/*
* Author: 黎永顺
@ -538,7 +539,7 @@ class Index extends Component {
const { taxAgentStore: { showOperateBtn }, otherDeductStore: { form } } = this.props;
const {
declareMonth, taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition,
importPayload, exportPayloadType
importPayload, exportPayloadType, targetid
} = this.state;
const tablePayload = { declareMonth: [declareMonth], taxAgentId };
return (
@ -546,11 +547,12 @@ class Index extends Component {
onResizeWindowInnerWidth={this.handleResize} slidePayload={slidePayload}
onClose={this.handleCloseSlide} onSave={this.handleSaveData}
slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl}
exportPayloadType={exportPayloadType}
exportPayloadType={exportPayloadType} logFunction="otherdeduction"
form={form} condition={advanceCondition} onAdSearch={this.handleAdSearch}
onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport}
importPayload={importPayload} onImportFile={this.handleImportFile}
onPreviewImport={this.handlePreviewImport} detailOptBtns={this.getDetailOptBtns()}
targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })}
columns={otherModalColumns}
>
<DataTables

10
pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
View File

@ -54,7 +54,8 @@ class Index extends Component {
},
exportPayloadUrl: "",
exportPayloadType: false,
advanceCondition: null
advanceCondition: null,
targetid: ""
};
this.tableRef = null;
this.addItemRef = null;
@ -360,7 +361,7 @@ class Index extends Component {
const { id } = record;
key === "handleAddData" ? getSpecialAddDeduction({ id }).then(({ status, data }) => {
if (status) this[key]("编辑", data);
}) : this.specialAddDeductionDeleteSelectData(record);
}) : key === "log" ? this.setState({ targetid: id }) : this.specialAddDeductionDeleteSelectData(record);
};
handleCloseSlide = () => {
const { slidePayload } = this.state;
@ -449,7 +450,7 @@ class Index extends Component {
const { taxAgentStore: { showOperateBtn }, specialAddStore: { advanceForm } } = this.props;
const {
taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition, importPayload,
exportPayloadType
exportPayloadType, targetid
} = this.state;
const tablePayload = { taxAgentId };
return (
@ -457,11 +458,12 @@ class Index extends Component {
onResizeWindowInnerWidth={this.handleResize} slidePayload={slidePayload}
onClose={this.handleCloseSlide} onSave={this.handleSaveData}
slideLoading={saveLoading} exportPayloadUrl={exportPayloadUrl}
exportPayloadType={exportPayloadType}
exportPayloadType={exportPayloadType} logFunction="specialAddDeduction"
form={advanceForm} condition={advanceCondition} onAdSearch={this.handleAdSearch}
onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport}
importPayload={importPayload} onImportFile={this.handleImportFile}
onPreviewImport={this.handlePreviewImport} detailOptBtns={[]}
targetid={targetid} onClearTargrtid={() => this.setState({ targetid: "" })}
columns={specialModalColumns}
>
<DataTables

18
pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
View File

@ -6,7 +6,7 @@
*/
import React, { Component } from "react";
import { WeaLocaleProvider, WeaTable } from "ecCom";
import { message, Modal } from "antd";
import { Dropdown, Menu, message, Modal } from "antd";
import { getDeclareList, withDrawTaxDeclaration } from "../../../../apis/declare";
import { sysConfCodeRule } from "../../../../apis/ruleconfig";
@ -117,6 +117,10 @@ class Index extends Component {
>
{getLabel(83110, "查看详情")}
</a>
{
!showWithDrawBtn && <a href="javascript:void(0)" style={{ marginLeft: 10 }}
onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
}
{
showWithDrawBtn &&
<a
@ -132,6 +136,18 @@ class Index extends Component {
{getLabel(32025, "撤回")}
</a>
}
{
showWithDrawBtn && <Dropdown overlay={
<Menu>
<Menu.Item>
<a href="javascript:void(0)"
onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)" style={{ marginLeft: 10 }}><i className="icon-coms-more"/></a>
</Dropdown>
}
</React.Fragment>;
}
}

34
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, filterConditions: "[]"
};
this.handleDebounce = null;
}
@ -57,21 +59,41 @@ class Calculate extends Component {
];
return !showOperateBtn ? calculateOpts.slice(1) : calculateOpts;
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const { queryParams, isRefresh, declareDaialog } = this.state;
const { queryParams, isRefresh, declareDaialog, logDialogVisible, filterConditions } = 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}/>
<DeclareTablelist queryParams={queryParams} isRefresh={isRefresh}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
<DeclareDialog {...declareDaialog}
onCancel={(bool) => this.setState({
declareDaialog: { ...declareDaialog, visible: false },
isRefresh: bool === "refresh" ? !isRefresh : isRefresh
})}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="taxdecla" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
</div>
</WeaTop>
);

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

@ -9,11 +9,12 @@ import { inject, observer } from "mobx-react";
import { WeaHelpfulTip, WeaLocaleProvider, WeaTab, WeaTable, WeaTop } from "ecCom";
import ExternalPersonManageEditSlide from "./components/externalPersonManageEditSlide";
import ExternalPersonImport from "./components/externalPersonImport";
import { Button, message, Modal } from "antd";
import { Button, Dropdown, Menu, message, Modal } from "antd";
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, filterConditions: "[]",
selectedRowKeys: [],
pageInfo: { current: 1, pageSize: 10, total: 0 },
showSearchAd: false,
@ -103,10 +104,22 @@ class Index extends Component {
}
}));
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const {
showSearchAd, externalPersonManagePayload, loading,
showSearchAd, externalPersonManagePayload, loading, logDialogVisible, filterConditions,
pageInfo, selectedRowKeys, dataSource, externalPersonImportPayload
} = this.state;
const {
@ -136,7 +149,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
@ -181,6 +200,17 @@ class Index extends Component {
<React.Fragment>
<a href="javascript: void(0);" onClick={() => this.handleAdd(id)}
style={{ paddingRight: 8 }}>编辑</a>
<Dropdown
overlay={
<Menu>
<Menu.Item>
<a href="javascript:void(0);"
onClick={() => this.onDropMenuClick("log", id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)"><i className="icon-coms-more"/></a>
</Dropdown>
{/*<a href="javascript: void(0);" onClick={() => this.handleDelete(id)}>删除</a>*/}
</React.Fragment>
)
@ -222,6 +252,9 @@ class Index extends Component {
/>
}
</div>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="extemployee" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
</WeaTop>
</div>
);

17
pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
View File

@ -5,11 +5,13 @@
* Date: 2023/1/19
*/
import React, { Component } from "react";
import { WeaTable } from "ecCom";
import { WeaLocaleProvider, WeaTable } from "ecCom";
import { inject, observer } from "mobx-react";
import { Switch } from "antd";
import { Dropdown, Menu, Switch } from "antd";
import { salaryFieldList } from "../../../apis/fieldManage";
const getLabel = WeaLocaleProvider.getLabel;
@inject("taxAgentStore")
@observer
class FieldTable extends Component {
@ -75,6 +77,17 @@ class FieldTable extends Component {
record.canDelete && (showSalaryItemBtn || showOperateBtn) &&
<a href="javascript:void(0);" className="mr10" onClick={() => onDeleteLedger(record)}>删除</a>
}
<Dropdown
overlay={
<Menu>
<Menu.Item>
<a href="javascript:void(0)"
onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)"><i className="icon-coms-more"/></a>
</Dropdown>
</div>;
};
} else {

41
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, filterConditions: "[]",
slideparams: {
visible: false,
title: "新建字段",
@ -67,9 +69,21 @@ class FieldManagement extends Component {
}
});
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const { searchVal, doSearch, slideparams } = this.state;
const { searchVal, doSearch, slideparams, logDialogVisible, filterConditions } = this.state;
const { taxAgentStore } = this.props;
const { showSalaryItemBtn, showOperateBtn } = taxAgentStore;
const btns = [
@ -85,15 +99,21 @@ 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}
onDeleteLedger={(record) => this.handleDeleteField([record.id])}/>
onDeleteLedger={(record) => this.handleDeleteField([record.id])}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/>
<FieldSlide
{...slideparams}
onChangeRecord={(record) => this.setState({
@ -105,6 +125,9 @@ class FieldManagement extends Component {
onCancel={this.handleResetField}
onRefreshList={() => this.setState({ doSearch: !doSearch })}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salarcfield" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
</div>
</WeaTop>
);

8
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
View File

@ -5,13 +5,15 @@
* Date: 2022/12/7
*/
import React, { Component } from "react";
import { WeaCheckbox, WeaTable } from "ecCom";
import { WeaCheckbox, WeaLocaleProvider, WeaTable } from "ecCom";
import { inject, observer } from "mobx-react";
import { Menu, message, Modal, Popover } from "antd";
import { changeLedgerStatus, deleteLedger, getLedgerList } from "../../../apis/ledger";
import CopyLedgerModal from "./copyLedgerModal";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
@inject("taxAgentStore", "ledgerStore")
@observer
class LedgerTable extends Component {
@ -91,6 +93,7 @@ class LedgerTable extends Component {
placement="bottomRight"
content={<Menu onClick={(e) => this.handleMenuClick(e, record)}>
<Menu.Item key="delete">删除</Menu.Item>
<Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
</Menu>} title="">
<i className="icon-coms-more"/>
</Popover>
@ -161,6 +164,9 @@ class LedgerTable extends Component {
}
});
break;
case "log":
this.props.onFilterLog(key, id);
break;
default:
break;
}

40
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, filterConditions: "[]",
slideparams: {
visible: false,
title: "新建账套",
@ -51,9 +53,21 @@ class Index extends Component {
}
});
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const { searchVal, doSearch, slideparams } = this.state;
const { logDialogVisible, filterConditions, doSearch, slideparams } = this.state;
const { taxAgentStore } = this.props;
const { showOperateBtn } = taxAgentStore;
const btns = [
@ -65,19 +79,27 @@ 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}/>
<LedgerTable doSearch={doSearch} onEditLedger={this.handleEditLedger}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
<LedgerSlide
{...slideparams}
onCancel={this.handleResetLedger}
onRefreshList={() => this.setState({ doSearch: !doSearch })}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salarysob" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
</div>
</WeaTop>
);

2
pc4mobx/hrmSalary/pages/ledgerPage/index.less
View File

@ -1,7 +1,7 @@
.ledgerOuter {
.wea-new-top {
.ant-col-10 {
span:nth-child(2) {
& > span:nth-child(2) {
margin-top: -6px;
}
}

20
pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js
View File

@ -6,6 +6,7 @@
*/
import React, { Component } from "react";
import { WeaLocaleProvider, WeaTable } from "ecCom";
import { Dropdown, Menu } from "antd";
import { mySalaryBillList, mySalaryBillList4Card } from "../../../../apis/mySalaryBenefits";
import moment from "moment";
@ -83,9 +84,22 @@ class Index extends Component {
dataIndex: "options",
title: getLabel(30585, "操作"),
width: 120,
render: (_, record) => (<a
href={`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/mySalary/${record.id}`}
target="_blank">{getLabel(33564, "查看")}</a>)
render: (_, record) => (<React.Fragment>
<a style={{ marginRight: 10 }}
href={`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/mySalary/${record.id}`}
target="_blank">{getLabel(33564, "查看")}</a>
<Dropdown
overlay={
<Menu>
<Menu.Item>
<a href="javascript:void(0);"
onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)"><i className="icon-coms-more"/></a>
</Dropdown>
</React.Fragment>)
}]}
/>
);

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

@ -11,6 +11,7 @@ import SalaryAdjustmentRecords from "./components/SalaryAdjustmentRecords";
import { MonthRangePicker } from "../reportView/components/statisticalMicroSettingsSlide";
import Authority from "../mySalary/authority";
import * as API from "../../apis/ruleconfig";
import LogDialog from "../../components/logViewModal";
import moment from "moment";
import "./index.less";
@ -21,6 +22,7 @@ class Index extends Component {
super(props);
this.state = {
selectedKey: "0", sysinfo: {}, tabs: [], store: { loading: false, hasRight: false },
logDialogVisible: false, filterConditions: "[]",
salaryYearMonth: [
moment().subtract(1, "year").startOf("year").format("YYYY-MM"),
moment().endOf("year").format("YYYY-MM")
@ -51,7 +53,8 @@ class Index extends Component {
let Dom = null;
switch (selectedKey) {
case "1":
Dom = <Payroll salaryYearMonth={salaryYearMonth}/>;
Dom = <Payroll salaryYearMonth={salaryYearMonth}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>;
break;
case "2":
Dom = <SalaryAdjustmentRecords/>;
@ -61,9 +64,21 @@ class Index extends Component {
}
return Dom;
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const { selectedKey, salaryYearMonth, tabs } = this.state;
const { selectedKey, salaryYearMonth, tabs, logDialogVisible, filterConditions } = this.state;
const btns = [
<div className="flex-salary">
<div className="mysalary-search-title">{getLabel(542604, "薪资所属月")}</div>
@ -71,6 +86,7 @@ class Index extends Component {
onChange={v => this.setState({ salaryYearMonth: v })}/>
</div>
];
const logFunction = selectedKey === "1" ? "mysalarybill" : "myadjustrecord";
return (
<Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
store={{ ...this.state.store }}>
@ -79,8 +95,18 @@ class Index extends Component {
iconBgcolor="#F14A2D" tabDatas={tabs} className="mySalary_wrapper"
buttons={selectedKey === "1" ? btns : []} buttonSpace={10} selectedKey={selectedKey}
onChange={selectedKey => this.setState({ selectedKey })}
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
{this.renderContent()}
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction={logFunction} filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
</WeaReqTop>
</Authority>
);

6
pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
View File

@ -109,6 +109,9 @@ class Index extends Component {
}
});
break;
case "log":
this.props.onFilterLog(id, params.record.id);
break;
default:
break;
}
@ -143,7 +146,8 @@ class Index extends Component {
"删除待办": getLabel(543181, "删除待办"), "查看": getLabel(33564, "查看"),
"取消停薪": getLabel(543309, "取消停薪"), "共": getLabel(18609, "共"),
"条": getLabel(18256, "条"), "设为发薪人员": getLabel(543308, "设为发薪人员"),
"停薪": getLabel(542692, "停薪"), "编辑": getLabel(501169, "编辑")
"停薪": getLabel(542692, "停薪"), "编辑": getLabel(501169, "编辑"),
"操作日志": getLabel(545781, "操作日志")
};
const childFrameObj = document.getElementById("atdTable");
childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");

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

@ -115,6 +115,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":

17
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, filterConditions: ""
};
this.salaryFileListRef = null;
}
@ -48,9 +49,15 @@ class SalaryFiles extends Component {
handleOpenAdvanceSearch = () => this.setState({ showSearchAd: true });
handleAdvanceSearch = () => this.setState({ isQuery: !this.state.isQuery });
onAdSearch = () => this.setState({ showSearchAd: false, isQuery: !this.state.isQuery });
onDropMenuClick = (key) => {
onDropMenuClick = (key, targetid = "") => {
const { state, handleSalaryOpts } = this.salaryFileListRef.wrappedInstance || {};
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
case "custom_cols":
const { payrollFilesStore: { tableStore } } = this.props;
tableStore.setColSetVisible(true);
@ -232,7 +239,7 @@ class SalaryFiles extends Component {
render() {
const {
selectedKey, topTabCount, showSearchAd, isQuery, showDelSalaryFileBtn, showExtEmpsWitch,
salaryFileImpDialog, salaryImportTypes
salaryFileImpDialog, salaryImportTypes, logDialogVisible, filterConditions
} = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props;
return (
@ -263,7 +270,11 @@ class SalaryFiles extends Component {
selectedKey={selectedKey} showOperateBtn={showOperateBtn}
showDelSalaryFileBtn={showDelSalaryFileBtn}
onChangeTopTabCount={this.queryInsuranceTabTotal}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salaryarchive" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
{/* 导入*/}
<SalaryFileImportDialog {...salaryFileImpDialog}
onCancel={(isFresh) => {

17
pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js
View File

@ -57,7 +57,7 @@ class Index extends Component {
<div className="salarySobNameTagWrapper">
{
salaryAcctType === 1 &&
<Tag color="yellow">补发</Tag>
<Tag color="yellow">{getLabel(388064, "补发")}</Tag>
}
<Tag color="blue">{`${getLabel(15323, "第")}${acctTimes}${getLabel(18929, "次")}`}</Tag>
</div>
@ -90,6 +90,9 @@ class Index extends Component {
message.warning(getLabel(543602, "请设置默认模板"));
}
break;
case "log":
this.props.onFilterLog(key, id);
break;
default:
break;
}
@ -140,11 +143,23 @@ class Index extends Component {
style={{ marginRight: 10 }} target="_blank"
>{getLabel(83110, "查看详情")}</a>
}
{
sendNum === sendTotal && !showGrant &&
<Dropdown
overlay={<Menu onClick={e => this.handleOpts(e, record)}>
<Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
</Menu>
}
>
<a href="javascript:void(0);"><i className="icon-coms-more"/></a>
</Dropdown>
}
{
sendNum !== sendTotal && !showGrant &&
<Dropdown
overlay={<Menu onClick={e => this.handleOpts(e, record)}>
<Menu.Item key="template">{getLabel(543603, "更新模板")}</Menu.Item>
<Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
</Menu>
}
>

4
pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js
View File

@ -115,6 +115,9 @@ class Index extends Component {
}
});
break;
case "log":
this.props.onFilterLog(key, id);
break;
default:
break;
}
@ -165,6 +168,7 @@ class Index extends Component {
<Dropdown
overlay={<Menu onClick={e => this.handleOpts(e, record)}>
<Menu.Item key="del">{getLabel(535052, "删除")}</Menu.Item>
<Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
</Menu>
}
>

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 () => {

35
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, filterConditions: "[]"
};
this.templateRef = null;
this.baseSetRef = null;
@ -92,11 +93,13 @@ class Index extends Component {
onUpdateTemp={(id) => this.setState({ selectedKey: "template" }, () => {
this.templateRef.wrappedInstance.handleOpts({ key: "edit" }, { id });
})}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/>;
break;
case "template":
dom = <PayrollTemplateTableList ref={dom => this.templateRef = dom} queryParams={queryParams}
isRefresh={isRefresh} forceUpdate={() => this.forceUpdate()}/>;
isRefresh={isRefresh} forceUpdate={() => this.forceUpdate()}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>;
break;
case "watermark":
dom = <TemplateBaseSettings
@ -109,9 +112,21 @@ class Index extends Component {
}
return dom;
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const { selectedKey, queryParams } = this.state;
const { selectedKey, queryParams, logDialogVisible, filterConditions } = this.state;
const tabs = [
{ key: "grant", title: getLabel(538012, "工资单发放") },
{ key: "template", title: getLabel(543575, "工资单模板设置") },
@ -126,9 +141,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 })} filterConditions={filterConditions}/>
</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;
}

50
pc4mobx/hrmSalary/pages/salaryItem/index.js
View File

@ -11,6 +11,7 @@ import CustomSalaryItemSlide from "./customSalaryItemSlide";
import CustomPaginationTable from "../../components/customPaginationTable";
import SyncToSalaryAccountSetDialog from "./syncToSalaryAccountSetDialog";
import "../socialSecurityBenefits/programme/index.less";
import LogDialog from "../../components/logViewModal";
const { getLabel } = WeaLocaleProvider;
@inject("salaryItemStore", "taxAgentStore", "salaryFileStore")
@ -27,7 +28,8 @@ export default class SalaryItem extends React.Component {
formalModalVisible: false,
searchParams: { current: 1, pageSize: 10, total: 0 },
selectedRowKeys: [],
syncSalarySetDialog: { visible: false, title: "", id: "" }
syncSalarySetDialog: { visible: false, title: "", id: "" },
logDialogVisible: false, filterConditions: "[]"
};
columns.map(item => {
if (item.dataIndex == "refere") {
@ -130,7 +132,7 @@ export default class SalaryItem extends React.Component {
columns.push({
key: "operate",
title: "操作",
width: 120,
width: 185,
render: (text, record) => {
return (
<React.Fragment>
@ -142,6 +144,17 @@ export default class SalaryItem extends React.Component {
onClick={() => this.handleDeleteItem(record)}
>{getLabel(535052, "删除")}</a>
}
<Dropdown
overlay={
<Menu>
<Menu.Item>
<a href="javascript:void(0);"
onClick={() => this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)" style={{ marginLeft: 10 }}><i className="icon-coms-more"/></a>
</Dropdown>
</React.Fragment>
);
}
@ -191,6 +204,20 @@ export default class SalaryItem extends React.Component {
getTableDatas({ ...searchParams });
}
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const {
salaryItemStore,
@ -198,7 +225,7 @@ export default class SalaryItem extends React.Component {
taxAgentStore: { showOperateBtn, showSalaryItemBtn, taxAgentOption }
} = this.props;
const { userStatusList } = salaryFileStore;
const { selectedRowKeys } = this.state;
const { selectedRowKeys, logDialogVisible, filterConditions } = this.state;
const { loading, deleteItemRequest, getTableDatas } = salaryItemStore;
const {
tableDataSource,
@ -342,11 +369,14 @@ export default class SalaryItem extends React.Component {
};
return (
<div className="mySalaryBenefitsWrapper">
<WeaTop
title="薪资项目管理"
icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D"
showDropIcon={false}
<WeaTop title="薪资项目管理" icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
<CustomTab searchOperationItem={renderRightOperation()}/>
<div className="tableWrapper">
@ -387,7 +417,9 @@ export default class SalaryItem extends React.Component {
}
})}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salaryitem" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
{
systemItemVisible &&
<SystemSalaryItemModal

8
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js
View File

@ -105,6 +105,9 @@ class WelfareRecordList extends Component {
}
});
break;
case "log":
this.props.onFilterLog(id, params.id);
break;
default:
break;
}
@ -117,7 +120,7 @@ class WelfareRecordList extends Component {
"未归档": getLabel(17999, "未归档"), "操作": getLabel(30585, "操作"),
"核算": getLabel(538780, "核算"), "归档": getLabel(251, "归档"),
"查看": getLabel(33564, "查看"), "重新核算": getLabel(542637, "重新核算"),
"删除": getLabel(535052, "删除")
"删除": getLabel(535052, "删除"), "操作日志": getLabel(545781, "操作日志")
};
const childFrameObj = document.getElementById("unitTable");
childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
@ -136,7 +139,8 @@ class WelfareRecordList extends Component {
pageInfo: { ...pageInfo, current, pageSize, total },
dataSource, columns
}, () => this.postMessageToChild({
scrollHeight: 108, dataSource, columns, pageInfo: this.state.pageInfo, showOperateBtn
scrollHeight: 108, dataSource, columns, pageInfo: this.state.pageInfo, showOperateBtn,
unitTableType: "welfareRecord"
}));
}
}).catch(() => this.setState({ loading: false }));

34
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, filterConditions: "[]"
};
this.wfListRef = null;
this.timer = null;
@ -102,9 +104,21 @@ class StandingBook extends Component {
});
}
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
const { accountDialog, queryForm } = this.state;
const { accountDialog, queryForm, logDialogVisible, filterConditions } = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props;
const rightBtns = [<Button type="primary" onClick={() => this.setState({
accountDialog: { ...accountDialog, visible: true, title: getLabel(538780, "核算") }
@ -112,7 +126,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) => {
@ -122,13 +144,17 @@ class StandingBook extends Component {
}}
onPutAccountOptions={options => this.setState({ accountDialog: { ...accountDialog, options } })}
/>
<WelfareRecordList ref={dom => this.wfListRef = dom} queryForm={queryForm}/>
<WelfareRecordList ref={dom => this.wfListRef = dom} queryForm={queryForm}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
</div>
<Accountdialog {...accountDialog}
onCancel={() => this.setState({
accountDialog: { ...accountDialog, visible: false, title: "", loading: false }
})} onOk={this.handleAccount}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="siAccount" filterConditions={filterConditions}
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/components/welfareTableList/index.js
View File

@ -138,6 +138,9 @@ class Index extends Component {
onOk: () => this.handleWelfareOpts(_.camelCase(id), [baseInfo])
});
break;
case "log":
this.props.onFilterLog(id, baseInfo);
break;
default:
break;
}
@ -231,7 +234,8 @@ class Index extends Component {
"增员": getLabel(543180, "增员"), "删除档案": getLabel(23238, "删除档案"),
"删除待办": getLabel(543181, "删除待办"), "减员": getLabel(543182, "减员"),
"查看": getLabel(33564, "查看"), "取消停缴": getLabel(543183, "取消停缴"),
"共": getLabel(18609, "共"), "条": getLabel(18256, "条")
"共": getLabel(18609, "共"), "条": getLabel(18256, "条"),
"操作日志": getLabel(545781, "操作日志")
};
const childFrameObj = document.getElementById("atdTable");
childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");

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) {

31
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, filterConditions: "[]"
};
}
@ -57,6 +58,14 @@ class Index extends Component {
};
handleOpenAdvanceSearch = () => this.setState({ showSearchAd: true });
handleAdvanceSearch = () => this.setState({ isQuery: !this.state.isQuery });
handleImport = () => {
this.setState({
welfareImpDialog: {
...this.state.welfareImpDialog, visible: true,
runStatuses: this.state.selectedKey
}
});
};
onDropMenuClick = (key) => {
switch (key) {
case "import":
@ -84,8 +93,14 @@ class Index extends Component {
case "exportSelected":
this.handleExport(key);
break;
case "record":
this.setState({ recordDialogVisible: true });
break;
case "log":
this.setState({ logDialogVisible: true });
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
@ -127,8 +142,8 @@ class Index extends Component {
render() {
const {
selectedKey, topTabCount, showSearchAd, isQuery,
logDialogVisible, welfareImpDialog, showExtEmpsWitch
selectedKey, topTabCount, showSearchAd, isQuery, recordDialogVisible,
logDialogVisible, filterConditions, welfareImpDialog, showExtEmpsWitch
} = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props;
const tipList = _.find(welfareTipList, o => o.viewcondition === selectedKey).list;
@ -159,11 +174,15 @@ class Index extends Component {
<WelfareTableList isQuery={isQuery} ref={dom => this.welfareListRef = dom}
runStatuses={selectedKey} showOperateBtn={showOperateBtn}
onChangeTopTabCount={this.queryInsuranceTabTotal}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/>
{/*提示*/}
{!_.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" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
{/* 导入*/}
<WelfareArchivesImportDialog {...welfareImpDialog}
onCancel={(isFresh) => {

15
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js
View File

@ -265,6 +265,10 @@ class Index extends Component {
<a href="javascript:void(0)"
onClick={() => this.handleOpts("delete", record)}>{getLabel(535052, "删除")}</a>
</Menu.Item>
<Menu.Item>
<a href="javascript:void(0)"
onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)"><i className="icon-coms-more"/></a>
@ -278,6 +282,17 @@ class Index extends Component {
onClick={() => this.handleOpts("custom-edit", record)}>{getLabel(501169, "编辑")}</a>
<a href="javascript:void(0);"
onClick={() => this.handleOpts("custom-delete", record)}>{getLabel(535052, "删除")}</a>
<Dropdown
overlay={
<Menu>
<Menu.Item>
<a href="javascript:void(0);"
onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)"><i className="icon-coms-more"/></a>
</Dropdown>
</div>)
};
return (

18
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js
View File

@ -22,8 +22,8 @@ class Index extends Component {
constructor(props) {
super(props);
this.state = {
selectedKey: "SOCIAL_SECURITY", showSearchAd: false, isQuery: false, logDialogVisible: false,
customQuery: ""
selectedKey: "SOCIAL_SECURITY", showSearchAd: false, isQuery: false, customQuery: "",
logDialogVisible: false, filterConditions: "[]"
};
this.welfarePlanListRef = null;
}
@ -48,10 +48,13 @@ class Index extends Component {
handleOpenAdvanceSearch = () => this.setState({ showSearchAd: true });
handleAdvanceSearch = (customQuery = "") => this.setState({ isQuery: !this.state.isQuery, customQuery });
onAdSearch = () => this.setState({ showSearchAd: false, isQuery: !this.state.isQuery });
onDropMenuClick = (key) => {
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({ logDialogVisible: true });
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
@ -60,7 +63,7 @@ class Index extends Component {
render() {
const { taxAgentStore: { showOperateBtn } } = this.props;
const { logDialogVisible, selectedKey, showSearchAd, isQuery, customQuery } = this.state;
const { logDialogVisible, filterConditions, selectedKey, showSearchAd, isQuery, customQuery } = this.state;
return (
<div className="salary-welfare-plan-wrapper">
<WeaReqTop
@ -80,11 +83,12 @@ class Index extends Component {
</div>
{/*列表*/}
<WelfarePlanList ref={dom => this.welfarePlanListRef = dom} customQuery={customQuery}
selectedKey={selectedKey} isQuery={isQuery}/>
selectedKey={selectedKey} isQuery={isQuery}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
</div>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction={selectedKey === "CUSTOM" ? "siCategory" : "siScheme"}
onCancel={() => this.setState({ logDialogVisible: false })}/>
filterConditions={filterConditions} onCancel={() => this.setState({ logDialogVisible: false })}/>
</WeaReqTop>
</div>
);

57
pc4mobx/hrmSalary/pages/taxAgent/index.js
View File

@ -1,13 +1,16 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { Button, Col, message, Modal, Row, Switch } from "antd";
import { WeaFormItem, WeaInputSearch, WeaSearchGroup, WeaTable, WeaTop } from "ecCom";
import { Button, Col, Dropdown, Menu, message, Modal, Row, Switch } from "antd";
import { WeaFormItem, WeaInputSearch, WeaLocaleProvider, WeaSearchGroup, WeaTable, WeaTop } from "ecCom";
import { renderNoright } from "../../util";
import EditModal from "./editModal";
import TipLabel from "../../components/TipLabel";
import { decentralizationConditions, editConditions } from "./editConditions";
import LogDialog from "../../components/logViewModal";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
@inject("taxAgentStore")
@observer
export default class TaxAgent extends React.Component {
@ -30,7 +33,9 @@ export default class TaxAgent extends React.Component {
conditions: editConditions,
decentralizationConditions: decentralizationConditions,
permission: {},
syncLoading: false
syncLoading: false,
logDialogVisible: false,
filterConditions: "[]"
};
}
@ -282,6 +287,18 @@ export default class TaxAgent extends React.Component {
}
});
};
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
this.setState({
logDialogVisible: true,
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
default:
break;
}
};
render() {
@ -294,7 +311,9 @@ export default class TaxAgent extends React.Component {
decentralizationConditions,
permission,
syncLoading,
name
name,
logDialogVisible,
filterConditions
} = this.state;
const {
loading,
@ -362,6 +381,17 @@ export default class TaxAgent extends React.Component {
onClick={() => this.deleteTaxAgent(record.id)}>
删除
</a>
<Dropdown
overlay={
<Menu>
<Menu.Item>
<a href="javascript:void(0)"
onClick={() => this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}</a>
</Menu.Item>
</Menu>
}>
<a href="javascript:void(0)"><i className="icon-coms-more"/></a>
</Dropdown>
</div>
}
],
@ -389,12 +419,15 @@ export default class TaxAgent extends React.Component {
return (
<div className="taxWithholdingAgentWrapper">
<WeaTop
title="个税扣缴义务人" // 文字
icon={<i className="icon-coms-fa"/>} // 左侧图标
iconBgcolor="#F14A2D" // 左侧图标背景色
buttons={showOperateBtn ? btns : btns.slice(1)}
showDropIcon={true}>
<WeaTop title="个税扣缴义务人" 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, "操作日志")
}
]}
>
<Row
gutter={16}
style={{ overflow: "hidden", width: "100%", marginTop: 8 }}>
@ -440,7 +473,9 @@ export default class TaxAgent extends React.Component {
</Col>
</Row>
</WeaTop>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="taxagent" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
{editModalProps.visible &&
<EditModal
{...editModalProps}