diff --git a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js index c87cd3ab..e985ac5a 100644 --- a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js +++ b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js @@ -1,4 +1,5 @@ import { WeaTools } from "ecCom"; +import { convertToUrlString } from "../util/url"; // 工资单列表 export const mySalaryBillList = params => { @@ -25,7 +26,13 @@ export const recordList = params => { // 工资查看详情 export const mySalaryBill = params => { - return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/mySalaryBill", "GET", params); + return fetch(`/api/bs/hrmsalary/salaryBill/mySalaryBill?${convertToUrlString(params)}`, { + method: "GET", + mode: "cors", + headers: { + "Content-Type": "application/json" + } + }).then(res => res.json()); }; export const isNeedSecondPwdVerify = params => { diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js index 3fd68eba..c9daa679 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js @@ -50,7 +50,6 @@ export const condition = [ options: [], viewAttr: 2, helpfulTip: "", - hide: true }, { colSpan: 1, @@ -92,7 +91,6 @@ export const reportCondition = [ rules: "required|string", viewAttr: 3, helpfulTip: "", - hide: true } ], title: "", diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js index 9a4c55f0..2051d811 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js @@ -97,6 +97,13 @@ class ReportList extends Component { } + { + isShare && +
+ {getLabel(111, "被分享")} +
+
+ } ; }) diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less index e0326f2a..5a3c335e 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less @@ -31,6 +31,47 @@ justify-content: space-between; padding: 22px 0 22px 16px; border: 1px solid #e5e5e5; + position: relative; + + .ant-ribbon { + padding: 0 8px; + color: #1677ff; + font-size: 12px; + line-height: 22px; + list-style: none; + position: absolute; + top: 0; + white-space: nowrap; + background-color: #1677ff; + border-radius: 4px; + + .ant-ribbon-text { + color: #FFF; + } + + .ant-ribbon-corner { + position: absolute; + top: 100%; + width: 8px; + height: 8px; + color: currentcolor; + border: 4px solid; + transform: scaleY(.75); + transform-origin: top; + filter: brightness(75%); + } + } + + .ant-ribbon-placement-end { + inset-inline-end: -8px; + border-end-end-radius: 0; + + .ant-ribbon-corner { + inset-inline-end: 0; + border-inline-end-color: transparent; + border-block-end-color: transparent; + } + } .cardLeft { display: flex; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index e4975825..54c3a475 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -41,7 +41,7 @@ class Index extends Component { super(props); this.state = { year: moment(new Date()).format("YYYY"), - declareMonth: moment(new Date()).month() + 1 > 10 ? (moment(new Date()).month() + 1) + "" : "0" + (moment(new Date()).month() + 1), + declareMonth: moment(new Date()).month() + 1 >= 10 ? (moment(new Date()).month() + 1) + "" : "0" + (moment(new Date()).month() + 1), taxAgentId: "", innerWidth: window.innerWidth, addAllLoading: false,