release/2.18.2.2412.02

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

@@ -182,7 +182,7 @@ class LedgerSalaryItemNormal extends Component {
               >
                 <LedgerSalaryItemTable
                   tableData={items}
-                  dataSource={_.find(dataSource, childItem => childItem.id === id || childItem.uuid === uuid).items}
+                  dataSource={_.find(newDateSource, childItem => childItem.uuid === uuid).items}
                   salarySobId={editId || saveSalarySobId}
                   selectedRowKeys={field.selectedRowKeys || []}
                   onDropCategoryItem={(data) => onDropCategoryItem(field, data)}

pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js

@@ -84,7 +84,7 @@ class PlanSetTable extends Component {
         com: [{
           type: "custom",
           key: "custom",
-          render: text => (<span>{text}</span>)
+          render: text => (<span className="text-td-elli" title={text}>{text}</span>)
         }]
       },
       {

pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less

@@ -232,6 +232,14 @@
         text-overflow: ellipsis;
         overflow: hidden;
       }
+
+      .text-td-elli {
+        display: inline-block;
+        width: 120px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
   }
 }

pc4mobx/hrmSalary/style/index.less

@@ -128,3 +128,10 @@
   }
 }
 
+//公共表格操作按钮间距
+.space_div {
+  a:not(:last-child) {
+    margin-right: 8px;
+  }
+}
+