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

Merge branch 'release/2.16.1.2410.01' into release/2.16.1.2410.01-个税 

# Conflicts:
#	pc4mobx/hrmSalary/index.js
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
This commit is contained in:
lys 2024-11-12 18:01:30 +08:00
parent 15acb33aa0 24cadda23f
commit 4383e14491
60 changed files with 948 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/apis/calculate.js
View File

@ -235,6 +235,10 @@ export const updateLockStatus = (params) => {
export const updateLockEmpStatus = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/lockEmp", params);
};
// 单元格锁定
export const updateLockEmpCellStatus = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/lock", params);
};
// 导入薪资核算添加表头字段缓存
export const cacheImportField = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/cacheImportField", params);

4
pc4mobx/hrmSalary/apis/ledger.js
View File

@ -61,6 +61,10 @@ export const deleteLedgerPersonExtRange = params => {
export const saveLedgerPersonRange = params => {
return postFetch("/api/bs/hrmsalary/salarysob/range/save", params);
};
//编辑薪资帐套人员范围
export const editLedgerPersonRange = params => {
return postFetch("/api/bs/hrmsalary/salarysob/range/edit", params);
};
//删除薪资帐套人员范围
export const deleteLedgerPersonRange = params => {

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

@ -52,5 +52,5 @@ export const saveSecondaryPwd = params => {
return WeaTools.callApi("/api/hrm/secondarypwd/saveSecondaryPwd", "POST", params);
};
export const salaryBillGetToken = params => {
return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/getToken", "GET", params);
return postFetch("/api/bs/hrmsalary/salaryBill/getToken", params);
};

12
pc4mobx/hrmSalary/apis/statistics.js
View File

@ -138,3 +138,15 @@ export const exportSalaryList = (params) => {
export const savePageListSetting = (params) => {
return postFetch("/api/bs/hrmsalary/common/pageList/save/setting", params);
};
//薪酬统计报表-保存页面模板
export const savePageListTemplate = (params) => {
return postFetch("/api/bs/hrmsalary/common/pageList/template/save", params);
};
//薪酬统计报表-获取页面模板
export const getPageListTemplatelist = (params) => {
return postFetch("/api/bs/hrmsalary/common/pageList/template/list", params);
};
//薪酬统计报表-切换个体页面模板
export const changePageListTemplate = (params) => {
return postFetch("/api/bs/hrmsalary/common/pageList/template/change", params);
};

4
pc4mobx/hrmSalary/apis/taxAgent.js
View File

@ -48,6 +48,10 @@ export const deleteTaxAgent = (params) => {
export const taxAgentRangeSave = (params) => {
return postFetch("/api/bs/hrmsalary/taxAgent/range/save", params);
};
//编辑人员范围
export const taxAgentRangeEdit = (params) => {
return postFetch("/api/bs/hrmsalary/taxAgent/range/edit", params);
};
//非系统人员范围查询
export const taxAgentRangelistExt = (params) => {
return postFetch("/api/bs/hrmsalary/taxAgent/range/listExt", params);

25
pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
View File

@ -66,6 +66,26 @@ class CustomBrowserMutiRight extends Component {
clearTimeout(timeout);
this.props.onDoubleClick && this.props.onDoubleClick(key);
};
onDragStart = (obj) => {
clearTimeout(timeout);
this.props.checkedCb && this.props.checkedCb([]);
};
onDrop = (obj) => {
const dragNodes = obj.dragNodesKeys;
const targetNode = obj.node.props.eventKey;
const result = [];
this.nodeIds.filter((item) => {
return dragNodes.indexOf(item) === -1;
}).forEach((id) => {
if (id === targetNode) {
dragNodes.forEach((drag) => {
result.push(this.nodeObj[drag]);
});
}
result.push(this.nodeObj[id]);
});
this.props.onDrag && this.props.onDrag(result);
};
render() {
const { height, checkedKeys } = this.props;
@ -76,9 +96,8 @@ class CustomBrowserMutiRight extends Component {
<div>
<WeaNewScroll height={height || 400}>
<Tree className="transfer-tree" draggable multiple={true} async={true} selectable={true}
onSelect={this.checkHandler}
onDoubleClick={this.onDoubleClick}
selectedKeys={checkedKeys}>
onSelect={this.checkHandler} onDoubleClick={this.onDoubleClick} selectedKeys={checkedKeys}
onDragStart={this.onDragStart} onDrop={this.onDrop}>
{this.generateTreeNodes()}
</Tree>
</WeaNewScroll>

7
pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js
View File

@ -34,7 +34,7 @@ class CustomTransferDialog extends Component {
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) {
this.getData(true);
this.getData(true, nextProps);
if (nextProps.datas) {
this.setState({
leftListSelectedData: _.values(nextProps.datas), rightDatas: _.values(nextProps.datas)
@ -49,9 +49,9 @@ class CustomTransferDialog extends Component {
}
}
getData = (init = false) => {
getData = (init = false, props) => {
const { query } = this.state;
const { completeURL, convertDatasource, dataParams = {} } = this.props;
const { completeURL, convertDatasource, dataParams = {} } = props || this.props;
let payload = { ...dataParams, ...query };
this.setState({ loading: true });
postFetch(completeURL, payload).then(({ status, data }) => {
@ -188,6 +188,7 @@ class CustomTransferDialog extends Component {
data={rightDatas} checkedKeys={rightCheckedKeys}
checkedCb={rightCheckedKeys => this.setState({ rightCheckedKeys })}
onDoubleClick={this.onRightDoubleClick}
onDrag={(data) => {this.setState({rightDatas: data})}}
/>
</div>
</div>

77
pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
View File

@ -39,47 +39,33 @@ class PersonalScopeModal extends Component {
}
componentDidMount() {
const { isTaxgent = true } = this.props;
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) {
const { isTaxgent = true } = nextProps;
if (isTaxgent) {
this.getTaxAgentRangeForm();
} else {
this.commonEnumList();
// const employeeStatus = [
// { key: "TRIAL", showname: "试用" },
// { key: "FORMAL", showname: "正式" },
// { key: "TEMPORARY", showname: "临时" },
// { key: "DELAY", showname: "试用延期" },
// { key: "FIRE", showname: "解雇" },
// { key: "DEPARTURE", showname: "离职" },
// { key: "RETIRED", showname: "退休" }
// ];
// const targetTypeList = [
// {
// key: "EMPLOYEE",
// showname: "人员",
// selected: false
// },
// {
// key: "SUBCOMPANY",
// showname: "分部",
// selected: false
// },
// {
// key: "DEPT",
// showname: "部门",
// selected: false
// },
// {
// key: "POSITION",
// showname: "岗位",
// selected: false
// }
// ];
// this.setState({ targetTypeList, employeeStatus });
this.commonEnumList(nextProps);
}
if (!_.isEmpty(nextProps.record)) {
this.setState({
targetType: nextProps.record.targetType,
targetTypeIds: String(nextProps.record.targetId),
targetTypeIdsNames: nextProps.record.targetName,
status: nextProps.record.status,
statusAll: ""
});
} else {
this.handleReset();
}
}
}
commonEnumList = () => {
commonEnumList = (props) => {
const { record } = props;
commonEnumList({ enumClass: "com.engine.salary.enums.UserStatusEnum" }).then(({ status, data }) => {
if (status) {
const targetTypeList = [
@ -112,6 +98,11 @@ class PersonalScopeModal extends Component {
this.setState({
targetTypeList,
employeeStatus: _.map(_.filter(data, o => o.value !== 7), it => ({ key: it.enum, showname: it.defaultLabel }))
}, () => {
if (!_.isEmpty(record)) {
const bool = _.every(_.map(this.state.employeeStatus, it => it.key), item => record.status.split(",").includes(item));
this.setState({ statusAll: bool ? "0" : "" });
}
});
}
});
@ -129,7 +120,7 @@ class PersonalScopeModal extends Component {
};
handleSubmit = () => {
const { status, targetTypeIds, targetType } = this.state;
const { includeType, saveKeyVal, onSuccess, onCancel, APISaveFox } = this.props;
const { includeType, saveKeyVal, onSuccess, onCancel, APISaveFox, record } = this.props;
if (_.isEmpty(status) || _.isEmpty(targetTypeIds)) {
Modal.warning({
title: "信息确认",
@ -139,14 +130,14 @@ class PersonalScopeModal extends Component {
}
const payload = {
employeeStatus: status.split(","),
includeType,
includeType, id: record.id,
targetParams: targetType !== "SQL" ?
_.map(targetTypeIds.split(","), it => ({ targetType, targetId: it, target: "" })) :
[{ targetType, targetId: "0", target: targetTypeIds }],
[saveKeyVal["key"]]: saveKeyVal["value"]
};
this.setState({ loading: true });
APISaveFox["save"](payload).then(({ status, errormsg }) => {
APISaveFox[_.isEmpty(record) ? "save" : "edit"](payload).then(({ status, errormsg }) => {
this.setState({ loading: false });
if (status) {
message.success("保存成功");
@ -159,6 +150,7 @@ class PersonalScopeModal extends Component {
}).catch(() => this.setState({ loading: true }));
};
renderBrowser = () => {
const { record } = this.props;
const { targetType, targetTypeIds, targetTypeIdsNames } = this.state;
let browserType = {};
switch (targetType) {
@ -186,9 +178,9 @@ class PersonalScopeModal extends Component {
return <WeaBrowser
{...browserType}
viewAttr={3}
isSingle={false}
isSingle={!_.isEmpty(record)}
value={targetTypeIds}
valueSpan={targetTypeIdsNames}
replaceDatas={[{ id: targetTypeIds, name: targetTypeIdsNames }]}
inputStyle={{ width: 200 }}
onChange={(targetTypeIds, targetTypeIdsNames) => {
this.setState({ targetTypeIds, targetTypeIdsNames });
@ -197,7 +189,7 @@ class PersonalScopeModal extends Component {
};
handleReset = () => {
this.setState({
targetType: "EMPLOYEE",
targetType: !_.isEmpty(this.props.record) ? this.props.record.targetType : "EMPLOYEE",
targetTypeIds: "",
status: "",
statusAll: ""
@ -205,7 +197,7 @@ class PersonalScopeModal extends Component {
};
render() {
const { onCancel, title, visible } = this.props;
const { onCancel, title, visible, record } = this.props;
const { employeeStatus, targetTypeList, targetType, status, statusAll, loading } = this.state;
const buttons = [
<Button type="primary" onClick={this.handleSubmit} loading={loading}>确定</Button>,
@ -233,6 +225,7 @@ class PersonalScopeModal extends Component {
<div style={{ display: "flex", alignItems: "center" }}>
<WeaSelect
style={{ width: 60, marginRight: 12 }}
disabled={!_.isEmpty(record)}
value={targetType}
options={targetTypeList}
onChange={(targetType) => this.setState({ targetType })}

5
pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
View File

@ -59,7 +59,10 @@ class PersonalScopeTable extends Component {
columns: _.map(columns, item => {
return {
...item,
render: (text) => {
render: (text, record) => {
if (item.dataIndex === "targetName") {
return <a href="javascript:void(0);" onClick={() => this.props.onEditScope(record)}>{text}</a>;
}
return <span className="tdEllipsis" title={text}>{text}</span>;
}
};

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

@ -40,7 +40,7 @@ class Index extends Component {
this.setState({
dataSource: [], columns: [], pageInfo: { current: 0, pageSize: 10, total: 0 },
loading: false
});
}, () => this.props.baseFormStore.form.resetForm());
}
}

51
pc4mobx/hrmSalary/index.js
View File

@ -63,67 +63,16 @@ import TopologyMap from "./pages/topologyMap";
import SupplementaryCalc from "./pages/supplementaryCalc";
import VariableSalary from "./pages/variableSalary";
import Layout from "./layout";
import stores from "./stores";
import "./style/index";
// 读取系统多语言配置
let getLocaleLabel = WeaLocaleProvider.getLocaleLabel.bind(this, "hrmSalary");
// 不需要读取系统多语言
getLocaleLabel = function (nextState, replace, callback) {
callback();
};
const Home = (props) => props.children;
const SocialSecurityBenefits = (props) => props.children;
const DataAcquisition = (props) => props.children;
// historicalPayroll 历史工资单查看
// salaryAdjustmentRecords 调薪记录查看
// mySalaryMobile 我的薪资福利-移动端
// mySalaryMobile 我的薪资福利-移动端
// mySalary 我的薪资福利
// mySalaryView 我的薪资福利-查看工资单
// socialSecurityBenefits 社保福利
// programme 社保福利方案
// archives 社保福利档案
// standingBook 社保福利台账
// sbofflineComparison 社保福利台账线下对比
// salaryItem 薪资项目管理
// salaryFile 薪资档案
// dataAcquisition 数据采集
// CumDeduct 累计专项附加扣除
// otherDeduct 其他免税扣除
// cumSituation 往期累计情况
// attendance 考勤引用
// specialAddDeduction 专项附件扣除
// ledger 薪资账套
// calculate 薪资核算
// calculateDetail 核算详情
// DoCalcDetail 核算详情页面-新
// CalcView 核算查看页面-新
// OfflineCompare 薪资核算线下对比-新
// placeOnFileDetail 核算归档详情
// compareDetail 线下线上对比
// payroll 工资单发放
// declare 个税申报表
// generateDeclarationDetail 个税单详情
// taxRate 个税税率表
// taxAgent 个税扣缴义务人
// mobilepayroll 移动端工资单
// sysconfig 系統配置
// sysconfig-1 规则配置
// appconfig 应用配置
// fieldManagement 字段管理
// analysisOfSalaryStatistics 薪酬统计分析
// reportView 薪酬报表查看
// externalPersonManage 非系统人员管理
// adjustSalaryManage 档案管理
// supplementaryCalc 补算
const Routes = (
<Route key="hrmSalary" path="hrmSalary" onEnter={getLocaleLabel} component={Layout}>
<Route key="historicalPayroll" path="historicalPayroll" component={HistoricalPayroll}/>

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

@ -1,4 +1,3 @@
import React from "react";
import { WeaLocaleProvider } from "ecCom";
const { getLabel } = WeaLocaleProvider;
@ -219,3 +218,47 @@ export const salaryDetailSearchConditions = [
col: 2
}
];
export const tempCondition = [
{
items: [
{
conditionType: "INPUT",
domkey: ["name"],
fieldcol: 14,
label: "模板名称",
lanId: 111,
labelcol: 6,
value: "",
rules: "required|string",
viewAttr: 3
},
{
conditionType: "SELECT",
domkey: ["sharedType"],
fieldcol: 14,
label: "可见性",
lanId: 111,
labelcol: 6,
options: [],
rules: "required|string",
viewAttr: 3
},
{
conditionType: "SELECT",
domkey: ["limitIds"],
fieldcol: 14,
label: "可见性范围",
lanId: 111,
labelcol: 6,
options: [],
detailtype: 3,
multiple: true,
rules: "",
viewAttr: 1,
hide: true
}
],
title: "",
defaultshow: true
}
];

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

@ -108,7 +108,7 @@ class EmployeeDetails extends Component {
pagination={pagination}
loading={loading}
columns={columns}
scroll={{ y: `calc(100vh - 174px)` }}
scroll={{ y: `calc(100vh - 182px)` }}
/>
);
}

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

@ -5,7 +5,7 @@
* Date: 2023/4/17
*/
import React, { Component } from "react";
import { WeaLocaleProvider } from "ecCom";
import { WeaAlertPage, WeaLocaleProvider } from "ecCom";
import { Button, Col, Dropdown, Menu, message, Modal, Row } from "antd";
import {
reportStatisticsReportDelete,
@ -14,7 +14,6 @@ import {
} from "../../../apis/statistics";
import "../index.less";
const SubMenu = Menu.SubMenu;
const { getLabel } = WeaLocaleProvider;
class ReportList extends Component {
@ -87,7 +86,9 @@ class ReportList extends Component {
return (
<Row gutter={16} className="reportRow">
{
_.isEmpty(dataSource) ? <div className="empty">{getLabel(83553, "暂无数据")}</div> :
_.isEmpty(dataSource) ? <WeaAlertPage icon="icon-coms-blank" iconSize={100}>
<div>暂无数据</div>
</WeaAlertPage> :
_.map(dataSource, it => {
const { reportName, dimension, id, dimensionId, isShare } = it;
return <Col className="gutter-row" span={6} onClick={() => this.handleGoReportView(id)}>

182
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
View File

@ -5,15 +5,20 @@
* Date: 2024/3/26
*/
import React, { Component } from "react";
import { toJS } from "mobx";
import { inject, observer } from "mobx-react";
import { WeaTableNew } from "comsMobx";
import { WeaLoadingGlobal, WeaLocaleProvider } from "ecCom";
import { WeaLoadingGlobal, WeaLocaleProvider, WeaSelect } from "ecCom";
import { message, Spin } from "antd";
import { toJS } from "mobx";
import { getIframeParentHeight } from "../../../util";
import { sysConfCodeRule } from "../../../apis/ruleconfig";
import CustomTransferDialog from "../../../components/CustomBrowser/components/customTransferDialog";
import SalaryDetailsTempDialog from "./salaryDetailsTempDialog";
import { MonthRangePicker } from "../../reportView/components/statisticalMicroSettingsSlide";
import AdvanceInputBtn from "../components/advanceInputBtn";
import SearchPannel from "../components/searchPannel";
import * as API from "../../../apis/statistics";
import cs from "classnames";
import "../index.less";
const WeaTableComx = WeaTableNew.WeaTable;
@ -25,24 +30,32 @@ class SalaryDetails extends Component {
constructor(props) {
super(props);
this.state = {
loading: false, dataSource: [], columns: [], selectedRowKeys: [],
pageInfo: { current: 1, pageSize: 10, total: 0 }, payload: {},
showTotalCell: false, updateSum: true,
loading: false, dataSource: [], columns: [], selectedRowKeys: [], tempPageList: [], sumRow: {},
pageInfo: { current: 1, pageSize: 10, total: 0 }, payload: {}, templateId: "",
showTotalCell: false, updateSum: true, tempDialog: { visible: false, setting: [], id: "", template: {} },
transferDialog: {
visible: false, searchParamsKey: "name", dataParams: { page: "salary_details_report" }, saveLoading: false,
completeURL: "/api/bs/hrmsalary/common/pageList/get/setting", convertDatasource: datas => {
completeURL: "", convertDatasource: datas => {
return {
listDatas: _.map(datas.setting, o => ({ id: o.id, name: o.name })),
listDatas: _.map(datas.setting, o => ({ id: o.id || o.column, name: o.name || o.text })),
checked: this.converCheckedCol(datas)
};
}
},
type: "default"
}
};
}
componentDidMount() {
async componentDidMount() {
const [{ data: confCode }] = await Promise.all([sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" })]);
this.setState({
showTotalCell: confCode === "1"
}, () => {
this.getSalaryList(this.props);
this.getPageListTemplatelist();
});
window.addEventListener("message", this.handleReceive, false);
window.addEventListener("resize", () => this.forceUpdate(), false);
}
componentWillReceiveProps(nextProps, nextContext) {
@ -53,9 +66,21 @@ class SalaryDetails extends Component {
componentWillUnmount() {
window.removeEventListener("message", this.handleReceive, false);
window.removeEventListener("message", () => this.forceUpdate(), false);
this.setState(({ selectedRowKeys: [] }));
}
getPageListTemplatelist = () => {
API.getPageListTemplatelist({ page: "salary_details_report" }).then(({ status, data }) => {
if (status) {
this.setState({
tempPageList: _.map(data, o => ({ ...o, key: String(o.id), showname: o.name })),
templateId: !_.isEmpty(_.find(data, o => !!o.checked)) ? String(_.find(data, o => !!o.checked).id) : "",
transferDialog: { ...this.state.transferDialog, visible: false, type: "default" }
});
}
});
};
handleReceive = ({ data }) => {
const { type, payload: { id, params } = {} } = data;
const { pageInfo } = this.state;
@ -86,7 +111,7 @@ class SalaryDetails extends Component {
const { attendanceStore: { salaryDetailSearchForm, tableStore }, dateRange } = props || this.props;
const [startDateStr, endDateStr] = dateRange;
const { taxAgentIds, subcompanyIds, departmentIds, ...extra } = salaryDetailSearchForm.getFormParams();
const { pageInfo, transferDialog } = this.state;
const { pageInfo, transferDialog, updateSum } = this.state;
const payload = {
taxAgentIds: taxAgentIds ? taxAgentIds.split(",") : [],
departmentIds: departmentIds ? departmentIds.split(",") : [],
@ -94,45 +119,50 @@ class SalaryDetails extends Component {
...extra, ...pageInfo, startDateStr, endDateStr
};
this.setState({ loading: true });
API.getSalaryList(payload).then(async ({ status, data }) => {
// API.getSalaryListSum(payload),
const [{ data: confCode }] = await Promise.all([sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" })]);
API.getSalaryList(payload).then(({ status, data }) => {
if (updateSum) this.getSalaryListSum(payload);
this.setState({ loading: false });
if (status) {
const { dataKey, pageInfo: pageparams } = data;
const { columns, dataKey, pageInfo: pageparams } = data;
const { list: dataSource, pageNum: current, total, pageSize } = pageparams;
this.setState({
dataSource, pageInfo: { ...pageInfo, current, total, pageSize }, payload,
showTotalCell: confCode === "1", transferDialog: { ...transferDialog, cancel: false }
columns, dataSource, pageInfo: { ...pageInfo, current, total, pageSize }, payload
}, () => tableStore.getDatas(dataKey.datas));
}
}).catch(() => this.setState({ loading: false }));
};
getSalaryListSum = (payload) => {
API.getSalaryListSum(payload).then(({ status, data }) => {
if (status) this.setState({ sumRow: data.sumRow });
});
};
handleExportSalaryList = (key) => {
const { attendanceStore: { tableStore } } = this.props;
let { selectedRowKeys, payload } = this.state;
const { attendanceStore: { tableStore }, salaryDetailShowType } = this.props;
let { selectedRowKeys, payload, columns: tempCols } = this.state;
const customCols = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
const columns = salaryDetailShowType === "1" ? _.filter(tempCols, o => o.column !== "acctTimes") : customCols;
if (key === "SELECTED" && selectedRowKeys.length === 0) {
message.warning(getLabel(543345, "请选择需要导出的数据！"));
return;
}
WeaLoadingGlobal.start();
const promise = API.exportSalaryList({
...payload, ids: key === "SELECTED" ? selectedRowKeys : [],
columns: _.map(_.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes"), o => o.dataIndex)
...payload, ids: key === "SELECTED" ? selectedRowKeys : [], columns: _.map(columns, o => o.column || o.dataIndex)
});
};
getColumns = () => {
const { attendanceStore: { tableStore } } = this.props;
const { dataSource, pageInfo, selectedRowKeys, showTotalCell, payload, updateSum, transferDialog } = this.state;
const columns = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
const sumRowlistUrl = showTotalCell ? "/api/bs/hrmsalary/report/statistics/employee/salaryListSum" : "";
if (!_.isEmpty(columns) && !transferDialog.visible && !transferDialog.cancel) {
const { attendanceStore: { tableStore }, salaryDetailShowType } = this.props;
const {
columns: tempCols, dataSource, pageInfo, selectedRowKeys, showTotalCell, sumRow, transferDialog
} = this.state;
const customCols = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
const columns = salaryDetailShowType === "1" ? _.filter(tempCols, o => o.column !== "acctTimes") : customCols;
if (!_.isEmpty(columns)) {
this.postMessageToChild({
dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154,
sumRowlistUrl, payload: { ...payload, updateSum },
dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, sumRow,
columns: _.map(columns, (it, idx) => ({
...it,
width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : it.oldWidth,
dataIndex: it.column || it.dataIndex, title: it.text || it.title, calcDetail: true,
width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : (it.width || it.oldWidth),
fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "",
ellipsis: true
}))
@ -140,15 +170,27 @@ class SalaryDetails extends Component {
}
return [];
};
handleSetDefCols = () => this.setState({ transferDialog: { ...this.state.transferDialog, visible: true } });
handleSetDefCols = () => this.setState({
transferDialog: {
...this.state.transferDialog, completeURL: "/api/bs/hrmsalary/common/pageList/get/setting", visible: true,
dataParams: { page: "salary_details_report" }
}
});
converCheckedCol = (data) => {
return _.reduce(data.checked, (pre, cur) => {
const item = _.find(data.setting, k => k.id === cur);
if (!_.isEmpty(item)) return [...pre, item];
return _.reduce(data.checked || [], (pre, cur) => {
const item = _.find(data.setting, k => (k.id === cur) || (k.column === cur.column));
if (!_.isEmpty(item)) return [...pre, { ...item, id: item.id || item.column, name: item.name || item.text }];
return pre;
}, []);
};
savePageListSetting = (values) => {
const { transferDialog, tempDialog } = this.state, { type } = transferDialog;
if (type === "temp") {
this.setState({
tempDialog: { ...tempDialog, visible: true, setting: _.map(values, o => o.id) }
});
return;
}
const payload = {
page: "salary_details_report",
setting: _.map(values, o => o.id)
@ -158,19 +200,67 @@ class SalaryDetails extends Component {
this.setState({ transferDialog: { ...this.state.transferDialog, saveLoading: false } });
if (status) {
message.success(getLabel(111, "操作成功！"));
this.setState({ transferDialog: { ...this.state.transferDialog, visible: false } }, () => this.getSalaryList());
this.setState({
transferDialog: { ...this.state.transferDialog, visible: false, type: "default" }
}, () => this.getSalaryList());
} else {
message.error(errormsg);
}
});
};
handelAddTemp = (templateId) => {
const { transferDialog, tempDialog, tempPageList } = this.state;
this.setState({
transferDialog: {
...transferDialog, visible: true, type: "temp",
dataParams: { ...transferDialog.dataParams, id: templateId },
completeURL: "/api/bs/hrmsalary/common/pageList/template/get"
},
tempDialog: { ...tempDialog, id: templateId, template: _.find(tempPageList, o => o.key === templateId) }
});
};
changePageListTemplate = (templateId) => {
this.setState({ templateId }, () => {
API.changePageListTemplate({ page: "salary_details_report", templateId }).then(({ status, errormsg }) => {
if (status) {
message.success(getLabel(111, "操作成功！"));
this.getSalaryList();
} else {
message.error(errormsg);
}
});
});
};
render() {
const { loading, dataSource, transferDialog } = this.state;
const { attendanceStore: { tableStore } } = this.props;
return (
const { loading, dataSource, transferDialog, tempDialog, tempPageList, templateId } = this.state;
const { attendanceStore: { tableStore }, dateRange, showSearchAd, salaryDetailShowType } = this.props;
return (<React.Fragment>
<div className="query-div">
{
salaryDetailShowType === "1" &&
<div className="custom-select">
<WeaSelect style={{ width: 200 }} hasAddBtn options={tempPageList} addOnClick={this.handelAddTemp}
showSearch optionFilterProp="children" value={templateId}
onChange={this.changePageListTemplate}/>
{
templateId &&
<span className="custom-select-edit" title={getLabel(111, "编辑模板")}
onClick={() => this.handelAddTemp(templateId)}>
<i className="icon-coms-BatchEditing-Hot"></i>
</span>
}
</div>
}
<MonthRangePicker dateRange={dateRange} viewAttr={2} onChange={this.props.onChange}/>
<AdvanceInputBtn onOpenAdvanceSearch={this.props.handleOpenAdvanceSearch}
onAdvanceSearch={this.props.handleAdvanceSearch}/>
</div>
<div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
<SearchPannel onCancel={this.props.onCancel} onAdSearch={this.props.onAdSearch}/>
</div>
<div className="table-layout"
style={{ height: getIframeParentHeight(".wea-new-top-req-content", dataSource.length, 0) + "px" }}>
style={{ height: getIframeParentHeight(".wea-new-top-req-content", dataSource.length, 70) + "px" }}>
<Spin spinning={loading}>
<iframe
style={{ border: 0, width: "100%", height: "100%" }}
@ -185,12 +275,24 @@ class SalaryDetails extends Component {
needScroll={true}
columns={this.getColumns()}
/>
{/*默认显示列*/}
{/*默认显示列,薪资模板列表*/}
<CustomTransferDialog {...transferDialog} onChange={this.savePageListSetting}
onCancel={() => this.setState({
transferDialog: { ...transferDialog, visible: false, cancel: true }
transferDialog: {
...transferDialog, completeURL: "", visible: false, type: "default"
}
})}/>
{/*薪资明细模板设置*/}
<SalaryDetailsTempDialog {...tempDialog}
onCancel={callback => this.setState({
tempDialog: { ...tempDialog, visible: false, setting: [] }
}, () => callback && callback())}
onSuccess={() => {
this.getPageListTemplatelist();
this.getSalaryList();
}}/>
</div>
</React.Fragment>
);
}
}

127
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetailsTempDialog.js Normal file
View File

@ -0,0 +1,127 @@
/*
* 薪酬统计分析-薪资明细
* 列表模板设置
* @Author: 黎永顺
* @Date: 2024/11/7
* @Wechat:
* @Email: 971387674@qq.com
* @description:
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
import { tempCondition } from "./conditions";
import { getTaxAgentSelectList } from "../../../apis/taxAgent";
import * as API from "../../../apis/statistics";
import { Button, message } from "antd";
import { getSearchs } from "../../../util";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
@inject("attendanceStore")
@observer
class SalaryDetailTempDialog extends Component {
constructor(props) {
super(props);
this.state = {
loading: false, conditions: []
};
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) this.getTempForm(nextProps);
if (nextProps.visible !== this.props.visible && !nextProps.visible) {
this.setState({ loading: false, conditions: [] }, () => nextProps.attendanceStore.initTempForm());
}
}
getTempForm = (props) => {
getTaxAgentSelectList().then(({ status, data }) => {
if (status) {
const { id, template } = props;
this.setState({
conditions: _.map(tempCondition, item => ({
...item, items: _.map(item.items, o => {
if (getKey(o) === "sharedType") {
return {
...o, label: getLabel(o.lanId, o.label), value: id ? String(template["sharedType"]) : "0",
options: [
{ key: "0", showname: getLabel(111, "公共") },
{ key: "1", showname: getLabel(111, "私有") }
]
};
} else if (getKey(o) === "limitIds") {
return {
...o, label: getLabel(o.lanId, o.label), hide: !id || (id && template["sharedType"] === 0),
value: id ? template["limitIds"].join(",") : "",
options: _.map(data, o => ({ key: o.id, showname: o.content }))
};
}
return { ...o, label: getLabel(o.lanId, o.label), value: id ? template[getKey(o)] : "" };
})
}))
}, () => {
const { attendanceStore: { tempForm } } = props;
tempForm.initFormFields(this.state.conditions);
});
}
});
};
save = () => {
const { attendanceStore: { tempForm }, setting, id } = this.props;
tempForm.validateForm().then(f => {
if (f.isValid) {
this.setState({ loading: true });
const { limitIds, ...formVal } = tempForm.getFormParams();
const payload = {
page: "salary_details_report", setting, id, ...formVal,
limitIds: !_.isEmpty(limitIds) ? limitIds.split(",") : []
};
API.savePageListTemplate(payload).then(({ status, errormsg }) => {
if (status) {
message.success(getLabel(111, "操作成功！"));
this.props.onCancel(this.props.onSuccess());
} else {
message.error(errormsg);
}
});
} else {
f.showErrors();
}
}).catch(() => this.setState({ loading: false }));
};
formFieldChange = (field) => {
const key = Object.keys(field)[0], value = field[key].value;
this.setState({
conditions: _.map(this.state.conditions, item => ({
...item, items: _.map(item.items, o => {
if (key === "sharedType" && getKey(o) === "limitIds") {
return {
...o, hide: value !== "1", viewAttr: value === "1" ? 3 : 1,
rules: value === "1" ? "required|string" : ""
};
}
return { ...o };
})
}))
}, () => {
const { attendanceStore: { tempForm } } = this.props;
tempForm.initFormFields(this.state.conditions);
});
};
render() {
const { loading, conditions } = this.state;
const { attendanceStore: { tempForm } } = this.props;
return (
<WeaDialog
{...this.props} style={{ width: 480, height: 127 }} initLoadCss title={getLabel(111, "模板保存")}
buttons={[<Button type="primary" onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>]}>
<div className="form-dialog-layout">{getSearchs(tempForm, conditions, 1, false, this.formFieldChange)}</div>
</WeaDialog>
);
}
}
export default SalaryDetailTempDialog;

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

@ -9,7 +9,7 @@ import { inject, observer } from "mobx-react";
import { WeaDatePicker, WeaInputSearch, WeaLocaleProvider, WeaReqTop } from "ecCom";
import { Button, Dropdown, Menu } from "antd";
import { condition, reportCondition } from "./components/conditions";
import { commonEnumList, reportGetForm } from "../../apis/ruleconfig";
import { commonEnumList, reportGetForm, sysinfo } from "../../apis/ruleconfig";
import { dimensionGetForm } from "../../apis/statistics";
import EmployeeDetails from "./components/employeeDetails";
import SalaryDetails from "./components/salaryDetails";
@ -19,11 +19,7 @@ import DimensionTable from "./components/dimensionTable";
import ReportList from "./components/reportList";
import ReportForm from "./components/reportForm";
import LogDialog from "../../components/logViewModal";
import { MonthRangePicker } from "../reportView/components/statisticalMicroSettingsSlide";
import AdvanceInputBtn from "./components/advanceInputBtn";
import SearchPannel from "./components/searchPannel";
import moment from "moment";
import cs from "classnames";
import "./index.less";
const { getLabel } = WeaLocaleProvider;
@ -54,12 +50,16 @@ class Index extends Component {
title: "", visible: false,
typeKey: "", id: ""
},
logDialogVisible: false, filterConditions: "[]"
logDialogVisible: false, filterConditions: "[]",
salaryDetailShowType: "0" //薪资明细列表显示方式
};
}
componentDidMount() {
this.initReportFormCondition();
sysinfo().then(({ status, data }) => {
if (status) this.setState({ salaryDetailShowType: data.SALARY_DETAILS_REPORT_SHOW_TYPE });
});
}
initReportFormCondition = (payload = {}) => {
@ -281,7 +281,7 @@ class Index extends Component {
const {
selectedKey, modalReq, slideReq, conditions, reportConditions,
reportName, keyword, year, logDialogVisible, filterConditions,
dateRange, showSearchAd, isQuery
dateRange, showSearchAd, isQuery, salaryDetailShowType
} = this.state;
const buttons = selectedKey === "statistics" ? [
<Button type="primary" onClick={() => this.handleReqBtnsClick("addReport")}>{getLabel(111, "新建报表")}</Button>,
@ -307,11 +307,7 @@ class Index extends Component {
onClick={({ key }) => this.handleExportSalaryList(key)}>
<Menu.Item
key="SELECTED">{getLabel(543715, "导出所选")}</Menu.Item>
</Menu>}>{getLabel(81272, "导出全部")}</Dropdown.Button>,
<MonthRangePicker dateRange={dateRange} viewAttr={2}
onChange={v => this.setState({ dateRange: v }, () => this.handleAdvanceSearch())}/>,
<AdvanceInputBtn onOpenAdvanceSearch={this.handleOpenAdvanceSearch}
onAdvanceSearch={this.handleAdvanceSearch}/>
</Menu>}>{getLabel(81272, "导出全部")}</Dropdown.Button>
];
let dropMenuDatas = [
{
@ -344,11 +340,8 @@ class Index extends Component {
iconBgcolor="#F14A2D" tabDatas={tabs} className="xc_tj_fx_wrapper"
buttons={(!statisticsReportBtn && selectedKey === "statistics") ? buttons.slice(-1) : buttons} buttonSpace={10}
onChange={selectedKey => this.setState({ selectedKey }, () => this.state.selectedKey === "statistics" && this.initReportFormCondition())}
showDropIcon={selectedKey !== "detail"} onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={dropMenuDatas}>
<div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
<SearchPannel onCancel={() => this.setState({ showSearchAd: false })} onAdSearch={this.onAdSearch}/>
</div>
showDropIcon={(selectedKey === "statistics") || (selectedKey === "salaryDetail" && salaryDetailShowType !== "1")}
onDropMenuClick={this.onDropMenuClick} dropMenuDatas={dropMenuDatas}>
{
selectedKey === "statistics" ?
<ReportList
@ -360,7 +353,12 @@ class Index extends Component {
ref={dom => this.employeeListRef = dom}
keyword={keyword} year={year}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/> : <SalaryDetails ref={dom => this.salaryRef = dom} dateRange={dateRange} isQuery={isQuery}/>
/> : <SalaryDetails ref={dom => this.salaryRef = dom} dateRange={dateRange} isQuery={isQuery}
salaryDetailShowType={salaryDetailShowType}
showSearchAd={showSearchAd} handleOpenAdvanceSearch={this.handleOpenAdvanceSearch}
handleAdvanceSearch={this.handleAdvanceSearch} onAdSearch={this.onAdSearch}
onCancel={() => this.setState({ showSearchAd: false })}
onChange={v => this.setState({ dateRange: v }, () => this.handleAdvanceSearch())}/>
}
<StatisticsModal {...modalReq} onCancel={this.handleCancel} form={reportForm} onClose={this.handleCancel}
onAddDimension={this.handleAddDimension}

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

@ -5,6 +5,10 @@
width: 220px;
}
.ant-btn-group {
margin-right: 10px;
}
.employeeYearWrapper {
display: flex;
align-items: center;
@ -15,7 +19,7 @@
}
.wea-new-top-req-content {
padding: 16px;
padding: 8px 16px;
.wea-new-table {
background: #FFF;
@ -158,11 +162,8 @@
}
}
.empty {
font-size: 16px;
width: 100%;
text-align: center;
margin-top: 26px;
.wea-alert-page-con {
padding-top: 100px;
}
}
@ -210,6 +211,42 @@
}
}
.query-div {
display: flex;
align-items: center;
justify-content: flex-end;
height: 46px;
background: #FFF;
margin-bottom: 8px;
padding: 0 8px;
.custom-select {
display: flex;
align-content: center;
position: relative;
.custom-select-edit {
position: absolute;
right: -56px;
cursor: pointer;
display: inline-block;
vertical-align: middle;
background-color: #f4f4f4;
color: #b2b2b2;
border: 1px solid #d9d9d9;
border-left: none;
width: 28px;
height: 30px;
line-height: 28px;
text-align: center;
}
}
.rangePickerBox {
margin: 0 10px 0 68px;
}
}
.table-layout {
.ant-spin-nested-loading, .ant-spin-container {
height: 100%;

24
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
View File

@ -8,7 +8,12 @@ import React, { Component } from "react";
import { WeaLocaleProvider, WeaTools } from "ecCom";
import { message, Modal, Spin } from "antd";
import { inject, observer } from "mobx-react";
import { acctResultList, updateLockEmpStatus, updateLockStatus } from "../../../../../apis/calculate";
import {
acctResultList,
updateLockEmpCellStatus,
updateLockEmpStatus,
updateLockStatus
} from "../../../../../apis/calculate";
import ProgressModal from "../../../../../components/progressModal";
import BatchUpdateSalaryItemValDialog from "./batchUpdateSalaryItemValDialog";
import EditSalaryCalcSlide from "./editSalaryCalcSlide";
@ -135,7 +140,7 @@ class EditCalcTable extends Component {
});
};
updateEmpLockStatus = (payload) => {
const { lockStatus } = payload;
const { lockStatus, salaryItemId } = payload;
Modal.confirm({
title: getLabel(131329, "信息确认"),
content: <div>
@ -166,13 +171,16 @@ class EditCalcTable extends Component {
}, 500);
});
const { routeParams: { salaryAcctRecordId } } = this.props;
updateLockEmpStatus({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => {
if (status) {
const params = salaryItemId ? payload : { ...payload, salaryAcctRecordId };
const APIFunction = salaryItemId ? updateLockEmpCellStatus : updateLockEmpStatus;
APIFunction(params).then(({ status, errormsg }) => {
clearInterval(this.timerLock);
this.setState({
progressVisible: false,
progress: 0
}, () => this.queryCalcResultList());
});
if (status) {
this.queryCalcResultList();
} else {
message.error(errormsg);
}
@ -224,8 +232,8 @@ class EditCalcTable extends Component {
"点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
"点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
"锁定的项目值": getLabel(543647, "锁定的项目值"),
"当前状态锁定，点击解锁": getLabel(111, "当前状态锁定，点击解锁"),
"当前状态未锁定，点击锁定": getLabel(111, "当前状态未锁定，点击锁定"),
"当前状态锁定，右击解锁": getLabel(111, "当前状态锁定，右击解锁"),
"当前状态未锁定，右击锁定": getLabel(111, "当前状态未锁定，右击锁定"),
"共": getLabel(18609, "共"), "条": getLabel(18256, "条"),
"总计": getLabel(523, "总计"), "批量解锁": getLabel(111, "批量解锁"),
"批量锁定": getLabel(111, "批量锁定"), "批量更新": getLabel(111, "批量更新"),
@ -324,7 +332,7 @@ const traverse = (arr, calcDetail) => {
return _.map(arr, item => {
if (!_.isEmpty(item.children)) {
return {
title: item.text, width: item.width + "px", ellipsis: true,
title: item.text, width: item.width + "px", ellipsis: true, calcDetail,
dataIndex: item.column, children: traverse(item.children, calcDetail),
fixed: item.fixed || false, dataType: item.dataType, align: "center"
};

4
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryMonthTip/index.js
View File

@ -12,7 +12,7 @@ const getLabel = WeaLocaleProvider.getLabel;
class Index extends Component {
render() {
const { attendCycle, salaryCycle, salaryMonth, socialSecurityCycle } = this.props;
const { attendCycle, salaryCycle, taxCycle, salaryMonth, socialSecurityCycle } = this.props;
const { fromDate: attendFromDate, endDate: attendEndDate } = attendCycle,
{ fromDate: salaryFromDate, endDate: salaryEndDate } = salaryCycle;
return (
@ -23,7 +23,7 @@ class Index extends Component {
</div>
<div className="line">
<div className="lable">{getLabel(542240, "税款所属期")}</div>
<div className="value">{salaryMonth}</div>
<div className="value">{taxCycle || salaryMonth}</div>
</div>
<div className="line">
<div className="lable">{getLabel(543475, "考勤取值周期")}</div>

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

@ -76,6 +76,8 @@
height: 100%;
width: 100%;
overflow-y: auto;
padding: 8px 16px 0 16px;
background: #F6F6F6;
.wea-new-table {
background: #fff;

3
pc4mobx/hrmSalary/pages/declare/index.less
View File

@ -35,7 +35,8 @@
.declare-body {
height: 100%;
width: 100%;
padding: 16px;
padding: 8px 16px 0 16px;
background: #F6F6F6;
overflow-y: auto;
.wea-new-table {

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

@ -127,7 +127,7 @@ class FieldTable extends Component {
pagination={pagination}
loading={loading}
columns={this.getColumns()}
scroll={{ y: "calc(100vh - 152px)" }}
scroll={{ y: "calc(100vh - 175px)" }}
/>
);
}

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

@ -99,7 +99,7 @@ class FieldManagement extends Component {
];
return (
<WeaTop
title="字段管理" icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
title="字段管理" icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D" className="fieldManageWrapper"
buttons={(showSalaryItemBtn || showOperateBtn) ? btns : btns.slice(-1)}
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
@ -109,11 +109,9 @@ class FieldManagement extends Component {
}
]}
>
<div className="fieldManageWrapper">
<FieldTable name={searchVal} doSearch={doSearch} onEditLedger={this.handleEditField}
onDeleteLedger={(record) => this.handleDeleteField([record.id])}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/>
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
<FieldSlide
{...slideparams}
onChangeRecord={(record) => this.setState({
@ -128,7 +126,6 @@ class FieldManagement extends Component {
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salarcfield" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
</div>
</WeaTop>
);
}

12
pc4mobx/hrmSalary/pages/fieldManagement/index.less
View File

@ -1,3 +1,15 @@
.fieldManageWrapper {
.wea-new-top-content {
background: #F6F6F6;
padding: 8px 16px 0 16px;
}
.wea-new-table {
background: #FFF;
}
}
.slideOuterWrapper {
.wea-form-item-group {
margin: 16px;

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

@ -249,7 +249,7 @@
padding: 0;
background: transparent;
border: none;
font-size: 20px;
font-size: 20px!important;
line-height: 20px;
}

18
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
View File

@ -13,6 +13,7 @@ import PersonalScopeModal from "../../../components/PersonalScopeModal";
import {
deleteLedgerPersonExtRange,
deleteLedgerPersonRange,
editLedgerPersonRange,
getLedgerPersonRangeExclude,
getLedgerPersonRangeExtList,
getLedgerPersonRangeInclude,
@ -32,7 +33,8 @@ const APIFox = {
externalList: getLedgerPersonRangeExtList
};
const APISaveFox = {
save: saveLedgerPersonRange
save: saveLedgerPersonRange,
edit: editLedgerPersonRange
};
@inject("taxAgentStore")
@ -55,7 +57,8 @@ class LedgerAssociatedPersonnel extends Component {
personalAddModal: {
visible: false,
title: "关联人员",
includeType: ""
includeType: "",
record: {}
},
extEmpsWitch: "1" //非系统人员开关， 1： 开启， 0：关闭
};
@ -157,7 +160,7 @@ class LedgerAssociatedPersonnel extends Component {
* Params:
* Date: 2022/11/30
*/
handleAddPersonal = () => {
handleAddPersonal = (record = {}) => {
const { personalAddModal, selectedKey } = this.state;
if (selectedKey === "externalList") {
this.setState({ externalPersonModalVisible: true });
@ -165,7 +168,7 @@ class LedgerAssociatedPersonnel extends Component {
this.setState({
personalAddModal: {
...personalAddModal,
visible: true,
visible: true, record,
includeType: selectedKey === "listInclude" ? 1 : 0
}
});
@ -256,7 +259,7 @@ class LedgerAssociatedPersonnel extends Component {
disabled={_.isEmpty(rowKeys)}
onClick={this.taxAgentRangeDelete}
/>,
<WeaButtonIcon buttonType="add" type="primary" onClick={this.handleAddPersonal}/>,
<WeaButtonIcon buttonType="add" type="primary" onClick={() => this.handleAddPersonal()}/>,
<WeaInputSearch
style={{ width: 220 }}
value={searchValue}
@ -287,6 +290,7 @@ class LedgerAssociatedPersonnel extends Component {
tabActive={selectedKey}
searchValue={searchValue}
onChangeSelectKey={rowKeys => this.setState({ rowKeys })}
onEditScope={this.handleAddPersonal}
/>
{/*关联人员范围导入*/}
{importParams.visible && (
@ -336,9 +340,7 @@ class LedgerAssociatedPersonnel extends Component {
onCancel={() =>
this.setState({
personalAddModal: {
...personalAddModal,
visible: false,
includeType: ""
...personalAddModal, record: {}, includeType: "", visible: false
}
})
}

4
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
View File

@ -232,11 +232,11 @@ const TitleNormalComp = (props) => {
<i className="icon-coms-Delete" title="删除" onClick={() => onDeleteCategory(uuid)}/>
}
{
sortedIndex !== 0 && showOperateBtn &&
name !== getLabel(111, "未分类") && sortedIndex !== 0 && showOperateBtn &&
<i className="icon-coms-Reverse" title="向上移动" onClick={() => onUpgo(sortedIndex)}/>
}
{
sortedIndex !== dataSourceLen - 1 && showOperateBtn &&
name !== getLabel(111, "未分类") && sortedIndex !== dataSourceLen - 2 && showOperateBtn &&
<i className="icon-coms-positive-sequence" title="向下移动" onClick={() => onDowngo(sortedIndex)}/>
}
</div>

2
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
View File

@ -173,7 +173,7 @@ class LedgerSalaryItemTable extends Component {
this.setState({
editFormulModal: {
...editFormulModal, visible: true, valueType, dataType, name: salaryItemName,
formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent === " ")) ? formulaId : ""
formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent !== " ")) ? formulaId : ""
}
});
};

34
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
View File

@ -15,8 +15,7 @@ import { getTaxAgentSelectList } from "../../../apis/taxAgent";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
@inject("ledgerStore")
@observer
@inject("ledgerStore") @observer
class LedgerSearchComp extends Component {
constructor(props) {
super(props);
@ -36,14 +35,11 @@ class LedgerSearchComp extends Component {
this.setState({
conditions: _.map(searchConditions, o => {
return {
...o,
items: _.map(o.items, j => {
...o, items: _.map(o.items, j => {
if (getKey(j) === "taxAgentId") {
return {
...j,
options: [{ key: "", showname: getLabel(332, "全部") }, ..._.map(data, g => ({
key: g.id,
showname: g.content
...j, options: [{ key: "", showname: getLabel(332, "全部") }, ..._.map(data, g => ({
key: g.id, showname: g.content
}))]
};
}
@ -62,18 +58,15 @@ class LedgerSearchComp extends Component {
let items = [];
c.items.map(fields => {
items.push({
com: (
<WeaFormItem label={`${fields.label}`} labelCol={{ span: `${fields.labelcol}` }}
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}/>
</WeaFormItem>),
colSpan: 2
tipPosition="bottom">
<WeaSwitch fieldConfig={fields} form={form} formParams={formParams}
onChange={_.debounce(this.props.onSearch, 500)}/>
</WeaFormItem>), colSpan: 2
});
});
group.push(
<WeaSearchGroup col={2} needTigger={true} title={c.title} showGroup={c.defaultshow} center={false}
group.push(<WeaSearchGroup col={2} needTigger={true} title={c.title} showGroup={c.defaultshow} center={false}
items={items}/>);
});
return group;
@ -82,12 +75,7 @@ class LedgerSearchComp extends Component {
render() {
const { conditions } = this.state;
const { ledgerStore: { searchForm } } = this.props;
return (
<div className="ledgerSearch-Wrapper">
{this.formRender(searchForm, conditions)}
<Button type="primary" onClick={this.props.onSearch}>{getLabel(388113, "搜索")}</Button>
</div>
);
return (<div className="ledgerSearch-Wrapper">{this.formRender(searchForm, conditions)}</div>);
}
}

4
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
View File

@ -123,9 +123,9 @@ class LedgerSlide extends Component {
if (!it.salarySobId) delete it.id;
return { ...it };
}),
itemGroups: _.map(_.filter(itemGroups, it => it.name !== "未分类"), item => {
itemGroups: _.map(_.filter(itemGroups, it => it.name !== "未分类"), (item, index) => {
return {
...item,
...item, sortedIndex: index,
items: _.map(item.items, it => {
delete it.originFormulaContent;
delete it.originSqlContent;

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

@ -71,10 +71,9 @@ class Index extends Component {
const { taxAgentStore } = this.props;
const { showOperateBtn } = taxAgentStore;
const btns = [
<Button
type="primary"
onClick={() => this.setState({ slideparams: { ...slideparams, visible: true } })}
>新建</Button>,
<Button type="primary" onClick={() => this.setState({ slideparams: { ...slideparams, visible: true } })}>
{getLabel(111, "新建")}
</Button>,
<LedgerSearchComp onSearch={() => this.setState({ doSearch: !doSearch })}/>
];
return (

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

@ -1,5 +1,11 @@
.ledgerWrapper {
height: 100%;
padding: 8px 16px 0 16px;
background: #F6F6F6;
.wea-new-table {
background: #FFF;
}
.tdEllipsis {
display: inline-block;
@ -12,8 +18,6 @@
.ledgerSearch-Wrapper {
min-width: 350px;
margin-top: 5px;
margin-right: 70px;
position: relative;
& > button {

5
pc4mobx/hrmSalary/pages/mobilePayroll/index.js
View File

@ -73,7 +73,10 @@ export default class MobilePayroll extends React.Component {
});
} else {
const params = this.getUrlkey();
const { data } = await salaryBillGetToken({ uid: _.pick(params, ["recipient"]).recipient });
const { data } = await salaryBillGetToken({
recipient: _.pick(params, ["recipient"]).recipient,
salaryCode: _.pick(params, ["salaryCode"]).salaryCode
});
this.setState({ salaryBillToken: data }, () => {
API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
.then(({ status, isNeedSecondAuth }) => {

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

@ -46,7 +46,7 @@ class Index extends Component {
if (it.column === "salaryYearMonth" || it.column === "sendTime") {
return {
dataIndex: it.column, title: it.text, width: it.width,
render: (__, record) => (<span>{moment(record[it["column"]]).format("YYYY-MM")}</span>)
render: (__, record) => (<span>{record[it["column"]]}</span>)
};
}
return {

4
pc4mobx/hrmSalary/pages/mySalaryBenefits/index.less
View File

@ -1,4 +1,8 @@
.mySalary_wrapper {
.wea-new-top-req-content {
padding: 8px 16px;
}
.wea-transfer-list-wrapper {
border: none;
}

5
pc4mobx/hrmSalary/pages/payroll/index.less
View File

@ -26,6 +26,11 @@
padding: 5px 16px;
border-bottom: 1px solid #e5e5e5;
.wea-select {
width: 120px !important;
margin-left: 10px;
}
.wea-input-number {
width: 80px !important;
margin: 0 10px;

4
pc4mobx/hrmSalary/pages/payroll/stepForm/index.less
View File

@ -96,6 +96,10 @@
& > ul {
border: 1px solid #e5e5e5;
.sortable-handle {
display: none;
}
.wea-sortable-salary-item {
padding: 0;
margin: 0;

10
pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
View File

@ -106,7 +106,7 @@ class TemplateBaseSettings extends Component {
render() {
const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state;
const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
const { limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting;
const { monthType = "SALARY_DATE", limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting;
return (
<React.Fragment>
<WeaSearchGroup title={getLabel(111, "水印设置")} showGroup needTigger className="waterMarkWrapper">
@ -204,6 +204,14 @@ class TemplateBaseSettings extends Component {
<WeaSearchGroup title={getLabel(111, "工资单时效设置")} showGroup needTigger className="waterMarkWrapper">
<div className="agingBox">
<span>{getLabel(111, "仅可查看")}</span>
<WeaSelect
value={monthType} onChange={monthType => this.setState({
salaryBillViewingLimitSetting: { ...salaryBillViewingLimitSetting, monthType }
})}
options={[
{ key: "SALARY_DATE", showname: getLabel(111, "薪资所属月"), selected: true },
{ key: "SEND_DATE", showname: getLabel(111, "发放日期") }
]}/>
<WeaInputNumber min={0} value={limitMonth}
onChange={limitMonth => this.setState({
salaryBillViewingLimitSetting: {

3
pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
View File

@ -37,7 +37,8 @@ class TmpPreview extends Component {
}
const data = JSON.parse(dataStr);
let theme = data.theme || "";
theme = theme.replaceAll("${salaryMonth}", moment().format("YYYY-MM"));
theme = theme.replaceAll("${salaryMonth}", moment().format("YYYY年MM月"));
theme = theme.replaceAll("${salaryYear}", moment().format("YYYY年"));
this.setState({
theme, tip: data.textContent || "",
background: data.background || "",

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

@ -358,6 +358,15 @@ export const salaryFileSearchConditions = [
labelcol: 8,
value: "",
viewAttr: 2
},
{
conditionType: "RANGEPICKER",
domkey: ["adjustSalaryStartDate", "adjustSalaryEndDate"],
fieldcol: 16,
label: getLabel(111, "调薪日期"),
labelcol: 8,
value: "",
viewAttr: 2
}
],
defaultshow: true,

2
pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
View File

@ -253,7 +253,7 @@ export const tempNormalSetConditions = [
colSpan: 1,
conditionType: "INPUT",
domkey: ["theme"],
fieldcol: 10,
fieldcol: 8,
label: "工资单标题",
lanId: 543588,
labelcol: 6,

21
pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js
View File

@ -56,7 +56,7 @@ class Index extends Component {
});
};
getPayrollBaseForm = (props) => {
const { tmplId: id, payrollStore: { payrollTempForm, payrollTempFeedbackForm, tmplDataSource } } = props;
const { detail, tmplId: id, payrollStore: { payrollTempForm, payrollTempFeedbackForm, tmplDataSource } } = props;
getPayrollBaseForm({ id }).then(async ({ status, data }) => {
if (status) {
const { salaryTemplateBaseSet: { salarySobOptions, data: result } } = data;
@ -84,7 +84,7 @@ class Index extends Component {
};
} else if (getKey(o) === "reissueRule") {
return {
...o, options: [
...o, viewAttr: !detail ? o.viewAttr : 1, options: [
{ key: "0", showname: getLabel(332, "全部") },
{ key: "1", showname: getLabel(542696, "按规则") }
]
@ -92,10 +92,11 @@ class Index extends Component {
} else if (getKey(o) === "replenishRule") {
return {
...o, hide: (_.isNil(fieldsEchoData["reissueRule"]) || fieldsEchoData["reissueRule"] === "0"),
options: _.map(replenishRuleOptions, t => ({ key: t.id, showname: t.content }))
options: _.map(replenishRuleOptions, t => ({ key: t.id, showname: t.content })),
viewAttr: !detail ? o.viewAttr : 1
};
}
return { ...o };
return { ...o, viewAttr: !detail ? o.viewAttr : 1 };
})
};
} else if (it.title === "sendSet") {
@ -104,16 +105,16 @@ class Index extends Component {
items: _.map(it.items, o => {
if (getKey(o) === "autoSendStatus") {
return {
...o,
...o, viewAttr: !detail ? o.viewAttr : 1,
helpfulTitle: getLabel(544272, "开启后，还需在计划任务中配置定时任务，执行工资单定时发送任务；")
};
} else if (getKey(o) === "smsSetting") {
return {
...o,
...o, viewAttr: !detail ? o.viewAttr : 1,
hide: _.isNil(fieldsEchoData["smsStatus"]) || !fieldsEchoData["smsStatus"] || (!_.isNil(fieldsEchoData["smsStatus"]) && (fieldsEchoData["smsStatus"].toString() === "0"))
};
}
return { ...o };
return { ...o, viewAttr: !detail ? o.viewAttr : 1 };
})
};
}
@ -125,17 +126,17 @@ class Index extends Component {
items: _.map(it.items, o => {
if (getKey(o) === "autoAckDays") {
return {
...o,
...o, viewAttr: !detail ? o.viewAttr : 1,
hide: _.isNil(fieldsEchoData["ackFeedbackStatus"]) ? o.hide : !fieldsEchoData["ackFeedbackStatus"],
helpfulTitle: getLabel(544273, "开启后，还需在计划任务中配置定时任务，执行自动确认任务；邮箱端查看工资单暂不支持确认及反馈；")
};
} else if (getKey(o) === "feedbackUrl" || getKey(o) === "mobileFeedbackUrl") {
return {
...o,
...o, viewAttr: !detail ? o.viewAttr : 1,
hide: _.isNil(fieldsEchoData["feedbackStatus"]) ? o.hide : !fieldsEchoData["feedbackStatus"]
};
}
return { ...o };
return { ...o, viewAttr: !detail ? o.viewAttr : 1 };
})
};
}

6
pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
View File

@ -1,4 +1,4 @@
import React, { Component } from "react";
import React from "react";
import { WeaSwitch } from "comsMobx";
import { WeaButtonIcon, WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
@ -41,11 +41,13 @@ export const payrollTempNormalSetForm = (form, condition, background, onChange =
/>
}
{
getKey(fields) === "theme" &&
getKey(fields) === "theme" && c.viewAttr === 3 &&
<div className="sft-variables">
<span className="sftv-tip">{getLabel(500143, "插入变量")}：</span>
<a className="sftv-item"
onClick={() => insertVar("theme", "${companyName}")}>{getLabel(1976, "公司名称")}</a>
<a className="sftv-item"
onClick={() => insertVar("theme", "${salaryYear}")}>{getLabel(111, "薪资所属年")}</a>
<a className="sftv-item"
onClick={() => insertVar("theme", "${salaryMonth}")}>{getLabel(542604, "薪资所属月")}</a>
</div>

19
pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/index.js
View File

@ -12,6 +12,7 @@ import { getPayrollItemList, getPayrollShowForm } from "../../../../apis/payroll
import { tempNormalSetConditions } from "../conditions";
import { payrollTempNormalSetForm } from "./formRender";
import SalaryItemSettings from "../../../payroll/stepForm/salaryItemSettings";
import SalaryItems from "./salaryItems";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
@ -36,7 +37,9 @@ class Index extends Component {
}
getPayrollShowForm = () => {
const { tmplId: id, payrollStore: { payrollTempNormalForm, tmplDataSource, setTmplDataSource } } = this.props;
const {
detail, tmplId: id, payrollStore: { payrollTempNormalForm, tmplDataSource, setTmplDataSource }
} = this.props;
getPayrollShowForm({ id }).then(async ({ status, data }) => {
if (status) {
const { salaryTemplateShowSet, salaryTemplateSalaryItemSet: salaryItemSet, salaryBillItemNameSet } = data;
@ -69,7 +72,7 @@ class Index extends Component {
items: _.map(it.items, o => {
if (getKey(o) === "textContentPosition") {
return {
...o, label: getLabel(o.lanId, o.label),
...o, label: getLabel(o.lanId, o.label), viewAttr: !detail ? o.viewAttr : 1,
options: [
{ key: "1", showname: getLabel(542697, "薪资项目前") },
{ key: "2", showname: getLabel(542698, "薪资项目后") }
@ -77,10 +80,10 @@ class Index extends Component {
};
} else if (getKey(o) === "background") {
return {
...o, title: getLabel(20001, "上传图片")
...o, viewAttr: !detail ? o.viewAttr : 1, title: getLabel(20001, "上传图片")
};
}
return { ...o, label: getLabel(o.lanId, o.label) };
return { ...o, viewAttr: !detail ? o.viewAttr : 1, label: getLabel(o.lanId, o.label) };
})
};
}
@ -150,7 +153,7 @@ class Index extends Component {
render() {
const { conditions, salaryBillItemNameSet, salaryItemSet } = this.state;
const { payrollStore: { payrollTempNormalForm, tmplDataSource } } = this.props;
const { detail, payrollStore: { payrollTempNormalForm, tmplDataSource } } = this.props;
return (
<React.Fragment>
{!_.isEmpty(conditions) && payrollTempNormalSetForm(payrollTempNormalForm, conditions, toJS(tmplDataSource).background, this.handleChange, this.handleInsertVar)}
@ -158,13 +161,14 @@ class Index extends Component {
title={
<div className="salarySetTitle">
<span>{getLabel(543593, "薪资项目设置")}</span>
<WeaButtonIcon buttonType="add" type="primary"
<WeaButtonIcon buttonType="add" type="primary" disabled={detail}
onClick={() => this.salaryItemSettingsRef.handleOpenModal(toJS(tmplDataSource).salarySob, getLabel(543594, "添加分类"))}/>
</div>
}
items={[]} needTigger showGroup
>
<SalaryItemSettings
{
detail ? <SalaryItems dataSource={salaryItemSet}/> : <SalaryItemSettings
ref={dom => this.salaryItemSettingsRef = dom}
dataSource={salaryItemSet} salaryTemplateId={this.props.tmplId || ""}
onChangeSalaryItem={this.handleChangeSalaryItem}
@ -172,6 +176,7 @@ class Index extends Component {
salarySobId={toJS(tmplDataSource).salarySob}
isReplenish={false} salaryBillItemNameSet={salaryBillItemNameSet}
/>
}
</WeaSearchGroup>
</React.Fragment>
);

57
pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/salaryItems.js Normal file
View File

@ -0,0 +1,57 @@
/*
* 工资单模板设置
* 薪资项目查看
* @Author: 黎永顺
* @Date: 2024/11/12
* @Wechat:
* @Email: 971387674@qq.com
* @description:
*/
import React, { Component } from "react";
import { toJS } from "mobx";
import { WeaLocaleProvider, WeaSortable } from "ecCom";
const getLabel = WeaLocaleProvider.getLabel;
class SalaryItems extends Component {
render() {
const { dataSource } = this.props;
const dataList = _.map(toJS(dataSource), item => ({ ...item, id: item.groupId }));
return (
<div className="salaryItemSettingWrapper">
<WeaSortable datas={dataList} draggableType="icon"
renderNodeItem={(item) => {
return <div className="salaryItemWrapper">
<div className="salaryItemHeader">
<span className="titleWrapper">
<span className="salaryClassTitle">{item.groupName}</span>
<span className="iconWrapper"/>
</span>
</div>
<div className="salaryItemContent">
{
!_.isEmpty(item.items) ?
<WeaSortable
datas={item.items} draggableType="icon"
renderNodeItem={(filed) => {
return <div className="salaryItemList">
<div className="salaryItem" title={filed.name}>
<div className="salaryItemName"> {filed.name} </div>
</div>
</div>;
}}
className="wea-sortable-salary-item"
/> :
<div className="empty">暂无数据</div>
}
</div>
</div>;
}}
className="wea-sortable-salary-item"
/>
</div>
);
}
}
export default SalaryItems;

8
pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempReissueSet/index.js
View File

@ -8,6 +8,7 @@ import React, { Component } from "react";
import { toJS } from "mobx";
import { WeaButtonIcon, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
import SalaryItemSettings from "../../../payroll/stepForm/salaryItemSettings";
import SalaryItems from "../payrollTempNormalSet/salaryItems";
import { getReplenishForm } from "../../../../apis/payroll";
const getLabel = WeaLocaleProvider.getLabel;
@ -68,18 +69,20 @@ class Index extends Component {
};
render() {
const { payrollStore: { tmplDataSource } } = this.props;
const { payrollStore: { tmplDataSource }, detail } = this.props;
const { replenishSalaryTemplateSalaryItemSet, salaryBillItemNameSet } = this.state;
return (
<WeaSearchGroup
title={
<div className="salarySetTitle">
<span>{getLabel(543593, "薪资项目设置")}</span>
<WeaButtonIcon buttonType="add" type="primary"
<WeaButtonIcon buttonType="add" type="primary" disabled={detail}
onClick={() => this.salaryItemSettingsRef.handleOpenModal(toJS(tmplDataSource).salarySob, getLabel(543594, "添加分类"))}/>
</div>
}
items={[]} needTigger showGroup>
{
detail ? <SalaryItems dataSource={replenishSalaryTemplateSalaryItemSet}/> :
<SalaryItemSettings
ref={dom => this.salaryItemSettingsRef = dom}
dataSource={replenishSalaryTemplateSalaryItemSet}
@ -89,6 +92,7 @@ class Index extends Component {
salaryTemplateId={this.props.tmplId || ""}
isReplenish={true} salaryBillItemNameSet={salaryBillItemNameSet}
/>
}
</WeaSearchGroup>
);
}

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

@ -25,7 +25,7 @@ class Index extends Component {
copyDialog: { visible: false, title: "", copyId: "", salarySobId: "" },
tmplSlide: {
visible: false, tmplId: "", top: 0, width: 792, height: 100,
measureT: "%", measureX: "px", measureY: "%"
measureT: "%", measureX: "px", measureY: "%", detail: false
}
};
}
@ -82,9 +82,10 @@ class Index extends Component {
const { copyDialog, tmplSlide, selectedRowKeys } = this.state;
const { id, salarySobId } = record;
switch (key) {
case "view":
case "edit":
this.setState({
tmplSlide: { ...tmplSlide, visible: true, tmplId: id }
tmplSlide: { ...tmplSlide, visible: true, tmplId: id, detail: key === "view" }
});
break;
case "copy":
@ -170,11 +171,12 @@ class Index extends Component {
<Menu.Item key="del">{getLabel(535052, "删除")}</Menu.Item>
<Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
</Menu>
}
>
}>
<a href="javascript:void(0);"><i className="icon-coms-more"/></a>
</Dropdown>
</React.Fragment> : <a href="javascript:void(0);">{getLabel(83110, "查看详情")}</a>;
</React.Fragment> :
<a href="javascript:void(0);"
onClick={() => this.handleOpts({ key: "view" }, record)}>{getLabel(83110, "查看详情")}</a>;
}
}
]}

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

@ -123,7 +123,7 @@ class Index extends Component {
}).catch(() => this.setState({ loading: false }));
};
renderTitle = () => {
const { tmplId } = this.props, { current, loading } = this.state;
const { tmplId, detail } = this.props, { current, loading } = this.state;
const { payrollStore: { payrollTempNormalForm, setTmplDataSource, tmplDataSource } } = this.props;
return <div className="payroll-title-flex titleDialog">
<div className="titleCol titleLeftBox">
@ -156,7 +156,11 @@ class Index extends Component {
<React.Fragment>
<Button type="ghost"
onClick={() => this.setState({ current: current - 1 })}>{getLabel(1876, "上一步")}</Button>
<Button type="primary" loading={loading} onClick={this.savePayroll}>{getLabel(537558, "保存")}</Button>
{
!detail &&
<Button type="primary" loading={loading}
onClick={this.savePayroll}>{getLabel(537558, "保存")}</Button>
}
</React.Fragment>
}
</div>
@ -185,8 +189,29 @@ class Index extends Component {
payrollStore: {
initPayrollTempForm, initPayrollTempFeedbackForm, setSalaryBillItemNameSetting,
initPayrollTempNormalForm, setTmplDataSource, hasBeenModify
}, onClose
}, onClose, detail
} = this.props;
if (detail) {
initPayrollTempForm();
initPayrollTempFeedbackForm();
initPayrollTempNormalForm();
setTmplDataSource({});
setSalaryBillItemNameSetting([
{
salaryTemplateId: "",
salaryBillType: 0,
itemShowNameSetting: []
},
{
salaryTemplateId: "",
salaryBillType: 1,
itemShowNameSetting: []
}
]);
this.setState({ current: 0 });
onClose(type);
return;
}
if (hasBeenModify) {
Modal.confirm({
title: getLabel(131329, "信息确认"),

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

@ -27,6 +27,7 @@
.salary-payroll-content {
padding: 8px 16px;
height: 100%;
overflow-y: auto;
& > .wea-search-group {
background: #FFF;
@ -157,7 +158,7 @@
margin-left: 10px;
position: absolute;
top: 25%;
right: -208px;
right: -262px;
margin-top: -2px;
.sftv-item {

10
pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
View File

@ -196,6 +196,16 @@ export const conditions = [
options: [],
labelcol: 8,
viewAttr: 2
},
{
conditionType: "SELECT",
domkey: ["SALARY_DETAILS_REPORT_SHOW_TYPE"],
fieldcol: 10,
label: "薪资明细显示模式",
lanId: 111,
options: [],
labelcol: 8,
viewAttr: 2
}
],
title: "薪资报表",

13
pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
View File

@ -51,6 +51,13 @@ class RuleConfig extends Component {
{ key: "1", showname: getLabel(111, "实时组织信息"), selected: false }
]
};
} else if (getKey(o) === "SALARY_DETAILS_REPORT_SHOW_TYPE") {
return {
...o, options: [
{ key: "0", showname: getLabel(111, "定制列"), selected: true },
{ key: "1", showname: getLabel(111, "模板"), selected: false }
]
};
} else if (getKey(o) === "OPEN_APPLICATION_ENCRYPT") {
return { ...o, viewAttr: sysinfo.showEncryptOperationButton === "true" ? 2 : 1 };
} else if (getKey(o) === "taxDeclarationFunction") {
@ -78,7 +85,7 @@ class RuleConfig extends Component {
form.updateFields({ [item]: { value: sysinfo["salaryAcctEmployeeRule"] || "" } });
} else if (item === "taxDeclarationFunction") {
form.updateFields({ [item]: { value: sysinfo[item] === "0" ? "0" : (sysinfo[item] || "1") } });
} else if (item === "REPORT_ORGANIZATIN_TYPE") {
} else if (item === "REPORT_ORGANIZATIN_TYPE" || item === "SALARY_DETAILS_REPORT_SHOW_TYPE") {
form.updateFields({ [item]: { value: sysinfo[item] === "0" ? "0" : (sysinfo[item] || "0") } });
} else if (item === "taxAgentShowStatus" || item === "salaryShowStatus" || item === "adjustShowStatus") {
form.updateFields({ [item]: { value: sysinfo[item] || "1" } });
@ -128,6 +135,7 @@ class RuleConfig extends Component {
case "salaryShowStatus":
case "adjustShowStatus":
case "REPORT_ORGANIZATIN_TYPE":
case "SALARY_DETAILS_REPORT_SHOW_TYPE":
if (!this.handleDebounce) {
this.handleDebounce = _.debounce(() => {
const confTitle = {
@ -138,7 +146,8 @@ class RuleConfig extends Component {
taxAgentShowStatus: getLabel(111, "显示【个税扣缴义务人】信息"),
salaryShowStatus: getLabel(111, "显示工资单页签"),
adjustShowStatus: getLabel(111, "显示调薪记录页签"),
REPORT_ORGANIZATIN_TYPE: getLabel(111, "组织信息")
REPORT_ORGANIZATIN_TYPE: getLabel(111, "组织信息"),
SALARY_DETAILS_REPORT_SHOW_TYPE: getLabel(111, "薪资明细显示模式")
};
this.unifiedSettings(key, confTitle[key]);
this.handleDebounce = null;

35
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
View File

@ -16,17 +16,13 @@ import moment from "moment";
const getLabel = WeaLocaleProvider.getLabel;
const getKey = WeaTools.getKey;
@inject("standingBookStore")
@observer
@inject("standingBookStore") @observer
class WelfareRecordQuery extends Component {
constructor(props) {
super(props);
this.state = {
conditions: [],
dateRange: [
moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"),
moment(new Date()).endOf("year").format("YYYY-MM")
]
dateRange: [moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"), moment(new Date()).endOf("year").format("YYYY-MM")]
};
}
@ -36,8 +32,7 @@ class WelfareRecordQuery extends Component {
this.setState({
conditions: _.map(welfareRQConditions, item => {
return {
...item,
items: _.map(item.items, o => {
...item, items: _.map(item.items, o => {
if (getKey(o) === "taxAgents") {
return { ...o, options: _.map(data, g => ({ key: g.id.toString(), showname: g.name })) };
}
@ -63,27 +58,21 @@ class WelfareRecordQuery extends Component {
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}
onChange={this.getWelfareRecordList}/>
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} onChange={this.getWelfareRecordList}/>
</WeaFormItem>)
});
});
group.push(
<WeaSearchGroup col={3} needTigger showGroup={c.defaultshow}
items={[
{
group.push(<WeaSearchGroup col={3} needTigger showGroup={c.defaultshow}
items={[{
com: (<WeaFormItem label={getLabel(542443, "账单月份")} labelCol={{ span: 4 }}
wrapperCol={{ span: 16 }}>
<MonthRangePicker dateRange={dateRange} viewAttr={2}
onChange={v => this.setState({ dateRange: v }, () => this.getWelfareRecordList())}/>
</WeaFormItem>)
},
...items
]}
}, ...items]}
/>);
});
return group;
@ -101,9 +90,7 @@ class WelfareRecordQuery extends Component {
render() {
const { standingBookStore: { welfareRQForm } } = this.props;
const { conditions } = this.state;
return (
<div className="salary-welfare-record-query">{this.renderForm(welfareRQForm, conditions)}</div>
);
return (<div className="salary-welfare-record-query">{this.renderForm(welfareRQForm, conditions)}</div>);
}
}

12
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less
View File

@ -57,24 +57,22 @@
//社保福利台账页面重构
.salary-welfare-record {
min-width: 1000px;
overflow: auto;
width: 100%;
height: 100%;
background: #f6f6f6;
.salary-welfare-record-content {
width: 100%;
height: 100%;
padding: 8px 16px;
padding: 8px 16px 0 16px;
background: #F6F6F6;
display: flex;
flex-direction: column;
.salary-welfare-record-query {
width: 100%;
padding: 0 8px;
margin-bottom: 8px;
height: 46px;
display: flex;
align-items: center;
background: #FFF;
.wea-search-group {
width: 100%;

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

@ -123,18 +123,15 @@ class StandingBook extends Component {
const rightBtns = [<Button type="primary" onClick={() => this.setState({
accountDialog: { ...accountDialog, visible: true, title: getLabel(538780, "核算") }
})}>{getLabel(538780, "核算")}</Button>];
return (
<div className="salary-welfare-record">
<WeaTop title={getLabel(538002, "社保福利台账")} icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []}
return (<WeaTop title={getLabel(538002, "社保福利台账")} icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []} className="salary-welfare-record"
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) => {
@ -164,9 +161,7 @@ class StandingBook extends Component {
}}
/>
}
</WeaTop>
</div>
);
</WeaTop>);
}
}

2
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
View File

@ -62,7 +62,6 @@ class RegEditDetial extends Component {
otherComJson: {}
};
_.forEach(socialData.dataSource, item => {
console.log(item)
if (item.personalPaymentAmount) {
payload["socialPerJson"][item["insuranceId"]] = toDecimal_n(item.personalPaymentAmount, item.personalPaymentAmountValidNum || 2);
}
@ -164,7 +163,6 @@ class RegEditDetial extends Component {
const social = this.combinedData(socialSecurity, result);
const fund = this.combinedData(accumulationFund, result);
const other = this.combinedData(otherBenefits, result);
console.log(social)
this.setState({
listMap: [
{

55
pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js
View File

@ -21,10 +21,30 @@ export default class AddTaxAgentModal extends React.Component {
selectedKey: "EMPLOYEE",
checkboxValue: "",
checkAll: "0",
ids: ""
ids: "",
idsName: ""
};
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) {
if (!_.isEmpty(nextProps.scopeRecord)) {
const { employeeStatus } = nextProps;
const checked = _.map(employeeStatus, it => it.id);
const bool = _.every(checked, it => nextProps.scopeRecord.status.indexOf(it) !== -1);
this.setState({
selectedKey: nextProps.scopeRecord.targetType,
checkboxValue: nextProps.scopeRecord.status,
checkAll: bool ? "1" : "0",
ids: nextProps.scopeRecord.targetType === "SQL" ? nextProps.scopeRecord.target : String(nextProps.scopeRecord.targetId),
idsName: nextProps.scopeRecord.targetName
});
} else {
this.handleReset();
}
}
}
onCheckboxChange = (checkboxValue) => {
const { employeeStatus } = this.props;
const checked = _.map(employeeStatus, it => it.id);
@ -45,7 +65,7 @@ export default class AddTaxAgentModal extends React.Component {
// 保存
handleSave = () => {
const { onTaxAgentSave } = this.props;
const { onTaxAgentSave, scopeRecord } = this.props;
const { checkboxValue, ids, selectedKey } = this.state;
const payload = {
employeeStatus: checkboxValue.split(","),
@ -67,21 +87,22 @@ export default class AddTaxAgentModal extends React.Component {
this.refs.weaError1.showError();
return;
}
onTaxAgentSave && onTaxAgentSave(payload);
onTaxAgentSave && onTaxAgentSave({ ...payload, id: scopeRecord.id });
};
// 重置
handleReset = () => {
this.setState({
selectedKey: "EMPLOYEE",
selectedKey: !_.isEmpty(this.props.scopeRecord) ? this.props.scopeRecord.targetType : "EMPLOYEE",
checkboxValue: "",
checkAll: "0",
ids: ""
ids: "",
idsName: ""
});
};
render() {
const { employeeStatus, targetTypeList, visible, onCancel, loading } = this.props;
const { employeeStatus, targetTypeList, visible, onCancel, loading, scopeRecord } = this.props;
return (
<WeaDialog
visible={visible}
@ -107,7 +128,7 @@ export default class AddTaxAgentModal extends React.Component {
<Col span={16}>
<div style={{ display: "inline-block", marginRight: 12 }}>
<WeaSelect
style={{ height: "30px" }}
style={{ height: "30px" }} disabled={!_.isEmpty(scopeRecord)}
options={_.map(targetTypeList, (it) => ({
...it,
key: it.id,
@ -130,11 +151,12 @@ export default class AddTaxAgentModal extends React.Component {
type={17}
viewAttr={3}
value={this.state.ids}
replaceDatas={[{ id: this.state.ids, name: this.state.idsName }]}
title={"人员选择"}
isSingle={false}
isSingle={!_.isEmpty(scopeRecord)}
inputStyle={{ width: 200 }}
onChange={(ids, names, datas) => {
this.setState({ ids });
this.setState({ ids, idsName: names });
}}
/>
</WeaError>
@ -148,11 +170,12 @@ export default class AddTaxAgentModal extends React.Component {
type={57}
viewAttr={3}
title="部门选择"
isSingle={false}
isSingle={!_.isEmpty(scopeRecord)}
inputStyle={{ width: 200 }}
value={this.state.ids}
replaceDatas={[{ id: this.state.ids, name: this.state.idsName }]}
onChange={(ids, names, datas) => {
this.setState({ ids });
this.setState({ ids, idsName: names });
}}
/>
</WeaError>
@ -166,11 +189,12 @@ export default class AddTaxAgentModal extends React.Component {
type={164}
viewAttr={3}
title={"分部选择"}
isSingle={false}
isSingle={!_.isEmpty(scopeRecord)}
inputStyle={{ width: 200 }}
value={this.state.ids}
replaceDatas={[{ id: this.state.ids, name: this.state.idsName }]}
onChange={(ids, names, datas) => {
this.setState({ ids });
this.setState({ ids, idsName: names });
}}
/>
</WeaError>
@ -184,11 +208,12 @@ export default class AddTaxAgentModal extends React.Component {
type={278}
viewAttr={3}
title={"岗位选择"}
isSingle={false}
isSingle={!_.isEmpty(scopeRecord)}
value={this.state.ids}
replaceDatas={[{ id: this.state.ids, name: this.state.idsName }]}
inputStyle={{ width: 200 }}
onChange={(ids, names, datas) => {
this.setState({ ids });
this.setState({ ids, idsName: names });
}}
/>
</WeaError>

14
pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
View File

@ -8,6 +8,7 @@ import React, { Component } from "react";
import { message, Modal } from "antd";
import { inject, observer } from "mobx-react";
import SlideTaxagentUser from "./slideTaxagentUser";
import { taxAgentRangeEdit } from "../../apis/taxAgent";
import "./index.less";
const personScopeWarrper = {};
@ -199,7 +200,7 @@ export default class PersonalScope extends Component {
taxAgentRangeSave = (module) => {
const { taxAgentId } = this.props;
const { pageObj } = this.state;
const { includeType } = module;
const { includeType, id } = module;
const { taxAgentRangeSave, taxAgentRangeExtSave } = this.props.taxAgentStore;
this.setState({ submitLoading: true });
if (includeType === "2") {
@ -214,12 +215,12 @@ export default class PersonalScope extends Component {
}
});
} else {
taxAgentRangeSave({ ...module, taxAgentId }).then(
({ status, errormsg }) => {
const API= id ? taxAgentRangeEdit : taxAgentRangeSave;
API({ ...module, taxAgentId }).then(({ status, errormsg }) => {
this.setState({ submitLoading: false });
if (status) {
this.tagAgentRef.closeModal();
message.success("新增成功");
message.success("操作成功");
includeType == "1"
? this.getTaxAgentRangeListInclude({
current: pageObj.current,
@ -230,10 +231,9 @@ export default class PersonalScope extends Component {
pageSize: pageObj.pageSize
});
} else {
message.error(errormsg || "新增失败");
message.error(errormsg);
}
}
);
});
}
};

114
pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
View File

@ -15,6 +15,7 @@ export default class SlideTaxagentUser extends React.Component {
showSearchAd: false,
externalPersonModalVisible: false, //外部人员关联弹框
addTaxagentModalVisible: false,
scopeRecord: {},
includeType: "1",
selectedRowKeys: [],
searchValue: "",
@ -72,7 +73,8 @@ export default class SlideTaxagentUser extends React.Component {
closeModal = () => {
this.setState({
addTaxagentModalVisible: false,
externalPersonModalVisible: false
externalPersonModalVisible: false,
scopeRecord: {}
}, () => {
this.addTaxRef && this.addTaxRef.handleReset();
});
@ -131,7 +133,8 @@ export default class SlideTaxagentUser extends React.Component {
externalPersonModalVisible,
importParams,
previewDataSource,
showSearchAd, extEmpsWitch
showSearchAd, extEmpsWitch,
scopeRecord
} = this.state;
const {
submitLoading,
@ -224,106 +227,33 @@ export default class SlideTaxagentUser extends React.Component {
onSearchChange={searchValue => this.setState({ searchValue })}
onChange={v => this.setState({ includeType: v }, () => onChangeTab && onChangeTab(this.state.includeType))}
/>
{/*<div*/}
{/* style={{*/}
{/* height: "47px",*/}
{/* lineHeight: "47px",*/}
{/* paddingLeft: "10px",*/}
{/* paddingRight: "10px",*/}
{/* display: "flex",*/}
{/* justifyContent: "space-between"*/}
{/* }}>*/}
{/* <div*/}
{/* style={{*/}
{/* display: "inlineBlock",*/}
{/* color: "#666"*/}
{/* }}>*/}
{/* <span*/}
{/* style={{*/}
{/* cursor: "pointer",*/}
{/* color: includeType == 1 ? "#4ba9f2" : "#000"*/}
{/* }}*/}
{/* onClick={() => {*/}
{/* this.handleTabClick(1);*/}
{/* }}>*/}
{/* 人员范围*/}
{/* </span>|<span*/}
{/* style={{*/}
{/* cursor: "pointer",*/}
{/* color: includeType == 0 ? "#4ba9f2" : "#000"*/}
{/* }}*/}
{/* onClick={() => {*/}
{/* this.handleTabClick(0);*/}
{/* }}>*/}
{/* 从范围中排除*/}
{/* </span>*/}
{/* </div>*/}
{/* <div>*/}
{/* <div*/}
{/* style={{*/}
{/* color: "#4ba9f2",*/}
{/* display: "inlineBlock",*/}
{/* float: "left"*/}
{/* }}>*/}
{/* {*/}
{/* (hideIconInTax || showSalaryItemBtn) && <div className="operateBtn">*/}
{/* {*/}
{/* includeType == "1" &&*/}
{/* <Button*/}
{/* type="primary"*/}
{/* size="small"*/}
{/* onClick={() => {*/}
{/* this.setState({ importParams: { ...importParams, visible: true, step: 0 } });*/}
{/* }}*/}
{/* ><span className="icon-coms-leading-in" title="导入"></span></Button>*/}
{/* }*/}
{/* <div className="addOrDelBtn">*/}
{/* <Button type="primary"*/}
{/* size="small"*/}
{/* onClick={() => {*/}
{/* this.handleTabDelete();*/}
{/* }}*/}
{/* ><span className="icon-coms-form-delete-hot" title="删除"></span></Button>*/}
{/* <Button type="primary"*/}
{/* size="small"*/}
{/* style={{ marginRight: 10 }}*/}
{/* onClick={() => this.setState({ addTaxagentModalVisible: true })}*/}
{/* ><span className="icon-coms-Add-to-hot" title="添加"></span></Button>*/}
{/* </div>*/}
{/* </div>*/}
{/* }*/}
{/* </div>*/}
{/* <WeaInputSearch*/}
{/* style={{ marginTop: "8px", float: "right" }}*/}
{/* value={searchValue}*/}
{/* onChange={value => {*/}
{/* this.setState({ searchValue: value });*/}
{/* }}*/}
{/* onSearch={value => {*/}
{/* this.handleSearch(value);*/}
{/* }}*/}
{/* />*/}
{/* </div>*/}
{/*</div>*/}
<div style={{ maxHeight: "500px", scrollY: "scroll" }}>
<WeaTable
rowKey="id"
loading={queryLoading}
rowSelection={rowSelection}
dataSource={dataSource}
columns={taxAgentColumns}
<WeaTable rowKey="id" loading={queryLoading} rowSelection={rowSelection} dataSource={dataSource}
pagination={pagination}
/>
columns={_.map(taxAgentColumns, o => {
return {
...o, render: (text, record) => {
if (o.dataIndex === "targetName") {
return <a href="javascript:void(0);" onClick={() => {
const key = includeType === "2" ? "externalPersonModalVisible" : "addTaxagentModalVisible";
this.setState({ [key]: true, scopeRecord: record });
}}>{text}</a>;
}
return <span>{text}</span>;
}
};
})}/>
</div>
<ExternalPersonModal
visible={externalPersonModalVisible}
loading={submitLoading}
onCancel={() => this.setState({ externalPersonModalVisible: false })}
onCancel={() => this.setState({ externalPersonModalVisible: false, scopeRecord: {} })}
onExternalPersonSave={val => onTaxAgentSave({ ...val, includeType: includeType })}
/>
<AddTaxAgentModal
ref={(ref) => this.addTaxRef = ref}
scopeRecord={scopeRecord}
loading={submitLoading}
employeeStatus={employeeStatus}
targetTypeList={targetTypeList}
@ -332,7 +262,7 @@ export default class SlideTaxagentUser extends React.Component {
onTaxAgentSave({ ...val, includeType: includeType })}
visible={addTaxagentModalVisible}
onCancel={() => {
this.setState({ addTaxagentModalVisible: false });
this.setState({ addTaxagentModalVisible: false, scopeRecord: {} });
}}
/>
{importParams.visible && (

3
pc4mobx/hrmSalary/stores/attendanceStore.js
View File

@ -22,6 +22,9 @@ export class AttendanceStore {
@observable extensionForm = new WeaForm(); //扩展属性
@action("报表查看-扩展属性表单初始化")
initExtensionForm = () => this.extensionForm = new WeaForm();
@observable tempForm = new WeaForm(); //扩展属性
@action("薪资明细-模板设置表单初始化")
initTempForm = () => this.tempForm = new WeaForm();
@action("报表查看-分享报表表单初始化")
initShareForm = () => this.shareForm = new WeaForm();