diff --git a/pc4mobx/hrmSalary/apis/statistics.js b/pc4mobx/hrmSalary/apis/statistics.js
index 929f41b9..a4d16bbc 100644
--- a/pc4mobx/hrmSalary/apis/statistics.js
+++ b/pc4mobx/hrmSalary/apis/statistics.js
@@ -150,3 +150,7 @@ export const getPageListTemplatelist = (params) => {
export const changePageListTemplate = (params) => {
return postFetch("/api/bs/hrmsalary/common/pageList/template/change", params);
};
+//薪酬统计报表-删除模板
+export const deleteTemplatePageList = (params) => {
+ return postFetch("/api/bs/hrmsalary/common/pageList/template/delete", params);
+};
diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js b/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js
index 94aaad3f..5714241e 100644
--- a/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js
@@ -8,7 +8,7 @@
* @description:
*/
import React, { Component } from "react";
-import { WeaDialog, WeaInputSearch, WeaLocaleProvider, WeaNewScroll } from "ecCom";
+import { WeaDialog, WeaInputSearch, WeaLocaleProvider, WeaNewScroll, WeaTable } from "ecCom";
import { Button, Col, Row, Spin } from "antd";
import CustomBrowserMutiLeft from "./customBrowserMutiLeft";
import CustomBrowserMutiRight from "./customBrowserMutiRight";
@@ -22,8 +22,8 @@ class CustomTransferDialog extends Component {
constructor(props) {
super(props);
this.state = {
- loading: false, listDatas: [],
- query: { [props.searchParamsKey]: "" },
+ loading: false, listDatas: [], columns: [], selectedRowKeys: [], pageInfo: { current: 1, pageSize: 10, total: 0 },
+ query: props.searchParamsKey ? { [props.searchParamsKey]: "" } : {},
leftListSelectedKeys: [], // 左侧table选择的keys
leftListSelectedData: [], // 左侧table选择的数据
rightCheckedKeys: [], //右侧选择的keys
@@ -42,24 +42,27 @@ class CustomTransferDialog extends Component {
}
} else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
this.setState({
- query: { [this.props.searchParamsKey]: "" },
- rightDatas: [], rightCheckedKeys: [], leftListSelectedData: [], leftListSelectedKeys: []
+ query: { [this.props.searchParamsKey]: "" }, selectedRowKeys: [],
+ rightDatas: [], rightCheckedKeys: [], leftListSelectedData: [], leftListSelectedKeys: [],
+ pageInfo: { current: 1, pageSize: 10, total: 0 }
});
this.selectedData = {};
}
}
getData = (init = false, props) => {
- const { query } = this.state;
- const { completeURL, convertDatasource, dataParams = {} } = props || this.props;
+ const { query, pageInfo } = this.state;
+ const { completeURL, convertDatasource, dataParams = {}, dialogType } = props || this.props;
let payload = { ...dataParams, ...query };
+ dialogType === "table" && (payload = { ...payload, ...pageInfo });
this.setState({ loading: true });
postFetch(completeURL, payload).then(({ status, data }) => {
this.setState({ loading: false });
if (status && data.list) {
const { pageNum: current, pageSize, total } = data;
this.setState({
- listDatas: convertDatasource ? convertDatasource(data.list) : data.list
+ listDatas: convertDatasource ? convertDatasource(data.list) : data.list, columns: data.columns,
+ pageInfo: { ...pageInfo, current, pageSize, total }
});
} else {
this.setState({
@@ -132,18 +135,23 @@ class CustomTransferDialog extends Component {
};
renderTitle = () => {
return (
-
{getLabel(111, "数据选择")}
-
+
{this.props.title || getLabel(111, "数据选择")}
+
{this.props.titleOptsComs}
+ {this.props.children}
+
+
;
+ }
return (
this.dialog = dom} title={this.renderTitle()}
- className="custom_browser_dialog" draggable={false} style={{
+ className="custom_browser_dialog" draggable={true} style={{
width: 784, height: 460, minHeight: 200, minWidth: 380,
maxHeight: "90%", maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
}} buttons={buttons}>{dom}
diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/index.less b/pc4mobx/hrmSalary/components/CustomBrowser/index.less
index d4d61a16..e49d982a 100644
--- a/pc4mobx/hrmSalary/components/CustomBrowser/index.less
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/index.less
@@ -3,6 +3,20 @@
display: flex;
justify-content: space-between;
align-items: center;
+
+ .wea-select, .ant-select-selection, .ant-select {
+ width: 100%;
+ }
+
+ .wea-select {
+ display: inline-block;
+ position: relative;
+ }
+
+ .ant-select-selection {
+ height: 30px;
+ border-radius: 0;
+ }
}
.wea-hr-muti-input-table {
@@ -10,6 +24,19 @@
padding: 8px 16px;
height: 100%;
+ .table_opts {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ width: 100%;
+ height: 40px;
+ background: #FFF;
+
+ .wea-button-icon {
+ margin-right: 10px;
+ }
+ }
+
.wea-new-table {
background: #FFF;
}
diff --git a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
index b51b5a63..935e1e00 100644
--- a/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
+++ b/pc4mobx/hrmSalary/components/PersonalScopeModal/index.js
@@ -168,7 +168,7 @@ class PersonalScopeModal extends Component {
break;
case "SQL":
return
- this.setState({ targetTypeIds: val, targetTypeIdsNames: val })}/>
}/>
;
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index a45cee0f..657c4dfb 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -5,15 +5,15 @@
* 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, WeaSelect } from "ecCom";
-import { message, Spin } from "antd";
+import { Button, message, Modal, Spin } from "antd";
import { getIframeParentHeight } from "../../../util";
import { sysConfCodeRule } from "../../../apis/ruleconfig";
import CustomTransferDialog from "../../../components/CustomBrowser/components/customTransferDialog";
import SalaryDetailsTempDialog from "./salaryDetailsTempDialog";
+import SalaryTempMangerDialog from "./salaryTempMangerDialog";
import { MonthRangePicker } from "../../reportView/components/statisticalMicroSettingsSlide";
import AdvanceInputBtn from "../components/advanceInputBtn";
import SearchPannel from "../components/searchPannel";
@@ -31,29 +31,28 @@ class SalaryDetails extends Component {
super(props);
this.state = {
loading: false, dataSource: [], columns: [], selectedRowKeys: [], tempPageList: [], sumRow: {},
- pageInfo: { current: 1, pageSize: 10, total: 0 }, payload: {}, templateId: "",
+ pageInfo: { current: 1, pageSize: 10, total: 0 }, payload: {}, templateId: "", tempManageQuery: false,
showTotalCell: false, updateSum: true, tempDialog: { visible: false, setting: [], id: "", template: {} },
transferDialog: {
- visible: false, searchParamsKey: "name", dataParams: { page: "salary_details_report" }, saveLoading: false,
+ visible: false, searchParamsKey: "name", saveLoading: false,
+ dataParams: { page: "salary_details_report" },
completeURL: "", convertDatasource: datas => {
return {
listDatas: _.map(datas.setting, o => ({ id: o.id || o.column, name: o.name || o.text })),
- checked: this.converCheckedCol(datas)
+ checked: converCheckedCol(datas)
};
},
- type: "default"
+ dialogType: "temp"
+ },
+ tempManageDialog: { //模板管理
+ visible: false, completeURL: "", dialogType: "table", dataParams: { page: "salary_details_report" }
}
};
}
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();
- });
+ this.setState({ showTotalCell: confCode === "1" });
window.addEventListener("message", this.handleReceive, false);
window.addEventListener("resize", () => this.forceUpdate(), false);
}
@@ -75,8 +74,7 @@ class SalaryDetails extends Component {
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" }
+ templateId: !_.isEmpty(_.find(data, o => !!o.checked)) ? String(_.find(data, o => !!o.checked).id) : ""
});
}
});
@@ -85,13 +83,13 @@ class SalaryDetails extends Component {
const { type, payload: { id, params } = {} } = data;
const { pageInfo } = this.state;
if (type === "init") {
- this.getColumns();
+ // this.getColumns();
+ this.getSalaryList(this.props);
} else if (type === "turn") {
if (id === "PAGEINFO") {
const { pageNum: current, size: pageSize } = params;
this.setState({
- pageInfo: { ...pageInfo, current, pageSize },
- updateSum: false
+ pageInfo: { ...pageInfo, current, pageSize }, updateSum: false
}, () => this.getSalaryList(this.props));
} else if (id === "CHECKBOX") {
const { selectedRowKeys: checkBox } = params;
@@ -127,20 +125,24 @@ class SalaryDetails extends Component {
const { list: dataSource, pageNum: current, total, pageSize } = pageparams;
this.setState({
columns, dataSource, pageInfo: { ...pageInfo, current, total, pageSize }, payload
- }, () => tableStore.getDatas(dataKey.datas));
+ }, () => {
+ // tableStore.getDatas(dataKey.datas)
+ this.getColumns();
+ });
}
}).catch(() => this.setState({ loading: false }));
};
getSalaryListSum = (payload) => {
API.getSalaryListSum(payload).then(({ status, data }) => {
- if (status) this.setState({ sumRow: data.sumRow });
+ if (status) this.setState({ sumRow: data.sumRow }, () => this.getColumns());
});
};
handleExportSalaryList = (key) => {
- const { attendanceStore: { tableStore }, salaryDetailShowType } = this.props;
+ // 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;
+ // const customCols = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
+ // const columns = salaryDetailShowType === "1" ? _.filter(tempCols, o => o.column !== "acctTimes") : customCols;
+ const columns = _.filter(tempCols, o => o.column !== "acctTimes");
if (key === "SELECTED" && selectedRowKeys.length === 0) {
message.warning(getLabel(543345, "请选择需要导出的数据！"));
return;
@@ -151,12 +153,13 @@ class SalaryDetails extends Component {
});
};
getColumns = () => {
- const { attendanceStore: { tableStore }, salaryDetailShowType } = this.props;
+ // const { attendanceStore: { tableStore }, salaryDetailShowType } = this.props;
const {
- columns: tempCols, dataSource, pageInfo, selectedRowKeys, showTotalCell, sumRow, transferDialog
+ columns: tempCols, dataSource, pageInfo, selectedRowKeys, showTotalCell, sumRow
} = 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;
+ // const customCols = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
+ // const columns = salaryDetailShowType === "1" ? _.filter(tempCols, o => o.column !== "acctTimes") : customCols;
+ const columns = _.filter(tempCols, o => o.column !== "acctTimes");
if (!_.isEmpty(columns)) {
this.postMessageToChild({
dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, sumRow,
@@ -170,31 +173,17 @@ class SalaryDetails extends Component {
}
return [];
};
- handleSetDefCols = () => this.setState({
+ handleSetDefCols = (params = {}) => this.setState({
transferDialog: {
- ...this.state.transferDialog, completeURL: "/api/bs/hrmsalary/common/pageList/get/setting", visible: true,
- dataParams: { page: "salary_details_report" }
+ ...this.state.transferDialog, visible: true, dataParams: { ...this.state.transferDialog.dataParams, ...params },
+ completeURL: "/api/bs/hrmsalary/common/pageList/template/get", dialogType: "temp"
}
- });
- converCheckedCol = (data) => {
- const { salaryDetailShowType } = this.props;
- return _.reduce(data.checked || [], (pre, cur) => {
- const item = _.find(data.setting, k => (salaryDetailShowType !== "1" && k.id === cur) || (salaryDetailShowType === "1" && k.column === cur.column));
- if (!_.isEmpty(item)) return [...pre, { ...item, id: item.id || item.column, name: item.name || item.text }];
- return pre;
- }, []);
- };
+ }, () => this.getPageListTemplatelist());
+
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 { transferDialog } = this.state;
const payload = {
- page: "salary_details_report",
- setting: _.map(values, o => o.id)
+ ...transferDialog.dataParams, setting: _.map(values, o => o.id)
};
this.setState({ transferDialog: { ...this.state.transferDialog, saveLoading: true } });
API.savePageListSetting(payload).then(({ status, errormsg }) => {
@@ -202,57 +191,68 @@ class SalaryDetails extends Component {
if (status) {
message.success(getLabel(111, "操作成功！"));
this.setState({
- transferDialog: { ...this.state.transferDialog, visible: false, type: "default" }
+ transferDialog: { ...this.state.transferDialog, visible: false, dialogType: "temp" }
}, () => this.getSalaryList());
} else {
message.error(errormsg);
}
});
};
- handelAddTemp = (templateId) => {
- const { transferDialog, tempDialog, tempPageList } = this.state;
+ handelAddTemp = (templateId = "") => {
+ const { 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) }
+ tempDialog: {
+ ...tempDialog, visible: true, setting: _.map(this.transferRef.state.rightDatas, o => o.id)
+ // 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);
- }
- });
+ API.changePageListTemplate({ page: "salary_details_report", templateId })
+ .then(({ status, errormsg }) => {
+ if (status) {
+ message.success(getLabel(111, "操作成功！"));
+ this.setState({
+ transferDialog: {
+ ...this.state.transferDialog,
+ dataParams: { ...this.state.transferDialog.dataParams, id: templateId }
+ }
+ }, () => {
+ this.transferRef.getData(true);
+ this.getSalaryList();
+ });
+ } else {
+ message.error(errormsg);
+ }
+ });
+ });
+ };
+ handleDelTemp = (ids) => {
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(111, "确认删除吗?"),
+ onOk: () => {
+ API.deleteTemplatePageList({ ids }).then(({ status, errormsg }) => {
+ if (status) {
+ message.success(getLabel(111, "操作成功！"));
+ this.setState({ tempManageQuery: !this.state.tempManageQuery }, () => this.getPageListTemplatelist());
+ } else {
+ message.error(errormsg);
+ }
+ });
+ }
});
};
render() {
- const { loading, dataSource, transferDialog, tempDialog, tempPageList, templateId } = this.state;
- const { attendanceStore: { tableStore }, dateRange, showSearchAd, salaryDetailShowType } = this.props;
+ const {
+ loading, dataSource, transferDialog, tempDialog, tempPageList, templateId, tempManageDialog, tempManageQuery
+ } = this.state;
+ const { dateRange, showSearchAd } = this.props;
+ const { dialogType } = transferDialog;
return (
- {
- salaryDetailShowType === "1" &&
-
-
- {
- templateId &&
- this.handelAddTemp(templateId)}>
-
-
- }
-
- }
@@ -270,28 +270,47 @@ class SalaryDetails extends Component {
id="atdTable"
/>
-
+ {/**/}
{/*默认显示列,薪资模板列表*/}
- this.transferRef = dom}
onCancel={() => this.setState({
- transferDialog: {
- ...transferDialog, completeURL: "", visible: false, type: "default"
- }
- })}/>
+ transferDialog: { ...transferDialog, completeURL: "", visible: false }
+ })}
+ buttons={
+ dialogType === "temp" ? [
+ ,
+
+ ] : []
+ }
+ titleOptsComs={
+ dialogType === "temp" ?
+ : null
+ }/>
{/*薪资明细模板设置*/}
this.setState({
tempDialog: { ...tempDialog, visible: false, setting: [] }
}, () => callback && callback())}
- onSuccess={() => {
- this.getPageListTemplatelist();
- this.getSalaryList();
- }}/>
+ onSuccess={this.getPageListTemplatelist}/>
+ {/*薪资明细自定义列模板管理*/}
+ this.setState({
+ tempManageDialog: { ...tempManageDialog, completeURL: "", visible: false }
+ })}/>
+ this.handleTempAdminCols()}/>
+ this.props.onDelete(selectedRowKeys)} disabled={_.isEmpty(selectedRowKeys)}/>
+
+ {/*模板管理*/}
+ this.setState({
+ tempAdminDialog: { visible: false, dataParams: { page: "salary_details_report" } }
+ })}/>
+ {/*薪资明细模板设置*/}
+ this.setState({
+ tempDialog: { ...tempDialog, visible: false, setting: [] }
+ }, () => callback && callback())}
+ onSuccess={() => this.setState({
+ tempAdminDialog: { visible: false, dataParams: { page: "salary_details_report" } }
+ }, () => {
+ this.props.onSuccess();
+ this.tempManageRef.getData();
+ })}/>
+ );
+ }
+}
+
+export default SalaryTempMangerDialog;
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
index 3b68a2b3..f7c2ca7a 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
@@ -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, sysinfo } from "../../apis/ruleconfig";
+import { commonEnumList, reportGetForm } from "../../apis/ruleconfig";
import { dimensionGetForm } from "../../apis/statistics";
import EmployeeDetails from "./components/employeeDetails";
import SalaryDetails from "./components/salaryDetails";
@@ -50,16 +50,12 @@ class Index extends Component {
title: "", visible: false,
typeKey: "", id: ""
},
- logDialogVisible: false, filterConditions: "[]",
- salaryDetailShowType: "0" //薪资明细列表显示方式
+ logDialogVisible: false, filterConditions: "[]"
};
}
componentDidMount() {
this.initReportFormCondition();
- sysinfo().then(({ status, data }) => {
- if (status) this.setState({ salaryDetailShowType: data.SALARY_DETAILS_REPORT_SHOW_TYPE });
- });
}
initReportFormCondition = (payload = {}) => {
@@ -281,7 +277,7 @@ class Index extends Component {
const {
selectedKey, modalReq, slideReq, conditions, reportConditions,
reportName, keyword, year, logDialogVisible, filterConditions,
- dateRange, showSearchAd, isQuery, salaryDetailShowType
+ dateRange, showSearchAd, isQuery
} = this.state;
const buttons = selectedKey === "statistics" ? [
,
@@ -319,8 +315,9 @@ class Index extends Component {
icon: ,
content: getLabel(111, "显示列定制"),
onClick: () => {
- tableStore.setColSetVisible(true);
- tableStore.tableColSet(true);
+ this.salaryRef.wrappedInstance.handleSetDefCols();
+ // tableStore.setColSetVisible(true);
+ // tableStore.tableColSet(true);
}
}
];
@@ -330,18 +327,13 @@ class Index extends Component {
{ key: "salaryDetail", title: getLabel(111, "薪资明细") }
];
dropMenuDatas = selectedKey === "salaryDetail" ? dropMenuDatas.slice(-1) : dropMenuDatas.slice(0, 1);
- (PageAndOptAuth.isChief && selectedKey === "salaryDetail") && (dropMenuDatas = [...dropMenuDatas, {
- key: "DEF_COLUMN", icon: , content: getLabel(111, "默认显示列"),
- onClick: () => this.salaryRef.wrappedInstance.handleSetDefCols()
- }]);
return (
} selectedKey={selectedKey}
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 === "statistics") || (selectedKey === "salaryDetail" && salaryDetailShowType !== "1")}
- onDropMenuClick={this.onDropMenuClick} dropMenuDatas={dropMenuDatas}>
+ showDropIcon={selectedKey !== "detail"} onDropMenuClick={this.onDropMenuClick} dropMenuDatas={dropMenuDatas}>
{
selectedKey === "statistics" ?
this.onDropMenuClick(type, targetid)}
/> : 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 })}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index a8280592..6949c945 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -72,8 +72,7 @@ class Index extends Component {
if (this.timer) clearInterval(this.timer);
this.timer = setInterval(() => {
API.getCalculateProgress(salaryAcctRecordId).then(({ data }) => {
- let progress = data.progress;
- if (progress === 1 && this.timer) {
+ if ((_.isNil(data) || data.progress === 1) && this.timer) {
clearInterval(this.timer);
this.timer = null;
this.setState({
@@ -91,7 +90,7 @@ class Index extends Component {
});
message.error(data.message);
}
- this.setState({ progress: Number(progress) * 100 });
+ this.setState({ progress: Number(data.progress) * 100 });
});
}, 1000);
});
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
index f1e9b4fd..be64c8e8 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
@@ -41,8 +41,7 @@ class AttendanceDataViewSlide extends Component {
const { columns, list: dataSource, pageNum: current, pageSize, total } = data.pageInfo;
this.setState({
pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
- // o.dataIndex === "username" ? "left" :
- columns: _.map(columns, o => ({ ...o, width: 150, fixed: null }))
+ columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : null }))
});
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
@@ -103,7 +102,7 @@ class AttendanceDataViewSlide extends Component {
+ loading={loading.query} scroll={{ x: 1200, y: `calc(100vh - 240px)` }}/>
}
/>
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index f6590053..bc125003 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -30,6 +30,7 @@ import TableRecord from "../components/tableRecord";
import { dataCollectCondition } from "./columns";
import { removePropertyCondition } from "../../../util/response";
import { convertToUrlString } from "../../../util/url";
+import { getDomkes } from "../../../util";
import Layout from "../layout";
import moment from "moment";
import SalaryCumDeductChooseTaxPeriodDialog from "./components/salaryCumDeductChooseTaxPeriodDialog";
@@ -253,6 +254,7 @@ class Index extends Component {
addForm.validateForm().then(f => {
if (f.isValid) {
const payload = {
+ ..._.reduce(getDomkes(dataCollectCondition), (pre, cur) => ({ ...pre, [cur]: "" }), {}),
...addForm.getFormParams(),
taxAgentName: _.find(taxAgentOption, it => it.key === addForm.getFormParams().taxAgentId).showname
};
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
index 660c148e..4c579f2c 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
@@ -29,6 +29,7 @@ import AddItems from "../addItems";
import TableRecord from "../components/tableRecord";
import { convertToUrlString } from "../../../util/url";
import SalaryCumDeductChooseTaxPeriodDialog from "../cumDeduct/components/salaryCumDeductChooseTaxPeriodDialog";
+import { getDomkes } from "../../../util";
const getLabel = WeaLocaleProvider.getLabel;
const getKey = WeaTools.getKey;
@@ -429,6 +430,7 @@ class Index extends Component {
addForm.validateForm().then(f => {
if (f.isValid) {
const payload = {
+ ..._.reduce(getDomkes(dataCollectCondition), (pre, cur) => ({ ...pre, [cur]: "" }), {}),
...addForm.getFormParams(),
taxAgentName: _.find(taxAgentOption, it => it.key === addForm.getFormParams().taxAgentId).showname
};
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
index f812edda..8f786982 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
@@ -29,6 +29,7 @@ import { dataCollectCondition } from "./columns";
import AddItems from "../addItems";
import TableRecord from "../components/tableRecord";
import { convertToUrlString } from "../../../util/url";
+import { getDomkes } from "../../../util";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
@@ -407,6 +408,7 @@ class Index extends Component {
addForm.validateForm().then(f => {
if (f.isValid) {
const payload = {
+ ..._.reduce(getDomkes(dataCollectCondition), (pre, cur) => ({ ...pre, [cur]: "" }), {}),
...addForm.getFormParams(),
taxAgentName: _.find(taxAgentOption, it => it.key === addForm.getFormParams().taxAgentId).showname
};
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
index 70c04767..5986baae 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
@@ -20,6 +20,7 @@ import { condition } from "./components/condition";
import AddItems from "../addItems";
import TableRecord from "../components/tableRecord";
import { convertToUrlString } from "../../../util/url";
+import { getDomkes } from "../../../util";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
@@ -345,6 +346,7 @@ class Index extends Component {
addForm.validateForm().then(f => {
if (f.isValid) {
const payload = {
+ ..._.reduce(getDomkes(condition), (pre, cur) => ({ ...pre, [cur]: "" }), {}),
...addForm.getFormParams(),
taxAgentName: _.find(taxAgentOption, it => it.key === addForm.getFormParams().taxAgentId).showname
};
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
index 774269f5..f340fb3e 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
@@ -114,6 +114,7 @@ export default class LedgerSalaryItemAddModal extends React.Component {
...pageInfo,
showTotal: total => `共 ${total} 条`,
showQuickJumper: true,
+ showSizeChanger: true,
pageSizeOptions: ["10", "20", "50", "100"],
onChange: current => {
this.setState({
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
index 22135a29..51759130 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
@@ -215,16 +215,16 @@ export const conditions = [
labelcol: 8,
viewAttr: 2
},
- {
- conditionType: "SELECT",
- domkey: ["SALARY_DETAILS_REPORT_SHOW_TYPE"],
- fieldcol: 10,
- label: "薪资明细显示模式",
- lanId: 111,
- options: [],
- labelcol: 8,
- viewAttr: 2
- }
+ // {
+ // conditionType: "SELECT",
+ // domkey: ["SALARY_DETAILS_REPORT_SHOW_TYPE"],
+ // fieldcol: 10,
+ // label: "薪资明细显示模式",
+ // lanId: 111,
+ // options: [],
+ // labelcol: 8,
+ // viewAttr: 2
+ // }
],
title: "薪资报表",
lanId: 111,
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
index 90cc4633..8e9d740e 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
@@ -123,7 +123,7 @@ class Index extends Component {
const [__, fields] = this.state.conditions, { items } = fields;
_.forEach(items, o => {
if (getKey(o) === key && o.dataType === "number") {
- if (_.isNaN(Number(value))) {
+ if (_.isNaN(Number(value)) || value.indexOf(" ") !== -1) {
const { baseTableStore: { VSSalaryFileForm } } = this.props;
message.warning(getLabel(111, "数值类型有误！"));
VSSalaryFileForm.updateFields({ [getKey(o)]: { value: "" } });