From 9d1b537abffea75d6b64b5f378f580d242fa1b36 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, 18 Jul 2023 15:25:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=9A=90=E8=97=8F=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fieldManagement/components/fieldSlide.js | 31 +++++- .../fieldManagement/components/fieldTable.js | 2 +- pc4mobx/hrmSalary/pages/salaryItem/columns.js | 101 ++++++++++-------- pc4mobx/hrmSalary/pages/salaryItem/index.js | 24 ++++- .../pages/salaryItem/salaryItemForm.js | 6 +- .../pages/salaryItem/systemSalaryItemModal.js | 2 +- pc4mobx/hrmSalary/stores/salaryItem.js | 2 + 7 files changed, 111 insertions(+), 57 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js index 94295816..b3217d65 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js @@ -6,13 +6,25 @@ */ import React, { Component } from "react"; import { inject, observer } from "mobx-react"; -import { WeaCheckbox, WeaFormItem, WeaHelpfulTip, WeaInput, WeaSelect, WeaSlideModal, WeaTextarea, WeaInputNumber } from "ecCom"; +import { + WeaCheckbox, + WeaFormItem, + WeaHelpfulTip, + WeaInput, + WeaInputNumber, + WeaLocaleProvider, + WeaSelect, + WeaSlideModal, + WeaTextarea +} from "ecCom"; import { message, Modal } from "antd"; import SlideModalTitle from "../../../components/slideModalTitle"; import { getSalaryFieldForm, saveSalaryField } from "../../../apis/fieldManage"; import { commonEnumList } from "../../../apis/payrollFiles"; import { dataTypeOptions, patternOptions, roundingModeOptions } from "../../salaryItem/options"; +const getLabel = WeaLocaleProvider.getLabel; + @inject("taxAgentStore") @observer class FieldSlide extends Component { @@ -54,6 +66,7 @@ class FieldSlide extends Component { const { name, useDefault, + hideDefault, useInEmployeeSalary, dataType, description, @@ -68,6 +81,7 @@ class FieldSlide extends Component { name, useInEmployeeSalary: useInEmployeeSalary ? useInEmployeeSalary.toString() : "0", useDefault: useDefault ? useDefault.toString() : "0", + hideDefault: hideDefault ? hideDefault.toString() : "0", dataType, description, sortedIndex, @@ -120,6 +134,7 @@ class FieldSlide extends Component { const { name, useDefault, + hideDefault, useInEmployeeSalary, dataType, description, @@ -133,6 +148,7 @@ class FieldSlide extends Component { name, useInEmployeeSalary: Number(useInEmployeeSalary), useDefault: Number(useDefault), + hideDefault: Number(hideDefault), dataType, description, sortedIndex, @@ -168,6 +184,7 @@ class FieldSlide extends Component { name: "", useInEmployeeSalary: "1", useDefault: "0", + hideDefault: "0", sharedType: "0", taxAgentIds: "", dataType: "number", @@ -191,6 +208,7 @@ class FieldSlide extends Component { name, useInEmployeeSalary, useDefault, + hideDefault, shareTypeList, sharedType, taxAgentIds, @@ -250,6 +268,17 @@ class FieldSlide extends Component { placement="topLeft" /> + + this.handleChangeFields("hideDefault", value)} + /> + + { const { dataIndex } = item; - if (dataIndex === "useDefault") { + if (dataIndex === "useDefault" || dataIndex === "hideDefault") { item.render = (text) => (); } else if (dataIndex === "operate") { item.width = 120; diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js index 573795b4..ce744d37 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js @@ -1,5 +1,7 @@ +import { WeaLocaleProvider } from "ecCom"; import { dataTypeOptions, patternOptions, roundingModeOptions } from "./options"; +const getLabel = WeaLocaleProvider.getLabel; export const columns = [ { title: "名称", @@ -54,11 +56,11 @@ export const columns = [ ]; export const salaryItemFields = [ { - key: 'name', - label: '名称', - type: 'INPUT', + key: "name", + label: "名称", + type: "INPUT", viewAttr: 3, - tip: '' + tip: "" }, // { // key: 'useInEmployeeSalary', @@ -68,63 +70,70 @@ export const salaryItemFields = [ // tip: '提示：开启后，该薪资项目不可删除或设为无效，取值方式会默认置为输入' // }, { - key: 'useDefault', - label: '默认使用', - type: 'SWITCH', + key: "useDefault", + label: "默认使用", + type: "SWITCH", viewAttr: 2, - tip: '提示：开启后，每个薪资方案都有该薪资项目，可在具体薪资方案中删除' + tip: "提示：开启后，每个薪资方案都有该薪资项目，可在具体薪资方案中删除" }, { - key: 'sharedType', - label: '可见性', - type: 'SELECT', + key: "hideDefault", + label: getLabel(111, "默认隐藏"), + type: "SWITCH", viewAttr: 2, - tip: '' + tip: getLabel(111, "提示：开启后，在薪资账套中添加该项目时，默认勾选隐藏且在核算时隐藏该薪资项目，可在具体薪资账套中设置是否隐藏") }, { - key: 'taxAgentIds', - label: '可见性范围', - type: 'SELECT', + key: "sharedType", + label: "可见性", + type: "SELECT", + viewAttr: 2, + tip: "" + }, + { + key: "taxAgentIds", + label: "可见性范围", + type: "SELECT", viewAttr: 3, - tip: '' + tip: "" }, { - key: 'dataType', - label: '字段类型', - type: 'SELECT', + key: "dataType", + label: "字段类型", + type: "SELECT", viewAttr: 3, options: dataTypeOptions, - tip: '' + tip: "" }, { - key: 'roundingMode', - label: '舍入规则', - type: 'SELECT', + key: "roundingMode", + label: "舍入规则", + type: "SELECT", viewAttr: 2, options: roundingModeOptions, - tip: '' + tip: "" }, { - key: 'pattern', - label: '保留小数位', - type: 'SELECT', + key: "pattern", + label: "保留小数位", + type: "SELECT", viewAttr: 2, options: patternOptions, - tip: '' + tip: "" }, { - key: 'valueType', - label: '取值方式', - type: 'RADIO', + key: "valueType", + label: "取值方式", + type: "RADIO", viewAttr: 2, - tip: '' + tip: "" }, { - key: 'formulaContent', - label: '公式', - type: 'INPUT', + key: "formulaContent", + label: "公式", + type: "INPUT", viewAttr: 2, - tip: '' + tip: "" }, { key: "sortedIndex", @@ -134,18 +143,18 @@ export const salaryItemFields = [ tip: "" }, { - key: 'description', - label: '备注', - type: 'TEXTAREA', + key: "description", + label: "备注", + type: "TEXTAREA", viewAttr: 2, - tip: '' - }, + tip: "" + } +]; +export const valTakeOptions = [ + { key: "1", showname: "输入" }, + { key: "2", showname: "公式" }, + { key: "3", showname: "SQL" } ]; -export const valTakeOptions=[ - {key: "1", showname: '输入'}, - {key: "2", showname: '公式'}, - {key: "3", showname: 'SQL'}, -] diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index a07c33b2..57ecbbeb 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -112,9 +112,9 @@ export default class SalaryItem extends React.Component { return { this.onEditItem(record, false); }}>{text}; - case "useInEmployeeSalary": - return ; case "useDefault": + case "hideDefault": + case "useInEmployeeSalary": return ; default: return
; @@ -366,9 +366,23 @@ export default class SalaryItem extends React.Component { { - systemItemVisible && { - setSystemItemVisible(false); - }}/> + systemItemVisible && + { + setSystemItemVisible(false); + }} + onInitTableList={() => { + getTableDatas({ ...this.state.searchParams, name: this.state.searchValue }).then(res => { + this.setState({ + searchParams: { + ...this.state.searchParams, + total: res.total + } + }); + }); + }} + /> } { editSlideVisible && diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js index 1f09d059..05a3ba25 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js @@ -5,7 +5,7 @@ * Date: 2023/2/9 */ import React, { Component } from "react"; -import { WeaCheckbox, WeaFormItem, WeaInput, WeaSearchGroup, WeaSelect, WeaTextarea, WeaInputNumber } from "ecCom"; +import { WeaCheckbox, WeaFormItem, WeaInput, WeaInputNumber, WeaSearchGroup, WeaSelect, WeaTextarea } from "ecCom"; import { salaryItemFields, valTakeOptions } from "./columns"; class SalaryItemForm extends Component { @@ -86,7 +86,7 @@ class SalaryItemForm extends Component { if (key === "valueType") { onChangeFieldsItem({ formulaContent: "", formulaId: 0, valueType: v }); } else { - onChangeFieldsItem({ [key]: (key === "useDefault" || key === "useInEmployeeSalary") ? Number(v) : v }); + onChangeFieldsItem({ [key]: (key === "useDefault" || key === "useInEmployeeSalary" || key === "hideDefault") ? Number(v) : v }); } }); }; @@ -131,7 +131,7 @@ class SalaryItemForm extends Component { (type === "INPUTNUMBER" && display) ? this.handleChangeSalaryFiledItems(key, v)}/> + onChange={v => this.handleChangeSalaryFiledItems(key, v)}/> : null } ; diff --git a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js index 3530ee29..2e7d169f 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js @@ -60,7 +60,7 @@ export default class SystemSalaryItemModal extends React.Component { if (status) { message.success(getLabel(111, "添加成功")); this.setState({ selectedRowKeys: [] }, () => { - this.getSysItemList(); + this.props.onInitTableList(); this.props.onCancel(); }); } else { diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js index 6eb365de..696fed61 100644 --- a/pc4mobx/hrmSalary/stores/salaryItem.js +++ b/pc4mobx/hrmSalary/stores/salaryItem.js @@ -23,6 +23,7 @@ export class SalaryItemStore { @observable request = { name: "", useDefault: 0, + hideDefault: 0, useInEmployeeSalary: 0, systemType: 0, roundingMode: "1", @@ -63,6 +64,7 @@ export class SalaryItemStore { initRequest = () => this.request = { name: "", useDefault: 0, + hideDefault: 0, useInEmployeeSalary: 0, systemType: 0, roundingMode: "1", From ee4915093063cc8158d1d0409721d93dad9b997d 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, 18 Jul 2023 15:47:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=9A=90=E8=97=8F=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/ledgerPage/components/ledgerSalaryItemAddModal.js | 1 + 1 file changed, 1 insertion(+) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js index f0ddd511..470c1956 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js @@ -96,6 +96,7 @@ export default class LedgerSalaryItemAddModal extends React.Component { if (item.id === key) { item.salaryItemId = item.id; item.key = item.id; + item.itemHide = item.hideDefault; item.sortedIndex = (!_.isEmpty(_.maxBy(arrItems, it => it.sortedIndex)) ? _.maxBy(arrItems, it => it.sortedIndex).sortedIndex : 0) + keyIdx + 1; selectItems.push(item); } From 4e3e090c3c14513af32247fca1bfa8c06c6842d9 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, 18 Jul 2023 16:50:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=9A=90=E8=97=8F=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/ledgerPage/components/ledgerSalaryItemAddModal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js index 470c1956..774269f5 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js @@ -74,8 +74,9 @@ export default class LedgerSalaryItemAddModal extends React.Component { let valueSpan = record[newColumn.dataIndex + "span"] !== undefined ? record[newColumn.dataIndex + "span"] : record[newColumn.dataIndex]; switch (newColumn.dataIndex) { case "useDefault": + case "hideDefault": case "useInEmployeeSalary": - return ; + return ; default: return
; } From 77645b717ac0320bd56e6275ccf24ab42953075f 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, 18 Jul 2023 17:31:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/pages/fieldManagement/components/fieldSlide.js | 2 +- pc4mobx/hrmSalary/pages/salaryItem/columns.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js index b3217d65..77e8d62f 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js @@ -268,7 +268,7 @@ class FieldSlide extends Component { placement="topLeft" /> - +