release/3.0.0.2502.01-合并业务线

This commit is contained in:
lys 2025-02-20 11:32:32 +08:00
parent 98b1c2bc08
commit c0217a2608
3 changed files with 18 additions and 17 deletions

View File

@ -22,3 +22,4 @@ export const PAGE = {
"dataPush": ["/hrmSalary/datapush"], //数据推送
"adjustRecord": ["/hrmSalary/adjustSalaryManage"] //调薪管理
};
export const EXCLUDE_PAGE=["mobilepayroll"]

View File

@ -11,6 +11,7 @@ import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { WeaLocaleProvider, WeaTools } from "ecCom";
import Authority from "./pages/mySalary/authority";
import { EXCLUDE_PAGE } from "./config";
import stores from "./stores";
const { ls } = WeaTools;
@ -46,8 +47,10 @@ class Layout extends Component {
let header = document.getElementById("container");
header.appendChild(link);
top.$(".ant-message").remove();
window.location.hash.indexOf("mobilepayroll") === -1 && stores.taxAgentStore.getPermission();
window.location.hash.indexOf("mobilepayroll") !== -1 && stores.taxAgentStore.initPageAndOptAuth();
_.map(EXCLUDE_PAGE, page => {
if (window.location.hash.indexOf(page) === -1) stores.taxAgentStore.getPermission();
if (window.location.hash.indexOf(page) !== -1) stores.taxAgentStore.initPageAndOptAuth();
});
}
window.addEventListener("storage", this.setFontSize);
}

View File

@ -1,16 +1,11 @@
import React from "react";
import ReactDOM from "react-dom";
import { createHashHistory } from "History";
import { IndexRedirect, Route, Router, useRouterHistory } from "react-router";
import { RouterStore, syncHistoryWithStore } from "mobx-react-router";
import { EXCLUDE_PAGE } from "./config";
import { Provider } from "mobx-react";
import Module from "weaHrmSalary";
import stores from "./stores";
const routing = new RouterStore();
@ -30,16 +25,18 @@ const Home = props => props.children;
class Root extends React.Component {
componentWillMount() {
const src = "/spa/hrmSalary/hrmSalaryCalculateDetail/css/iconfont/iconfont.css"
const link = document.createElement("link")
link.setAttribute('rel','stylesheet');
link.setAttribute('type','text/css');
link.setAttribute('href',src);
let header = document.getElementById("container")
header.appendChild(link)
const src = "/spa/hrmSalary/hrmSalaryCalculateDetail/css/iconfont/iconfont.css";
const link = document.createElement("link");
link.setAttribute("rel", "stylesheet");
link.setAttribute("type", "text/css");
link.setAttribute("href", src);
let header = document.getElementById("container");
header.appendChild(link);
top.$(".ant-message").remove();
window.location.hash.indexOf("mobilepayroll") === -1 && allStore.taxAgentStore.getPermission();
window.location.hash.indexOf("mobilepayroll") !== -1 && allStore.taxAgentStore.initPageAndOptAuth();
_.map(EXCLUDE_PAGE, page => {
if (window.location.hash.indexOf(page) === -1) allStore.taxAgentStore.getPermission();
if (window.location.hash.indexOf(page) !== -1) allStore.taxAgentStore.initPageAndOptAuth();
});
if (window.location.hash.indexOf("payroll") !== -1) {
window.localStorage.removeItem("template-basedata");
window.localStorage.removeItem("salary-showset");