diff --git a/pc4mobx/hrmSalary/apis/custom-apis/index.js b/pc4mobx/hrmSalary/apis/custom-apis/index.js
new file mode 100644
index 00000000..e69de29b
diff --git a/pc4mobx/hrmSalary/apis/payroll.js b/pc4mobx/hrmSalary/apis/payroll.js
index 01048186..b78fac43 100644
--- a/pc4mobx/hrmSalary/apis/payroll.js
+++ b/pc4mobx/hrmSalary/apis/payroll.js
@@ -240,3 +240,7 @@ export const salaryBillBaseSetPreviewWaterMark = (params) => {
export const getSmsSalaryItemSet = (params) => {
return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/template/getSmsSalaryItemSet", "GET", params);
};
+// 工资单导出PDF-检查
+export const genPdfBeforeExport = (params) => {
+ return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/genPdfBeforeExport", "GET", params);
+};
diff --git a/pc4mobx/hrmSalary/components/captchaModal/index.js b/pc4mobx/hrmSalary/components/captchaModal/index.js
index 35661772..a7f00b9b 100644
--- a/pc4mobx/hrmSalary/components/captchaModal/index.js
+++ b/pc4mobx/hrmSalary/components/captchaModal/index.js
@@ -36,7 +36,6 @@ class Index extends Component {
handleSendCaptcha = () => {
sendMobileCode({ id: this.props.id }).then(({ status, data }) => {
if (status) {
- console.log(data);
this.timeRef = setInterval(() => {
const { time } = this.state;
this.setState({ time: time - 1 }, () => {
diff --git a/pc4mobx/hrmSalary/custom-components/index.js b/pc4mobx/hrmSalary/custom-components/index.js
new file mode 100644
index 00000000..e69de29b
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index 7ff80bb3..280a0f46 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -26,7 +26,7 @@ class SalaryDetails extends Component {
this.state = {
loading: false, dataSource: [], columns: [], selectedRowKeys: [],
pageInfo: { current: 1, pageSize: 10, total: 0 }, payload: {},
- countResult: {}, showTotalCell: false
+ showTotalCell: false
};
}
@@ -82,14 +82,15 @@ class SalaryDetails extends Component {
};
this.setState({ loading: true });
API.getSalaryList(payload).then(async ({ status, data }) => {
- const [{ data: sumData }, { data: confCode }] = await Promise.all([API.getSalaryListSum(payload), sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" })]);
+ // API.getSalaryListSum(payload),
+ const [{ data: confCode }] = await Promise.all([sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" })]);
this.setState({ loading: false });
if (status) {
const { dataKey, pageInfo: pageparams } = data;
const { list: dataSource, pageNum: current, total, pageSize } = pageparams;
this.setState({
dataSource, pageInfo: { ...pageInfo, current, total, pageSize }, payload,
- countResult: sumData.sumRow, showTotalCell: confCode === "1"
+ showTotalCell: confCode === "1"
}, () => tableStore.getDatas(dataKey.datas));
}
}).catch(() => this.setState({ loading: false }));
@@ -105,12 +106,13 @@ class SalaryDetails extends Component {
};
getColumns = () => {
const { attendanceStore: { tableStore } } = this.props;
- const { dataSource, pageInfo, selectedRowKeys, countResult, showTotalCell } = this.state;
+ const { dataSource, pageInfo, selectedRowKeys, showTotalCell, payload } = 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)) {
this.postMessageToChild({
- dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154,
- sumRow: countResult,
+ dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, payload,
+ sumRowlistUrl,
columns: _.map(columns, (it, idx) => ({
...it,
width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : it.oldWidth,
diff --git a/pc4mobx/hrmSalary/pages/custom-pages/index.js b/pc4mobx/hrmSalary/pages/custom-pages/index.js
new file mode 100644
index 00000000..e69de29b
diff --git a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
index 8968b469..69bac121 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
@@ -27,8 +27,9 @@ class Index extends Component {
{getLabel(111, "发放时间")}
{moment(it.sendTime).format("YYYY-MM")}
-
+
{`${getLabel(33564, "查看")}>`}
;
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index 4e44a75f..52bb065c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -8,7 +8,7 @@ import { getQueryString } from "../../../util/url";
import { getSearchs, renderLoading } from "../../../util";
import CustomPaginationTable from "../../../components/customPaginationTable";
import PayrollPartTable from "./payrollPartTable";
-import { getPayrollIssuanceProgressBar } from "../../../apis/payroll";
+import { genPdfBeforeExport, getPayrollIssuanceProgressBar } from "../../../apis/payroll";
import ProgressModal from "../../../components/progressModal";
const getLabel = WeaLocaleProvider.getLabel;
@@ -328,7 +328,14 @@ export default class PayrollGrant extends React.Component {
{
- window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank");
+ genPdfBeforeExport({ id: record.id, salarySendId: getQueryString("id") })
+ .then(({ status, errormsg }) => {
+ if (status) {
+ window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank");
+ } else {
+ message.error(errormsg);
+ }
+ });
}}>
{getLabel(111, "导出PDF")}
@@ -343,7 +350,14 @@ export default class PayrollGrant extends React.Component {
{
- window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank");
+ genPdfBeforeExport({ id: record.id, salarySendId: getQueryString("id") })
+ .then(({ status, errormsg }) => {
+ if (status) {
+ window.open(`${window.ecologyContentPath || ""}/api/bs/hrmsalary/salaryBill/exportPdf?id=${record.id}&salarySendId=${getQueryString("id")}`, "_blank");
+ } else {
+ message.error(errormsg);
+ }
+ });
}}>
{getLabel(111, "导出PDF")}
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
index 46bce19e..25b815a0 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
@@ -484,6 +484,6 @@ const HelpfulDiv = () => {
{getLabel(544746, "c.返聘人员使用调薪功能调整薪资档案值或使用调整个税扣缴;")}
{getLabel(545755, "2.调薪:档案中已存在的人员批量调整薪资项目值(包括返聘人员的情况);")}
- {getLabel(545756, "3.调整个税扣缴义务人:档案中已存在的人员批量调整个税扣缴义务人(包括返聘人员的情况);")}
+ {/*{getLabel(545756, "3.调整个税扣缴义务人:档案中已存在的人员批量调整个税扣缴义务人(包括返聘人员的情况);")}*/}
;
};
diff --git a/pc4mobx/hrmSalary/stores/custom-stores/index.js b/pc4mobx/hrmSalary/stores/custom-stores/index.js
new file mode 100644
index 00000000..7be35b6b
--- /dev/null
+++ b/pc4mobx/hrmSalary/stores/custom-stores/index.js
@@ -0,0 +1,2 @@
+module.exports = {
+};
diff --git a/pc4mobx/hrmSalary/stores/index.js b/pc4mobx/hrmSalary/stores/index.js
index fdc926a3..f535bfc7 100644
--- a/pc4mobx/hrmSalary/stores/index.js
+++ b/pc4mobx/hrmSalary/stores/index.js
@@ -21,6 +21,7 @@ import { SpecialAddStore } from "./specialAdd";
import { ExternalPersonManageStore } from "./externalPersonManage";
import { EmployeeDeclareStore } from "./employeeDeclare";
import { IntelligentStore } from "./intelligent";
+import CustomModule from "./custom-stores";
module.exports = {
baseFormStore: new BaseFormStore(),
@@ -46,4 +47,5 @@ module.exports = {
externalPersonManageStore: new ExternalPersonManageStore(),
employeeDeclareStore: new EmployeeDeclareStore(),
intelligentStore: new IntelligentStore(),
+ ...CustomModule
};