Merge branch 'feature/V2-薪资账套页面重构-1208' into develop

pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js

@@ -200,7 +200,15 @@ class LedgerSalaryItem extends Component {
     this.setState({
       itemGroups: _.map(itemGroups, it => {
         if (filed.id === it.id) {
-          return { ...it, items: data };
+          return {
+            ...it,
+            items: _.map(data, (child, childIndex) => {
+              return {
+                ...child,
+                sortedIndex: childIndex
+              };
+            })
+          };
         }
         return { ...it };
       })

pc4mobx/hrmSalary/pages/payroll/SalarySendList.js

@@ -76,7 +76,7 @@ export default class SalarySendList extends React.Component {
             <span>{text}</span>
             <div className="salarySobNameTagWrapper">
               {
-                record.sendStatus === 1 &&
+                record.salaryAcctType === 1 &&
                 <Tag color="yellow">补发</Tag>
               }
               <Tag color="blue">{`第${record.acctTimes}次`}</Tag>
@@ -92,15 +92,18 @@ export default class SalarySendList extends React.Component {
           title: "操作",
           key: "operate",
           render: (text, record) => {
-            const { sendNum, sendTotal } = record;
+            const { sendNum, sendTotal, salaryAcctType } = record;
             return (
               <React.Fragment>
                 <a href="javascript:void(0);" onClick={() => this.handleGrant(record)}
                    style={{ marginRight: 10 }}>发放</a>
-                <a href="javascript:void(0);" onClick={() => this.handleShowDetail(record)}
-                   style={{ marginRight: 10 }}>查看详情</a>
                 {
-                  sendNum !== sendTotal &&
+                  salaryAcctType === 0 &&
+                  <a href="javascript:void(0);" onClick={() => this.handleShowDetail(record)}
+                     style={{ marginRight: 10 }}>查看详情</a>
+                }
+                {
+                  sendNum !== sendTotal && salaryAcctType === 0 &&
                   <a href="javascript:void(0);" onClick={() => this.handleUpdateTemplate(record)}>更新模板</a>
                 }
               </React.Fragment>
@@ -114,8 +117,14 @@ export default class SalarySendList extends React.Component {
           title: "操作",
           key: "operate",
           render: (text, record) => {
+            const { salaryAcctType } = record;
             return (
-              <a href="javascript:void(0);" onClick={() => this.handleShowDetail(record)}>查看详情</a>
+              <span>
+                {
+                  salaryAcctType === 0 &&
+                  <a href="javascript:void(0);" onClick={() => this.handleShowDetail(record)}>查看详情</a>
+                }
+              </span>
             );
           }
         }