Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2308.01

# Conflicts:
#	pc4mobx/hrmSalary/stores/payroll.js

pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js

@@ -125,6 +125,7 @@ class SalaryItemSettings extends Component {
   };
   getAvailableSalaryItemSet = (record, title) => {
     const payload = {
+      salaryTemplateId: this.props.salaryTemplateId,
       salarySobId: this.props.salarySobId,
       existSalaryItemIds: _.map(record.items, it => it.id),
       groupId: record.groupId,
@@ -149,6 +150,7 @@ class SalaryItemSettings extends Component {
     const { dataList } = this.state;
     const payload = {
       salarySobId,
+      salaryTemplateId: this.props.salaryTemplateId,
       existSalaryGroupIds: _.map(dataList, it => it.groupId),
       isReplenish: this.props.isReplenish
     };
@@ -255,7 +257,7 @@ class SalaryItemSettings extends Component {
             ...item,
             items: _.map(item.items, child => {
               if (child.salaryItemId === salaryItemId) {
-                return { ...child, salaryItemShowName: name, name };
+                return { ...child, salaryItemShowName: name, name: name ? name : child.originName };
               }
               return { ...child };
             })
@@ -268,7 +270,18 @@ class SalaryItemSettings extends Component {
         salaryItemShowName: originName === name ? "" : name
       }], itemShowNamesetting, "salaryItemId")
     }, () => {
-      this.props.onChangeSalaryItem(this.state.dataList);
+      const modifySalaryItemids = _.reduce(this.state.itemShowNamesetting, (pre, cur) => [...pre, cur.salaryItemId], []);
+      const convertDataList = _.map(this.state.dataList, it => {
+        if (it.groupId === "111111111111111111") return { ...it };
+        return {
+          ...it,
+          items: _.map(it.items, item => {
+            if (modifySalaryItemids.includes(item.salaryItemId)) return { ...item };
+            return { ...item, name: item.salaryItemShowName };
+          })
+        };
+      });
+      this.props.onChangeSalaryItem(convertDataList);
       this.props.onChangeSalaryItemShowNamesetting(this.state.itemShowNamesetting);
     });
   };

pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js

@@ -148,7 +148,7 @@ export default class ShowSettingForm extends React.Component {
         >
           <SalaryItemSettings
             ref={dom => this.salaryItemSettingsRef = dom}
-            dataSource={salaryItemSet}
+            dataSource={salaryItemSet} salaryTemplateId={this.props.id || ""}
             onChangeSalaryItem={this.handleChangeSalaryItem}
             onChangeSalaryItemShowNamesetting={this.handleChangeSalaryItemShowNamesetting}
             salarySobId={toJS(templateBaseData).salarySob}

pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js

@@ -44,6 +44,7 @@ export default class TemplateSettingForm extends React.Component {
             onChangeSalaryItem={this.handleChangeSalaryItem}
             onChangeSalaryItemShowNamesetting={this.handleChangeSalaryItemShowNamesetting}
             salarySobId={toJS(templateBaseData).salarySob}
+            salaryTemplateId={this.props.id || ""}
             isReplenish={true} salaryBillItemNameSet={salaryBillItemNameSet}
           />
         </WeaSearchGroup>

pc4mobx/hrmSalary/stores/payroll.js

@@ -26,6 +26,19 @@ export class payrollStore {
   @observable salaryTemplateShowSet = {}; // 显示设置基础表单
   @observable replenishSalaryTemplateSalaryItemSet = []; // 补发工资单模版基础表单
   @observable salaryItemSet = []; // 显示设置薪资项
+  @observable salaryBillItemNameSetting = [
+    {
+      salaryTemplateId: "",
+      salaryBillType: 0,
+      itemShowNameSetting: []
+    },
+    {
+      salaryTemplateId: "",
+      salaryBillType: 1,
+      itemShowNameSetting: []
+    }
+  ]; // 工资单模板薪资项目名称修改列表
+  @observable salaryBillItemNameSet = {}; // 工资单模板薪资项目名称修改列表
 
   // **** 工资单页面 ****
   @observable salarySendTableStore = new TableStore(); // 工资单列表
@@ -87,6 +100,10 @@ export class payrollStore {
 
   @action
   setSalaryItemSet = salaryItemSet => (this.salaryItemSet = salaryItemSet);
+  @action
+  setSalaryBillItemNameSet = salaryBillItemNameSet => (this.salaryBillItemNameSet = salaryBillItemNameSet);
+  @action
+  setSalaryBillItemNameSetting = salaryBillItemNameSetting => (this.salaryBillItemNameSetting = salaryBillItemNameSetting);
 
   @action("工资单模板分页信息修改")
   setTemplateTablePageInfo = (pageInfo, callback) => {
@@ -214,8 +231,9 @@ export class payrollStore {
       if (res.status) {
         if (id !== "") {
           this.salaryItemSet = res.data.salaryTemplateSalaryItemSet;
-          this.replenishSalaryTemplateSalaryItemSet = res.data.salaryTemplateSalaryItemSet;
+          this.replenishSalaryTemplateSalaryItemSet = res.data.replenishSalaryTemplateSalaryItemSet;
         }
+        this.salaryBillItemNameSet = res.data.salaryBillItemNameSet;
         this.salaryTemplateShowSet = { ...res.data.salaryTemplateShowSet.data, ...JSON.parse(salaryTemplateShowSetStorage) };
       } else {
         message.error(res.errormsg || "获取失败");
@@ -262,6 +280,7 @@ export class payrollStore {
       : false;
     params.salaryItemSetting = toJS(this.salaryItemSet);
     params.replenishSalaryItemSetting = toJS(this.replenishSalaryTemplateSalaryItemSet);
+    params.salaryBillItemNameSetting = toJS(this.salaryBillItemNameSetting);
     return params;
   };
 
@@ -274,6 +293,9 @@ export class payrollStore {
         if (res.status) {
           message.success("保存成功");
           this.getPayrollTemplateList();
+          this.setSalaryBillItemNameSetting(_.map(this.salaryBillItemNameSetting, it => {
+            return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
+          }));
           resolve();
         } else {
           message.error(res.errormsg || "保存失败");