From a3d11cf2499241766ee2535bdc9e7626f060086c 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, 20 Mar 2023 14:45:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=A1=B5=E9=9D=A2=E5=BE=85=E5=81=9C=E8=96=AA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=8F=96=E6=B6=88=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/payrollFiles/components/allWithoutPay.js | 7 +++++++ pc4mobx/hrmSalary/pages/payrollFiles/index.js | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js index c9d85ff8..47ec1a63 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js @@ -19,6 +19,12 @@ class AllWithoutPay extends Component { message.error(errormsg || "操作失败!"); } }); + }else if(key === "batchDeleteTodo"){ + if (selectedRowKeys.length === 0) { + message.warning("未选择条目"); + return; + } + console.log(selectedRowKeys); }else{ const { pageInfo } = this.props; if (pageInfo.total === 0) { @@ -48,6 +54,7 @@ class AllWithoutPay extends Component { 全部停薪 批量停薪 + 批量删除待办 ); } diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index e52b9e38..65a3fa93 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -496,7 +496,7 @@ class Index extends Component { placement="bottomRight" content={ this.handleMenuClick(e, record.id)}> 停薪 - {/*删除待办*/} + 删除待办 } title=""> From 98fba85bdd0f213bee572013e85cef607ed53dfc 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, 28 Mar 2023 15:13:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E5=BE=85=E5=81=9C=E8=96=AA=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BE=85=E5=8A=9E=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payrollFiles/components/allWithoutPay.js | 7 ------- pc4mobx/hrmSalary/pages/payrollFiles/index.js | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js index 47ec1a63..c9d85ff8 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js @@ -19,12 +19,6 @@ class AllWithoutPay extends Component { message.error(errormsg || "操作失败!"); } }); - }else if(key === "batchDeleteTodo"){ - if (selectedRowKeys.length === 0) { - message.warning("未选择条目"); - return; - } - console.log(selectedRowKeys); }else{ const { pageInfo } = this.props; if (pageInfo.total === 0) { @@ -54,7 +48,6 @@ class AllWithoutPay extends Component { 全部停薪 批量停薪 - 批量删除待办 ); } diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index 65a3fa93..5655e499 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -287,6 +287,7 @@ class Index extends Component { selectedRowKeys: [] }, () => { this.query(); + this.queryTabTotal(); }); } else { message.error(errormsg || "操作失败!"); @@ -397,14 +398,14 @@ class Index extends Component { verticalAlign: "middle" }}/> , - // , + , , @@ -591,6 +592,7 @@ class Index extends Component { handleChangeTab = (selectedKey) => { const { slideParams, pageInfo } = this.state; this.setState({ + selectedRowKeys: [], slideParams: { ...slideParams, visible: false, id: "" }, selectedKey, pageInfo: { From bd6242f413cbb6e8a3e88ba5fcf6dbe90d6c5b58 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, 29 Mar 2023 09:28:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E5=BE=85=E5=81=9C=E8=96=AA=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BE=85=E5=8A=9E=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/stores/taxRate.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/stores/taxRate.js b/pc4mobx/hrmSalary/stores/taxRate.js index fc3c4cd7..24db06e9 100644 --- a/pc4mobx/hrmSalary/stores/taxRate.js +++ b/pc4mobx/hrmSalary/stores/taxRate.js @@ -2,7 +2,7 @@ import { observable, action, toJS } from 'mobx'; import { message } from 'antd'; import { WeaForm, WeaTableNew } from 'comsMobx'; -import * as API from '../apis/taxRate'; // 引入API接口文件 +import * as API from '../apis/taxrate'; // 引入API接口文件 const { TableStore } = WeaTableNew; @@ -28,7 +28,7 @@ export class taxRateStore { @observable loading = true; // 数据加载状态 @observable dataSource = []; @observable nameValue = ""; - @observable remarkValue = ""; + @observable remarkValue = ""; @observable slideVisiable = false; // 侧边划入是否展示 currentId = ""; // 当前编辑的数据id @@ -110,7 +110,7 @@ export class taxRateStore { this.setNameValue(""); this.setRemarkValue(""); } - + // 获取表单数据 @action getItemInform = (id) => { this.currentId= id; @@ -174,6 +174,6 @@ export class taxRateStore { } this.doDelete(toJS(this.tableStore.selectedRowKeys)) } - -} \ No newline at end of file + +}