Merge branch 'feature/V2-薪资档案取消待停薪功能' into develop

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"
           }}/></Button>
         </Dropdown>,
-        // <Button type="ghost" onClick={() => {
-        //   const { selectedRowKeys } = this.state;
-        //   if (selectedRowKeys.length === 0) {
-        //     message.warning("未选择条目");
-        //     return;
-        //   }
-        //   this.deleteSuspendTodo(selectedRowKeys);
-        // }}>批量删除待办</Button>,
+        <Button type="ghost" onClick={() => {
+          const { selectedRowKeys } = this.state;
+          if (selectedRowKeys.length === 0) {
+            message.warning("未选择条目");
+            return;
+          }
+          this.deleteSuspendTodo(selectedRowKeys);
+        }}>批量删除待办</Button>,
         <Button type="primary" onClick={() => {
           this.importRef.handleMenuClick({ key: "SUSPEND" });
         }}>导入</Button>,
@@ -496,7 +497,7 @@ class Index extends Component {
                     placement="bottomRight"
                     content={<Menu onClick={(e) => this.handleMenuClick(e, record.id)}>
                       <Menu.Item key="stopSalary">停薪</Menu.Item>
-                      {/*<Menu.Item key="deleteSuspendTodo">删除待办</Menu.Item>*/}
+                      <Menu.Item key="deleteSuspendTodo">删除待办</Menu.Item>
                     </Menu>} title="">
                     <i className="icon-coms-more"/>
                   </Popover>
@@ -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: {

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))
   }
-  
 
-}
+
+}