diff --git a/pc4mobx/hrmSalary/components/selectItemsModal/index.js b/pc4mobx/hrmSalary/components/selectItemsModal/index.js
index 6c30b268..a3b2cce3 100644
--- a/pc4mobx/hrmSalary/components/selectItemsModal/index.js
+++ b/pc4mobx/hrmSalary/components/selectItemsModal/index.js
@@ -45,7 +45,7 @@ export default class SelectItemModal extends React.Component {
             <Menu onClick={(e) => this.handleMenuClick(e)}>
               <Menu.Item key="1">恢复默认设置</Menu.Item>
               <Menu.Item key="2">设置默认设置</Menu.Item>
-              <Menu.Item key="3">操作日志</Menu.Item>
+              {/* <Menu.Item key="3">操作日志</Menu.Item> */}
             </Menu>
           );
         return (
diff --git a/pc4mobx/hrmSalary/pages/calculate/baseFormModal.js b/pc4mobx/hrmSalary/pages/calculate/baseFormModal.js
index cf5493b6..1deacd94 100644
--- a/pc4mobx/hrmSalary/pages/calculate/baseFormModal.js
+++ b/pc4mobx/hrmSalary/pages/calculate/baseFormModal.js
@@ -53,6 +53,7 @@ export default class baseFormModal extends React.Component {
 
         saveBasic(params).then((id) => {
             this.props.onCancel()
+            this.props.onRefresh()
             window.open("/spa/hrmSalary/static/index.html#/main/hrmSalary/calculateDetail?id=" + id)
         })
     }
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.js b/pc4mobx/hrmSalary/pages/calculate/index.js
index 916f6417..bc738b9f 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/index.js
@@ -28,6 +28,7 @@ export default class Calculate extends React.Component {
       searchValue: "",
       startDate: moment(new Date()).format("YYYY-MM"),
       endDate: moment(new Date()).format("YYYY-MM"),
+      current: 1,
       columns: columns.map(item => {
         if(item.dataIndex == 'cz') {
           item.render = () => (
@@ -61,7 +62,8 @@ export default class Calculate extends React.Component {
     getSalaryAcctList({
       name: value,
       startMonthStr: this.state.startDate,
-      endMonthStr: this.state.endDate
+      endMonthStr: this.state.endDate,
+      current: this.state.current
     })
   }
 
@@ -165,9 +167,22 @@ export default class Calculate extends React.Component {
     return columns;
   }
 
+  // 分页
+  handleDataPageChange(value) {
+    this.setState({current: value})
+    getSalaryAcctList({
+      name: this.state.searchValue,
+      startMonthStr: this.state.startDate,
+      endMonthStr: this.state.endDate,
+      current: value
+    })
+  }
+
+  
+
   render() {
     const { calculateStore } = this.props;
-    const { salaryListDataSource, salaryListColumns, loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd } = calculateStore;
+    const { salaryListDataSource, salaryListColumns, loading, hasRight, form, condition, tableStore, showSearchAd, getTableDatas, doSearch, setShowSearchAd, salaryListPageInfo } = calculateStore;
     const { modalParam } = this.state
     if (!hasRight && !loading) { // 无权限处理
       return renderNoright();
@@ -241,11 +256,18 @@ export default class Calculate extends React.Component {
                 onChange={(v) => {
                 }}
               />
-            <CustomTable loadding={loading} columns={this.getColumns()} dataSource={salaryListDataSource}/>
+            <CustomTable loadding={loading} columns={this.getColumns()} dataSource={salaryListDataSource}
+              pagination={{
+                onChange: (value) => {this.handleDataPageChange(value)},
+                total: salaryListPageInfo.total,
+                current: salaryListPageInfo.pageNum
+              }}
+            />
           </WeaTop>
           {
             this.state.baseFormVisible && <BaseFormModal 
             visible={this.state.baseFormVisible}
+            onRefresh={() => this.handleSearch(this.state.searchValue)}
             onCancel={() => {
               this.setState({baseFormVisible: false})
             }}
diff --git a/pc4mobx/hrmSalary/pages/mySalary/index.js b/pc4mobx/hrmSalary/pages/mySalary/index.js
index f4ca89b9..1af0f821 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/index.js
@@ -128,7 +128,7 @@ export default class MySalary extends React.Component {
       //   viewcondition: "1"
       // },
       {
-        title: "薪酬记录",
+        title: "调薪记录",
         viewcondition: "2"
       }
     ];
diff --git a/pc4mobx/hrmSalary/pages/mySalary/payrollModal.js b/pc4mobx/hrmSalary/pages/mySalary/payrollModal.js
index 1e96c868..5e5d09c1 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/payrollModal.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/payrollModal.js
@@ -24,6 +24,7 @@ export default class PayrollModal extends React.Component {
                     paddingBottom: "20px",
                     margin: "20px auto",
                 }}>
+                    {/* 标题 */}
                     <div className="titleWrapper" style={{
                         textAlign: "center",
                         fontSize: "18px",
diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js
index c1026b60..57f3e44f 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/index.js
@@ -71,7 +71,7 @@ export default class Payroll extends React.Component {
               <a style={{marginRight: "10px"}}>编辑</a>
               <a style={{marginRight: "10px"}}>复制</a>
               <a style={{marginRight: "10px"}}>删除</a>
-              <a >操作日志</a>
+              {/* <a >操作日志</a> */}
             </div>
           )
         }
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
index 6aa51ded..6778fb60 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
@@ -79,7 +79,8 @@ export default class BaseInformForm extends React.Component {
                         </Row>
                     </div>
                 </div>
-                <div  className="formItemWrapper">
+                {/* 发送位置先隐藏 */}
+                {/* <div  className="formItemWrapper">
                     <span className="itemTitle">发送位置</span>
                     <div className="formWrapper">
                         <Row className="formItem">
@@ -111,7 +112,7 @@ export default class BaseInformForm extends React.Component {
                             </Col>
                         </Row>
                     </div>
-                </div>
+                </div> */}
             </div>
         )
     }
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js b/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js
index aa01fb80..f8e46c01 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js
@@ -152,7 +152,7 @@ export default class ChangeSalaryModal extends React.Component {
 
     // 保存
     handleSave() {
-        const { salaryFileStore: {saveSalaryItem, fetchSingleSalaryItemList}} = this.props;
+        const { salaryFileStore: {saveSalaryItem, fetchSingleSalaryItemList, getArchiveForm}} = this.props;
         let saveRequest = {...this.state.request}
         const { salaryArchiveItems } = this.state;
         if(salaryArchiveItems.length == 0) {
@@ -166,6 +166,7 @@ export default class ChangeSalaryModal extends React.Component {
             return result
         })
         saveSalaryItem(saveRequest).then(() => {
+            getArchiveForm(this.props.currentId)
             fetchSingleSalaryItemList({salaryArchiveId: this.props.currentId})
             this.props.onCancel()
         })
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
index 26139000..b1a2091e 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
@@ -42,13 +42,13 @@ export default class CustomSalaryItemSlide extends React.Component {
                     <Row className="formItem">
                         <Col span={4}>名称 <RequiredLabelTip /></Col>
                         <Col span={20}>
-                            <WeaInput viewAttr={editable ? 2 : 1} value={name}  onChange={(value) => {this.handleChange({name: value})}}/>
+                            <WeaInput  viewAttr={(editable && this.props.record.canEdit) || isAdd ? 2 : 1} value={name}  onChange={(value) => {this.handleChange({name: value})}}/>
                         </Col>
                     </Row>
                     <Row className="formItem">
                         <Col span={4}>默认使用</Col>
                         <Col span={20}>
-                            <Switch disabled={editable? false: true} checked = {useDefault == 1} onChange={(value) => {this.handleChange({useDefault: value ? 1 : 0})}}/>
+                            <Switch disabled={(editable && this.props.record.canEdit) || isAdd ? false: true} checked = {useDefault == 1} onChange={(value) => {this.handleChange({useDefault: value ? 1 : 0})}}/>
                             <WeaHelpfulTip
                                 style={{marginLeft: "10px"}}
                                 width={200}
@@ -62,7 +62,7 @@ export default class CustomSalaryItemSlide extends React.Component {
                     <Row className="formItem">
                         <Col span={4}>薪资档案引用</Col>
                         <Col span={20}>
-                            <Switch disabled={editable ? false: true} checked={useInEmployeeSalary == 1} onChange={(value) => {this.handleChange({useInEmployeeSalary: value? 1: 0})}}/>
+                            <Switch disabled={(editable && this.props.record.canEdit) || isAdd ? false: true} checked={useInEmployeeSalary == 1} onChange={(value) => {this.handleChange({useInEmployeeSalary: value? 1: 0})}}/>
                             <WeaHelpfulTip
                                 style={{marginLeft: "10px"}}
                                 width={200}
@@ -87,7 +87,7 @@ export default class CustomSalaryItemSlide extends React.Component {
                             <Row>
                                 <Col span={8}>舍入规则<RequiredLabelTip /></Col>
                                 <Col span={16}>
-                                    <WeaSelect options={roundingModeOptions} style={{width: "200px"}} value={roundingMode} onChange={(value) => {this.handleChange({roundingMode: value})}}/>
+                                    <WeaSelect viewAttr={(editable && this.props.record.canEdit) || isAdd ? 2 : 1} options={roundingModeOptions} style={{width: "200px"}} value={roundingMode} onChange={(value) => {this.handleChange({roundingMode: value})}}/>
                                 </Col>
                             </Row>
                         </Col>
@@ -95,7 +95,7 @@ export default class CustomSalaryItemSlide extends React.Component {
                         <Row>
                                 <Col span={8}>保留小数位<RequiredLabelTip /></Col>
                                 <Col span={16}>
-                                    <WeaSelect options={patternOptions} onChange={(value) => {this.handleChange({pattern: value})}} value={pattern} style={{width: "200px"}}/>
+                                    <WeaSelect viewAttr={(editable && this.props.record.canEdit) || isAdd ? 2 : 1} options={patternOptions} onChange={(value) => {this.handleChange({pattern: value})}} value={pattern} style={{width: "200px"}}/>
                                 </Col>
                             </Row>
                         </Col>
@@ -120,7 +120,12 @@ export default class CustomSalaryItemSlide extends React.Component {
                             <Col span={4}>公式<RequiredLabelTip /></Col>
                             <Col span={20}>
                                 <div style={{width: "100%", lineHeight: '30px', minHeight: "30px", border: "1px solid rgb(217, 217, 217)"}}
-                                    onClick={() => this.handleShowFormal()}
+                                    onClick={() => 
+                                        {
+                                            if(this.props.record.canEdit || isAdd) {
+                                                this.handleShowFormal()
+                                            }
+                                        }}
                                 >
                                     {formulaContent}
                                 </div>
@@ -131,7 +136,7 @@ export default class CustomSalaryItemSlide extends React.Component {
                     <Row className="formItem">
                         <Col span={4}>备注</Col>
                         <Col span={20}>
-                            <WeaTextarea viewAttr={editable ? 2 : 1} value={description} onChange={(value) => {this.handleChange({description: value})}}/>
+                            <WeaTextarea viewAttr={(editable && this.props.record.canEdit) || isAdd ? 2 : 1} value={description} onChange={(value) => {this.handleChange({description: value})}}/>
                         </Col>
                     </Row>
 
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/deleteSalaryItemModal.js b/pc4mobx/hrmSalary/pages/salaryItem/deleteSalaryItemModal.js
index 3f2f3917..c36c77bc 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/deleteSalaryItemModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/deleteSalaryItemModal.js
@@ -1,18 +1,28 @@
-import React from 'react'
+import React from 'react' 
 import { systemItemColumns, dataSource } from './columns'
-import { WeaInputSearch } from 'ecCom'
+import { WeaInputSearch, WeaTable } from 'ecCom'
 import { Modal, Button, Table } from 'antd'
 import { inject, observer } from 'mobx-react';
-import { WeaTableNew } from "comsMobx"
-const WeaTable = WeaTableNew.WeaTable;
+import CustomTable from '../../components/customTable'
 
 @inject('salaryItemStore')
 @observer
 export default class DeleteSalaryItemModal extends React.Component {
-    
+
+    componentWillMount() {
+        const { salaryItemStore: {listCanDelete}}  = this.props;
+        listCanDelete()
+    }
+
+    // 分页
+    handleDataPageChange(value) {
+        const { salaryItemStore: {listCanDelete}} = this.props;
+        listCanDelete({current: value})
+    }
+
     render() {
         const { salaryItemStore } = this.props;
-        const { deleteTableStore } = salaryItemStore
+        const { canDeleteList, loading } = salaryItemStore
         
         const handleDelete = () => {
             const { salaryItemStore: { deleteItem } } = this.props;
@@ -28,14 +38,16 @@ export default class DeleteSalaryItemModal extends React.Component {
                     </div>
                 </div>
                 <div style={{margin: "10px"}}>
-                    <WeaTable // table内部做了loading加载处理，页面就不需要再加了
-                        comsWeaTableStore={deleteTableStore} // table store
-                        hasOrder={true} // 是否启用排序
-                        needScroll={true} // 是否启用table内部列表滚动，将自适应到父级高度
-                        
-                        // getColumns={this.getColumns}
-                        // onOperatesClick={this.onOperatesClick.bind(this)}
-                    />
+                    <CustomTable loadding={loading} 
+                        columns={this.getColumns()} 
+                        dataSource={canDeleteList.list ? canDeleteList.list : []}
+                        pagination={{
+                            onChange: (value) => {this.handleDataPageChange(value)},
+                            total: canDeleteList.total,
+                            current: canDeleteList.pageNum
+                          }}
+                        />
+                    
                 </div>
             </Modal>
         )
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index 9b295e46..cd0d7ad4 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -46,23 +46,23 @@ export default class SalaryItem extends React.Component {
             return (<div>
               <a style={{marginRight: "10px"}}>编辑</a>
               <a style={{marginRight: "10px"}}>删除</a>
-              <a>操作日志</a>
+              {/* <a>操作日志</a> */}
             </div>)
         }
           
       }
     })
+    this.record = {}
   }
 
 
   componentWillMount() { // 初始化渲染页面
-    const { salaryItemStore: { doInit, listCanDelete }} = this.props;
+    const { salaryItemStore: { doInit }} = this.props;
     doInit();
-    listCanDelete();
-
   }
 
   onEditItem(record, isedit) {
+    this.record = record
     const { salaryItemStore: {getItemForm, setEditSlideVisible}} = this.props;
     this.setState({editable: isedit, isAdd: false})
     getItemForm(record.id)
@@ -343,7 +343,7 @@ export default class SalaryItem extends React.Component {
                     }
                   />
                 }
-                content={<CustomSalaryItemSlide editable={this.state.editable} isAdd={this.state.isAdd} request={request} onChange={(value) => {handleSaveSlideChange(value)}}/>}
+                content={<CustomSalaryItemSlide record={this.record} editable={this.state.editable} isAdd={this.state.isAdd} request={request} onChange={(value) => {handleSaveSlideChange(value)}}/>}
                 onClose={() => setEditSlideVisible(false)}
                 showMask={true}
                 closeMaskOnClick={() => setEditSlideVisible(false)} />
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
index 24e595e4..0482a4fa 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
@@ -105,7 +105,7 @@ export default class StandingBook extends React.Component {
                             <Menu.Item key="archive">归档</Menu.Item>
                             <Menu.Item key="detail">异常详情</Menu.Item>
                             <Menu.Item key="delete">删除</Menu.Item>
-                            <Menu.Item key="operate">操作日志</Menu.Item>
+                            {/* <Menu.Item key="operate">操作日志</Menu.Item> */}
                           </Menu>
                         }>
                         <i className="icon-coms-more more" />
@@ -119,7 +119,7 @@ export default class StandingBook extends React.Component {
                               this.handleOperate({ key, billMonth })
                             }>
                             <Menu.Item key="view">查看</Menu.Item>
-                            <Menu.Item key="operate">操作日志</Menu.Item>
+                            {/* <Menu.Item key="operate">操作日志</Menu.Item> */}
                           </Menu>
                         }>
                         <i className="icon-coms-more more" />
@@ -286,7 +286,7 @@ export default class StandingBook extends React.Component {
       <Dropdown
         overlay={
           <Menu>
-            <Menu.Item key="log">操作日志</Menu.Item>
+            {/* <Menu.Item key="log">操作日志</Menu.Item> */}
             <Menu.Item key="column">自定义列</Menu.Item>
             <Menu.Item key="help">帮助</Menu.Item>
           </Menu>
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js
index 6b3e76dd..f53c3fe3 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/index.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js
@@ -116,12 +116,12 @@ export default class TaxAgent extends React.Component {
     }
 
     const rightMenu = [// 右键菜单
-      {
-        key: 'BTN_COLUMN',
-        icon: <i className='icon-coms-Custom' />,
-        content: '操作日志',
-        onClick: this.showLogView
-      },
+      // {
+      //   key: 'BTN_COLUMN',
+      //   icon: <i className='icon-coms-Custom' />,
+      //   content: '操作日志',
+      //   onClick: this.showLogView
+      // },
     ];
 
     const initEditModal = () => {
diff --git a/pc4mobx/hrmSalary/stores/calculate.js b/pc4mobx/hrmSalary/stores/calculate.js
index 5553538f..60ebb464 100644
--- a/pc4mobx/hrmSalary/stores/calculate.js
+++ b/pc4mobx/hrmSalary/stores/calculate.js
@@ -19,6 +19,7 @@ export class calculateStore {
   @observable salaryListDataSource = [];
   @observable salaryListColumns = [];
   @observable calculateBaseForm = {}
+  @observable salaryListPageInfo = {}
 
   // ** 核算信息页 ***
   // 核算人员
@@ -115,6 +116,7 @@ export class calculateStore {
       if(res.status) {
         this.salaryListDataSource = res.data.list;
         this.salaryListColumns = res.data.columns
+        this.salaryListPageInfo = res.data
       } else {
         message.error(res.errormsg || '获取失败');
       }
diff --git a/pc4mobx/hrmSalary/stores/payroll.js b/pc4mobx/hrmSalary/stores/payroll.js
index 234856b4..c86cc4da 100644
--- a/pc4mobx/hrmSalary/stores/payroll.js
+++ b/pc4mobx/hrmSalary/stores/payroll.js
@@ -246,7 +246,7 @@ export class payrollStore {
 
   // 工资单模板-更新工资单模板
   @action
-  fetchUpdatePayroll = () => {
+  fetchUpdatePayroll = (id) => {
     if(!(this.validateSalaryTemplateShowSet())) {
       return false
     }
diff --git a/pc4mobx/hrmSalary/stores/salaryFile.js b/pc4mobx/hrmSalary/stores/salaryFile.js
index 2e6d8372..f4f0dd0e 100644
--- a/pc4mobx/hrmSalary/stores/salaryFile.js
+++ b/pc4mobx/hrmSalary/stores/salaryFile.js
@@ -133,7 +133,8 @@ export class salaryFileStore {
     return new Promise((resolve, reject) => {
       API.importSalaryArchive(params).then(res => {
         if(res.status) {
-          message.success("导入成功")
+          // message.success("导入成功")
+          this.getTableDatas();
           resolve(res.data)
         } else {
           message.error(res.errormsg || "接口异常")
diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js
index d7719f51..7b557231 100644
--- a/pc4mobx/hrmSalary/stores/salaryItem.js
+++ b/pc4mobx/hrmSalary/stores/salaryItem.js
@@ -322,13 +322,14 @@ export class SalaryItemStore {
   //
   @action
   listCanDelete = (params = {}) => {
+    this.loading = true;
     API.listCanDelete(params).then(res => {
       if(res.status) {
         this.canDeleteList = res.data
-        console.log("this.canDeleteList: ", this.canDeleteList);
       } else {
         message.error(res.errormsg || "获取失败")
       }
+      this.loading = false;
     })
   }
 }
\ No newline at end of file