部分bug修改

pc4mobx/hrmSalary/pages/calculate/index.js

@@ -9,6 +9,7 @@ import BaseFormModal from "./baseFormModal";
 import CustomPaginationTable from "../../components/customPaginationTable";
 import ProgressModal from "../../components/progressModal";
 import "./index.less";
+import { deleteLedgerPersonRange } from "../../apis/ledger";
 
 const MonthPicker = DatePicker.MonthPicker;
 
@@ -141,9 +142,15 @@ export default class Calculate extends React.Component {
 
   // 回算
   handleBackCalculate = (record) => {
-    const { calculateStore: { backCalculate } } = this.props;
-    backCalculate(record.id).then(() => {
-      this.handleSearch(this.state.searchValue);
+    Modal.confirm({
+      title: "信息确认",
+      content: "确定回算吗？\n 回算后，正常核算的数据会被覆盖，正常核算的工资单不能继续发放或撤回！",
+      onOk: () => {
+        const { calculateStore: { backCalculate } } = this.props;
+        backCalculate(record.id).then(() => {
+          this.handleSearch(this.state.searchValue);
+        });
+      }
     });
   };
 

pc4mobx/hrmSalary/pages/calculateDetail/issuedAndReissueTable.js

@@ -23,7 +23,7 @@ class IssuedAndReissueTable extends Component {
         title: <span>
           <span style={{ marginRight: 8 }}>项目值</span>
           <WeaHelpfulTip
-            title="若薪资项目有公式，手动编辑项目值后，则默认将手动编辑的项目值锁定；点击锁定图标，解锁手动编辑的项目值，公式生效，点击保存按照公式重新核算；重新核算后，不显示解锁图标。"
+            title="若薪资项目有公式，手动编辑项目值后，需点击锁定图标输入值才生效；点击锁定图标，解锁手动编辑的项目值，公式生效，点击保存按照公式重新核算；重新核算后，不显示解锁图标。"
             placement="bottom"
             width={200}
           />
@@ -44,7 +44,7 @@ class IssuedAndReissueTable extends Component {
         title: <span>
           <span style={{ marginRight: 8 }}>核算公式</span>
           <WeaHelpfulTip
-            title="若薪资项目有公式，且项目值手动编辑修改过，则公式失效；若解除锁定，则项目公式重新生效；"
+            title="若薪资项目有公式，且项目值手动编辑修改过并点击锁定图标，则公式失效；若解除锁定，则项目公式重新生效；"
             placement="bottom"
             width={200}
           />

pc4mobx/hrmSalary/pages/payroll/SalarySendList.js

@@ -92,18 +92,20 @@ export default class SalarySendList extends React.Component {
           title: "操作",
           key: "operate",
           render: (text, record) => {
-            const { sendNum, sendTotal, salaryAcctType } = record;
+            const { sendNum, sendTotal, salaryAcctType, haveBackCalc } = record;
+            //显示发放
+            const showGrant = haveBackCalc === 1 && salaryAcctType === 0;
             return (
               <React.Fragment>
                 <a href="javascript:void(0);" onClick={() => this.handleGrant(record)}
                    style={{ marginRight: 10 }}>发放</a>
                 {
-                  salaryAcctType === 0 &&
+                  !showGrant &&
                   <a href="javascript:void(0);" onClick={() => this.handleShowDetail(record)}
                      style={{ marginRight: 10 }}>查看详情</a>
                 }
                 {
-                  sendNum !== sendTotal && salaryAcctType === 0 &&
+                  sendNum !== sendTotal && !showGrant &&
                   <a href="javascript:void(0);" onClick={() => this.handleUpdateTemplate(record)}>更新模板</a>
                 }
               </React.Fragment>

pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js

@@ -243,6 +243,9 @@ export default class PayrollGrant extends React.Component {
   };
 
   getSearchsAdQuick() {
+    const { payrollStore } = this.props;
+    const { salarySendDetailBaseInfo } = payrollStore;
+    const notShowGrantOrWithdraw = salarySendDetailBaseInfo.haveBackCalc === 1 && salarySendDetailBaseInfo.salaryAcctType === "0";
     const { selectedKey } = this.state;
     const handleMenuClick = e => {
       switch (e.key) {
@@ -267,7 +270,7 @@ export default class PayrollGrant extends React.Component {
         更多
       </Dropdown.Button>
     ];
-    if (selectedKey === "0") {
+    if (selectedKey === "0" && !notShowGrantOrWithdraw) {
       btnDom = [
         <ButtonSelect
           datas={[
@@ -280,7 +283,7 @@ export default class PayrollGrant extends React.Component {
         />,
         ...btnDom
       ];
-    } else {
+    } else if(selectedKey === "1" && !notShowGrantOrWithdraw) {
       btnDom = [
         <ButtonSelect
           datas={[