From 98f35401e6c152c88cf5d646e540ad44e5a80af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 18 Jan 2024 14:44:24 +0800 Subject: [PATCH 01/24] =?UTF-8?q?release/2.9.10.2312.02=20=E5=B7=A5?= =?UTF-8?q?=E8=B5=84=E5=8D=95=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/common/titleLogo.png | Bin 0 -> 554 bytes .../components/pcTemplate/content.js | 9 ++-- .../components/pcTemplate/index.less | 44 ++++++++++++------ pc4mobx/hrmSalary/pages/mySalary/index.less | 4 +- 4 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 pc4mobx/hrmSalary/common/titleLogo.png diff --git a/pc4mobx/hrmSalary/common/titleLogo.png b/pc4mobx/hrmSalary/common/titleLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..d02c222716a88c72dfe0793a775044559bcdd966 GIT binary patch literal 554 zcmeAS@N?(olHy`uVBq!ia0vp^;y^6J!N$PA`1h5_S0IP6ILO_JVcj{Imq3n7YJ_K+ zuP=iZkj=rs*q+J20#X9RQb5eWz`THwff-0Mg2Wau!DYo4FvHn0AcYsrAM5}so8sx> z7~;YEHf*EcVF#YA>v?*3wRLjqmoe*zzH&Osz{I)ngCU2Zf`BvovaZhcnN3&Dc}i-k z95>FLboynG&@P3G9@po*eV%^3@X_N3zU7l=#BqrCJFiVuo*s2)+WuurWx_rL9{FX(4D+9U4i!)HJ}k5}l`Yz^$eE#S znV{f1Mfp^#pIZ{&rgI&CW_ro?pr^8L;{DQuYoWf`rI~j#Dt%v7g&oL0G1v9hl&9ZQ zC*E8o5_`fU)F<3et-a`}H_IiK!;hCd{kZt8^qDV~YL|4ceeXQFt^18y`Y)HZ=CH~0 zWBiu!CBK*W)NJ`HsCwd@%)W0gl`lUR3HbW%e2F|`o5h?b#^S}rEiV?%`MyeM?V+Cw e?HJ-4O8>HMQk)_4u$jdP6i=S6elF{r5}E*G>EjCk literal 0 HcmV?d00001 diff --git a/pc4mobx/hrmSalary/components/pcTemplate/content.js b/pc4mobx/hrmSalary/components/pcTemplate/content.js index b8c7360b..310999d6 100644 --- a/pc4mobx/hrmSalary/components/pcTemplate/content.js +++ b/pc4mobx/hrmSalary/components/pcTemplate/content.js @@ -10,7 +10,7 @@ class Content extends Component { const { onlyOneGrup, showData } = dealTemplate(itemTypeList, "pc"); return (
-
+
{theme || ""}
@@ -34,7 +34,10 @@ class Content extends Component { return (
{ - groupName ?
{groupName}
: null + groupName ?
+ + {groupName} +
: null }
{ @@ -71,9 +74,9 @@ class Content extends Component { !onlyOneGrup && tipPosi.toString() === "2" && tip &&
} + {this.props.children}
- {this.props.children}
); diff --git a/pc4mobx/hrmSalary/components/pcTemplate/index.less b/pc4mobx/hrmSalary/components/pcTemplate/index.less index 856a3d78..e57fe5e5 100644 --- a/pc4mobx/hrmSalary/components/pcTemplate/index.less +++ b/pc4mobx/hrmSalary/components/pcTemplate/index.less @@ -4,7 +4,7 @@ overflow-y: auto; .weapp-salary-sp { - background: #f6f6f6; + background: #F3F9FF; } .weapp-salary-payroll-pc-preview { @@ -58,6 +58,7 @@ .body { width: 100%; + background: #FFF; //margin-top: 32px; .comp-img { @@ -69,34 +70,43 @@ } .corporate-culture-text { - width: 100%; text-align: left; color: #111; - padding: 8px 16px; + margin: 16px 30px 20px 30px; white-space: pre-wrap; word-break: break-all; - margin-top: 16px; + padding: 10px 14px; + background: #FAFAFA; + border: 1px solid rgba(238, 238, 238, 1); + border-radius: 4px; } .data-detail { - margin-top: 16px; - .salary-group { - margin-bottom: 16px; - padding-bottom: 16px; background: #FFF; .group-title { font-size: 14px; - padding: 16px 0 0 8px; + padding: 16px 0 0 30px; font-weight: bolder; + color: #333333; + + img { + width: 16px; + height: 20px; + } + + span { + vertical-align: middle; + margin-left: 10px; + } } .group-list { margin-top: 16px; display: flex; flex-wrap: wrap; - padding: 0 8px; + padding: 0 30px; .even { border-left: 1px solid #e5e5e5; @@ -125,9 +135,9 @@ background: #fbfbfb; border-right: 1px solid #e5e5e5; font-size: 12px; - color: #666; + color: #5F5F5F; display: flex; - justify-content: center; + justify-content: flex-start; align-items: center; flex-shrink: 0; @@ -148,7 +158,7 @@ line-height: 40px; background: #fff; font-size: 12px; - color: #111; + color: #5F5F5F; word-break: break-all; } } @@ -157,4 +167,12 @@ } } } + + .space { + margin: 20px 0 40px 0 !important; + + button:last-child { + margin-right: 30px; + } + } } diff --git a/pc4mobx/hrmSalary/pages/mySalary/index.less b/pc4mobx/hrmSalary/pages/mySalary/index.less index d4fd9324..0451e3c2 100644 --- a/pc4mobx/hrmSalary/pages/mySalary/index.less +++ b/pc4mobx/hrmSalary/pages/mySalary/index.less @@ -30,8 +30,10 @@ .salary-preview-container { max-width: 1000px; margin: 0 auto; - border: 2px solid #FFF; + border: 1px solid rgba(229,229,229,1); padding-top: 32px; + background: #F3F9FF; + border-radius: 4px; } .space { From 8d09f81115bc21ff2a5ae915fcfa6742312b527f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 19 Jan 2024 10:00:36 +0800 Subject: [PATCH 02/24] release/2.9.10.2312.02 --- .../pages/socialSecurityBenefits/standingBook/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js index 3c130802..30ec27a6 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js @@ -24,8 +24,8 @@ export default class StandingBook extends React.Component { value: "", selectedKey: "0", tableParams: { - startTime: moment(new Date()).startOf("year").format("YYYY-MM"), - endTime: moment(new Date()).startOf("month").format("YYYY-MM"), + startTime: moment(new Date()).subtract(1, 'year').startOf("year").format("YYYY-MM"), + endTime: moment(new Date()).endOf("year").format("YYYY-MM"), paymentOrganization: "" }, current: 1, From a4da6674c557eee5345dd2e8d620147eb9196f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 19 Jan 2024 17:30:41 +0800 Subject: [PATCH 03/24] hotfix-2.9.10.2312.02 --- .../welfareEditArchiveSlide/index.js | 25 ++++++++++++------- .../welfareArchive/config.js | 4 +-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js index 87aab6f1..2a9eed2d 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js @@ -9,6 +9,7 @@ import { inject, observer } from "mobx-react"; import { WeaLocaleProvider, WeaSlideModal, WeaTools } from "ecCom"; import * as API from "../../../../../apis/welfareArchive"; import { getTaxAgentSelectList } from "../../../../../apis/taxAgent"; +import { sysinfo } from "../../../../../apis/ruleconfig"; import { getWelfareSearchsForm, welfareConditions } from "../../config"; import { getConditionDomkeys, toDecimal_n } from "../../../../../util"; import { Button, message, Modal } from "antd"; @@ -38,34 +39,34 @@ class Index extends Component { } getBaseForm = async (props) => { - const { data: taxAgentList } = await getTaxAgentSelectList(); + const [taxAgentListData, sysInfoData] = await Promise.all([getTaxAgentSelectList(), sysinfo()]); const { archivesStore: { welfareProfileForm }, socialBase, fundBase, otherBase, runStatuses, employeeId, paymentOrganization, socialBaseData, fundBaseData, othersBaseData, showOperateBtn } = props; let socialComData = {}, fundComData = {}, otherComData = {}; - if (!_.isNil(socialBase.comItems) && !_.isNil(socialBase.comData)) { + if (!_.isNil(socialBase.comItems)) { _.forEach(getConditionDomkeys(socialBase.comItems), o => { socialComData = { ...socialComData, - [`${o}_com`]: socialBase.comData[o] + [`${o}_com`]: !_.isNil(socialBase.comData) ? socialBase.comData[o] : _.find(socialBase.comItems[0].items, k => getKey(k) === o).min }; }); } - if (!_.isNil(fundBase.comItems) && !_.isNil(fundBase.comData)) { + if (!_.isNil(fundBase.comItems)) { _.forEach(getConditionDomkeys(fundBase.comItems), o => { fundComData = { ...fundComData, - [`${o}_com`]: fundBase.comData[o] + [`${o}_com`]: !_.isNil(fundBase.comData) ? fundBase.comData[o] : _.find(fundBase.comItems[0].items, k => getKey(k) === o).min }; }); } - if (!_.isNil(otherBase.comItems) && !_.isNil(otherBase.comData)) { + if (!_.isNil(otherBase.comItems)) { _.forEach(getConditionDomkeys(otherBase.comItems), o => { otherComData = { ...otherComData, - [`${o}_com`]: otherBase.comData[o] + [`${o}_com`]: !_.isNil(otherBase.comData) ? otherBase.comData[o] : _.find(otherBase.comItems[0].items, k => getKey(k) === o).min }; }); } @@ -76,7 +77,8 @@ class Index extends Component { const formData = { ...result, ...socialBaseData, ...fundBaseData, ...othersBaseData, ...socialBase.data, ...fundBase.data, ...otherBase.data, - ...socialComData, ...fundComData, ...otherComData + ...socialComData, ...fundComData, ...otherComData, + welBaseAutoAdjust: sysInfoData.data.welBaseAutoAdjust === "1" }; this.setState({ formData, @@ -95,7 +97,7 @@ class Index extends Component { items: _.map(o.items, g => { return { ...g, label: getLabel(g.lanId, g.label), - options: _.map(taxAgentList, j => ({ key: j.id, showname: j.content })) + options: _.map(taxAgentListData.data, j => ({ key: j.id, showname: j.content })) }; }) }; @@ -111,6 +113,11 @@ class Index extends Component { viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : g.viewAttr, options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options }; + } else if (getKey(g).indexOf("StartTime") !== -1) { + return { + ...g, label: getLabel(g.lanId, g.label), + viewAttr: (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr + }; } return { ...g, label: getLabel(g.lanId, g.label), diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js index b492bf50..580f695b 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js @@ -791,8 +791,8 @@ const BenefitBaseComponent = (props) => { com: onChange(getKey(child), v)} viewAttr={(runStatuses === "4,5" || !showOperateBtn) ? 1 : 2} /> From eb9d043d7464b2657baf4e1b813ac2f529935103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 24 Jan 2024 16:29:27 +0800 Subject: [PATCH 04/24] =?UTF-8?q?feature/2.10.1.2401.01-=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E5=A4=8D=E5=88=B6=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/pages/mobilePayroll/index.js | 4 +- .../pages/payroll/templateBaseSettings.js | 20 ++++++--- .../payrollRelease/components/conditions.js | 30 +++++++++++++- .../components/payrollCopyDialog/index.js | 41 +++++++++++++++---- .../components/payrollTempBaseSet/index.js | 10 +++-- .../payrollTemplateTableList/index.js | 11 +++-- 6 files changed, 93 insertions(+), 23 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js index 6ae229c8..98912d8a 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js @@ -159,9 +159,9 @@ export default class MobilePayroll extends React.Component { if (status) { const { mySalaryBillData } = this.state; const { salaryTemplate } = mySalaryBillData; - const { feedbackUrl } = salaryTemplate; + const { feedbackUrl, mobileFeedbackUrl } = salaryTemplate; this.getMySalaryBill(getQueryString("id")); - window.location.href = `${window.ecologyContentPath || ""}${feedbackUrl}`; + window.location.href = `${window.ecologyContentPath || ""}${getQueryString("type") === "phone" ? mobileFeedbackUrl : feedbackUrl}`; // window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`); } else { message.error(errorMsg); diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js index 6cd7f5b6..f64ad003 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js @@ -35,7 +35,8 @@ class TemplateBaseSettings extends Component { ackFeedbackSetting: { ackStatus: "0", autoAckDays: 7, - feedBackUrl: "" + feedBackUrl: "", + mobileFeedbackUrl: "" }, salaryBillViewingLimitSetting: { limitMonth: 0 @@ -68,8 +69,8 @@ class TemplateBaseSettings extends Component { }; salaryBillBaseSetSave = () => { const { watermark, watermarkStatus, wmSetting, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state; - const { feedBackUrl } = ackFeedbackSetting; - if (!feedBackUrl) { + const { feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting; + if (!feedBackUrl || !mobileFeedbackUrl) { Modal.warning({ title: getLabel(111, "信息确认"), content: getLabel(111, "必要信息不完整，红色*为必填项！") @@ -96,7 +97,7 @@ class TemplateBaseSettings extends Component { render() { const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state; - const { ackStatus, autoAckDays, feedBackUrl } = ackFeedbackSetting; + const { ackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting; const { limitMonth = 0 } = salaryBillViewingLimitSetting; return ( @@ -158,7 +159,7 @@ class TemplateBaseSettings extends Component { style={{ marginLeft: 10 }} placement="top" width={200}/> - + this.setState({ @@ -167,6 +168,15 @@ class TemplateBaseSettings extends Component { } })}/> + + this.setState({ + ackFeedbackSetting: { + ...ackFeedbackSetting, mobileFeedbackUrl + } + })}/> + } diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js index 5fec5c74..87d539d4 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js @@ -12,6 +12,19 @@ export const copyConditions = [ value: "", rules: "required|string", viewAttr: 3 + }, + { + colSpan: 1, + conditionType: "SELECT", + domkey: ["salarySobId"], + fieldcol: 14, + label: "薪资账套", + lanId: 538010, + labelcol: 6, + value: "", + options: [], + rules: "required|string", + viewAttr: 3 } ], defaultshow: true, @@ -194,8 +207,21 @@ export const tempBaseSetFbConditions = [ conditionType: "INPUT", domkey: ["feedbackUrl"], fieldcol: 14, - label: "反馈流程地址", - lanId: 544096, + label: "PC端反馈流程地址", + lanId: 111, + labelcol: 6, + value: "/", + viewAttr: 3, + hide: false, + rules: "required|string" + }, + { + colSpan: 1, + conditionType: "INPUT", + domkey: ["mobileFeedbackUrl"], + fieldcol: 14, + label: "移动端反馈流程地址", + lanId: 111, labelcol: 6, value: "/", viewAttr: 3, diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollCopyDialog/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollCopyDialog/index.js index de4c41ff..904c84d2 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollCopyDialog/index.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollCopyDialog/index.js @@ -6,13 +6,14 @@ */ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; -import { WeaDialog, WeaLocaleProvider } from "ecCom"; +import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom"; import { Button, message } from "antd"; import { getSearchs } from "../../../../util"; import { copyConditions } from "../conditions"; -import { duplicatePayroll } from "../../../../apis/payroll"; +import { duplicatePayroll, getPayrollTemplateLedgerList } from "../../../../apis/payroll"; const getLabel = WeaLocaleProvider.getLabel; +const getKey = WeaTools.getKey; @inject("payrollStore") @observer @@ -20,15 +21,41 @@ class Index extends Component { constructor(props) { super(props); this.state = { - loading: false + loading: false, conditions: [] }; } componentWillReceiveProps(nextProps, nextContext) { - if (nextProps.visible !== this.props.visible && nextProps.visible) nextProps.payrollStore.payrollCopyForm.initFormFields(copyConditions); + if (nextProps.visible !== this.props.visible && nextProps.visible) this.getPayrollTemplateLedgerList(nextProps); if (nextProps.visible !== this.props.visible && !nextProps.visible) nextProps.payrollStore.initPayrollCopyForm(); } + getPayrollTemplateLedgerList = (props) => { + getPayrollTemplateLedgerList().then(({ status, data }) => { + if (status) { + this.setState({ + conditions: _.map(copyConditions, item => { + return { + ...item, items: _.map(item.items, o => { + if (getKey(o) === "salarySobId") { + return { + ...o, label: getLabel(o.lanId, o.label), + options: _.map(data, d => ({ key: d.id, showname: d.content })) + }; + } else { + return { ...o, label: getLabel(o.lanId, o.label) }; + } + }) + }; + }) + }, () => { + props.payrollStore.payrollCopyForm.initFormFields(this.state.conditions); + props.payrollStore.payrollCopyForm.updateFields({ salarySobId: { value: props.salarySobId } }); + }); + } + }); + }; + save = () => { const { payrollStore: { payrollCopyForm }, copyId: id } = this.props; payrollCopyForm.validateForm().then(f => { @@ -51,16 +78,16 @@ class Index extends Component { }; render() { - const { loading } = this.state; + const { loading, conditions } = this.state; const { payrollStore: { payrollCopyForm } } = this.props; return ( {getLabel(537558, "保存")} ]} > -
{getSearchs(payrollCopyForm, copyConditions, 1, false)}
+
{getSearchs(payrollCopyForm, conditions, 1, false)}
 ); } diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js index 56b9bfde..770c1665 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js @@ -129,7 +129,7 @@ class Index extends Component { hide: _.isNil(fieldsEchoData["ackFeedbackStatus"]) ? o.hide : !fieldsEchoData["ackFeedbackStatus"], helpfulTitle: getLabel(544273, "开启后，还需在计划任务中配置定时任务，执行自动确认任务；邮箱端查看工资单暂不支持确认及反馈；") }; - } else if (getKey(o) === "feedbackUrl") { + } else if (getKey(o) === "feedbackUrl" || getKey(o) === "mobileFeedbackUrl") { return { ...o, hide: _.isNil(fieldsEchoData["ackFeedbackStatus"]) ? o.hide : !fieldsEchoData["ackFeedbackStatus"] @@ -298,7 +298,7 @@ class Index extends Component { if (it.title === getLabel(544092, "工资单确认反馈设置")) { return { ...it, items: _.map(it.items, o => { - if (getKey(o) === "autoAckDays" || getKey(o) === "feedbackUrl") { + if (getKey(o) === "autoAckDays" || getKey(o) === "feedbackUrl" || getKey(o) === "mobileFeedbackUrl") { return { ...o, hide: params[key].value === "0" }; @@ -312,7 +312,11 @@ class Index extends Component { }, () => { payrollTempFeedbackForm.initFormFields(this.state.fbConditions); const ackFeedbackStatus = payrollTempFeedbackForm.getFormParams().ackFeedbackStatus; - if (ackFeedbackStatus === "0") payrollTempFeedbackForm.updateFields({ autoAckDays: "7", feedbackUrl: "/" }); + if (ackFeedbackStatus === "0") payrollTempFeedbackForm.updateFields({ + autoAckDays: "7", + feedbackUrl: "/", + mobileFeedbackUrl: "/" + }); }); } setHasBeenModify(true); diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js index bc4fd61f..cb9c2402 100644 --- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js +++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js @@ -22,7 +22,7 @@ class Index extends Component { this.state = { loading: false, columns: [], dataSource: [], selectedRowKeys: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, delLoading: false, - copyDialog: { visible: false, title: "", copyId: "" }, + copyDialog: { visible: false, title: "", copyId: "", salarySobId: "" }, tmplSlide: { visible: false, tmplId: "", top: 0, width: 792, height: 100, measureT: "%", measureX: "px", measureY: "%" @@ -80,7 +80,7 @@ class Index extends Component { }; handleOpts = ({ key }, record) => { const { copyDialog, tmplSlide, selectedRowKeys } = this.state; - const { id } = record; + const { id, salarySobId } = record; switch (key) { case "edit": this.setState({ @@ -89,7 +89,10 @@ class Index extends Component { break; case "copy": this.setState({ - copyDialog: { ...copyDialog, visible: true, copyId: id, title: getLabel(543599, "复制工资单") } + copyDialog: { + ...copyDialog, visible: true, copyId: id, + salarySobId: salarySobId + "", title: getLabel(543599, "复制工资单") + } }); break; case "del": @@ -175,7 +178,7 @@ class Index extends Component { {/*复制工资单模板*/} this.setState({ - copyDialog: { ...copyDialog, visible: false, copyId: "" } + copyDialog: { ...copyDialog, visible: false, copyId: "", salarySobId: "" } }, () => v === "refresh" && this.getPayrollTemplateList(this.props))} /> {/* 新建编辑工资单模板*/} From 9087e50aaef9505ed164b5e236c2bec1f4f0aacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 24 Jan 2024 17:30:26 +0800 Subject: [PATCH 05/24] =?UTF-8?q?hotfix/2.10.1.2401.01=20=E7=A4=BE?= =?UTF-8?q?=E4=BF=9D=E6=96=B9=E6=A1=88=E5=88=97=E8=A1=A8=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=96=87=E5=AD=97=E8=BF=87=E9=95=BF=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../programme/defaultSlideForm.js | 12 +++++++++--- .../socialSecurityBenefits/programme/index.less | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js index e7c215c2..d5b1bc66 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js @@ -1,5 +1,5 @@ import React from "react"; -import { WeaHelpfulTip, WeaInputNumber, WeaSelect, WeaTab, WeaTable } from "ecCom"; +import { WeaHelpfulTip, WeaInputNumber, WeaSelect, WeaTab } from "ecCom"; import { Switch, Table } from "antd"; import { insertUpdateColumns } from "./columns"; import { inject, observer } from "mobx-react"; @@ -114,7 +114,13 @@ export default class DefaultSlideForm extends React.Component { const { programmeStore, requestParams, onChange } = this.props; const { defaultPersonDataSource, defaultCompanyDataSource } = programmeStore; insertUpdateColumns.map(item => { - if (item.dataIndex == "isPayment") { + if (item.dataIndex == "insuranceName") { + item.render = (text) => { + return ( +
{text}
+ ); + }; + } else if (item.dataIndex == "isPayment") { item.render = (text, record) => { return ( { if (record.paymentCycle === "0") { return ( -
基数*比例+固定费用
+
基数*比例+固定费用
); } else { return ( diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.less index 3ccc9d13..79827d28 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.less @@ -23,6 +23,12 @@ .tableWrapper { margin-top: 10px; + .ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .ant-table-fixed-left { tr { height: 63px !important; From a07823c74a516c32d852eb1b3aac8f5b41ed6ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 25 Jan 2024 14:15:32 +0800 Subject: [PATCH 06/24] 0release/2.10.1.2401.01 --- .../payrollFiles/components/salaryFileImportDialog/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js index c9a7d295..1a60b901 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileImportDialog/index.js @@ -36,7 +36,7 @@ class Index extends Component { importType: "", listType: importType }; payload = { - importType: "", listType: importType, + importType: "", listType: importType, hasData: false, ...salaryFileQueryForm.getFormParams() }; } else { @@ -44,7 +44,7 @@ class Index extends Component { importType: importType, listType: "FIXED" }; payload = { - importType: importType, listType: "FIXED", + importType: importType, listType: "FIXED", hasData: false, ...salaryFileQueryForm.getFormParams() }; } From 9d0d04be9d8fe71fce87a818e315202489d500c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 25 Jan 2024 14:44:12 +0800 Subject: [PATCH 07/24] hotfix/2.10.1.2401.01 --- .../components/importDialog/components/impStep2.js | 5 ++++- pc4mobx/hrmSalary/components/importDialog/index.js | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js index 71c6e099..91f3e690 100644 --- a/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js +++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js @@ -40,8 +40,11 @@ class ImpStep2 extends Component { render() { const { dataSource, columns, loading } = this.state; + const { scrollHeight } = this.props; return ( - + ); } } diff --git a/pc4mobx/hrmSalary/components/importDialog/index.js b/pc4mobx/hrmSalary/components/importDialog/index.js index f174e93d..739fbf84 100644 --- a/pc4mobx/hrmSalary/components/importDialog/index.js +++ b/pc4mobx/hrmSalary/components/importDialog/index.js @@ -36,8 +36,8 @@ class Index extends Component { } renderChildren = () => { - const { current } = this.state; - const { importParams, link, excludeKey, importResult, exportDataDom = null } = this.props; + const { current } = this.state, { importParams, link, excludeKey, importResult, exportDataDom = null } = this.props; + const scrollHeight = this.importRef ? this.importRef.state.height - 232 : 606.6; let CurrentDom = null; switch (current) { case 0: @@ -45,7 +45,7 @@ class Index extends Component { ref={dom => this.step1Ref = dom}/>; break; case 1: - CurrentDom = ; + CurrentDom = ; if (excludeKey) { CurrentDom = ; } @@ -127,9 +127,10 @@ class Index extends Component { loading={this.props.nextloading}>{getLabel(1402, "下一步")}, ]; + return ( this.importRef = dom} scalable hasScroll className="importBox" initLoadCss buttons={current === 0 ? _.nth(btns, 1) : (!this.props.excludeKey && current === 1) ? _.take(btns, 2) : _.takeRight(btns)} style={{ From f50257e1b515b9366a08d73aa2edd30ac4b25e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 25 Jan 2024 15:09:30 +0800 Subject: [PATCH 08/24] =?UTF-8?q?feature/2.10.1.2401.01-=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E7=9C=8B=E4=B8=8E=E8=B0=83=E8=96=AA=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=86=E5=BC=80=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/index.js | 8 ++++ .../pages/historicalPayroll/index.js | 38 +++++++++++++++++++ .../pages/salaryAdjustmentRecords/index.js | 22 +++++++++++ 3 files changed, 68 insertions(+) create mode 100644 pc4mobx/hrmSalary/pages/historicalPayroll/index.js create mode 100644 pc4mobx/hrmSalary/pages/salaryAdjustmentRecords/index.js diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 743b5cfc..799df79c 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -1,6 +1,8 @@ import React from "react"; import Route from "react-router/lib/Route"; import { WeaLocaleProvider } from "ecCom"; +import HistoricalPayroll from "./pages/historicalPayroll"; +import SalaryAdjustmentRecords from "./pages/salaryAdjustmentRecords"; import MySalaryMobile from "./pages/mySalaryMobile"; import MySalary from "./pages/mySalaryBenefits"; import Programme from "./pages/socialSecurityBenefits/programme"; @@ -67,6 +69,10 @@ const Home = (props) => props.children; const SocialSecurityBenefits = (props) => props.children; const DataAcquisition = (props) => props.children; +// historicalPayroll 历史工资单查看 +// salaryAdjustmentRecords 调薪记录查看 + +// mySalaryMobile 我的薪资福利-移动端 // mySalaryMobile 我的薪资福利-移动端 // mySalary 我的薪资福利 // mySalaryView 我的薪资福利-查看工资单 @@ -112,6 +118,8 @@ const Routes = ( path="hrmSalary" onEnter={getLocaleLabel} component={Home}> + + diff --git a/pc4mobx/hrmSalary/pages/historicalPayroll/index.js b/pc4mobx/hrmSalary/pages/historicalPayroll/index.js new file mode 100644 index 00000000..f33c7651 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/historicalPayroll/index.js @@ -0,0 +1,38 @@ +/* + * Author: 黎永顺 + * name:历史工资单 + * Description: + * Date: 2024/1/25 + */ +import React, { Component } from "react"; +import { WeaLocaleProvider } from "ecCom"; +import moment from "moment"; +import { MonthRangePicker } from "../reportView/components/statisticalMicroSettingsSlide"; + +const getLabel = WeaLocaleProvider.getLabel; + +class Index extends Component { + constructor(props) { + super(props); + this.state = { + dateRange: [ + moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"), + moment(new Date()).endOf("year").format("YYYY-MM") + ] + }; + } + + render() { + const { dateRange } = this.state; + return ( +
+
+ this.setState({ dateRange: v })}/> +
+
+ ); + } +} + +export default Index; diff --git a/pc4mobx/hrmSalary/pages/salaryAdjustmentRecords/index.js b/pc4mobx/hrmSalary/pages/salaryAdjustmentRecords/index.js new file mode 100644 index 00000000..b11891c8 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/salaryAdjustmentRecords/index.js @@ -0,0 +1,22 @@ +/* + * Author: 黎永顺 + * name:调薪记录 + * Description: + * Date: 2024/1/25 + */ +import React, { Component } from "react"; +import { WeaLocaleProvider } from "ecCom"; + +const getLabel = WeaLocaleProvider.getLabel; + +class Index extends Component { + render() { + return ( +
+ +
+ ); + } +} + +export default Index; From e86e4871d80d6f19ad5078a7cc0f149cde208c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 25 Jan 2024 15:11:35 +0800 Subject: [PATCH 09/24] release/2.10.1.2401.01 --- .../hrmSalary/components/importDialog/components/impStep3.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js index 481813b4..df9575ef 100644 --- a/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js +++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js @@ -31,7 +31,7 @@ class ImpStep3 extends Component {
} { - !_.isEmpty(importResult.errorData) && + (!_.isEmpty(importResult.errorNotice) || !_.isEmpty(importResult.errorData)) && } From b82ae4f4cee1a3a0572675df790438d6f28f1c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 25 Jan 2024 15:45:33 +0800 Subject: [PATCH 10/24] =?UTF-8?q?feature/2.10.1.2401.01-=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E7=9C=8B=E4=B8=8E=E8=B0=83=E8=96=AA=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=86=E5=BC=80=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/mySalaryBenefits.js | 8 +++++++ .../pages/historicalPayroll/index.js | 6 ++++- .../pages/historicalPayroll/index.less | 23 +++++++++++++++++++ .../components/payrollTable/index.js | 4 ++-- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/historicalPayroll/index.less diff --git a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js index 2cd64d80..e7c9c9b4 100644 --- a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js +++ b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js @@ -6,6 +6,14 @@ import { convertToUrlString } from "../util/url"; export const mySalaryBillList = params => { return postFetch("/api/bs/hrmsalary/salaryBill/mySalaryBillList", params); }; +// 人事卡片-工资单列表 +export const mySalaryBillList4Card = params => { + return postFetch("/api/bs/hrmsalary/salaryBill/mySalaryBillList4Card", params); +}; +// 人事卡片-调薪记录列表 +export const mySalaryRecordList4Card = params => { + return postFetch("/api/bs/hrmsalary/report/record/list4Card", params); +}; // 调薪记录列表 export const recordList = params => { diff --git a/pc4mobx/hrmSalary/pages/historicalPayroll/index.js b/pc4mobx/hrmSalary/pages/historicalPayroll/index.js index f33c7651..49c7fdb6 100644 --- a/pc4mobx/hrmSalary/pages/historicalPayroll/index.js +++ b/pc4mobx/hrmSalary/pages/historicalPayroll/index.js @@ -6,8 +6,10 @@ */ import React, { Component } from "react"; import { WeaLocaleProvider } from "ecCom"; -import moment from "moment"; import { MonthRangePicker } from "../reportView/components/statisticalMicroSettingsSlide"; +import Payroll from "../mySalaryBenefits/components/payrollTable"; +import moment from "moment"; +import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; @@ -27,9 +29,11 @@ class Index extends Component { return (
+ {getLabel(542604, "薪资所属月")} this.setState({ dateRange: v })}/>
+
); } diff --git a/pc4mobx/hrmSalary/pages/historicalPayroll/index.less b/pc4mobx/hrmSalary/pages/historicalPayroll/index.less new file mode 100644 index 00000000..459ccbaf --- /dev/null +++ b/pc4mobx/hrmSalary/pages/historicalPayroll/index.less @@ -0,0 +1,23 @@ +.history-payroll-box { + width: 100%; + height: 100%; + background: #f6f6f6; + padding: 16px; + + .topQuery { + width: 100%; + background: #fff; + padding: 16px; + margin-bottom: 16px; + display: flex; + align-items: center; + + .title { + margin-right: 10px; + } + } + + .wea-new-table { + background: #fff; + } +} diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js index 33cb6873..94161e1a 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js @@ -15,7 +15,7 @@ class Index extends Component { constructor(props) { super(props); this.state = { - juniorMapList: [], dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, + dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, loading: false, employeeId: "" }; } @@ -55,7 +55,7 @@ class Index extends Component { }; render() { - const { juniorMapList, dataSource, loading, columns, pageInfo } = this.state; + const { dataSource, loading, columns, pageInfo } = this.state; const pagination = { ...pageInfo, showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`, From 4242856f0eade2a9d99f1dfa5c01abe6bd2004ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 25 Jan 2024 16:11:00 +0800 Subject: [PATCH 11/24] =?UTF-8?q?release/2.10.1.2401.01=20=E8=96=AA?= =?UTF-8?q?=E8=B5=84=E6=A1=A3=E6=A1=88-=E9=9D=9E=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=B0=83=E8=96=AA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/payrollFiles/components/salaryFilesEditSlide/index.js | 2 +- pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js index 1eb1a76d..2cc7f785 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js @@ -152,7 +152,7 @@ class Index extends Component { }}>{getLabel(543310, "发起调薪")} } { - runStatuses === "fixed" && showOperateBtn && + (runStatuses === "fixed" || runStatuses === "ext") && showOperateBtn &&