From 93ea26dfac1fb9171627e6b9ef449ca8c0f2b579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 7 Feb 2023 15:46:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=BC=96=E8=BE=91=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/payroll/stepForm/index.less | 25 +++- .../pages/payroll/stepForm/showSettingForm.js | 120 +++++++++--------- 2 files changed, 84 insertions(+), 61 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less b/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less index 6c8e324c..64b3892d 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less @@ -23,6 +23,26 @@ } .showSettingForm { + .themeSetting { + border: 1px solid #e5e5e5; + border-bottom: none; + + & > div { + padding: 5px 16px; + border-bottom: 1px solid #e5e5e5; + + .wea-form-item-wrapper { + display: flex !important; + align-items: center; + justify-content: space-between; + + .wea-input-normal { + flex: 1; + padding-right: 8px; + } + } + } + } .settingItemWrapper { .itemTitle { @@ -197,8 +217,9 @@ } } } -.salaryItemModalWrapper{ - .modalContent{ + +.salaryItemModalWrapper { + .modalContent { padding: 16px; } } diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js index 0477bca2..50972199 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js @@ -56,16 +56,17 @@ export default class ShowSettingForm extends React.Component { } = { ...salaryTemplateShowSet, ...JSON.parse(salaryTemplateShowSetStorage) }; return (
- - - { - this.handleChange({ theme: value }); - }}/> - + +
+ + { + this.handleChange({ theme: value }); + }}/> + 插入变量： { this.handleThemeNameCllck("${companyName}"); @@ -74,55 +75,56 @@ export default class ShowSettingForm extends React.Component { this.handleThemeNameCllck("${salaryMonth}"); }} className="themeFormalStr">薪资所属月 - - - { - this.handleChange({ background: value }); - }}/> - - - { - this.handleChange({ textContent: value }); - }}/> - - - { - this.handleChange({ textContentPosition: e.target.value }); - }}> - 薪资项目前 - 薪资项目后 - - - - { - this.handleChange({ salaryItemNullStatus: value }); - }}/> - - - { - this.handleChange({ salaryItemZeroStatus: value }); - }}/> - + + + { + this.handleChange({ background: value }); + }}/> + + + { + this.handleChange({ textContent: value }); + }}/> + + + { + this.handleChange({ textContentPosition: e.target.value }); + }}> + 薪资项目前 + 薪资项目后 + + + + { + this.handleChange({ salaryItemNullStatus: value }); + }}/> + + + { + this.handleChange({ salaryItemZeroStatus: value }); + }}/> + +
Date: Wed, 8 Feb 2023 10:27:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=88=86=E7=B1=BB=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/payroll/stepForm/salaryItemModal.js | 2 +- .../pages/payroll/stepForm/salaryItemSettings.js | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js index 7a6e5557..1eea09a3 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js @@ -20,7 +20,7 @@ class SalaryItemModal extends Component { onCancel={onCancel} title={title} visible={visible} - style={{ width: 500 }} + style={{ width: 600 }} hasScroll buttons={buttons} initLoadCss diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js index b2865829..bdd1b1c8 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js @@ -6,7 +6,7 @@ */ import React, { Component } from "react"; import { toJS } from "mobx"; -import { WeaFormItem, WeaInput, WeaSelect, WeaSortable } from "ecCom"; +import { WeaFormItem, WeaInput, WeaSortable, WeaTransfer } from "ecCom"; import { Icon, Modal } from "antd"; import SalaryItemModal from "./salaryItemModal"; import { getAvailableSalaryGroupSet, getAvailableSalaryItemSet } from "../../../apis/payroll"; @@ -134,7 +134,7 @@ class SalaryItemSettings extends Component { visible: true, title, groupId: record.groupId, - options: _.map(data, it => ({ ...it, showname: it.name, key: it.salaryItemId })) + options: _.map(data, it => ({ ...it, name: it.name, id: it.salaryItemId })) } }); } @@ -155,7 +155,7 @@ class SalaryItemSettings extends Component { ...modalPayload, visible: true, title, - options: _.map(data, it => ({ ...it, showname: it.groupName, key: it.groupId })) + options: _.map(data, it => ({ ...it, name: it.groupName, id: it.groupId })) } }); } @@ -269,12 +269,10 @@ class SalaryItemSettings extends Component { - : this.setState({ checkedValue: v })} + : this.setState({ checkedValue: v.join(",") })} /> }