this.handleEdit(record)}>{(showOperateBtn && selectedKey !== "stop") ? "编辑" : "查看"}
+ {
+ showOperateBtn && selectedKey === "pending" &&
+ this.stayAddToPay([record.baseInfo])}>增员
+ }
+ {
+ showOperateBtn && selectedKey === "suspend" &&
+ this.stayDelToStop([record.baseInfo])}>减员
+ }
+ {
+ showOperateBtn && selectedKey === "stop" && salaryArchiveDelete === "1" &&
+ this.deleteSocialArchive([record.baseInfo])}>删除档案
+ }
+ {
+ showOperateBtn && selectedKey === "stop" && salaryArchiveDelete !== "1" &&
+ this.cancelStopPayment([record.baseInfo])}>取消停缴
+ }
{
showOperateBtn && selectedKey === "pending" &&
{
- if (key === "addMember") {
- this.stayAddToPay([record.baseInfo]);
- } else {
- Modal.warning({
- title: "信息确认",
- content: `确定要删除该条待办人员吗？`,
- onOk: () => this.deleteTodoList({ runStatus: "4", ids: [record.baseInfo] })
- });
- }
- }}>
- 增员
- 删除待办
- } title="">
+ content={
+ salaryArchiveDelete === "1" ?
+ :
+
+ } title="">
}
@@ -158,18 +208,15 @@ export default class Archives extends React.Component {
content: `确定要删除该条待办人员吗？`,
onOk: () => this.cancelStayDel({ runStatus: "3", ids: [record.baseInfo] })
});
- } else {
- this.stayDelToStop([record.baseInfo]);
}
}}>
- 减员
删除待办
} title="">
}
{
- showOperateBtn && selectedKey === "stop" &&
+ showOperateBtn && selectedKey === "stop" && salaryArchiveDelete === "1" &&
{
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(388758, "确认要删除吗?"),
+ onOk: () => {
+ API.deleteArchive(params).then(({ status, errormsg }) => {
+ if (status) {
+ message.success(getLabel(30700, "操作成功"));
+ this.query();
+ } else {
+ message.error(errormsg || getLabel(30651, "操作失败"));
+ }
+ });
+ }
+ });
+ };
//取消停缴
cancelStopPayment = (payload) => {
API.cancelStopPayment(payload).then(({ status, errormsg }) => {
From 0c9d4cc47ed8393bcae6c69b9aa02a7d098ad032 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, 30 Jun 2023 16:51:07 +0800
Subject: [PATCH 04/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E4=B8=AA=E7=A8=8E?=
=?UTF-8?q?=E7=94=B3=E6=8A=A5=E6=92=A4=E5=9B=9E=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/ruleconfig.js | 4 +++
pc4mobx/hrmSalary/pages/ruleConfig/index.js | 35 ++++++++++++++++++---
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/ruleconfig.js b/pc4mobx/hrmSalary/apis/ruleconfig.js
index 513f50b4..2e3c0c4f 100644
--- a/pc4mobx/hrmSalary/apis/ruleconfig.js
+++ b/pc4mobx/hrmSalary/apis/ruleconfig.js
@@ -47,6 +47,10 @@ export const operateTaxDeclarationFunction = (params) => {
export const saveArchiveDelete = (params) => {
return postFetch("/api/bs/hrmsalary/sys/saveArchiveDelete", params);
};
+//保存个税申报撤回规则
+export const saveWithDrawTaxDeclaration = (params) => {
+ return postFetch("/api/bs/hrmsalary/sys/saveWithDrawTaxDeclaration", params);
+};
//保存匹配规则
export const saveSalaryAcctEmployeeRule = (params) => {
return postFetch("/api/bs/hrmsalary/sys/saveSalaryAcctEmployeeRule", params);
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
index 2cc2f31b..363531bd 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
@@ -26,7 +26,8 @@ export default class Index extends Component {
enctry: "",
operateTaxDeclaration: "",
matchRule: "",
- confValue: "0"
+ confValue: "0",
+ withDrawTaxDeclaration: "0"
},
showEncryptOperationButton: "",
progressVisible: false,
@@ -55,7 +56,7 @@ export default class Index extends Component {
isOpenEncrypt: enctry,
isOpenTaxDeclaration: operateTaxDeclaration,
salaryAcctEmployeeRule: matchRule,
- salaryArchiveDelete: confValue
+ salaryArchiveDelete: confValue, withDrawTaxDeclaration
}
} = appSettings;
this.setState({
@@ -63,7 +64,7 @@ export default class Index extends Component {
showEncryptOperationButton,
saveParams: {
...saveParams,
- ascOrDesc, orderRule, rule, enctry, operateTaxDeclaration, matchRule, confValue
+ ascOrDesc, orderRule, rule, enctry, operateTaxDeclaration, matchRule, confValue, withDrawTaxDeclaration
}
});
}
@@ -209,6 +210,16 @@ export default class Index extends Component {
}
});
};
+ withDrawTaxDeclaration = () => {
+ API.saveWithDrawTaxDeclaration({ confValue: _.pick(this.state.saveParams, ["withDrawTaxDeclaration"]).withDrawTaxDeclaration })
+ .then(({ status, errormsg }) => {
+ if (status) {
+ message.success(getLabel(22619, "保存成功!"));
+ } else {
+ message.error(errormsg || getLabel(22620, "保存失败!"));
+ }
+ });
+ };
handleChange = (key, val) => {
const { saveParams } = this.state;
@@ -242,6 +253,9 @@ export default class Index extends Component {
case "confValue":
this.saveArchiveDelete();
break;
+ case "withDrawTaxDeclaration":
+ this.withDrawTaxDeclaration();
+ break;
default:
break;
}
@@ -267,7 +281,16 @@ export default class Index extends Component {
employeeOptions,
showEncryptOperationButton
} = this.state;
- const { orderRule, ascOrDesc, rule, enctry, operateTaxDeclaration, matchRule, confValue } = saveParams;
+ const {
+ orderRule,
+ ascOrDesc,
+ rule,
+ enctry,
+ operateTaxDeclaration,
+ matchRule,
+ confValue,
+ withDrawTaxDeclaration
+ } = saveParams;
return (
this.handleChange("operateTaxDeclaration", val)}/>
+
+ this.handleChange("withDrawTaxDeclaration", val)}/>
+
From fbf16f97dc0308ae70ed126648d84dfc532dfd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 3 Jul 2023 13:52:20 +0800
Subject: [PATCH 05/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E5=AE=9A=E6=97=B6=E5=8F=91=E6=94=BE?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/payroll/stepForm/baseInformForm.js | 73 ++++++++++++++++++-
.../pages/payroll/stepForm/index.less | 16 ++++
2 files changed, 86 insertions(+), 3 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
index 69ebf94e..157467d7 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
@@ -1,7 +1,8 @@
import React from "react";
-import { WeaCheckbox, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaSelect } from "ecCom";
+import { WeaCheckbox, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaSelect, WeaTimePicker } from "ecCom";
import { inject, observer } from "mobx-react";
import { getReplenishRuleSetOptions } from "../../../apis/payroll";
+import moment from "moment";
import { toJS } from "mobx";
import "./index.less";
@@ -35,7 +36,8 @@ export default class BaseInformForm extends React.Component {
...data.templateBaseData,
msgStatus: !this.props.id ? "1" : data.templateBaseData.msgStatus,
reissueRule: data.templateBaseData.replenishRule ? "1" : "0",
- ...JSON.parse(templateBaseData)
+ ...JSON.parse(templateBaseData),
+ sendEmail: ""
}
}, () => {
this.props.onChange && this.props.onChange(this.state.request);
@@ -73,7 +75,19 @@ export default class BaseInformForm extends React.Component {
render() {
const { request, options, replenishRuleOptions } = this.state;
- const { salarySob, name, description, replenishName, replenishRule, reissueRule, msgStatus, emailStatus } = request;
+ const {
+ salarySob,
+ name,
+ description,
+ replenishName,
+ replenishRule,
+ reissueRule,
+ msgStatus,
+ emailStatus,
+ autoSendStatus,
+ autoSendDayOfMonth,
+ autoSendTimeOfDay
+ } = request;
return (
@@ -164,8 +178,61 @@ export default class BaseInformForm extends React.Component {
this.hanldeChange({ emailStatus: value === "1" })}/>
+
+ this.hanldeChange({ autoSendStatus: value === "1" })}/>
+
+ {
+ autoSendStatus &&
+
+
+ }
);
}
}
+
+const SendTimeComp = (props) => {
+ const { value, onChange } = props;
+ const { autoSendDayOfMonth, autoSendTimeOfDay } = value;
+
+ const handleChangeSendtime = (key, val) => {
+ onChange({ autoSendDayOfMonth, autoSendTimeOfDay, [key]: val });
+ };
+ return
@@ -229,31 +219,14 @@ export default class Calculate extends React.Component {
{notAccountBtn.map(cz =>
{
- if (cz.text == "核算") {
- this.handleAccount(record);
- } else if (cz.text == "删除") {
- this.handleDeleteItem(record);
- } else if (cz.text == "归档") {
- this.handleFile(record);
- } else if (cz.text == "重新核算") {
- this.handleReaccount(record);
- } else if (cz.text == "查看") {
- this.handleDetail(record);
- } else if (cz.text == "回算") {
- this.handleBackCalculate(record);
- }
- }}>
+ onClick={() => this.handleOperateClick(cz.index, record)}>
{cz.text}
)}
}>
-
+
);
}
@@ -261,7 +234,23 @@ export default class Calculate extends React.Component {
};
}
});
- return showOperateBtn ? columns : _.filter(columns, it => it.title != "操作");
+ return showOperateBtn ? columns : _.filter(columns, it => it.title !== "操作");
+ };
+
+ handleOperateClick = (index, record) => {
+ if (index === "0") {
+ this.handleAccount(record);
+ } else if (index === "1") {
+ this.handleDeleteItem(record);
+ } else if (index === "2") {
+ this.handleFile(record);
+ } else if (index === "4") {
+ this.handleReaccount(record);
+ } else if (index === "3") {
+ this.handleDetail(record);
+ } else if (index === "5") {
+ this.handleBackCalculate(record);
+ }
};
// 分页
@@ -291,44 +280,13 @@ export default class Calculate extends React.Component {
render() {
const { calculateStore, taxAgentStore: { showOperateBtn } } = this.props;
- const {
- salaryListDataSource,
- salaryListColumns,
- loading,
- hasRight,
- form,
- condition,
- tableStore,
- showSearchAd,
- getTableDatas,
- doSearch,
- setShowSearchAd,
- salaryListPageInfo
- } = calculateStore;
+ const { salaryListDataSource, loading, hasRight, salaryListPageInfo } = calculateStore;
const { modalParam } = this.state;
if (!hasRight && !loading) {
// 无权限处理
return renderNoright();
}
- const rightMenu = [
- // 右键菜单
- {
- key: "BTN_COLUMN",
- icon: ,
- content: "显示列定制",
- onClick: this.showColumn
- }
- ];
- const collectParams = {
- // 收藏功能配置
- favname: "薪资核算",
- favouritetype: 1,
- objid: 0,
- link: "wui/index.html#/ns_demo03/index",
- importantlevel: 1
- };
-
const renderRightOperation = () => {
const { startDate, endDate } = this.state;
return (
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.less
index ebccaa07..56fd88df 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.less
@@ -45,18 +45,18 @@
}
.linkWapper {
- a {
- color: #4d7ad8;
- margin-right: 8px;
- }
+ //a {
+ // color: #4d7ad8;
+ // margin-right: 8px;
+ //}
i {
cursor: pointer;
}
- a:hover {
- text-decoration: none;
- }
+ //a:hover {
+ // text-decoration: none;
+ //}
}
}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
index 7f41b9de..de207b22 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
@@ -101,19 +101,22 @@ class DataTables extends Component {
} else if (dataIndex === "operate") {
return {
...item,
+ width: 150,
render: (text, record) => (
+ handleChangeSendtime("autoSendTimeOfDay", v)}/>
+
;
+};
+
+const getDay = () => {
+ let days = [];
+ let day = getDaysInMonth(moment().year(), moment().month() + 1);
+ for (let i = 1; i <= day; i++) {
+ days.push(i);
+ }
+ return days;
+};
+
+const getDaysInMonth = (year, month) => {
+ month = parseInt(month, 10);
+ let d = new Date(year, month, 0);
+ return d.getDate();
+};
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less b/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less
index 4bfbe9d0..f30d0063 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less
@@ -234,4 +234,20 @@
border-bottom: 1px solid #e5e5e5;
}
}
+
+ .customTimeCompWrapper {
+ display: flex;
+ justify-content: flex-start;
+
+ & > div {
+ margin-right: 10px;
+ display: flex;
+ align-items: center;
+
+ .wea-select {
+ width: 80px;
+ margin: 0 10px;
+ }
+ }
+ }
}
From 3d04a79fcddf204d6bfedab16b97a688816a5ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 3 Jul 2023 15:42:11 +0800
Subject: [PATCH 06/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C=E6=8C=89?=
=?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/UnifiedTable/index.js | 2 +-
.../components/UnifiedTable/index.less | 14 +--
pc4mobx/hrmSalary/pages/calculate/index.js | 92 +++++--------------
.../dataAcquisition/cumDeduct/index.less | 14 +--
.../pages/dataAcquisition/dataTables.js | 9 +-
.../dataAcquisition/otherDeduct/index.less | 14 +--
pc4mobx/hrmSalary/pages/ledger/index.less | 12 +--
.../ledgerPage/components/ledgerTable.js | 15 ++-
.../standingBook/index.js | 48 ++++++----
pc4mobx/hrmSalary/pages/taxAgent/index.js | 25 ++---
pc4mobx/hrmSalary/pages/taxAgent/index.less | 9 +-
11 files changed, 109 insertions(+), 145 deletions(-)
diff --git a/pc4mobx/hrmSalary/components/UnifiedTable/index.js b/pc4mobx/hrmSalary/components/UnifiedTable/index.js
index 8f406f4f..f8cbff97 100644
--- a/pc4mobx/hrmSalary/components/UnifiedTable/index.js
+++ b/pc4mobx/hrmSalary/components/UnifiedTable/index.js
@@ -13,7 +13,7 @@ class Index extends Component {
return { ...item, fixed: "left", width: 176 };
}
if (item.dataIndex === "operate") {
- return { ...item, fixed: "right", width: "120px" };
+ return { ...item, fixed: "right", width: item.width || "120px" };
}
return { ...item, width: "33%" };
});
diff --git a/pc4mobx/hrmSalary/components/UnifiedTable/index.less b/pc4mobx/hrmSalary/components/UnifiedTable/index.less
index e1dbaf1d..616d16f0 100644
--- a/pc4mobx/hrmSalary/components/UnifiedTable/index.less
+++ b/pc4mobx/hrmSalary/components/UnifiedTable/index.less
@@ -8,17 +8,17 @@
}
.linkWapper {
- a {
- color: #4d7ad8;
- margin-right: 8px;
- }
+ //a {
+ // color: #4d7ad8;
+ // margin-right: 8px;
+ //}
i {
cursor: pointer;
}
- a:hover {
- text-decoration: none;
- }
+ //a:hover {
+ // text-decoration: none;
+ //}
}
}
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.js b/pc4mobx/hrmSalary/pages/calculate/index.js
index 84c858a2..473e1ec0 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/index.js
@@ -187,15 +187,10 @@ export default class Calculate extends React.Component {
};
}
if (item.dataIndex === "operate" && showOperateBtn) {
+ item.width = 150;
item.render = (text, record) => {
- const accountBtn = _.filter(
- record.operate,
- it => it.text == "核算" || it.text == "重新核算"
- );
- const notAccountBtn = _.filter(
- record.operate,
- it => it.text != "核算" && it.text != "重新核算"
- );
+ const accountBtn = _.take(record.operate, 2);
+ const notAccountBtn = _.drop(record.operate, 2);
let operateBtn = [];
if (!_.isEmpty(accountBtn)) {
operateBtn.push(
@@ -207,13 +202,8 @@ export default class Calculate extends React.Component {
style={{ display: "inline-block", marginRight: 8 }}>
{
- if (it.text == "核算" || it.text == "重新核算") {
- it.text == "核算"
- ? this.handleAccount(record)
- : this.handleReaccount(record);
- }
- }}>
+ style={it.index !== "4" ? { padding: "0 12px" } : {}}
+ onClick={() => this.handleOperateClick(it.index, record)}>
{it.text}
+ {getLabel(111, "每月")}
+ ({ key: item, showname: item }))}
+ onChange={v => handleChangeSendtime("autoSendDayOfMonth", v)}
+ />
+ {getLabel(16992, "号")}
+
+
{
!isSpecial &&
- onViewDetails(record)}>查看明细
+ onTableOperate({ key: "handleAddData" }, record)}>编辑
+ onViewDetails(record)}>查看明细
{
showOperateBtn &&
onTableOperate(e, record)}>
- 编辑
删除
} title="">
@@ -127,7 +130,7 @@ class DataTables extends Component {
{
showOperateBtn &&
- onTableOperate({ key: "handleAddData" }, record)}>编辑
onTableOperate({ key: "deleteSelectAddUpDeduction" }, record)}>删除
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.less
index 93bc2137..cf86d2f7 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.less
@@ -11,18 +11,18 @@
}
.linkWapper {
- a {
- color: #4d7ad8;
- margin-right: 8px;
- }
+ //a {
+ // color: #4d7ad8;
+ // margin-right: 8px;
+ //}
i {
cursor: pointer;
}
- a:hover {
- text-decoration: none;
- }
+ //a:hover {
+ // text-decoration: none;
+ //}
}
}
diff --git a/pc4mobx/hrmSalary/pages/ledger/index.less b/pc4mobx/hrmSalary/pages/ledger/index.less
index 21467cbe..27948111 100644
--- a/pc4mobx/hrmSalary/pages/ledger/index.less
+++ b/pc4mobx/hrmSalary/pages/ledger/index.less
@@ -222,13 +222,13 @@
.mySalaryBenefitsWrapper {
.linkWapper {
- a {
- color: #4d7ad8;
- }
+ //a {
+ // color: #4d7ad8;
+ //}
- a:hover {
- text-decoration: none;
- }
+ //a:hover {
+ // text-decoration: none;
+ //}
}
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
index 97fa0829..2c712894 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
@@ -38,10 +38,10 @@ class LedgerTable extends Component {
}
componentWillReceiveProps(nextProps, nextContext) {
- if (nextProps.doSearch !== this.props.doSearch) this.getLedgerList({current: 1});
+ if (nextProps.doSearch !== this.props.doSearch) this.getLedgerList({ current: 1 });
}
- getLedgerList = (extra={}) => {
+ getLedgerList = (extra = {}) => {
const { name } = this.props;
const { pageInfo } = this.state;
const payload = { name, ...pageInfo, ...extra };
@@ -74,17 +74,22 @@ class LedgerTable extends Component {
/>;
};
} else if (dataIndex === "operate") {
- item.width = 120;
+ item.width = 150;
item.render = (text, record) => {
return this.handleUpdateTemplate(record)}>
+ 更新模板
+
+ }>
+
+
}
);
diff --git a/pc4mobx/hrmSalary/pages/payroll/templateSettingList.js b/pc4mobx/hrmSalary/pages/payroll/templateSettingList.js
index 05d75b27..9e986510 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templateSettingList.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templateSettingList.js
@@ -2,7 +2,7 @@ import React from "react";
import { inject, observer } from "mobx-react";
import { WeaLocaleProvider, WeaTable } from "ecCom";
import { toJS } from "mobx";
-import { Radio, Spin } from "antd";
+import { Dropdown, Menu, Radio, Spin } from "antd";
const getLabel = WeaLocaleProvider.getLabel;
@inject("payrollStore")
@@ -93,8 +93,14 @@ export default class TemplateSettingList extends React.Component {
onClick={() => this.onOperatesClick(record, "0")}>{getLabel(501169, "编辑")}
this.onOperatesClick(record, "1")}>{getLabel(77, "复制")}
- this.onOperatesClick(record, "2")}>{getLabel(535052, "删除")}
+ this.onOperatesClick(record, "2")}>
+ {getLabel(535052, "删除")}
+
+ }>
+
+
;
}
}
From 17a1262d46c684d1ed93afa94fad3f99dab914a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 4 Jul 2023 15:56:06 +0800
Subject: [PATCH 08/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/calculate/index.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.js b/pc4mobx/hrmSalary/pages/calculate/index.js
index 473e1ec0..cf34c232 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/index.js
@@ -202,7 +202,6 @@ export default class Calculate extends React.Component {
style={{ display: "inline-block", marginRight: 8 }}>
this.handleOperateClick(it.index, record)}>
{it.text}
From 0772c85c010c816fee57ec14838d51796badff4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 4 Jul 2023 16:00:01 +0800
Subject: [PATCH 09/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/calculate/index.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.js b/pc4mobx/hrmSalary/pages/calculate/index.js
index cf34c232..8223f240 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/index.js
@@ -202,6 +202,7 @@ export default class Calculate extends React.Component {
style={{ display: "inline-block", marginRight: 8 }}>
this.handleOperateClick(it.index, record)}>
{it.text}
From ff7ef86172c01b33f864320d476d0524a99ef4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 4 Jul 2023 16:02:15 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/calculate/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.js b/pc4mobx/hrmSalary/pages/calculate/index.js
index 8223f240..d9a3699a 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/index.js
@@ -202,7 +202,7 @@ export default class Calculate extends React.Component {
style={{ display: "inline-block", marginRight: 8 }}>
this.handleOperateClick(it.index, record)}>
{it.text}
From d2fe01c7592555d36365191b0d3fdbad06436f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 4 Jul 2023 17:37:04 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E5=AE=9A=E6=97=B6=E5=8F=91=E6=94=BE?=
=?UTF-8?q?bug=E5=A4=84=E7=90=86=E4=BB=A5=E5=8F=8A=E8=A7=84=E5=88=99?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/payroll/stepForm/baseInformForm.js | 31 ++++++++++++-------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
index 157467d7..251b8e7e 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
@@ -37,7 +37,8 @@ export default class BaseInformForm extends React.Component {
msgStatus: !this.props.id ? "1" : data.templateBaseData.msgStatus,
reissueRule: data.templateBaseData.replenishRule ? "1" : "0",
...JSON.parse(templateBaseData),
- sendEmail: ""
+ sendEmail: "",
+ autoSendStatus: !_.isNil(data.templateBaseData.autoSendStatus) ? data.templateBaseData.autoSendStatus : false
}
}, () => {
this.props.onChange && this.props.onChange(this.state.request);
@@ -50,7 +51,7 @@ export default class BaseInformForm extends React.Component {
JSON.parse(templateBaseData).salarySob && this.getReplenishRuleSetOptions({ salarySobId: JSON.parse(templateBaseData).salarySob });
}
- hanldeChange = (params) => {
+ handleChange = (params) => {
let request = { ...this.state.request, ...params };
this.setState({
request
@@ -104,7 +105,7 @@ export default class BaseInformForm extends React.Component {
options={options}
value={salarySob ? salarySob : ""}
style={{ width: 200 }}
- onChange={value => this.hanldeChange({ salarySob: value })}/>
+ onChange={value => this.handleChange({ salarySob: value })}/>
}
this.hanldeChange({ name: value })}
+ onChange={value => this.handleChange({ name: value })}
/>
this.hanldeChange({ replenishName: value })}
+ onChange={value => this.handleChange({ replenishName: value })}
/>
this.hanldeChange({ reissueRule: value })}
+ onChange={value => this.handleChange({ reissueRule: value })}
/>
{
@@ -153,7 +154,7 @@ export default class BaseInformForm extends React.Component {
options={replenishRuleOptions}
value={replenishRule}
viewAttr={3}
- onChange={value => this.hanldeChange({ replenishRule: value })}
+ onChange={value => this.handleChange({ replenishRule: value })}
/>
}
@@ -164,7 +165,7 @@ export default class BaseInformForm extends React.Component {
>
this.hanldeChange({ description: value })}
+ onChange={value => this.handleChange({ description: value })}
/>
@@ -172,15 +173,21 @@ export default class BaseInformForm extends React.Component {
className="payrollBaseInfoWrapper">
this.hanldeChange({ msgStatus: value === "1" })}/>
+ onChange={value => this.handleChange({ msgStatus: value === "1" })}/>
this.hanldeChange({ emailStatus: value === "1" })}/>
+ onChange={value => this.handleChange({ emailStatus: value === "1" })}/>
this.hanldeChange({ autoSendStatus: value === "1" })}/>
+ onChange={value => {
+ this.handleChange({
+ autoSendStatus: value === "1",
+ autoSendDayOfMonth: value === "1" ? "1" : null,
+ autoSendTimeOfDay: value === "1" ? "09:00" : null
+ });
+ }}/>
{
autoSendStatus &&
@@ -190,7 +197,7 @@ export default class BaseInformForm extends React.Component {
autoSendDayOfMonth,
autoSendTimeOfDay
}}
- onChange={this.hanldeChange}
+ onChange={this.handleChange}
/>
}
From e501aa293e3bdbec674c13a0c8a880f5ade96c83 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, 5 Jul 2023 10:54:39 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E5=AE=9A=E6=97=B6=E5=8F=91=E6=94=BE?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=96=AA=E8=B5=84=E6=89=80=E5=B1=9E=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/payroll/stepForm/baseInformForm.js | 46 ++++++++++++++-----
1 file changed, 34 insertions(+), 12 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
index 251b8e7e..82be3188 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
@@ -2,10 +2,12 @@ import React from "react";
import { WeaCheckbox, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaSelect, WeaTimePicker } from "ecCom";
import { inject, observer } from "mobx-react";
import { getReplenishRuleSetOptions } from "../../../apis/payroll";
+import { commonEnumList } from "../../../apis/payrollFiles";
import moment from "moment";
import { toJS } from "mobx";
import "./index.less";
+
const getLabel = WeaLocaleProvider.getLabel;
@inject("payrollStore")
@observer
@@ -16,6 +18,7 @@ export default class BaseInformForm extends React.Component {
inited: false,
options: [],
replenishRuleOptions: [],
+ salaryMonthOptions: [],
request: {}
};
}
@@ -24,6 +27,7 @@ export default class BaseInformForm extends React.Component {
const { payrollStore } = this.props;
const { getPayrollBaseForm } = payrollStore;
const templateBaseData = window.localStorage.getItem("template-basedata") || "{}";
+ this.commonEnumList();
getPayrollBaseForm(this.props.id).then(data => {
this.setState(
{
@@ -73,9 +77,19 @@ export default class BaseInformForm extends React.Component {
}
});
};
+ commonEnumList = () => {
+ commonEnumList({ enumClass: "com.engine.salary.enums.salarysend.SalaryAutoSendCycleTypeEnum" })
+ .then(({ status, data }) => {
+ if (status && !_.isEmpty(data)) {
+ this.setState({
+ salaryMonthOptions: _.map(data, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
+ });
+ }
+ });
+ };
render() {
- const { request, options, replenishRuleOptions } = this.state;
+ const { request, options, replenishRuleOptions, salaryMonthOptions } = this.state;
const {
salarySob,
name,
@@ -87,7 +101,8 @@ export default class BaseInformForm extends React.Component {
emailStatus,
autoSendStatus,
autoSendDayOfMonth,
- autoSendTimeOfDay
+ autoSendTimeOfDay,
+ autoSendCycleType
} = request;
return (
@@ -185,7 +200,8 @@ export default class BaseInformForm extends React.Component {
this.handleChange({
autoSendStatus: value === "1",
autoSendDayOfMonth: value === "1" ? "1" : null,
- autoSendTimeOfDay: value === "1" ? "09:00" : null
+ autoSendTimeOfDay: value === "1" ? "09:00" : null,
+ autoSendCycleType: 0
});
}}/>
@@ -193,9 +209,11 @@ export default class BaseInformForm extends React.Component {
autoSendStatus &&
- this.setState({ authCode })}/>
+ this.setState({ authCode })}/>
+ {
+ notSetting &&
+ this.setState({ pwdSetVisible: false })}/>
{
type === "phone" ?
{
+ const { isFormInit } = form, formParams = form.getFormParams();
+ let group = [];
+ isFormInit && condition && condition.map(c => {
+ let items = [];
+ c.items.map(fields => {
+ items.push({
+ com: (
+
+ {
+ fields.domkey[0] === "validatecode" ?
+
+ }
+ ),
+ colSpan: 1
+ });
+ });
+ group.push(
+ {getLabel(537558, "保存")}
+ ]}
+ >
+ {this.getSearchs(this.props.form, condition)}
+
+ );
+ }
+}
+
+export default PassSetDialog;
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
new file mode 100644
index 00000000..c2b9df7a
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
@@ -0,0 +1,45 @@
+import { WeaLocaleProvider } from "ecCom";
+
+const { getLabel } = WeaLocaleProvider;
+export const condition = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ checkbox: false,
+ checkboxValue: false,
+ conditionType: "INPUT",
+ domkey: ["secondaryPwd1"],
+ fieldcol: 18,
+ label: getLabel(409, "密码"),
+ labelcol: 6,
+ detailtype: 3,
+ rules: "required|string",
+ viewAttr: 3
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["secondaryPwd2"],
+ fieldcol: 18,
+ label: getLabel(511112, "确认密码"),
+ labelcol: 6,
+ rules: "required|string",
+ viewAttr: 3
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["validatecode"],
+ fieldcol: 18,
+ label: getLabel(511113, "验证码"),
+ labelcol: 6,
+ value: "",
+ rules: "required|string",
+ viewAttr: 3
+ }
+ ],
+ title: "",
+ defaultshow: true
+ }
+];
diff --git a/pc4mobx/hrmSalary/stores/mySalary.js b/pc4mobx/hrmSalary/stores/mySalary.js
index 61988d5b..916c3be9 100644
--- a/pc4mobx/hrmSalary/stores/mySalary.js
+++ b/pc4mobx/hrmSalary/stores/mySalary.js
@@ -14,6 +14,7 @@ const { TableStore } = WeaTableNew;
export class MySalaryStore {
@observable tableStore = new TableStore(); // new table
@observable form = new WeaForm(); // nrew 一个form
+ @observable pwdForm = new WeaForm(); // new 一个密码验证form
@observable condition = []; // 存储后台得到的form数据
@observable hasRight = false; // 判断用户是有权限查看当前页面： 没有权限渲染无权限页面，有权限渲染数据
@observable showSearchAd = false; // 高级搜索面板显示
diff --git a/pc4mobx/hrmSalary/util/RSAUtil.js b/pc4mobx/hrmSalary/util/RSAUtil.js
new file mode 100644
index 00000000..97b76234
--- /dev/null
+++ b/pc4mobx/hrmSalary/util/RSAUtil.js
@@ -0,0 +1,32 @@
+import loadjs from "loadjs";
+
+const RSAEcrypt = (openRSA, param) => {
+ return new Promise((resolve, reject) => {
+ //异步加载ras文件
+ loadjs.isDefined("rsa") ? loadjs.ready("rsa", () => {
+ if (openRSA && openRSA == "1") {
+ Object.keys(param).forEach(key => {
+ param[key] = __RSAEcrypt__.rsa_data_encrypt(param[key]);
+ });
+ }
+ resolve(param);
+ }) : loadjs(["/js/rsa/jsencrypt.js", "/js/rsa/rsa.js"], "rsa", {
+ async: false,
+ success: () => {
+ if (openRSA && openRSA == "1") {
+ const callback = () => {
+ Object.keys(param).forEach(key => {
+ param[key] = __RSAEcrypt__.rsa_data_encrypt(param[key]);
+ });
+ resolve(param);
+ };
+ __RSAEcrypt__.initRsaCode(callback);
+ } else {
+ resolve(param);
+ }
+ }
+ });
+ });
+};
+
+export { RSAEcrypt };
From 405e2a9bc60d6c63853d75182a765274643a91c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 11 Jul 2023 10:44:49 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=8C?=
=?UTF-8?q?=E6=AC=A1=E5=AF=86=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
index 1043d662..ff0acaba 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
@@ -90,6 +90,9 @@ class PassSetDialog extends Component {
form.resetForm();
} else {
message.warning(msg);
+ this.setState({ num: this.state.num + 1 }, () => {
+ this.setState({ src: `${window.ecologyContentPath || ""}/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4&seriesnum_=${this.state.num}` });
+ });
}
});
});
From d8fdc8096b6dc9c2a75e385ff6d45030bc2e02c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 11 Jul 2023 11:43:05 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=8C?=
=?UTF-8?q?=E6=AC=A1=E5=AF=86=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/mySalaryBenefits.js | 3 +++
.../pages/mobilePayroll/passSetDialog.js | 3 ++-
.../pages/mobilePayroll/pwdCondtion.js | 22 +++++++++++++++++++
3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
index 274544aa..c87cd3ab 100644
--- a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
+++ b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
@@ -37,6 +37,9 @@ export const getSecondAuthForm = params => {
export const doSecondAuth = params => {
return WeaTools.callApi("/api/encrypt/secondauthsetting/doSecondAuth", "POST", params);
};
+export const checkPassword = params => {
+ return WeaTools.callApi("/api/hrm/secondarypwd/checkPassword", "POST", params);
+};
export const saveSecondaryPwd = params => {
return WeaTools.callApi("/api/hrm/secondarypwd/saveSecondaryPwd", "POST", params);
};
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
index ff0acaba..82c6ca98 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
@@ -20,7 +20,8 @@ class PassSetDialog extends Component {
super(props);
this.state = {
src: (window.ecologyContentPath || "") + "/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4",
- num: 0
+ num: 0,
+ isPassLoginPassword: false
};
}
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
index c2b9df7a..a54f2909 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
@@ -1,6 +1,28 @@
import { WeaLocaleProvider } from "ecCom";
const { getLabel } = WeaLocaleProvider;
+export const loginCondition = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ checkbox: false,
+ checkboxValue: false,
+ conditionType: "INPUT",
+ domkey: ["password"],
+ fieldcol: 18,
+ label: getLabel(388431, "登录密码"),
+ labelcol: 6,
+ detailtype: 3,
+ rules: "required|string",
+ type: "password",
+ viewAttr: 3
+ }
+ ],
+ title: "",
+ defaultshow: true
+ }
+];
export const condition = [
{
items: [
From a13f31eefa1983c19719e25880aabf828cb25318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 11 Jul 2023 12:08:01 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=8C?=
=?UTF-8?q?=E6=AC=A1=E5=AF=86=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/mobilePayroll/passSetDialog.js | 74 ++++++++++++-------
1 file changed, 49 insertions(+), 25 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
index 82c6ca98..f857ff41 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
@@ -7,10 +7,10 @@
import React, { Component } from "react";
import { WeaDialog, WeaFormItem, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
import { WeaSwitch } from "comsMobx";
-import { condition } from "./pwdCondtion";
+import { condition, loginCondition } from "./pwdCondtion";
import { Button, message } from "antd";
import { RSAEcrypt } from "../../util/RSAUtil";
-import { saveSecondaryPwd } from "../../apis/mySalaryBenefits";
+import { checkPassword, saveSecondaryPwd } from "../../apis/mySalaryBenefits";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
@@ -26,6 +26,7 @@ class PassSetDialog extends Component {
}
componentDidMount() {
+ this.props.form.initFormFields(loginCondition);
this.props.form.initFormFields(condition);
}
@@ -72,43 +73,66 @@ class PassSetDialog extends Component {
return group;
};
saveSecondaryPassword = () => {
+ const { isPassLoginPassword } = this.state;
const { form } = this.props;
- const { secondaryPwd1, secondaryPwd2, validatecode } = form.getFormParams();
- if (!validatecode || !secondaryPwd1 || !secondaryPwd2) {
- message.error(getLabel(518702, "必要信息不完整，红色*为必填项！"));
- return;
+ const { secondaryPwd1, secondaryPwd2, validatecode, password } = form.getFormParams();
+ if (isPassLoginPassword) {
+ if (!validatecode || !secondaryPwd1 || !secondaryPwd2) {
+ message.error(getLabel(518702, "必要信息不完整，红色*为必填项！"));
+ return;
+ }
+ if (secondaryPwd1 !== secondaryPwd2) {
+ message.error(getLabel("504376", "密码确认不正确！"));
+ return;
+ }
+ } else {
+ if (!password) {
+ message.error(getLabel(518702, "必要信息不完整，红色*为必填项！"));
+ return;
+ }
}
- if (secondaryPwd1 !== secondaryPwd2) {
- message.error(getLabel("504376", "密码确认不正确！"));
- return;
- }
- const params = { secondaryPwd1, secondaryPwd2 };
+ const params = isPassLoginPassword ? { secondaryPwd1, secondaryPwd2 } : { password };
RSAEcrypt("1", params).then(RSAParam => {
- saveSecondaryPwd({ ...RSAParam, validatecode }).then(({ sign, message: msg }) => {
- if (sign === "1") {
- message.success(msg);
- this.props.onCancel();
- form.resetForm();
- } else {
- message.warning(msg);
- this.setState({ num: this.state.num + 1 }, () => {
- this.setState({ src: `${window.ecologyContentPath || ""}/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4&seriesnum_=${this.state.num}` });
- });
- }
- });
+ isPassLoginPassword ?
+ saveSecondaryPwd({ ...RSAParam, validatecode }).then(({ sign, message: msg }) => {
+ if (sign === "1") {
+ message.success(msg);
+ this.props.onCancel();
+ form.resetForm();
+ } else {
+ message.warning(msg);
+ this.setState({ num: this.state.num + 1 }, () => {
+ this.setState({ src: `${window.ecologyContentPath || ""}/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4&seriesnum_=${this.state.num}` });
+ });
+ }
+ }) :
+ checkPassword({ ...RSAParam }).then(({ result }) => {
+ if (result) {
+ this.setState({ isPassLoginPassword: true });
+ form.resetForm();
+ } else {
+ message.error(getLabel(504343, "登录密码错误"));
+ }
+ });
});
};
render() {
+ const { isPassLoginPassword } = this.state;
return (
{getLabel(537558, "保存")}
]}
>
- {this.getSearchs(this.props.form, condition)}
+ {
+ isPassLoginPassword ?
+ this.getSearchs(this.props.form, condition) :
+ this.getSearchs(this.props.form, loginCondition)
+ }
);
}
From 626f8721fbb75d22f07cc96e545c3d54c53517c8 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, 13 Jul 2023 15:23:38 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=AF=86=E7=A0=81?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
index a54f2909..e7c1fbbb 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
@@ -37,7 +37,8 @@ export const condition = [
labelcol: 6,
detailtype: 3,
rules: "required|string",
- viewAttr: 3
+ viewAttr: 3,
+ type: "password"
},
{
colSpan: 1,
@@ -47,7 +48,8 @@ export const condition = [
label: getLabel(511112, "确认密码"),
labelcol: 6,
rules: "required|string",
- viewAttr: 3
+ viewAttr: 3,
+ type: "password"
},
{
colSpan: 1,
- onEditLedger(record)}>{showOperateBtn ? "编辑" : "查看"}
+ onEditLedger(record)}>{showOperateBtn ? "编辑" : "查看"}
+ {
+ showOperateBtn &&
+ this.handleMenuClick({ key: "copy" }, record)}>复制
+ }
{
showOperateBtn &&
this.handleMenuClick(e, record)}>
- 复制
删除
} title="">
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
index be0ad9a8..c4ee3869 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
@@ -140,7 +140,7 @@ export default class StandingBook extends React.Component {
{
title: "操作",
dataIndex: "operate",
- width: 120,
+ width: 150,
key: "operate",
render: (text, r) => {
const { billStatus, billMonth, creator } = r;
@@ -154,6 +154,32 @@ export default class StandingBook extends React.Component {
核算
)}
+ {billStatus === "0" && (
+ this.handleOperate({
+ key: "archive",
+ billMonth,
+ paymentOrganizationId: r.paymentOrganizationId,
+ creator
+ })}>
+ 归档
+
+ )}
+ {billStatus === "1" && (
+ this.handleOperate({
+ key: "view",
+ billMonth,
+ paymentOrganizationId: r.paymentOrganizationId,
+ creator
+ })}>
+ 查看
+
+ )}
{billStatus === "1" && (
- 归档
删除
}>
)}
- {billStatus === "1" && (
-
- this.handleOperate({
- key,
- billMonth,
- paymentOrganizationId: r.paymentOrganizationId,
- creator
- })
- }>
- 查看
-
- }>
-
-
- )}
);
}
@@ -492,6 +499,7 @@ export default class StandingBook extends React.Component {
if (item.dataIndex !== "operate" && item.dataIndex !== "billStatus") {
return {
...item,
+ width:150,
render: (text) => {
return {text};
}
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js
index 6576e595..1010c090 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/index.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js
@@ -1,8 +1,8 @@
import React from "react";
import { inject, observer } from "mobx-react";
-import { Button, Col, Dropdown, Menu, message, Modal, Row, Switch } from "antd";
+import { Button, Col, message, Modal, Row, Switch } from "antd";
import { WeaFormItem, WeaInputSearch, WeaSearchGroup, WeaTable, WeaTop } from "ecCom";
-import { renderNoright } from "../../util"; // 渲染form数据的方法：因为多个页面都会使用，所以抽的公共方法在util中
+import { renderNoright } from "../../util";
import EditModal from "./editModal";
import TipLabel from "../../components/TipLabel";
import { decentralizationConditions, editConditions } from "./editConditions";
@@ -357,22 +357,11 @@ export default class TaxAgent extends React.Component {
onClick={() => this.showEditModal(record.id)}>
编辑
-
-
- this.deleteTaxAgent(record.id)}>
- 删除
-
-
-
- }>
-
-
-
-
+ this.deleteTaxAgent(record.id)}>
+ 删除
+
}
],
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.less b/pc4mobx/hrmSalary/pages/taxAgent/index.less
index ccff7add..6bfafdb0 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/index.less
+++ b/pc4mobx/hrmSalary/pages/taxAgent/index.less
@@ -39,12 +39,13 @@
.operationWapper,
.employeeRangeWapper {
a {
- color: #4d7ad8;
+ //color: #4d7ad8;
+ margin-right: 10px;
}
- a:hover {
- text-decoration: none;
- }
+ //a:hover {
+ // text-decoration: none;
+ //}
a.ant-dropdown-link {
margin-left: 18px;
From afd3163ff52dfbe4112d45532516706013729399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 3 Jul 2023 16:03:56 +0800
Subject: [PATCH 07/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E7=BB=9F=E4=B8=80?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C=E6=8C=89?=
=?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/payroll/SalarySendList.js | 12 ++++++++++--
.../hrmSalary/pages/payroll/templateSettingList.js | 12 +++++++++---
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js b/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js
index 2b98919b..947db8db 100644
--- a/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js
+++ b/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js
@@ -1,6 +1,6 @@
import React from "react";
import { inject, observer } from "mobx-react";
-import { message, Tag } from "antd";
+import { Dropdown, Menu, message, Tag } from "antd";
import moment from "moment";
import CustomPaginationTable from "../../components/customPaginationTable";
import "../calculate/index.less";
@@ -91,6 +91,7 @@ export default class SalarySendList extends React.Component {
{
title: "操作",
key: "operate",
+ width: 150,
render: (text, record) => {
const { sendNum, sendTotal, salaryAcctType, haveBackCalc, canSeeDetail } = record;
//显示发放
@@ -106,7 +107,14 @@ export default class SalarySendList extends React.Component {
}
{
sendNum !== sendTotal && !showGrant &&
- this.handleUpdateTemplate(record)}>更新模板
+
- {getLabel(111, "每月")}
+ {getLabel(542604, "薪资所属月")}
+ handleChangeSendtime("autoSendCycleType", Number(v))}
+ />
({ key: item, showname: item }))}
+ options={_.map(getDay(autoSendCycleType), item => ({ key: item, showname: item }))}
onChange={v => handleChangeSendtime("autoSendDayOfMonth", v)}
/>
{getLabel(16992, "号")}
@@ -229,15 +252,14 @@ const SendTimeComp = (props) => {
;
};
-const getDay = () => {
+const getDay = (num = 1) => {
let days = [];
- let day = getDaysInMonth(moment().year(), moment().month() + 1);
+ let day = getDaysInMonth(moment().year(), moment().month() + num);
for (let i = 1; i <= day; i++) {
days.push(i);
}
return days;
};
-
const getDaysInMonth = (year, month) => {
month = parseInt(month, 10);
let d = new Date(year, month, 0);
From ae79ab24c37fedf6151d6afa29298eceb4c7e54c 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, 5 Jul 2023 14:04:26 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E6=A8=A1=E6=9D=BF=E5=AE=9A=E6=97=B6=E5=8F=91=E6=94=BE?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=96=AA=E8=B5=84=E6=89=80=E5=B1=9E=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
index 82be3188..5cd3f6f1 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
@@ -201,7 +201,7 @@ export default class BaseInformForm extends React.Component {
autoSendStatus: value === "1",
autoSendDayOfMonth: value === "1" ? "1" : null,
autoSendTimeOfDay: value === "1" ? "09:00" : null,
- autoSendCycleType: 0
+ autoSendCycleType: value === "1" ? 1 : null,
});
}}/>
From 153be5b7a72d1525199e0374fc8750ff4cef27fb 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, 7 Jul 2023 10:47:45 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E6=95=B0=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/socialSecurityBenefits/standingBook/index.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
index c4ee3869..7e8a8af8 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
@@ -149,7 +149,7 @@ export default class StandingBook extends React.Component {
{billStatus === "0" && (
this.handleGoDetail(billMonth, "", r.paymentOrganizationId, creator)}>
核算
@@ -157,7 +157,7 @@ export default class StandingBook extends React.Component {
{billStatus === "0" && (
this.handleOperate({
key: "archive",
billMonth,
@@ -170,7 +170,7 @@ export default class StandingBook extends React.Component {
{billStatus === "1" && (
this.handleOperate({
key: "view",
billMonth,
@@ -499,7 +499,7 @@ export default class StandingBook extends React.Component {
if (item.dataIndex !== "operate" && item.dataIndex !== "billStatus") {
return {
...item,
- width:150,
+ width: 150,
render: (text) => {
return {text};
}
From aa9c4223b65bd8ff129f6f3926356e790da62ef1 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, 7 Jul 2023 13:45:11 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/calculate/index.less | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less
index cec45959..2a274b60 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/index.less
@@ -4,6 +4,12 @@
}
.formItem {
+ display: flex;
+
+ .ant-col-8 {
+ line-height: 30px;
+ }
+
.wea-select, .ant-select {
width: 100%;
}
From 9226ef19b3a1d842c3c48fbdd664e0772ce99de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 10 Jul 2023 09:21:57 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E7=A7=BB=E5=8A=A8?=
=?UTF-8?q?=E7=AB=AF=E4=BA=8C=E6=AC=A1=E9=AA=8C=E8=AF=81=E5=AF=86=E7=A0=81?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/mySalaryBenefits.js | 6 +
.../hrmSalary/pages/mobilePayroll/index.js | 29 ++++-
.../hrmSalary/pages/mobilePayroll/index.less | 24 ++++
.../pages/mobilePayroll/passSetDialog.js | 113 ++++++++++++++++++
.../pages/mobilePayroll/pwdCondtion.js | 45 +++++++
pc4mobx/hrmSalary/stores/mySalary.js | 1 +
pc4mobx/hrmSalary/util/RSAUtil.js | 32 +++++
7 files changed, 244 insertions(+), 6 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/mobilePayroll/passSetDialog.js
create mode 100644 pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
create mode 100644 pc4mobx/hrmSalary/util/RSAUtil.js
diff --git a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
index a2f5be7a..274544aa 100644
--- a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
+++ b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
@@ -31,6 +31,12 @@ export const mySalaryBill = params => {
export const isNeedSecondPwdVerify = params => {
return WeaTools.callApi("/api/encrypt/secondauthsetting/isNeedSecondAuth", "POST", params);
};
+export const getSecondAuthForm = params => {
+ return WeaTools.callApi("/api/encrypt/secondauthsetting/getSecondAuthForm", "POST", params);
+};
export const doSecondAuth = params => {
return WeaTools.callApi("/api/encrypt/secondauthsetting/doSecondAuth", "POST", params);
};
+export const saveSecondaryPwd = params => {
+ return WeaTools.callApi("/api/hrm/secondarypwd/saveSecondaryPwd", "POST", params);
+};
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index db4f3c2f..5a41f8ac 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -1,7 +1,7 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { getQueryString } from "../../util/url";
-import { WeaDialog, WeaError, WeaInput } from "ecCom";
+import { WeaDialog, WeaError, WeaInput, WeaLocaleProvider } from "ecCom";
import { Button, message } from "antd";
import Authority from "../mySalary/authority";
import ComputerTemplate from "../payroll/templatePreview/computerTemplate";
@@ -9,8 +9,11 @@ import PhoneTemplate from "../payroll/templatePreview/phoneTemplate";
import "../payroll/templatePreview/index.less";
import * as API from "../../apis/mySalaryBenefits";
import { payrollCheckType } from "../../apis/payroll";
-import "./index.less";
import CaptchaModal from "../../components/captchaModal";
+import PassSetDialog from "./passSetDialog";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
@inject("mySalaryStore")
@observer
@@ -18,9 +21,11 @@ export default class MobilePayroll extends React.Component {
constructor(props) {
super(props);
this.state = {
+ pwdSetVisible: false,
visible: false,
captchaVisible: false,
authCode: "",
+ notSetting: false,
mySalaryBillData: {
employeeInformation: {},
salaryTemplate: []
@@ -49,7 +54,11 @@ export default class MobilePayroll extends React.Component {
// if (window.em) {
API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }).then(({ status, isNeedSecondAuth }) => {
if (status && isNeedSecondAuth) {
- this.setState({ visible: true });
+ this.setState({ visible: true }, () => {
+ API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }).then(({ status, notSetting }) => {
+ this.setState({ notSetting });
+ });
+ });
} else {
this.getMySalaryBill(getQueryString("id"));
setInitEmVerify();
@@ -106,8 +115,8 @@ export default class MobilePayroll extends React.Component {
};
render() {
- const { mySalaryStore: { clearLoading } } = this.props;
- const { mySalaryBillData, visible, captchaVisible } = this.state;
+ const { mySalaryStore: { clearLoading, pwdForm } } = this.props;
+ const { mySalaryBillData, visible, captchaVisible, notSetting, pwdSetVisible } = this.state;
const type = getQueryString("type");
const employeeInformation = mySalaryBillData.employeeInformation ? mySalaryBillData.employeeInformation : {};
const salaryGroups = mySalaryBillData.salaryGroups ? mySalaryBillData.salaryGroups : [];
@@ -126,9 +135,17 @@ export default class MobilePayroll extends React.Component {
]}
>
+ {getLabel("514970", "您还未设置二次验证密码，点击")}
+ this.setState({ pwdSetVisible: true })}>{getLabel("30747", "设置")}
+
+ }
+
+
+ 
{
+ this.setState({ num: this.state.num + 1 }, () => {
+ this.setState({ src: `${window.ecologyContentPath || ""}/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4&seriesnum_=${this.state.num}` });
+ });
+ }}
+ alt=""
+ />
+
+ :