From c3d72e9fae9ed89bd606578492ccb95a91f849d8 Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Mon, 24 Oct 2022 09:28:28 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=20=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6-?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=BC=B4=E7=BA=B3=E9=9C=80=E8=A6=81=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E6=89=8D=E8=83=BD=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/ruleConfig/index.js | 18 +++++++++--------- .../standingBook/index.js | 1 - .../standingBookDetail/index.js | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js index 301fe673..860480b6 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js @@ -184,7 +184,7 @@ class Index extends Component { progressVisible: false, progress: 100 }); - message.success("加密成功"); + message.success("保存成功"); } else if(progress_statue === "in_progress" && this.timer){ this.setState({ progress: 10 * number @@ -197,7 +197,7 @@ class Index extends Component { progressVisible: false, progress: 100 }); - message.error(errormsg || "加密失败!"); + message.error(errormsg || "保存失败!"); } }); }, 1000); @@ -252,13 +252,13 @@ class Index extends Component { } showGroup center items={importItems}/> - {/**/} - {/* 加密规则*/} - {/* */} - {/* */} - {/* } showGroup center items={enctryItems}/>*/} + + 加密规则 + + + } showGroup center items={enctryItems}/> { this.state.progressVisible && { const { save } = this.props.standingBookStore; const { billMonth, ...extra } = formVal; - console.log("extra:", extra); const payload = { billMonth: moment(billMonth).format("YYYY-MM"), ...extra diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js index 360c972a..1155cb22 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js @@ -17,7 +17,7 @@ class StandingBookDetail extends Component { constructor(props) { super(props); this.state = { - selectedKey: "", + selectedKey: "1", tabList: [], remarks: "", billMonth: "" From 7384d124b2fcf6238c6437abe02ed985fc87e595 Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Mon, 24 Oct 2022 11:24:09 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=8F=91?= =?UTF-8?q?=E6=94=BE=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E7=9A=84bug?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/mobilePayroll/index.js | 15 ++++++++------- .../templatePreview/computerTemplate/index.js | 8 +++++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js index 949412ed..5ea4e38e 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js @@ -11,9 +11,10 @@ import "../payroll/templatePreview/index.less"; export default class MobilePayroll extends React.Component { constructor(props) { super(props); - this.state= { + this.state = { mySalaryBillData: { - employeeInformation: {} + employeeInformation: {}, + salaryTemplate: [] } }; this.id = ""; @@ -31,13 +32,13 @@ export default class MobilePayroll extends React.Component { getMySalaryBill(id).then(result => { this.setState({ mySalaryBillData: result - }) - }) - } + }); + }); + }; render() { - const { mySalaryBillData }= this.state; + const { mySalaryBillData } = this.state; const type = getQueryString("type"); const employeeInformation = mySalaryBillData.employeeInformation ? mySalaryBillData.employeeInformation : {}; const salaryGroups = mySalaryBillData.salaryGroups ? mySalaryBillData.salaryGroups : []; @@ -64,7 +65,7 @@ export default class MobilePayroll extends React.Component { isPreview isMsgPreview salaryTemplateShowSet={JSON.stringify(mySalaryBillData.salaryTemplate)} - salaryItemSet={!_.isEmpty(salaryGroups) ? JSON.stringify([employeeInformation, ...salaryGroups]) : []} + salaryItemSet={!_.isEmpty(salaryGroups) ? JSON.stringify([employeeInformation, ...salaryGroups]) : JSON.stringify([])} /> } diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js index b6ddd000..f1616003 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js @@ -73,9 +73,11 @@ export default class ComputerTemplate extends React.Component { const { salaryTemplateShowSet, salaryItemSet } = this.state; return (
-
- {salaryTemplateShowSet.theme.replace("${companyName}", "").replace("${salaryMonth}", moment(new Date()).format("YYYY-MM"))} -
+ {salaryTemplateShowSet.theme && +
+ {salaryTemplateShowSet.theme.replace("${companyName}", "").replace("${salaryMonth}", moment(new Date()).format("YYYY-MM"))} +
+ } { salaryTemplateShowSet.background &&
From 0305c245567af0bdb1f7c3cf9c70bd199a29a602 Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Mon, 24 Oct 2022 18:45:04 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payrollFiles/components/importMenu.js | 18 ++++-- pc4mobx/hrmSalary/pages/payrollFiles/index.js | 63 +++++++++---------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js index 04103886..5e9e6ae0 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js @@ -21,7 +21,12 @@ class ImportMenu extends Component { } salaryArchivePreview = (params) => { - params.importType = this.state.importParams.importType; + if (this.state.importParams.importType === "init" || this.state.importParams.importType === "salaryItemAdjust") { + params.importType = this.state.importParams.importType; + params.listType = "FIXED"; + } else { + params.listType = this.state.importParams.importType; + } API.salaryArchivePreview(params).then(({ status, data }) => { if (status) { const { headers, list } = data; @@ -77,16 +82,21 @@ class ImportMenu extends Component { handleInitModal = () => { // 清空列表数据 this.setState({ - previewDataSource:[], + previewDataSource: [], importParams: { ...this.state.importParams, - importResult:{}, + importResult: {} } }); }; // 导入档案 handleImportFile = (params) => { - params.importType = this.state.importParams.importType; + if (this.state.importParams.importType === "init" || this.state.importParams.importType === "salaryItemAdjust") { + params.importType = this.state.importParams.importType; + params.listType = "FIXED"; + } else { + params.listType = this.state.importParams.importType; + } API.importSalaryArchive(params).then(({ status, data }) => { if (status) { data.errorData = data.errorNotice; diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index 5ee14399..47405cca 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -223,7 +223,7 @@ class Index extends Component { onOk: () => { API.allGotoFixed({}).then(({ status, data, errormsg }) => { if (status) { - const { msg }= data; + const { msg } = data; message.info(msg || "操作成功!"); this.query(); } else { @@ -293,20 +293,12 @@ class Index extends Component { const { taxAgentStore: { showOperateBtn } } = this.props; if (selectedKey === "pending" && showOperateBtn) { return [ - it.id !== "salaryItemAdjust")} - refreshList={() => { - this.query(); - this.setState({ selectedRowKeys: [] }); - }}/>}> - - , - }> - , + }> + @@ -328,13 +320,14 @@ class Index extends Component { this.setState({ selectedRowKeys: [] }); }}/> }> - , - }> - @@ -365,20 +358,11 @@ class Index extends Component { } this.deleteSuspendTodo(selectedRowKeys); }}>批量删除待办, - it.id !== "salaryItemAdjust")} - refreshList={() => { - this.query(); - this.setState({ selectedRowKeys: [] }); - }}/> - }> - - , - }> + , + }> , - }> + }> , }> - @@ -380,14 +380,14 @@ class Index extends Component { }} /> }> - , }> - From 6b3c8aa272509aa63ccd75b36209e22be04670b1 Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Wed, 26 Oct 2022 13:56:28 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=9A=84=E5=BE=85=E5=87=8F=E5=91=98=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=8E=BB=E6=8E=89=E5=88=A0=E9=99=A4=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js | 2 ++ .../hrmSalary/pages/socialSecurityBenefits/archives/index.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js index e3601c05..74dd4b0e 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js @@ -26,6 +26,7 @@ class ImportMenu extends Component { params.listType = "FIXED"; } else { params.listType = this.state.importParams.importType; + params.importType = ''; } API.salaryArchivePreview(params).then(({ status, data }) => { if (status) { @@ -95,6 +96,7 @@ class ImportMenu extends Component { params.importType = this.state.importParams.importType; params.listType = "FIXED"; } else { + params.importType = ''; params.listType = this.state.importParams.importType; } API.importSalaryArchive(params).then(({ status, data }) => { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index dddddc66..a35a81e6 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -175,7 +175,7 @@ export default class Archives extends React.Component { } }}> 减员 - 删除待办 + {/*删除待办*/} } title=""> From 86f002a636548f59b1638df6b12adff5f4aa053a Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Wed, 26 Oct 2022 15:46:39 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E5=8A=A0=E5=AF=86=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A1=AE=E8=AE=A4=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/ruleConfig/index.js | 88 +++++++++++---------- 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js index 860480b6..6e8e1909 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js @@ -159,49 +159,57 @@ class Index extends Component { } }); } else if (type === "ENCRYTION") { - this.setState({ loading: { ...this.state.loading, encry: true } }); - API.saveEncryptSetting({ isOpenEncrypt: saveParams.enctry }).then(({ data, status, errormsg }) => { - this.setState({ loading: { ...this.state.loading, encry: false } }); - if (status) { - const { isSuccess, progressId, msg } = data; - if(!isSuccess){ - message.error(errormsg || msg || "保存失败!"); - return - } - this.setState({ - progressVisible: true - }, () => { - let number=1 ; - this.timer && clearInterval(this.timer); - this.timer = setInterval(() => { - API.getEncryptProgress({ progressId }).then(({status, data, errormsg}) => { - const { progress_statue }= data; - if (progress_statue === "success" && this.timer) { - clearInterval(this.timer); - this.timer = null; - number=1; - this.setState({ - progressVisible: false, - progress: 100 + Modal.confirm({ + title: "信息确认", + content: "开启/关闭加密前请做好数据库备份！！！逆向解密会花费几分钟时间，请耐心等待！！！", + onOk: () => { + this.setState({ loading: { ...this.state.loading, encry: true } }); + API.saveEncryptSetting({ isOpenEncrypt: saveParams.enctry }).then(({ data, status, errormsg }) => { + this.setState({ loading: { ...this.state.loading, encry: false } }); + if (status) { + const { isSuccess, progressId, msg } = data; + if(!isSuccess){ + message.error(errormsg || msg || "保存失败!"); + return + } + this.setState({ + progressVisible: true + }, () => { + let number=1 ; + this.timer && clearInterval(this.timer); + this.timer = setInterval(() => { + API.getEncryptProgress({ progressId }).then(({status, data, errormsg}) => { + const { progress_statue }= data; + if (progress_statue === "success" && this.timer) { + clearInterval(this.timer); + this.timer = null; + number=1; + this.setState({ + progressVisible: false, + progress: 100 + }); + message.success("保存成功"); + } else if(progress_statue === "in_progress" && this.timer){ + this.setState({ + progress: 10 * number + }, ()=> number++ ); + }else if (!status || (progress_statue === "fail" && this.timer)) { + clearInterval(this.timer); + this.timer = null; + number=1; + this.setState({ + progressVisible: false, + progress: 100 + }); + message.error(errormsg || "保存失败!"); + } }); - message.success("保存成功"); - } else if(progress_statue === "in_progress" && this.timer){ - this.setState({ - progress: 10 * number - }, ()=> number++ ); - }else if (!status || (progress_statue === "fail" && this.timer)) { - clearInterval(this.timer); - this.timer = null; - number=1; - this.setState({ - progressVisible: false, - progress: 100 - }); - message.error(errormsg || "保存失败!"); - } + }, 1000); }); - }, 1000); + } }); + }, + onCancel: () => { } }); } From 1075625170f41c0e32256ad59de39d51a06b1940 Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Wed, 26 Oct 2022 16:54:15 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standingBookDetail/components/normal.js | 4 +++- .../pages/socialSecurityBenefits/standingBookDetail/index.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index f16b06a9..4a2e7f9f 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -47,8 +47,10 @@ export default class NormalIndex extends Component { } componentDidMount() { - const { billMonth, selectedKey, paymentOrganization } = this.props; + const { selectedKey, location } = this.props; const { current } = this.state; + const billMonth = location.query.billMonth; + const paymentOrganization = location.query.paymentOrganization; selectedKey === "1" ? this.getNormalList({ billMonth, current, paymentOrganization }) : this.getSupplementaryList({ billMonth, current, paymentOrganization }); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js index 1155cb22..9fa45933 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js @@ -62,7 +62,7 @@ class StandingBookDetail extends Component { { (selectedKey === "1" || selectedKey === "3") && + paymentOrganization={this.paymentOrganization} location={this.props.location}/> } { selectedKey === "2" && From aa7ec552943c87ec84cebf8f047afb2cfb3fc593 Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Wed, 26 Oct 2022 18:40:25 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/pages/declare/generateModal.js | 4 +++- pc4mobx/hrmSalary/pages/payrollFiles/index.js | 18 ++++++++-------- pc4mobx/hrmSalary/stores/declare.js | 10 +++++---- pc4mobx/hrmSalary/stores/salaryItem.js | 21 +++++++++++-------- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/declare/generateModal.js b/pc4mobx/hrmSalary/pages/declare/generateModal.js index 5ae0e1e1..8bc9e95e 100644 --- a/pc4mobx/hrmSalary/pages/declare/generateModal.js +++ b/pc4mobx/hrmSalary/pages/declare/generateModal.js @@ -43,7 +43,8 @@ export default class GenerateModal extends React.Component { render() { const { - taxAgentStore: { taxAgentAdminOption } + taxAgentStore: { taxAgentAdminOption }, + declareStore: { loading } } = this.props; return ( { this.handleGenerate(); }}> diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index e654c674..e7fd1f95 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -350,14 +350,14 @@ class Index extends Component { verticalAlign: "middle" }}/> , - , + // , , @@ -446,7 +446,7 @@ class Index extends Component { placement="bottomRight" content={ this.handleMenuClick(e, record.id)}> 停薪 - 删除待办 + {/*删除待办*/} } title=""> diff --git a/pc4mobx/hrmSalary/stores/declare.js b/pc4mobx/hrmSalary/stores/declare.js index 2a6fd40a..c4e006d8 100644 --- a/pc4mobx/hrmSalary/stores/declare.js +++ b/pc4mobx/hrmSalary/stores/declare.js @@ -92,7 +92,9 @@ export class DeclareStore { @action saveDeclare = (params) => { return new Promise((resolve, reject) => { + this.loading= true; API.saveDeclare(params).then(res => { + this.loading= false; if(res.status) { message.success("生成成功") resolve(); @@ -102,8 +104,8 @@ export class DeclareStore { } }) }) - - } + + } //个税申报表-个税申报表相关信息 @action @@ -139,6 +141,6 @@ export class DeclareStore { } - -} \ No newline at end of file + +} diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js index e1c329d3..96d60416 100644 --- a/pc4mobx/hrmSalary/stores/salaryItem.js +++ b/pc4mobx/hrmSalary/stores/salaryItem.js @@ -79,18 +79,21 @@ export class SalaryItemStore { setDeleteItemVisible = deleteItemVisible => this.deleteItemVisible = deleteItemVisible; @action - setSystemItemVisible = systemItemVisible => this.systemItemVisible = systemItemVisible; + setSystemItemVisible = systemItemVisible => { + this.systemItemVisible = systemItemVisible; + this.sysListTableStore = new TableStore(); + }; // 存储分页以及关键字信息 @action - setPageInfo = (pageInfo) => this.pageInfo = {...this.pageInfo,...pageInfo}; + setPageInfo = (pageInfo) => this.pageInfo = { ...this.pageInfo, ...pageInfo }; // 渲染table数据 @action getTableDatas = (params) => { this.loading = true; - return new Promise((resolve, reject)=>{ - API.getItemList({...params, ...this.pageInfo}).then(action(res => { + return new Promise((resolve, reject) => { + API.getItemList({ ...params, ...this.pageInfo }).then(action(res => { this.loading = false; if (res.status) { // 接口请求成功/失败处理 this.tableDataSource = res.data.list; @@ -101,7 +104,7 @@ export class SalaryItemStore { reject(); } })); - }) + }); }; @action @@ -202,7 +205,7 @@ export class SalaryItemStore { @action deleteItemRequest = (ids) => { - return new Promise((resolve, reject)=>{ + return new Promise((resolve, reject) => { API.deleteItem(ids).then(res => { if (res.status) { this.deleteItemVisible = false; @@ -213,7 +216,7 @@ export class SalaryItemStore { reject(); } }); - }) + }); }; validateForm(params) { @@ -252,7 +255,7 @@ export class SalaryItemStore { //薪资项目-新增薪资项目 @action saveItem = (params, continueFlag) => { - return new Promise((resolve, reject)=>{ + return new Promise((resolve, reject) => { if (!this.validateForm(params)) { return; } @@ -269,7 +272,7 @@ export class SalaryItemStore { reject(); } }); - }) + }); }; // 获取公式变量类型 From 216f8c8b932b69d20a6f17054ef0b9be611b24dc Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Thu, 27 Oct 2022 09:46:28 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/payrollFiles/index.js | 25 ++++++---- pc4mobx/hrmSalary/pages/ruleConfig/index.js | 50 ++++++++++++------- 2 files changed, 46 insertions(+), 29 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index e7fd1f95..b79884ca 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -400,18 +400,21 @@ class Index extends Component { const { pageInfo, selectedKey } = this.state; const { payrollFilesStore: { tableStore }, taxAgentStore: { showOperateBtn } } = this.props; let columns = _.filter(toJS(tableStore.columns), (item) => item.display === "true"); - return _.map([{ - title: "序号", - dataIndex: "index", - align: "left", - oldWidth: 60, - render: (text, record, index) => { - const { current, pageSize } = pageInfo; - return (current - 1) * pageSize + index + 1; - } - }, ...columns], (item, index) => { + return _.map([ + // { + // title: "序号", + // dataIndex: "index", + // align: "left", + // oldWidth: 60, + // render: (text, record, index) => { + // const { current, pageSize } = pageInfo; + // return (current - 1) * pageSize + index + 1; + // } + // }, + ...columns], (item, index) => { if (index === 0) { - return { ...item, width: item.oldWidth, fixed: "left" }; + // , fixed: "left" + return { ...item, width: item.oldWidth }; } if (item.dataIndex === "operate") { return { diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js index 6e8e1909..a54c69f5 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js @@ -168,38 +168,51 @@ class Index extends Component { this.setState({ loading: { ...this.state.loading, encry: false } }); if (status) { const { isSuccess, progressId, msg } = data; - if(!isSuccess){ + if (!isSuccess) { message.error(errormsg || msg || "保存失败!"); - return + return; } this.setState({ - progressVisible: true + progressVisible: true, + progress: 0 }, () => { - let number=1 ; + let number = 1; this.timer && clearInterval(this.timer); this.timer = setInterval(() => { - API.getEncryptProgress({ progressId }).then(({status, data, errormsg}) => { - const { progress_statue }= data; + API.getEncryptProgress({ progressId }).then(({ status, data, errormsg }) => { + const { progress_statue } = data; if (progress_statue === "success" && this.timer) { clearInterval(this.timer); this.timer = null; - number=1; + number = 1; this.setState({ - progressVisible: false, - progress: 100 + progress: 100, + },()=>{ + this.setState({ + progressVisible: false, + }) }); message.success("保存成功"); - } else if(progress_statue === "in_progress" && this.timer){ - this.setState({ - progress: 10 * number - }, ()=> number++ ); - }else if (!status || (progress_statue === "fail" && this.timer)) { + } else if (progress_statue === "in_progress" && this.timer) { + if (this.state.progress === 90) { + this.setState({ + progress: this.state.progress + 90/100 + }); + } else { + this.setState({ + progress: 10 * number + }, () => number++); + } + } else if (!status || (progress_statue === "fail" && this.timer)) { clearInterval(this.timer); this.timer = null; - number=1; + number = 1; this.setState({ - progressVisible: false, - progress: 100 + progress: 100, + },()=>{ + this.setState({ + progressVisible: false, + }) }); message.error(errormsg || "保存失败!"); } @@ -257,7 +270,8 @@ class Index extends Component { title={
人员校验规则 - +
} showGroup center items={importItems}/> Date: Thu, 27 Oct 2022 13:58:23 +0800 Subject: [PATCH 10/19] =?UTF-8?q?hotfix/v2-bug=E4=BF=AE=E5=A4=8D-1024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/pages/ledger/calcRulesForm.js | 11 +++- .../pages/ledger/step4/RuleEditModal.js | 8 +-- pc4mobx/hrmSalary/pages/ruleConfig/index.js | 20 +++---- .../archives/accumulationFundForm.js | 4 +- .../archives/otherForm.js | 4 +- .../archives/socialSecurityForm.js | 4 +- .../standingBook/index.js | 55 +++++++++++++------ pc4mobx/hrmSalary/stores/archives.js | 8 +-- 8 files changed, 71 insertions(+), 43 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ledger/calcRulesForm.js b/pc4mobx/hrmSalary/pages/ledger/calcRulesForm.js index 4306a345..5958e987 100644 --- a/pc4mobx/hrmSalary/pages/ledger/calcRulesForm.js +++ b/pc4mobx/hrmSalary/pages/ledger/calcRulesForm.js @@ -5,6 +5,7 @@ import { slideStep4Columns } from "./columns"; import "./index.less"; import RuleEditModal from "./step4/RuleEditModal"; import { inject, observer } from "mobx-react"; +import { toJS } from 'mobx'; @inject("ledgerStore") @observer @@ -48,8 +49,13 @@ export default class CalRulesForm extends React.Component { } convertAdjustmentType(index) { - let nameList = ["取调整后薪资", "分段计薪", "取平均"]; - return nameList[Number(index) - 1]; + let nameList = { + 1: '取调薪前薪资', + 2: '取调薪后薪资', + 3: '平均值', + 4: '分段计薪', + }; + return nameList[Number(index)]; } getSalaryItemName(salaryItemId) { @@ -75,7 +81,6 @@ export default class CalRulesForm extends React.Component { rule: resultStr }; }); - } render() { diff --git a/pc4mobx/hrmSalary/pages/ledger/step4/RuleEditModal.js b/pc4mobx/hrmSalary/pages/ledger/step4/RuleEditModal.js index 5b5e28ff..bf8876cc 100644 --- a/pc4mobx/hrmSalary/pages/ledger/step4/RuleEditModal.js +++ b/pc4mobx/hrmSalary/pages/ledger/step4/RuleEditModal.js @@ -15,7 +15,7 @@ export default class RuleEditModal extends React.Component { this.state = { itemValue: "", effectiveDate: "", - beforeAdjustmentType: 1, + beforeAdjustmentType: 2, afterAdjustmentType: 1, initedSelect: false }; @@ -150,8 +150,8 @@ export default class RuleEditModal extends React.Component { { this.beforeAdjustmentTypeChange(value); }} value={beforeAdjustmentType}> - 取调整后薪资 - 分段计薪取调整后薪资 + 分段计薪 取调整前薪资 - 分段计薪分段计薪{ + progress: 100 + }, () => { this.setState({ - progressVisible: false, - }) + progressVisible: false + }); }); message.success("保存成功"); } else if (progress_statue === "in_progress" && this.timer) { - if (this.state.progress === 90) { + if (this.state.progress >= 90) { this.setState({ - progress: this.state.progress + 90/100 + progress: this.state.progress + (0.001 * this.state.progress) }); } else { this.setState({ @@ -208,11 +208,11 @@ class Index extends Component { this.timer = null; number = 1; this.setState({ - progress: 100, - },()=>{ + progress: 100 + }, () => { this.setState({ - progressVisible: false, - }) + progressVisible: false + }); }); message.error(errormsg || "保存失败!"); } diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js index 0e1d8e91..f7c8ce98 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js @@ -12,8 +12,8 @@ export default class AccumulationFundForm extends React.Component { componentWillMount() { const { archivesStore: { getBaseForm, getPaymentForm } } = this.props; - getBaseForm(this.props.employeeId, "ACCUMULATION_FUND"); - getPaymentForm(this.props.employeeId, "ACCUMULATION_FUND", this.props.record.fundSchemeId); + getBaseForm(this.props.employeeId, "ACCUMULATION_FUND", this.props.record.paymentOrganization); + getPaymentForm(this.props.employeeId, "ACCUMULATION_FUND", this.props.record.fundSchemeId, this.props.record.paymentOrganization); } // 表单变化 diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js index ceff0bf9..5d02b807 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js @@ -19,8 +19,8 @@ export default class OtherForm extends React.Component { componentWillMount() { const { archivesStore: { getBaseForm, getPaymentForm } } = this.props; - getBaseForm(this.props.employeeId, "OTHER"); - getPaymentForm(this.props.employeeId, "OTHER", this.props.record.otherSchemeId); + getBaseForm(this.props.employeeId, "OTHER", this.props.record.paymentOrganization); + getPaymentForm(this.props.employeeId, "OTHER", this.props.record.otherSchemeId, this.props.record.paymentOrganization); } // 获取基数表单 diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js index 016cea47..10c16fb5 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js @@ -14,8 +14,8 @@ export default class SocialSecurityForm extends React.Component { componentWillMount() { const { archivesStore } = this.props; const { getBaseForm, getPaymentForm } = archivesStore; - getBaseForm(this.props.employeeId, "SOCIAL_SECURITY"); - getPaymentForm(this.props.employeeId, "SOCIAL_SECURITY", this.props.record.siSchemeId); + getBaseForm(this.props.employeeId, "SOCIAL_SECURITY", this.props.record.paymentOrganization); + getPaymentForm(this.props.employeeId, "SOCIAL_SECURITY", this.props.record.siSchemeId, this.props.record.paymentOrganization); } // 表单变化 diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js index 2c0a7610..3d2fa3ce 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js @@ -11,8 +11,7 @@ import AbnormalDrawer from "./components/abnormalDrawer"; import CustomPaginationTable from "../../../components/customPaginationTable"; import moment from "moment"; import _ from "lodash"; - -// import { columns, dataSource } from './columns'; +import ProgressModal from "../../../components/progressModal"; import "./index.less"; const MonthPicker = DatePicker.MonthPicker; @@ -49,7 +48,9 @@ export default class StandingBook extends React.Component { list: [], total: 0 }, - adminData: {} + adminData: {}, + progressVisible: false, + progress: 0 }; this.payload = {}; this.pageInfo = { current: 1, pageSize: 10 }; @@ -248,13 +249,6 @@ export default class StandingBook extends React.Component { `/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/standingBookDetail?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}` ); } - - setTimeout(() => { - this.getCommonList({ - ...this.state.tableParams, - current: this.state.current - }); - }, 3000); }; handleOperate = (payload) => { const { siaccountFile, siaccountDelete, deleteLoading } = @@ -318,13 +312,31 @@ export default class StandingBook extends React.Component { ...extra }; save(payload).then(() => { - message.success("核算成功"); - this.handleClose(); - this.getCommonList({ - ...this.state.tableParams, - current: this.state.current + this.setState({ + progressVisible: true + }, () => { + this.timer = setInterval(() => { + if (this.state.progress !== 100) { + this.setState({ + progress: this.state.progress + 10 + }); + } else { + clearInterval(this.timer); + this.setState({ + progressVisible: false, + progress: 0 + },()=>{ + message.success("核算成功"); + this.handleClose(); + this.getCommonList({ + ...this.state.tableParams, + current: this.state.current + }); + this.handleGoDetail(moment(billMonth).format("YYYY-MM"), "", extra.paymentOrganization ? extra.paymentOrganization : ""); + }); + } + }, 1000); }); - this.handleGoDetail(moment(billMonth).format("YYYY-MM"), "", extra.paymentOrganization ? extra.paymentOrganization : ""); }); }; @@ -492,6 +504,17 @@ export default class StandingBook extends React.Component { loading={loading} /> )} + {/*核算进度条*/} + { + this.state.progressVisible && + { + this.setState({ progressVisible: false, progress: 0 }); + }} + progress={this.state.progress} + /> + } {drawerProps.visible && ( { - API.getBaseForm({employeeId, welfareTypeEnum}).then(action(res => { + getBaseForm = (employeeId, welfareTypeEnum ="", paymentOrganization="") => { + API.getBaseForm({employeeId, welfareTypeEnum, paymentOrganization}).then(action(res => { if(res.status) { if(welfareTypeEnum == "") { this.baseFormData = res.data.data @@ -166,8 +166,8 @@ export class ArchivesStore { // 查询档案缴纳基数表单 @action - getPaymentForm = (employeeId, welfareTypeEnum, schemeId) => { - API.getPaymentForm({employeeId, welfareTypeEnum, schemeId}).then(res => { + getPaymentForm = (employeeId, welfareTypeEnum, schemeId, paymentOrganization="") => { + API.getPaymentForm({employeeId, welfareTypeEnum, schemeId, paymentOrganization}).then(res => { if(welfareTypeEnum == "SOCIAL_SECURITY") { this.socialSecurityPaymentForm = res.data } else if(welfareTypeEnum == "ACCUMULATION_FUND") { From 08ab6de7a47ad981f55b279d2f6139edff783d4f Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Fri, 28 Oct 2022 17:12:03 +0800 Subject: [PATCH 11/19] =?UTF-8?q?hotfix/v2-bug=E4=BF=AE=E5=A4=8D-1024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/ruleconfig.js | 4 + pc4mobx/hrmSalary/pages/ledger/index.js | 1 - pc4mobx/hrmSalary/pages/ledger/index.less | 4 + .../hrmSalary/pages/ledger/slideRefereUser.js | 1 + pc4mobx/hrmSalary/pages/payrollFiles/index.js | 15 +- pc4mobx/hrmSalary/pages/ruleConfig/index.js | 14 +- .../pages/salaryFile/saralyFileViewSlide.js | 2 +- .../socialSecurityBenefits/archives/index.js | 28 +-- .../standingBook/index.less | 2 +- pc4mobx/hrmSalary/pages/taxAgent/index.js | 1 + pc4mobx/hrmSalary/stores/archives.js | 230 +++++++++--------- 11 files changed, 159 insertions(+), 143 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/ruleconfig.js b/pc4mobx/hrmSalary/apis/ruleconfig.js index 09f8ebba..13f2e0eb 100644 --- a/pc4mobx/hrmSalary/apis/ruleconfig.js +++ b/pc4mobx/hrmSalary/apis/ruleconfig.js @@ -31,6 +31,10 @@ export const queryAppsetting = (params) => { export const saveEncryptSetting = (params) => { return postFetch('/api/bs/hrmsalary/sys/app/setting/saveEncryptSetting', params); } +//加密配置保存 +export const appSettingSave = (params) => { + return postFetch('/api/bs/hrmsalary/sys/app/setting/save', params); +} //获取加密进度条 export const getEncryptProgress = params => { return WeaTools.callApi('/api/bs/hrmsalary/sys/app/getEncryptProgress', 'GET', params); diff --git a/pc4mobx/hrmSalary/pages/ledger/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js index 5051c138..80474093 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.js +++ b/pc4mobx/hrmSalary/pages/ledger/index.js @@ -16,7 +16,6 @@ import SlideModalTitle from "../../components/slideModalTitle"; import CopyFormModal from "./copyFormModal"; import "./index.less"; - @inject("ledgerStore", "taxAgentStore") @observer export default class Ledger extends React.Component { diff --git a/pc4mobx/hrmSalary/pages/ledger/index.less b/pc4mobx/hrmSalary/pages/ledger/index.less index f735565b..219586a4 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.less +++ b/pc4mobx/hrmSalary/pages/ledger/index.less @@ -326,3 +326,7 @@ border-radius: 0; } } + +//.ant-modal-body { +// overflow: auto; +//} diff --git a/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js b/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js index 58645741..b55ed5a4 100644 --- a/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js +++ b/pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js @@ -50,6 +50,7 @@ export default class SlideRefereUser extends React.Component { } = this.props; getLedgerPersonRangeInclude({ salarySobId: salarySobId }); if (edit) getLedgerBasicForm(); + // window.setLayoutWindow=window; } onSelectChange = selectedRowKeys => { diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index b79884ca..bee13a3e 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -414,12 +414,14 @@ class Index extends Component { ...columns], (item, index) => { if (index === 0) { // , fixed: "left" - return { ...item, width: item.oldWidth }; + // , width: item.oldWidth + return { ...item }; } if (item.dataIndex === "operate") { return { - ...item, fixed: "right", - width: 150, + ...item, + // fixed: "right", + // width: 150, render: (text, record) => { if (!showOperateBtn) { return
@@ -471,7 +473,8 @@ class Index extends Component { } }; } - return { ...item, width: item.oldWidth }; + // , width: item.oldWidth + return { ...item }; }); }; handleEdit = (record) => { @@ -551,7 +554,7 @@ class Index extends Component { handleSave = () => { const { paysetParams, selectedKey } = this.state; const { salaryFileStore: { adjustSalaryItems, detailForm } } = this.props; - if ((selectedKey === "pending" && _.isEmpty(paysetParams.payStartDate)) || (selectedKey !== "pending" && _.isEmpty(paysetParams.payEndDate))) { + if ((selectedKey === "pending" && _.isEmpty(paysetParams.payStartDate)) || (selectedKey === "suspend" && _.isEmpty(paysetParams.payEndDate))) { Modal.warning({ title: "信息确认", content: "必要信息不完整，红色*为必填项！" @@ -722,7 +725,7 @@ class Index extends Component { columns={this.getColumns()} dataSource={dataSource} pagination={pagination} // rowClassName={(record) => record.archiveStatus === "ARCHIVE" ? "archiveRow" : ""} rowSelection={rowSelection} - scroll={{ x: 1200 }} + // scroll={{ x: 1200 }} /> 保存
} showGroup center items={importItems}/> - - 加密规则 - -
- } showGroup center items={enctryItems}/> + {/**/} + {/* 加密规则*/} + {/* */} + {/*
*/} + {/* } showGroup center items={enctryItems}/>*/} { this.state.progressVisible && { - if(key === "addMember"){ + content={ { + if (key === "addMember") { this.stayAddToPay([record.baseInfo]); - }else{ + } else { Modal.warning({ title: "信息确认", content: `确定要删除该条待办人员吗？`, @@ -200,23 +200,23 @@ export default class Archives extends React.Component { } // 保存 - handleEditSlideSave() { + handleEditSlideSave = () => { const { selectedTab } = this.state; const { archivesStore: { save } } = this.props; if (selectedTab == 1) { - save("SOCIAL_SECURITY"); + save("SOCIAL_SECURITY").then(() => { + this.query(); + }); } else if (selectedTab == 2) { - save("ACCUMULATION_FUND"); + save("ACCUMULATION_FUND").then(() => { + this.query(); + }); } else if (selectedTab == 3) { - save("OTHER"); + save("OTHER").then(() => { + this.query(); + }); } - } - - handlePageChnage(value) { - const { archivesStore: { form, getTableDatas } } = this.props; - this.pageInfo.current = value; - getTableDatas(this.pageInfo); - } + }; // 导入 handleBtnImport(runStatus) { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less index 0acd026f..10130c20 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less @@ -1,6 +1,5 @@ .standingbookWrapper { .wea-new-top-content { - padding: 0 16px; .wea-new-table { .ant-table-row:hover { .more { @@ -23,6 +22,7 @@ display: flex; align-items: center; height: 46px; + padding: 0 16px; .to { padding: 0 8px; } diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js index fda157e0..f7024ec0 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/index.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js @@ -43,6 +43,7 @@ export default class TaxAgent extends React.Component { const { doInit } = taxAgentStore; doInit(); this.getPermission(); + // window.setLayoutWindow=window; } getPermission = () => { diff --git a/pc4mobx/hrmSalary/stores/archives.js b/pc4mobx/hrmSalary/stores/archives.js index b01de4fe..db02436d 100644 --- a/pc4mobx/hrmSalary/stores/archives.js +++ b/pc4mobx/hrmSalary/stores/archives.js @@ -1,17 +1,17 @@ -import { observable, action, toJS } from 'mobx'; -import { message } from 'antd'; -import { WeaForm, WeaTableNew } from 'comsMobx'; -import { removePropertyCondition } from '../util/response' +import { action, observable } from "mobx"; +import { message } from "antd"; +import { WeaForm, WeaTableNew } from "comsMobx"; +import { removePropertyCondition } from "../util/response"; -import * as API from '../apis/welfareArchive'; // 引入API接口文件 +import * as API from "../apis/welfareArchive"; // 引入API接口文件 const { TableStore } = WeaTableNew; export class ArchivesStore { @observable tableStore = new TableStore( - // {dataHandle: (datas) => { - // return dataSource; - // }} + // {dataHandle: (datas) => { + // return dataSource; + // }} ); @observable form = new WeaForm(); // nrew 一个form @observable condition = []; // 存储后台得到的form数据 @@ -22,9 +22,9 @@ export class ArchivesStore { @observable dataSource = []; // Slide 表单 - @observable baseFormData = {} - @observable socialSecurityForm = {} // 社保表单 - @observable accumulationFundForm = {} // 公积金表单 + @observable baseFormData = {}; + @observable socialSecurityForm = {}; // 社保表单 + @observable accumulationFundForm = {}; // 公积金表单 @observable otherForm = {}; // 其他福利表单 // 基数表单 @@ -34,35 +34,35 @@ export class ArchivesStore { @observable pageInfo = {}; // 导入预览 - @observable previewCurDataList = {} - @observable previewCurDataColumns = [] - @observable previewCurDataDataSource = [] - @observable importResult = {} + @observable previewCurDataList = {}; + @observable previewCurDataColumns = []; + @observable previewCurDataDataSource = []; + @observable importResult = {}; @action initImportParams = () => { this.previewCurDataList = {}; this.previewCurDataColumns = []; this.previewCurDataDataSource = []; - this.importResult = {} - } + this.importResult = {}; + }; // ** 设置导入参数 start ** @action setPreviewCurDataColumns = (previewCurDataColumns) => { - this.previewCurDataColumns = previewCurDataColumns - } + this.previewCurDataColumns = previewCurDataColumns; + }; @action setPreviewCurDataDataSource = (previewCurDataDataSource) => { - this.previewCurDataDataSource = previewCurDataDataSource - } + this.previewCurDataDataSource = previewCurDataDataSource; + }; @action setImportResult = (importResult) => { - this.importResult = importResult - } + this.importResult = importResult; + }; // ** 设置导入参数 end ** // 社保表单 @@ -71,66 +71,66 @@ export class ArchivesStore { // 公积金表单 @action - setAccumulationFundForm = accumulationFundForm => this.accumulationFundForm = accumulationFundForm + setAccumulationFundForm = accumulationFundForm => this.accumulationFundForm = accumulationFundForm; // 其他福利表单 @action - setOtherForm = otherForm => this.otherForm = otherForm + setOtherForm = otherForm => this.otherForm = otherForm; // 社保表单 @action - setSocialSecurityPaymentForm = socialSecurityPaymentForm => this.socialSecurityPaymentForm = socialSecurityPaymentForm + setSocialSecurityPaymentForm = socialSecurityPaymentForm => this.socialSecurityPaymentForm = socialSecurityPaymentForm; // 公积金表单 @action - setAccumulationFundPaymentForm = accumulationFundPaymentForm => this.accumulationFundPaymentForm = accumulationFundPaymentForm + setAccumulationFundPaymentForm = accumulationFundPaymentForm => this.accumulationFundPaymentForm = accumulationFundPaymentForm; // 其他福利基数表单 @action - setOtherPaymentForm = otherPaymentForm => this.otherPaymentForm = otherPaymentForm + setOtherPaymentForm = otherPaymentForm => this.otherPaymentForm = otherPaymentForm; // 初始化操作 @action doInit = () => { this.getCondition(); // this.getTableDatas(); - } + }; // 获得高级搜索表单数据 @action getCondition = () => { API.getCondition().then(action(res => { if (res.status) { // 接口请求成功/失败处理 - let condition = removePropertyCondition(res.data.condition) + let condition = removePropertyCondition(res.data.condition); this.condition = condition; this.form.initFormFields(condition); // 渲染高级搜索form表单 } else { - message.error(res.msg || '接口调用失败！') + message.error(res.msg || "接口调用失败！"); } })); - } + }; // 渲染table数据 @action getTableDatas = (params = {}) => { this.loading = true; const formParams = this.form.getFormParams() || {}; - params = {...formParams, ...params}; + params = { ...formParams, ...params }; API.getTable(params).then(action(res => { if (res.status) { // 接口请求成功/失败处理 this.dataSource = res.data.datas.map(item => { - item = {...item} - item.key = item.employeeId + item = { ...item }; + item.key = item.employeeId; return item; - }) + }); // this.columns = res.data.columns; - this.tableStore.getDatas(res.data.dataKey.datas) - this.pageInfo = res.data.pageInfo + this.tableStore.getDatas(res.data.dataKey.datas); + this.pageInfo = res.data.pageInfo; } else { - message.error(res.msg || '接口调用失败！') + message.error(res.msg || "接口调用失败！"); } this.loading = false; })); - } + }; @action setShowSearchAd = bool => this.showSearchAd = bool; @@ -139,124 +139,128 @@ export class ArchivesStore { @action doSearch = () => { this.getTableDatas(); this.showSearchAd = false; - } + }; // 查询档案基本信息表单 @action - getBaseForm = (employeeId, welfareTypeEnum ="", paymentOrganization="") => { - API.getBaseForm({employeeId, welfareTypeEnum, paymentOrganization}).then(action(res => { - if(res.status) { - if(welfareTypeEnum == "") { - this.baseFormData = res.data.data - } else if(welfareTypeEnum == "SOCIAL_SECURITY"){ - this.socialSecurityForm = res.data - } else if(welfareTypeEnum == "ACCUMULATION_FUND") { - this.accumulationFundForm = res.data - } else if(welfareTypeEnum == "OTHER") { - this.otherForm = res.data - } - // if(res.data && res.data.data && res.data.data.id) { - // this.getPaymentForm(employeeId, welfareTypeEnum, res.data.data.id) - // } - } else { - message.error(res.errormsg || "获取失败") + getBaseForm = (employeeId, welfareTypeEnum = "", paymentOrganization = "") => { + API.getBaseForm({ employeeId, welfareTypeEnum, paymentOrganization }).then(action(res => { + if (res.status) { + if (welfareTypeEnum == "") { + this.baseFormData = res.data.data; + } else if (welfareTypeEnum == "SOCIAL_SECURITY") { + this.socialSecurityForm = res.data; + } else if (welfareTypeEnum == "ACCUMULATION_FUND") { + this.accumulationFundForm = res.data; + } else if (welfareTypeEnum == "OTHER") { + this.otherForm = res.data; } - })) - } + // if(res.data && res.data.data && res.data.data.id) { + // this.getPaymentForm(employeeId, welfareTypeEnum, res.data.data.id) + // } + } else { + message.error(res.errormsg || "获取失败"); + } + })); + }; // 查询档案缴纳基数表单 @action - getPaymentForm = (employeeId, welfareTypeEnum, schemeId, paymentOrganization="") => { - API.getPaymentForm({employeeId, welfareTypeEnum, schemeId, paymentOrganization}).then(res => { - if(welfareTypeEnum == "SOCIAL_SECURITY") { - this.socialSecurityPaymentForm = res.data - } else if(welfareTypeEnum == "ACCUMULATION_FUND") { - this.accumulationFundPaymentForm = res.data - } else if(welfareTypeEnum == "OTHER") { - this.otherPaymentForm = res.data + getPaymentForm = (employeeId, welfareTypeEnum, schemeId, paymentOrganization = "") => { + API.getPaymentForm({ employeeId, welfareTypeEnum, schemeId, paymentOrganization }).then(res => { + if (welfareTypeEnum == "SOCIAL_SECURITY") { + this.socialSecurityPaymentForm = res.data; + } else if (welfareTypeEnum == "ACCUMULATION_FUND") { + this.accumulationFundPaymentForm = res.data; + } else if (welfareTypeEnum == "OTHER") { + this.otherPaymentForm = res.data; } - }) - } + }); + }; // 保存表单 @action save = (welfareType) => { - let baseForm = "" - let paymentForm = "" - if(welfareType == "SOCIAL_SECURITY") { - baseForm = JSON.stringify(this.socialSecurityForm.data) - paymentForm = JSON.stringify(this.socialSecurityPaymentForm.data) - } else if(welfareType == "ACCUMULATION_FUND") { - baseForm = JSON.stringify(this.accumulationFundForm.data) - paymentForm = JSON.stringify(this.accumulationFundPaymentForm.data) - } else if(welfareType == "OTHER") { - baseForm = JSON.stringify(this.otherForm.data) - paymentForm = JSON.stringify(this.otherPaymentForm.data) + let baseForm = ""; + let paymentForm = ""; + if (welfareType == "SOCIAL_SECURITY") { + baseForm = JSON.stringify(this.socialSecurityForm.data); + paymentForm = JSON.stringify(this.socialSecurityPaymentForm.data); + } else if (welfareType == "ACCUMULATION_FUND") { + baseForm = JSON.stringify(this.accumulationFundForm.data); + paymentForm = JSON.stringify(this.accumulationFundPaymentForm.data); + } else if (welfareType == "OTHER") { + baseForm = JSON.stringify(this.otherForm.data); + paymentForm = JSON.stringify(this.otherPaymentForm.data); } - API.save({welfareType, baseForm, paymentForm}).then(res => { - if(res.status) { - message.success("保存成功", 1) - this.getTableDatas() - } else { - message.error(res.errormsg || "保存失败", 1) - } - }) - } + return new Promise((resolve, reject) => { + API.save({ welfareType, baseForm, paymentForm }).then(res => { + if (res.status) { + message.success("保存成功", 1); + resolve(); + // this.getTableDatas() + } else { + message.error(res.errormsg || "保存失败", 1); + reject(); + } + }); + }); + }; // 导入模板下载 @action exportTempateDownload = (params = {}) => { - API.exportCurData(params) - } + API.exportCurData(params); + }; // 导入预览 @action previewCurData = (params) => { API.previewCurData(params).then(res => { - if(res.status) { - this.previewCurDataList = res.data + if (res.status) { + this.previewCurDataList = res.data; this.previewCurDataColumns = res.data.headers.map((item, index) => { - let column = {} + let column = {}; column.title = item; column.dataIndex = "" + index; - column.key = index + "" - return column - }) + column.key = index + ""; + return column; + }); this.previewCurDataDataSource = res.data.list.map((item) => { - let data = {} + let data = {}; item.map((i, index) => { - data[index + ''] = i - }) - return data - }) + data[index + ""] = i; + }); + return data; + }); } else { message.error(res.errormsg || "获取失败", 1); } - }) - } + }); + }; // 导入 @action importBatch = (params) => { return new Promise((resolve, reject) => { API.importBatch(params).then(res => { - if(res.status) { - this.importResult = res.data + if (res.status) { + this.importResult = res.data; resolve(); } else { - message.error(res.errormsg || "导入失败", 1) + message.error(res.errormsg || "导入失败", 1); reject(); } - }) - }) + }); + }); - } + }; // 导出档案 @action exportArchives = (ids = "") => { - API.exportArchives(ids) - } + API.exportArchives(ids); + }; } From e8dbd3e350e71a5feab128a741a0052447053a8c Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Mon, 31 Oct 2022 09:12:18 +0800 Subject: [PATCH 12/19] =?UTF-8?q?hotfix/v2-bug=E4=BF=AE=E5=A4=8D-1024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/ruleConfig/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js index b309c9d4..450ff8d2 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js @@ -274,13 +274,13 @@ class Index extends Component { loading={loading.employee}>保存 } showGroup center items={importItems}/> - {/**/} - {/* 加密规则*/} - {/* */} - {/* */} - {/* } showGroup center items={enctryItems}/>*/} + + 加密规则 + + + } showGroup center items={enctryItems}/> { this.state.progressVisible && Date: Mon, 31 Oct 2022 14:49:24 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/components/TipLabel/index.js | 32 +-- .../socialSecurityBenefits/archives/index.js | 44 +++ .../programme/columns.js | 252 +++++++++--------- .../programme/defaultSlideForm.js | 24 +- .../socialSecurityBenefits/programme/index.js | 2 +- 5 files changed, 215 insertions(+), 139 deletions(-) diff --git a/pc4mobx/hrmSalary/components/TipLabel/index.js b/pc4mobx/hrmSalary/components/TipLabel/index.js index 5d111c33..5671fb88 100644 --- a/pc4mobx/hrmSalary/components/TipLabel/index.js +++ b/pc4mobx/hrmSalary/components/TipLabel/index.js @@ -1,18 +1,18 @@ -import React from 'react'; -import "./index.less" +import React from "react"; +import "./index.less"; export default class TipLabel extends React.Component { - render() { - return ( -
-
- {this.props.title ? this.props.title : "小提示"} -
-
- {this.props.tipList && this.props.tipList.map(item =>
{item}
)} - {this.props.children} -
-
- ) - } -} \ No newline at end of file + render() { + return ( +
+
+ {this.props.title ? this.props.title : "小提示"} +
+
+ {this.props.tipList && this.props.tipList.map(item =>
{item}
)} + {this.props.children} +
+
+ ); + } +} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index bf54f956..a48b9557 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -12,6 +12,7 @@ import OtherForm from "./otherForm"; import { tabCondition } from "./config"; import * as API from "../../../apis/welfareArchive"; import ImportModal from "../../../components/importModal"; +import TipLabel from "../../../components/TipLabel"; import "./index.less"; @inject("archivesStore", "taxAgentStore") @@ -433,6 +434,48 @@ export default class Archives extends React.Component { }); }; + getTipChildren = () => { + const { selectedKey } = this.state; + let dom = null; + switch (selectedKey) { + case "pending": + dom =
+
1、新入职人员、返聘人员和个税扣缴义务人发生变更从【待减员】中减员操作的会进入【待增员】；
+
2、返聘人员默认返聘前的社保福利缴纳方案、缴纳账号、缴纳组织数据，其他数据会清空；
+
3、个税扣缴义务人变更进入【待增员】的，保留所有最新版本数据；若修改了数据再增员则修改的数据作为新版本保存；
+
4、维护好员工的社保福利档案数据后，点击【增员】，数据会进入【在缴员工】；
+
5、若不需给该员工缴纳，可点击【删除待办】进入【停缴员工】；进入【停缴员工】后，可以点击【取消停缴】再次进入【待增员】；
+
6、不管起始缴纳月维护到哪个月，都可以进行增员，不影响核算判断；若维护了最后缴纳月，且小于等于当前月，则增员失败；
+
7、增员失败情况：①终止缴纳月小于等于当前月；②其他的个税扣缴义务人下的在缴员工中存在该员工，在缴员工未进入停缴员工；
+
; + break; + case "fixed": + dom =
+
1、需缴纳社保福利的员工维护在【在缴员工】；
+
2、可使用更新导入，调整档案数据；
+
3、若维护了最后缴纳月且小于等于当前月，则自动进入【待减员】；
+
4、核算人员范围为，【在缴员工】中的起始缴纳月和最后缴纳月区间包含当前月的人员；
+
; + break; + case "suspend": + dom =
+
1、数据进入【待减员】规则：①员工的人事状态属性从在职变成非在职，且在【在缴员工】里；②【在缴员工】里档案维护了缴纳终止月且小于等于当前月；③个税扣缴义务人发生调整；④某员工分权时在原个税扣缴义务人下处于【在缴员工】里但又将该员工添加到其他的个税扣缴义务人下的情况；
+
2、【待减员】为是否不再缴纳的待办状态，数据是从【在缴员工】中复制的，若不处理列表中的待办数据，也不影响社保福利核算；【待减员】维护的数据和【在缴员工】数据是同步的；
+
3、点击【减员】前先维护最后缴纳月，所有有起始缴纳月的福利项的最后缴纳月都小于等于当前月且无未归档的核算数据的档案才能减员成功，减员成功后数据进入【停缴员工】；
+
4、数据进入【待减员】规则的第四种情况下，若还需要在当前个税扣缴义务人下进行缴纳的话，当前该员工的【待减员】数据进行【删除待办】操作即可；若不在该个税扣缴义务人下继续缴纳，维护好最后缴纳月后进行【减员】操作，员工进入【停缴员工】；
+
; + break; + default: + dom =
+
1、不需要缴纳社保福利的员工，保存在【停缴员工】；
+
2、【停缴员工】点击取消停缴，数据会回退到上次的位置（从【待减员】减员到停缴员工的，点击停缴返回到【在缴员工】，不返回到【待减员】）；
+
3、若员工的社保福利从一个个税扣缴义务人下转到另一个个税扣缴义务人下去缴纳，则在转后的个税扣缴义务人的【待增员】中进行增员操作成功后，员工进入待【在缴员工】，而在原个税扣缴义务人下的【停缴员工】中，该员工数据将会被删除；是否开启分权员工的档案数据都只保存一份；
+
; + break; + } + return dom; + }; + render() { const { archivesStore, taxAgentStore: { showOperateBtn } } = this.props; const { selectedTab, selectedRowKeys, selectedKey, dataSource: dataSourceActive, pageInfo, tabCount } = this.state; @@ -658,6 +701,7 @@ export default class Archives extends React.Component { rowSelection={rowSelection} scroll={{ x: 1200 }} /> + {this.getTipChildren()} { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js index 349ea720..5a3004ee 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js @@ -1,144 +1,154 @@ // 社保 export const socialSecurityColumns = [{ - title: "方案名称", - dataIndex: 'title', - key: 'title', + title: "方案名称", + dataIndex: "title", + key: "title" }, { - title: '缴纳类型', - dataIndex: 'username', - key: 'username', + title: "缴纳类型", + dataIndex: "username", + key: "username" }, { - title: '缴纳范围', - dataIndex: 'projectName', - key: 'projectName', + title: "缴纳范围", + dataIndex: "projectName", + key: "projectName" }, { - title: '备注', - dataIndex: 'customer', - key: 'customer', + title: "备注", + dataIndex: "customer", + key: "customer" }, { - title: '操作', - dataIndex: 'customer', - key: 'customer', + title: "操作", + dataIndex: "customer", + key: "customer" }]; // 公积金 -export const accumulationFundColumns= [{ - title: "方案名称", - dataIndex: 'title', - key: 'title', +export const accumulationFundColumns = [{ + title: "方案名称", + dataIndex: "title", + key: "title" }, { - title: '缴纳类型', - dataIndex: 'username', - key: 'username', + title: "缴纳类型", + dataIndex: "username", + key: "username" }, { - title: '缴纳范围', - dataIndex: 'projectName', - key: 'projectName', + title: "缴纳范围", + dataIndex: "projectName", + key: "projectName" }, { - title: '备注', - dataIndex: 'customer', - key: 'customer', + title: "备注", + dataIndex: "customer", + key: "customer" }, { - title: '操作', - dataIndex: 'customer', - key: 'customer', -}] + title: "操作", + dataIndex: "customer", + key: "customer" +}]; // 企业年金及其他福利 export const otherBenefitsColumns = [ - { - title: "方案名称", - dataIndex: 'title', - key: 'title', - - }, - { - title: "缴纳类型", - dataIndex: 'title', - key: 'title', - }, - { - title: "缴纳范围", - dataIndex: 'title', - key: 'title', - }, - { - title: "备注", - dataIndex: 'title', - key: 'title', - }, - { - title: "操作", - dataIndex: 'title', - key: 'title', - } -] + { + title: "方案名称", + dataIndex: "title", + key: "title" + + }, + { + title: "缴纳类型", + dataIndex: "title", + key: "title" + }, + { + title: "缴纳范围", + dataIndex: "title", + key: "title" + }, + { + title: "备注", + dataIndex: "title", + key: "title" + }, + { + title: "操作", + dataIndex: "title", + key: "title" + } +]; export const CustomBenefitsColumns = [ - { - title: "福利名称", - dataIndex: 'title', - key: 'title', - }, - { - title: "启用", - dataIndex: 'title', - key: 'title', - }, - { - title: "类型", - dataIndex: 'title', - key: 'title', - }, - { - title: "缴纳对象", - dataIndex: 'title', - key: 'title', - }, - { - title: "操作", - dataIndex: 'title', - key: 'title', - } -] + { + title: "福利名称", + dataIndex: "title", + key: "title" + }, + { + title: "启用", + dataIndex: "title", + key: "title" + }, + { + title: "类型", + dataIndex: "title", + key: "title" + }, + { + title: "缴纳对象", + dataIndex: "title", + key: "title" + }, + { + title: "操作", + dataIndex: "title", + key: "title" + } +]; export const insertUpdateColumns = [ - { - title: "类型名称", - dataIndex: "insuranceName", - key: "insuranceName" - }, - { - title: "是否缴费", - dataIndex: "isPayment", - key: "isPayment" - }, - { - title: "缴纳对象", - dataIndex: "paymentScope", - key: "paymentScope" - }, - { - title: "缴纳比例%", - dataIndex: "paymentProportion", - key: "paymentProportion" - }, - { - title: "固定费用", - dataIndex: "fixedCost", - key: "fixedCost" - }, - { - title: "有效小数位", - dataIndex: "validNum", - key: "validNum" - }, - { - title: "进位规则", - dataIndex: "rententionRule", - key: "rententionRule" - }, -] + { + title: "类型名称", + dataIndex: "insuranceName", + key: "insuranceName" + }, + { + title: "是否缴费", + dataIndex: "isPayment", + key: "isPayment" + }, + { + title: "缴纳对象", + dataIndex: "paymentScope", + key: "paymentScope" + }, + { + title: "缴纳比例%", + dataIndex: "paymentProportion", + key: "paymentProportion" + }, + { + title: "固定费用", + dataIndex: "fixedCost", + key: "fixedCost" + }, + { + title: "基数上限", + dataIndex: "upperLimit", + key: "upperLimit" + }, + { + title: "基数下限", + dataIndex: "lowerLimit", + key: "lowerLimit" + }, + { + title: "有效小数位", + dataIndex: "validNum", + key: "validNum" + }, + { + title: "进位规则", + dataIndex: "rententionRule", + key: "rententionRule" + } +]; export const dataSource = []; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js index f3c77655..fc3467b3 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js @@ -1,6 +1,6 @@ import React from "react"; import { WeaSelect, WeaInput, WeaTable } from "ecCom"; -import { Table, Row, Col, Switch } from "antd"; +import { Row, Col, Switch } from "antd"; import { insertUpdateColumns } from "./columns"; import { inject, observer } from "mobx-react"; import SmallTab from "../../../components/smallTab"; @@ -123,6 +123,28 @@ export default class DefaultSlideForm extends React.Component { /> ); }; + } else if (item.dataIndex == "upperLimit") { + item.render = (text, record) => { + return ( + { + this.updateDataSource(record, v, "upperLimit"); + }} + /> + ); + }; + } else if (item.dataIndex == "lowerLimit") { + item.render = (text, record) => { + return ( + { + this.updateDataSource(record, v, "lowerLimit"); + }} + /> + ); + }; } }); } diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js index 8f7c1585..3afd55cc 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js @@ -538,7 +538,7 @@ export default class Programme extends React.Component { className="slideOuterWrapper" visible={this.state.slideVisiable} top={0} - width={50} + width={60} height={100} direction={"right"} measure={"%"} From 3c5b564ccb33ab1078923ce1802ff8f7971bb11b Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Mon, 31 Oct 2022 17:58:56 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../socialSecurityBenefits/archives/accumulationFundForm.js | 2 +- .../pages/socialSecurityBenefits/archives/otherForm.js | 2 +- .../pages/socialSecurityBenefits/archives/socialSecurityForm.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js index f7c8ce98..0fece0ec 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js @@ -30,7 +30,7 @@ export default class AccumulationFundForm extends React.Component { // 获取基数表单 handleFetchPaymentForm(fundName) { const { archivesStore: { getPaymentForm } } = this.props; - getPaymentForm(this.props.employeeId, "ACCUMULATION_FUND", fundName); + getPaymentForm(this.props.employeeId, "ACCUMULATION_FUND", fundName, this.props.record.paymentOrganization); } diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js index 5d02b807..f8a24dba 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js @@ -26,7 +26,7 @@ export default class OtherForm extends React.Component { // 获取基数表单 handleFetchPaymentForm(value) { const { archivesStore: { getPaymentForm } } = this.props; - getPaymentForm(this.props.employeeId, "OTHER", value); + getPaymentForm(this.props.employeeId, "OTHER", value, this.props.record.paymentOrganization); } // 表单变化 diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js index 10c16fb5..6ab3793e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js @@ -31,7 +31,7 @@ export default class SocialSecurityForm extends React.Component { // 获取基数表单 handleFetchPaymentForm(value) { const { archivesStore: { getPaymentForm } } = this.props; - getPaymentForm(this.props.employeeId, "SOCIAL_SECURITY", value); + getPaymentForm(this.props.employeeId, "SOCIAL_SECURITY", value, this.props.record.paymentOrganization); } //基数变化 From 023f70e692084162f65a08f0c2a84b1204f32cff Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Tue, 1 Nov 2022 10:35:59 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../socialSecurityBenefits/archives/index.js | 10 +++-- .../programme/columns.js | 20 ++++----- .../programme/defaultSlideForm.js | 44 +++++++++++-------- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index a48b9557..0c825a73 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -285,6 +285,7 @@ export default class Archives extends React.Component { const { pageInfo } = this.state; this.setState({ selectedKey, + selectedRowKeys:[], editSlideVisible: false, pageInfo: { ...pageInfo, @@ -527,7 +528,7 @@ export default class Archives extends React.Component { url = `${url}&runStatuses=3`; break; default: - url = `${url}&runStatuses=4`; + url = `${url}&runStatuses=4,5`; break; } window.open(url, "_self"); @@ -553,7 +554,7 @@ export default class Archives extends React.Component { url = `${url}&runStatuses=3`; break; default: - url = `${url}&runStatuses=4`; + url = `${url}&runStatuses=4,5`; break; } window.open(url, "_self"); @@ -701,7 +702,10 @@ export default class Archives extends React.Component { rowSelection={rowSelection} scroll={{ x: 1200 }} /> - {this.getTipChildren()} + { + !_.isEmpty(this.getColumns()) && + {this.getTipChildren()} + } { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js index 5a3004ee..369e6b5a 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js @@ -118,16 +118,6 @@ export const insertUpdateColumns = [ dataIndex: "paymentScope", key: "paymentScope" }, - { - title: "缴纳比例%", - dataIndex: "paymentProportion", - key: "paymentProportion" - }, - { - title: "固定费用", - dataIndex: "fixedCost", - key: "fixedCost" - }, { title: "基数上限", dataIndex: "upperLimit", @@ -138,6 +128,16 @@ export const insertUpdateColumns = [ dataIndex: "lowerLimit", key: "lowerLimit" }, + { + title: "缴纳比例%", + dataIndex: "paymentProportion", + key: "paymentProportion" + }, + { + title: "固定费用", + dataIndex: "fixedCost", + key: "fixedCost" + }, { title: "有效小数位", dataIndex: "validNum", diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js index fc3467b3..b85a779b 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js @@ -160,20 +160,35 @@ export default class DefaultSlideForm extends React.Component { } = this.props; let result = { ...record }; result[key] = e; - if (this.state.selectItem == "个人") { - let dataSource = [...defaultPersonDataSource]; + if(key === 'upperLimit' || key === 'lowerLimit'){ + let dataSource = [...defaultPersonDataSource], + dataSource_company = [...defaultCompanyDataSource]; dataSource = dataSource.map(item => { - if (item.id == result.id) return result; + if (item.insuranceName === result.insuranceName) return {...item, [key]: e, }; + else return item; + }); + dataSource_company = dataSource_company.map(item => { + if (item.insuranceName === result.insuranceName) return {...item, [key]: e }; else return item; }); setDefaultPersonDataSource(dataSource); - } else { - let dataSource = [...defaultCompanyDataSource]; - dataSource = dataSource.map(item => { - if (item.id == result.id) return result; - else return item; - }); - setDefaultCompanyDataSource(dataSource); + setDefaultCompanyDataSource(dataSource_company); + }else{ + if (this.state.selectItem == "个人") { + let dataSource = [...defaultPersonDataSource]; + dataSource = dataSource.map(item => { + if (item.id == result.id) return result; + else return item; + }); + setDefaultPersonDataSource(dataSource); + } else { + let dataSource = [...defaultCompanyDataSource]; + dataSource = dataSource.map(item => { + if (item.id == result.id) return result; + else return item; + }); + setDefaultCompanyDataSource(dataSource); + } } } @@ -189,10 +204,7 @@ export default class DefaultSlideForm extends React.Component { const { programmeStore, salaryFileStore, taxAgentStore } = this.props; const { userStatusList } = salaryFileStore; const { taxAgentAdminOption,getTaxAgentSelectListAsAdmin } = taxAgentStore; - const { - defaultPersonDataSource, - defaultCompanyDataSource, - } = programmeStore; + const { defaultPersonDataSource, defaultCompanyDataSource } = programmeStore; const options = [ { key: "", @@ -212,13 +224,9 @@ export default class DefaultSlideForm extends React.Component { ]; const handleSmallTabChange = item => { - // let paymentArea = item == "paymentArea" ? "1": "2" - // let requestParams = {...this.props.requestParams} - // requestParams.paymentArea = paymentArea this.setState({ selectItem: item.value }); - // this.props.onChange(requestParams) }; return ( From abd8f2b9f417cce5c4a9c4ca8b13b3fdd2b6e63b Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Tue, 1 Nov 2022 15:50:54 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/welfareScheme.js | 1 - .../archives/accumulationFundForm.js | 26 ++++++++-------- .../socialSecurityBenefits/archives/index.js | 5 ++-- .../archives/otherForm.js | 25 ++++++++-------- .../archives/socialSecurityForm.js | 25 +++++++--------- .../programme/columns.js | 10 +++---- .../programme/defaultSlideForm.js | 14 +++++---- .../socialSecurityBenefits/programme/index.js | 22 +++++++------- .../standingBookDetail/components/normal.js | 30 +++++++++++-------- 9 files changed, 83 insertions(+), 75 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/welfareScheme.js b/pc4mobx/hrmSalary/apis/welfareScheme.js index b46fe837..d0e0b11c 100644 --- a/pc4mobx/hrmSalary/apis/welfareScheme.js +++ b/pc4mobx/hrmSalary/apis/welfareScheme.js @@ -25,7 +25,6 @@ export const createScheme = params => { }).then(res => res.json()) }; export const updateScheme = params => { - return fetch('/api/bs/hrmsalary/scheme/update', { method: 'POST', mode: 'cors', diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js index 0fece0ec..a7465898 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js @@ -1,7 +1,7 @@ import React from "react"; import { inject, observer } from "mobx-react"; import { Col, Row, Select } from "antd"; -import { WeaCheckbox, WeaDatePicker, WeaInput } from "ecCom"; +import { WeaCheckbox, WeaDatePicker, WeaInput, WeaSelect } from "ecCom"; import GroupCard from "../../../components/groupCard"; import cs from "classnames"; import "./index.less"; @@ -80,18 +80,20 @@ export default class AccumulationFundForm extends React.Component { 公积金方案名称： - { - this.handleFormChange({ otherName: value }); - this.handleFetchPaymentForm(value); - }}> - { - items && items[0].items && items[0].items[0] && items[0].items[0].options.map(item => ( - - )) - } - + { + this.handleFormChange({ otherName: showname, otherSchemeId: value }); + this.handleFetchPaymentForm(value); + }}/> diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js index 6ab3793e..5007ef86 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js @@ -1,7 +1,7 @@ import React from "react"; import GroupCard from "../../../components/groupCard"; import { Col, Row, Select } from "antd"; -import { WeaCheckbox, WeaDatePicker, WeaInput } from "ecCom"; +import { WeaCheckbox, WeaDatePicker, WeaInput, WeaSelect } from "ecCom"; import { inject, observer } from "mobx-react"; import cs from "classnames"; import "./index.less"; @@ -84,21 +84,18 @@ export default class SocialSecurityForm extends React.Component { 社保方案名称： - + /> diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js index 369e6b5a..2f45ede4 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js @@ -118,16 +118,16 @@ export const insertUpdateColumns = [ dataIndex: "paymentScope", key: "paymentScope" }, - { - title: "基数上限", - dataIndex: "upperLimit", - key: "upperLimit" - }, { title: "基数下限", dataIndex: "lowerLimit", key: "lowerLimit" }, + { + title: "基数上限", + dataIndex: "upperLimit", + key: "upperLimit" + }, { title: "缴纳比例%", dataIndex: "paymentProportion", diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js index b85a779b..2b04f02c 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 { WeaSelect, WeaInput, WeaTable } from "ecCom"; +import { WeaSelect, WeaInput, WeaTable, WeaInputNumber } from "ecCom"; import { Row, Col, Switch } from "antd"; import { insertUpdateColumns } from "./columns"; import { inject, observer } from "mobx-react"; @@ -104,7 +104,8 @@ export default class DefaultSlideForm extends React.Component { } else if (item.dataIndex == "paymentProportion") { item.render = (text, record) => { return ( - { this.updateDataSource(record, v, "paymentProportion"); @@ -115,7 +116,8 @@ export default class DefaultSlideForm extends React.Component { } else if (item.dataIndex == "fixedCost") { item.render = (text, record) => { return ( - { this.updateDataSource(record, v, "fixedCost"); @@ -126,7 +128,8 @@ export default class DefaultSlideForm extends React.Component { } else if (item.dataIndex == "upperLimit") { item.render = (text, record) => { return ( - { this.updateDataSource(record, v, "upperLimit"); @@ -137,7 +140,8 @@ export default class DefaultSlideForm extends React.Component { } else if (item.dataIndex == "lowerLimit") { item.render = (text, record) => { return ( - { this.updateDataSource(record, v, "lowerLimit"); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js index 3afd55cc..f66751f8 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js @@ -224,7 +224,7 @@ export default class Programme extends React.Component { } } - onCustomEdit=(record)=> { + onCustomEdit = (record) => { const { programmeStore: { getCustomForm, setCustomNewVisible, setCustomRequest }, taxAgentStore: { showOperateBtn } @@ -242,10 +242,10 @@ export default class Programme extends React.Component { insuranceName: record["insurance_name"], id: record.id, isUse: record.is_use, - paymentScope: record["payment_scope"].split(",").map(item => paymentScopeEnum[item]).join(','), + paymentScope: record["payment_scope"].split(",").map(item => paymentScopeEnum[item]).join(","), welfareType: welfareTypeEnum[record.welfare_type] }); - } + }; // 页面跳转 handlePageChange(value) { @@ -405,7 +405,6 @@ export default class Programme extends React.Component { ...defaultCompanyDataSource ] }; - if (currentOperate == "add") { createScheme(request).then(res => { if (res.status) this.setState({ slideVisiable: false }); @@ -554,13 +553,14 @@ export default class Programme extends React.Component { /> } content={ - { - setRequestParams(requestParams); - }} - /> + this.state.slideVisiable ? + { + setRequestParams(requestParams); + }} + /> : null } onClose={() => { handleSlideClose(); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index 4a2e7f9f..67abafe6 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -9,7 +9,7 @@ import { Button, Icon, message, Modal, Spin, Tooltip } from "antd"; import { inject, observer } from "mobx-react"; import { toJS } from "mobx"; import { WeaDialog, WeaInputSearch, WeaTable } from "ecCom"; -import { getSearchs, calcPageNo } from "../../../../util"; +import { calcPageNo, getSearchs } from "../../../../util"; import { getQueryString } from "../../../../util/url"; import ProgressModal from "../../../../components/progressModal"; import AcctResultImportModal from "../../../calculateDetail/acctResult/importModal/acctResultImportModal"; @@ -67,8 +67,8 @@ export default class NormalIndex extends Component { if (nextProps.selectedKey != this.props.selectedKey) { const { billMonth, paymentOrganization } = nextProps; this.setState({ - current: 1, - }, ()=>{ + current: 1 + }, () => { const { current } = this.state; nextProps.selectedKey === "1" ? this.getNormalList({ billMonth, current, paymentOrganization }) @@ -77,7 +77,7 @@ export default class NormalIndex extends Component { current, paymentOrganization }); - }) + }); } } @@ -282,11 +282,11 @@ export default class NormalIndex extends Component { ? this.getNormalList({ billMonth, paymentOrganization, - current: calcPageNo(this.state.tableData.total,this.state.current, 10, includes.length) + current: calcPageNo(this.state.tableData.total, this.state.current, 10, includes.length) }) : this.getSupplementaryList({ billMonth, - current: calcPageNo(this.state.tableData.total,this.state.current, 10, includes.length), + current: calcPageNo(this.state.tableData.total, this.state.current, 10, includes.length), paymentOrganization }); }); @@ -495,7 +495,7 @@ export default class NormalIndex extends Component { selectedKey === "1" && } @@ -510,8 +510,11 @@ export default class NormalIndex extends Component { { this.props.type !== "detail" && - this.setState({ importParams: { ...importParams, visible: true } })}/> + this.setState({ importParams: { ...importParams, visible: true } })} + /> } {/*导入弹框*/} @@ -526,7 +529,7 @@ export default class NormalIndex extends Component { }); }} onCancel={() => { - this.setState({ importParams: { ...importParams, visible: false },fieldData: {} }, () => { + this.setState({ importParams: { ...importParams, visible: false }, fieldData: {} }, () => { const { billMonth, selectedKey, paymentOrganization } = this.props; const { current } = this.state; selectedKey === "1" @@ -540,8 +543,11 @@ export default class NormalIndex extends Component { } - + Date: Tue, 1 Nov 2022 16:52:55 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=BA=8F=E5=8F=B7=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/dataAcquisition/attendance/index.js | 16 +++++++++++++++- .../socialSecurityBenefits/archives/index.js | 18 +++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index d942b925..c747b794 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -604,7 +604,18 @@ export default class Attendance extends React.Component { // ) // } // }) - return newColumns; + return [ + { + title: "序号", + dataIndex: "index", + width: 80, + render: (text, record, index) => { + const { current, pageSize } = this.pageInfo; + return (current - 1) * pageSize + index + 1; + } + }, + ...newColumns + ]; }; // 保存回调 @@ -692,6 +703,7 @@ export default class Attendance extends React.Component { topTab={topTab} searchOperationItem={renderSearchOperationItem()} onChange={v => { + this.pageInfo = { current: 1, pageSize: 10 }; handleTabChange(v); }} /> @@ -725,6 +737,8 @@ export default class Attendance extends React.Component { onChange={v => { this.setState({ tabSelectedKey: v + },()=>{ + this.pageInfo = { current: 1, pageSize: 10 }; }); }} /> diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index c71a37ea..1f340ea1 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -441,13 +441,13 @@ export default class Archives extends React.Component { switch (selectedKey) { case "pending": dom =
-
1、新入职人员、返聘人员和个税扣缴义务人发生变更从【待减员】中减员操作的会进入【待增员】；
-
2、返聘人员默认返聘前的社保福利缴纳方案、缴纳账号、缴纳组织数据，其他数据会清空；
-
3、个税扣缴义务人变更进入【待增员】的，保留所有最新版本数据；若修改了数据再增员则修改的数据作为新版本保存；
-
4、维护好员工的社保福利档案数据后，点击【增员】，数据会进入【在缴员工】；
-
5、若不需给该员工缴纳，可点击【删除待办】进入【停缴员工】；进入【停缴员工】后，可以点击【取消停缴】再次进入【待增员】；
-
6、不管起始缴纳月维护到哪个月，都可以进行增员，不影响核算判断；若维护了最后缴纳月，且小于等于当前月，则增员失败；
-
7、增员失败情况：①终止缴纳月小于等于当前月；
+ {/*
1、新入职人员、返聘人员和个税扣缴义务人发生变更从【待减员】中减员操作的会进入【待增员】；
*/} + {/*
2、返聘人员默认返聘前的社保福利缴纳方案、缴纳账号、缴纳组织数据，其他数据会清空；
*/} +
1、个税扣缴义务人变更进入【待增员】的，保留所有最新版本数据；若修改了数据再增员则修改的数据作为新版本保存；
+
2、维护好员工的社保福利档案数据后，点击【增员】，数据会进入【在缴员工】；
+
3、若不需给该员工缴纳，可点击【删除待办】进入【停缴员工】；进入【停缴员工】后，可以点击【取消停缴】再次进入【待增员】；
+
4、不管起始缴纳月维护到哪个月，都可以进行增员，不影响核算判断；若维护了最后缴纳月，且小于等于当前月，则增员失败；
+
5、增员失败情况：①终止缴纳月小于等于当前月；
{/* ②其他的个税扣缴义务人下的在缴员工中存在该员工，在缴员工未进入停缴员工；*/}
; break; @@ -464,14 +464,14 @@ export default class Archives extends React.Component {
1、数据进入【待减员】规则：①员工的人事状态属性从在职变成非在职，且在【在缴员工】里；②【在缴员工】里档案维护了缴纳终止月且小于等于当前月；③个税扣缴义务人发生调整；④某员工分权时在原个税扣缴义务人下处于【在缴员工】里但又将该员工添加到其他的个税扣缴义务人下的情况；
2、【待减员】为是否不再缴纳的待办状态，数据是从【在缴员工】中复制的，若不处理列表中的待办数据，也不影响社保福利核算；【待减员】维护的数据和【在缴员工】数据是同步的；
3、点击【减员】前先维护最后缴纳月，所有有起始缴纳月的福利项的最后缴纳月都小于等于当前月且无未归档的核算数据的档案才能减员成功，减员成功后数据进入【停缴员工】；
-
4、数据进入【待减员】规则的第四种情况下，若还需要在当前个税扣缴义务人下进行缴纳的话，当前该员工的【待减员】数据进行【删除待办】操作即可；若不在该个税扣缴义务人下继续缴纳，维护好最后缴纳月后进行【减员】操作，员工进入【停缴员工】；
+ {/*
4、数据进入【待减员】规则的第四种情况下，若还需要在当前个税扣缴义务人下进行缴纳的话，当前该员工的【待减员】数据进行【删除待办】操作即可；若不在该个税扣缴义务人下继续缴纳，维护好最后缴纳月后进行【减员】操作，员工进入【停缴员工】；
*/} ; break; default: dom =
1、不需要缴纳社保福利的员工，保存在【停缴员工】；
2、【停缴员工】点击取消停缴，数据会回退到上次的位置（从【待减员】减员到停缴员工的，点击停缴返回到【在缴员工】，不返回到【待减员】）；
-
3、若员工的社保福利从一个个税扣缴义务人下转到另一个个税扣缴义务人下去缴纳，则在转后的个税扣缴义务人的【待增员】中进行增员操作成功后，员工进入待【在缴员工】，而在原个税扣缴义务人下的【停缴员工】中，该员工数据将会被删除；是否开启分权员工的档案数据都只保存一份；
+ {/*
3、若员工的社保福利从一个个税扣缴义务人下转到另一个个税扣缴义务人下去缴纳，则在转后的个税扣缴义务人的【待增员】中进行增员操作成功后，员工进入待【在缴员工】，而在原个税扣缴义务人下的【停缴员工】中，该员工数据将会被删除；是否开启分权员工的档案数据都只保存一份；
*/}
; break; } From 0110c3d19c42b6263e285ba3455cb30098f95bf7 Mon Sep 17 00:00:00 2001 From: 18652063575 Date: Wed, 2 Nov 2022 13:44:24 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4?= =?UTF-8?q?=E4=B9=89=E5=8A=A1=E4=BA=BA=E9=A1=B5=E9=9D=A2=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8C=89=E9=92=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/taxAgent/editModal.js | 6 ++++-- pc4mobx/hrmSalary/pages/taxAgent/index.js | 19 +++++++------------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js index 34fd1bf0..687ca334 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js @@ -103,7 +103,8 @@ export default class EditModal extends React.Component { saveloading, onClose, onChangeTab, - taxAgentStore + taxAgentStore, + isChief } = this.props; const { form } = taxAgentStore; return ( @@ -118,7 +119,8 @@ export default class EditModal extends React.Component {
{title}
- {editType !== "set" && ( + {/*总管理权限*/} + {(editType !== "set" && isChief) && (
}> - + + + + ); }