fix bug 36

pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js

@@ -80,12 +80,14 @@ export default class SalaryDetail extends React.Component {
             if(result.dataIndex === "taxAgentName" || result.dataIndex === "username" || result.dataIndex === "departmentName") {
                 result.fixed = "left"
             }
+
             return result;
         })
         columns.push({
             title: '操作',
             key: "cz",
             width: '100px',
+            fixed: 'right',
             render: (text, record) => {
                 return <a onClick={() => {this.handleEdit(record)}}>编辑</a>
             }

pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js

@@ -243,12 +243,6 @@ export default class Attendance extends React.Component {
     }
     
     const rightMenu = [// 右键菜单
-      { 
-        key: 'BTN_COLUMN',
-        icon: <i className='icon-coms-Custom' />,
-        content: '显示列定制',
-        onClick: this.showColumn
-      },
       {
         key: 'BTN_DEL',
         icon: <i className='icon-coms-delete'/>,

pc4mobx/hrmSalary/pages/dataAcquisition/attendance/itemMangeFormModal.js

@@ -31,6 +31,17 @@ export default class ItemMangeFormModal extends React.Component {
         this.setState({request: result})
     }   
 
+    convertFieldType(fileTypeStr) {
+        if(fileTypeStr == "数值") {
+            return "1"
+        } else if(fileTypeStr == "文本"){
+            return "2"
+        } else if(fileTypeStr == "1" || fileTypeStr == "2") {
+            return fileTypeStr;
+        }
+        return ""
+    }
+
     render() {
         const options =  [
             {
@@ -46,6 +57,7 @@ export default class ItemMangeFormModal extends React.Component {
         ]
         const { request } = this.state;
         const {fieldName, fieldType, enableStatus, description} = request
+        let fileTypeKey = convertFieldType(fieldType)
         const { attendanceStore : {currentItemOperate}} = this.props;
         return (
             <Modal width={600} visible={this.props.visible} onCancel={this.props.onCancel}
@@ -73,7 +85,7 @@ export default class ItemMangeFormModal extends React.Component {
                             类型
                         </Col>
                         <Col span={16}>
-                            <WeaSelect  style={{width: "200px"}} options={options} value={fieldType}
+                            <WeaSelect  style={{width: "200px"}} options={options} value={fileTypeKey}
                                 onChange={(v) => this.handleChange({fieldType: v})}
                             />
                         </Col>

pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js

@@ -352,9 +352,9 @@ export default class CumSituation extends React.Component {
 
     const handleButtonClick = () => {
       const {
-        cumSituationStore: { exportCumDeductList },
+        cumSituationStore: { exportCumSituationList },
       } = this.props;
-      exportCumDeductList();
+      exportCumSituationList();
     };
 
     const handleMenuClick = () => {

pc4mobx/hrmSalary/pages/ledger/slideRefereUser.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { inject, observer } from 'mobx-react';
-import { Icon, Table  } from 'antd';
+import { Icon, Table, message, Modal  } from 'antd';
 import { WeaInputSearch } from "ecCom"
 import { slideStep2Columns, dataSource } from './columns'
 import AddUserModal from './addUserModal'
@@ -43,7 +43,16 @@ export default class SlideRefereUser extends React.Component {
             message.warning("未选择条目")
             return
         }
-        deleteLedgerPersonRange(this.state.selectedRowKeys)
+        Modal.confirm({
+            title: '信息确认',
+            content: '确认删除',
+            onOk:() => {
+                deleteLedgerPersonRange(this.state.selectedRowKeys)
+            },
+            onCancel: () => {
+            },
+          });
+        
     }
 
     handleSearch = (value) => {

pc4mobx/hrmSalary/pages/salaryFile/index.js

@@ -357,14 +357,14 @@ export default class SalaryFile extends React.Component {
           className="salaryFileTabWrapper">
           <WeaHelpfulTip
             style={{ marginRight: "10px" }}
-            width={200}
-            title="导入按钮使用场景说明：\n
-                  1.档案初始化：\n
-                  a.初次使用薪酬模块，全量导入员工的薪资档案数据；\n
-                  b.员工入职，导入新入职的员工的薪资档案数据（若导入表格中的人员已存在在薪资档案中，初始化导入会将档案中该人员的数据清除再导入）；\n
-                  c.返聘人员使用调薪功能调整薪资档案值或使用调整个税扣缴；\n
-                  2.调薪：档案中已存在的人员批量调整薪资项目值（包括返聘人员的情况）；\n
-                  3.调整个税扣缴义务人：档案中已存在的人员批量调整个税扣缴义务人（包括返聘人员的情况）；\n"
+            width={300}
+            title="导入按钮使用场景说明：<br/>
+                  1.档案初始化：<br/>
+                  a.初次使用薪酬模块，全量导入员工的薪资档案数据；<br/>
+                  b.员工入职，导入新入职的员工的薪资档案数据（若导入表格中的人员已存在在薪资档案中，初始化导入会将档案中该人员的数据清除再导入）；<br/>
+                  c.返聘人员使用调薪功能调整薪资档案值或使用调整个税扣缴；<br/>
+                  2.调薪：档案中已存在的人员批量调整薪资项目值（包括返聘人员的情况）；<br/>
+                  3.调整个税扣缴义务人：档案中已存在的人员批量调整个税扣缴义务人（包括返聘人员的情况）；<br/>"
             placement="topLeft"
           />
           <Dropdown.Button