diff --git a/pc4mobx/hrmSalary/apis/welfareScheme.js b/pc4mobx/hrmSalary/apis/welfareScheme.js index 45a194c0..9cd7b113 100644 --- a/pc4mobx/hrmSalary/apis/welfareScheme.js +++ b/pc4mobx/hrmSalary/apis/welfareScheme.js @@ -1,5 +1,5 @@ import { WeaTools } from "ecCom"; -import { postFetch } from "../util/request"; +import { postExportFetch, postFetch } from "../util/request"; import { convertToUrlString } from "../util/url"; export const getForm = params => { @@ -51,3 +51,6 @@ export const deleteCustomCategory = (params) => { export const updateCustomCategoryStatus = params => { return postFetch("/api/bs/hrmsalary/sicategory/updateCustomCategoryStatus", params); }; +export const exportAllScheme = params => { + return postExportFetch("/api/bs/hrmsalary/scheme/exportAll", params); +}; diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index b4e65e33..bdfcacd5 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -63,6 +63,8 @@ import TopologyMap from "./pages/topologyMap"; import SupplementaryCalc from "./pages/supplementaryCalc"; import VariableSalary from "./pages/variableSalary"; import Layout from "./layout"; + +import CustomRoutes from "./pages/custom-pages"; import stores from "./stores"; import "./style/index"; // 读取系统多语言配置 @@ -142,6 +144,7 @@ const Routes = ( + {CustomRoutes} ); diff --git a/pc4mobx/hrmSalary/pages/custom-pages/az/salaryFileReports/index.js b/pc4mobx/hrmSalary/pages/custom-pages/az/salaryFileReports/index.js new file mode 100644 index 00000000..fbed35f0 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/custom-pages/az/salaryFileReports/index.js @@ -0,0 +1,25 @@ +/* + * 艾志工业个税 + * 薪资档案报表 + * @Author: 黎永顺 + * @Date: 2025/3/13 + * @Wechat: + * @Email: 971387674@qq.com + * @description: +*/ +import React, { Component } from "react"; +import { WeaLocaleProvider } from "ecCom"; + +const getLabel = WeaLocaleProvider.getLabel; + +class Index extends Component { + render() { + return ( +
+ 艾志薪资档案报表 +
+ ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/pages/custom-pages/index.js b/pc4mobx/hrmSalary/pages/custom-pages/index.js index e69de29b..3e2ca89d 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/index.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/index.js @@ -0,0 +1,10 @@ +import React from "react"; +import Route from "react-router/lib/Route"; +import SalaryFileReports from "./az/salaryFileReports"; + +const CustomRoutes = [ + +]; + +export default CustomRoutes; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/config.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/config.js index 8d105f60..ad949241 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/config.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/config.js @@ -39,6 +39,12 @@ export const renderReqBtns = (selectedKey, onSalaryOpts, showOperateBtn, customQ onSalaryOpts("OPEN")} onAdvanceSearch={() => onSalaryOpts("SEARCH")}/> ]; switch (selectedKey) { + case "SOCIAL_SECURITY": + case "ACCUMULATION_FUND": + case "OTHER": + reqBtns = [, ...reqBtns]; + break; case "CUSTOM": reqBtns[reqBtns.length - 1] = onSalaryOpts("SEARCH", v)} value={customQuery} @@ -53,8 +59,7 @@ export const renderReqBtns = (selectedKey, onSalaryOpts, showOperateBtn, customQ default: break; } - !showOperateBtn && reqBtns.shift(); - return reqBtns; + return showOperateBtn ? reqBtns : reqBtns.slice(-1); }; export const searchConditons = [ { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js index 4f7028ad..8adf519f 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js @@ -6,11 +6,12 @@ */ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; -import { WeaLocaleProvider, WeaReqTop } from "ecCom"; +import { WeaLoadingGlobal, WeaLocaleProvider, WeaReqTop } from "ecCom"; import { renderDropMenuDatas, renderReqBtns, tabWelfarePlanList } from "./config"; import WelfarePlanAdvanceSearchPannel from "./components/welfarePlanAdvanceSearchPannel"; import WelfarePlanList from "./components/welfarePlanList"; import LogDialog from "../../../components/logViewModal"; +import * as API from "../../../apis/welfareScheme"; import cs from "classnames"; import "./index.less"; @@ -41,6 +42,10 @@ class Index extends Component { case "SEARCH": this.handleAdvanceSearch(value); break; + case "EXPORT": + WeaLoadingGlobal.start(); + const promise = API.exportAllScheme({ welfareTypeEnum: selectedKey }); + break; default: break; }