Merge branch 'release/2.18.2.2412.02' into release/2.18.2.2412.02-个税

# Conflicts:
#	pc4mobx/hrmSalary/components/FormInfo/index.js

pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js

@@ -46,8 +46,8 @@ class Index extends Component {
     const payload = {
       ...pageInfo, ...extra,
       departmentIds: departmentIds ? departmentIds.split(",") : [],
-      positionIds: departmentIds ? departmentIds.split(",") : [],
-      operatorIds: departmentIds ? departmentIds.split(",") : [],
+      positionIds: positionIds ? positionIds.split(",") : [],
+      operatorIds: operatorIds ? operatorIds.split(",") : [],
       effectiveTime: effectiveTime1 ? [effectiveTime1, effectiveTime2] : [],
       operateTime: operateTime1 ? [operateTime1, operateTime2] : []
     };

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/welfareArchive/components/welfareEditArchiveSlide/index.js

@@ -116,7 +116,7 @@ class Index extends Component {
                   } else if (getKey(g).indexOf("StartTime") !== -1) {
                     return {
                       ...g, label: getLabel(g.lanId, g.label),
-                      viewAttr: (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr
+                      viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : (formData[o["typename"]][`${o.title}Name`] && showOperateBtn) ? 3 : g.viewAttr
                     };
                   }
                   return {

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;
+      }
     }
   }
 }