产品-合并代码

pc4mobx/hrmSalary/pages/payroll/index.js

@@ -64,12 +64,7 @@ export default class Payroll extends React.Component {
 
   getReplenishForm = (isEdit = false, params = {}) => {
     const { payrollStore } = this.props;
-    const {
-      templateBaseData,
-      salaryTemplateShowSet,
-      setReplenishSalaryTemplateSalaryItemSet,
-      setSalaryBillItemNameSet
-    } = payrollStore;
+    const { templateBaseData, salaryTemplateShowSet, setReplenishSalaryTemplateSalaryItemSet } = payrollStore;
     if (!salaryTemplateShowSet.theme && !isEdit) {
       Modal.warning({
         title: "信息确认",
@@ -82,12 +77,10 @@ export default class Payroll extends React.Component {
         if (!isEdit) {
           this.setState({ currentStep: this.state.currentStep + 1 }, () => {
             setReplenishSalaryTemplateSalaryItemSet(data.replenishSalaryTemplateSalaryItemSet);
-            setSalaryBillItemNameSet(data.salaryBillItemNameSet);
             window.localStorage.setItem("salary-showset", JSON.stringify(salaryTemplateShowSet));
           });
         } else {
           setReplenishSalaryTemplateSalaryItemSet(data.replenishSalaryTemplateSalaryItemSet);
-          setSalaryBillItemNameSet(data.salaryBillItemNameSet);
           window.localStorage.setItem("salary-showset", JSON.stringify(salaryTemplateShowSet));
         }
       }
@@ -268,9 +261,7 @@ export default class Payroll extends React.Component {
       setTemplateTableSelectedRowKeys,
       deletePayroll,
       templateBaseData,
-      setTemplateTablePageInfo,
-      setSalaryBillItemNameSetting,
-      salaryBillItemNameSetting
+      setTemplateTablePageInfo
     } = payrollStore;
     const { currentStep, selectedTab, templateSearchValue, templateSelect, startDate, endDate } = this.state;
     if (!hasRight && !loading) { // 无权限处理
@@ -325,7 +316,7 @@ export default class Payroll extends React.Component {
             {
               showOperateBtn &&
               <Button type="primary" onClick={() => {
-                this.setState({ stepSlideVisible: true, currentStep: 0 });
+                this.setState({ stepSlideVisible: true });
               }}>新建</Button>
             }
             {
@@ -474,16 +465,10 @@ export default class Payroll extends React.Component {
             customOperate={
               currentStep === 0 ? [
                 <Button type="primary" onClick={() => {
-                  setSalaryBillItemNameSetting(_.map(salaryBillItemNameSetting, it => {
-                    return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
-                  }));
                   nextStep();
                 }}>下一步</Button>
               ] : currentStep === 1 ? [
                 <Button type="default" onClick={() => {
-                  setSalaryBillItemNameSetting(_.map(salaryBillItemNameSetting, it => {
-                    return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
-                  }));
                   prevStep();
                 }}>上一步</Button>,
                 <Button type="primary" onClick={() => this.getReplenishForm()}>下一步</Button>,
@@ -492,9 +477,6 @@ export default class Payroll extends React.Component {
                 }}>预览</Button>
               ] : currentStep === 2 ? [
                   <Button type="default" onClick={() => {
-                    setSalaryBillItemNameSetting(_.map(salaryBillItemNameSetting, it => {
-                      return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
-                    }));
                     prevStep();
                   }}>上一步</Button>,
                   <Button type="primary" onClick={this.handleSave}>保存</Button>
@@ -524,7 +506,7 @@ export default class Payroll extends React.Component {
             className="slideOuterWrapper"
             visible={this.state.editSlideVisible}
             top={0}
-            width={65}
+            width={50}
             height={100}
             direction="right"
             measure="%"
@@ -557,9 +539,6 @@ export default class Payroll extends React.Component {
                 }
                 subItemChange={(selectedTab) => {
                   this.setState({ selectedTab: Number(selectedTab) }, () => {
-                    setSalaryBillItemNameSetting(_.map(salaryBillItemNameSetting, it => {
-                      return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
-                    }));
                     if (this.state.selectedTab === 2) this.getReplenishForm(true, { id: this.state.templateCurrentId });
                   });
                 }}

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

@@ -218,7 +218,7 @@ class SalaryItemSettings extends Component {
   };
   handleEditSalaryItemName = (item, field, viewAttr) => {
     //暂时关闭
-    return
+    return;
     const { groupId } = item, { salaryItemId } = field, { dataList } = this.state;
     if (groupId === "111111111111111111") return;
     this.setState({
@@ -307,36 +307,9 @@ class SalaryItemSettings extends Component {
                         })
                       )}
                       renderNodeItem={(filed) => {
-                        const salaryBillItemNameObj = salaryBillItemNameSet[filed.id] || {};
                         return <div className="salaryItemList">
-                          <div className="salaryItem"
-                               title={
-                                 (item.groupId !== "111111111111111111" && (!_.isEmpty(salaryBillItemNameObj) || (filed.salaryItemShowName !== filed.originName))) ?
-                                   `${filed.salaryItemShowName}(${filed.originName})` :
-                                   filed.name
-                               }
-                          >
-                            {
-                              filed.viewAttr === 2 ?
-                                <WeaInput
-                                  value={
-                                    item.groupId !== "111111111111111111" ?
-                                      filed.salaryItemShowName :
-                                      filed.name
-                                  }
-                                  id="salaryItemInput"
-                                  onBlur={() => this.handleEditSalaryItemName(item, filed, 1)}
-                                  onChange={(val) => this.handleChangeSalaryItemShowName(item, filed, val)}
-                                /> :
-                                <div className="salaryItemName"
-                                     onClick={() => this.handleEditSalaryItemName(item, filed, 2)}>
-                                  {
-                                    (item.groupId !== "111111111111111111" && (!_.isEmpty(salaryBillItemNameObj) || (filed.salaryItemShowName !== filed.originName))) ?
-                                      `${filed.salaryItemShowName}(${filed.originName})` :
-                                      filed.name
-                                  }
-                                </div>
-                            }
+                          <div className="salaryItem" title={filed.name}>
+                            <div className="salaryItemName">{filed.name}</div>
                             <Icon type="cross" onClick={() => this.handleDeleteSalaryItem(item, filed)}/>
                           </div>
                         </div>;

pc4mobx/hrmSalary/stores/payroll.js

@@ -26,19 +26,6 @@ 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(); // 工资单列表
@@ -100,10 +87,6 @@ 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) => {
@@ -231,7 +214,6 @@ export class payrollStore {
       if (res.status) {
         if (id !== "") {
           this.salaryItemSet = res.data.salaryTemplateSalaryItemSet;
-          this.salaryBillItemNameSet = res.data.salaryBillItemNameSet;
           this.replenishSalaryTemplateSalaryItemSet = res.data.salaryTemplateSalaryItemSet;
         }
         this.salaryTemplateShowSet = { ...res.data.salaryTemplateShowSet.data, ...JSON.parse(salaryTemplateShowSetStorage) };
@@ -280,7 +262,6 @@ export class payrollStore {
       : false;
     params.salaryItemSetting = toJS(this.salaryItemSet);
     params.replenishSalaryItemSetting = toJS(this.replenishSalaryTemplateSalaryItemSet);
-    params.salaryBillItemNameSetting = toJS(this.salaryBillItemNameSetting);
     return params;
   };
 
@@ -293,9 +274,6 @@ 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 || "保存失败");