diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js index 13ebd84a..ccf8083b 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js @@ -1,3 +1,5 @@ +import { dataTypeOptions, patternOptions, roundingModeOptions } from "./options"; + export const columns = [ { title: "名称", @@ -52,13 +54,91 @@ export const columns = [ ]; export const salaryItemFields = [ { - key: '', + key: 'name', label: '名称', type: 'INPUT', viewAttr: 3, tip: '' }, + { + key: 'useInEmployeeSalary', + label: '薪资档案引用', + type: 'SWITCH', + viewAttr: 2, + tip: '提示：开启后，该薪资项目不可删除或设为无效，取值方式会默认置为输入' + }, + { + key: 'useDefault', + label: '默认使用', + type: 'SWITCH', + viewAttr: 2, + tip: '提示：开启后，每个薪资方案都有该薪资项目，可在具体薪资方案中删除' + }, + { + key: 'sharedType', + label: '可见性', + type: 'SELECT', + viewAttr: 2, + tip: '' + }, + { + key: 'taxAgentIds', + label: '可见性范围', + type: 'SELECT', + viewAttr: 2, + tip: '' + }, + { + key: 'dataType', + label: '字段类型', + type: 'SELECT', + viewAttr: 3, + options: dataTypeOptions, + tip: '' + }, + { + key: 'roundingMode', + label: '舍入规则', + type: 'SELECT', + viewAttr: 2, + options: roundingModeOptions, + tip: '' + }, + { + key: 'pattern', + label: '保留小数位', + type: 'SELECT', + viewAttr: 2, + options: patternOptions, + tip: '' + }, + { + key: 'valueType', + label: '取值方式', + type: 'RADIO', + viewAttr: 2, + tip: '' + }, + { + key: 'formulaContent', + label: '公式', + type: 'INPUT', + viewAttr: 2, + tip: '' + }, + { + key: 'description', + label: '备注', + type: 'TEXTAREA', + viewAttr: 2, + tip: '' + }, ]; +export const valTakeOptions=[ + {key: "1", showname: '输入'}, + {key: "2", showname: '公式'}, + {key: "3", showname: 'SQL'}, +] diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js index 2b153731..4260304f 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js @@ -3,6 +3,7 @@ import { Col, Row, Switch } from "antd"; import { WeaHelpfulTip, WeaInput, WeaSelect, WeaTextarea } from "ecCom"; import { dataTypeOptions, patternOptions, roundingModeOptions } from "./options"; import FormalFormModal from "./formalFormModal"; +import SalaryItemForm from "./salaryItemForm"; import "./index.less"; export default class CustomSalaryItemSlide extends React.Component { @@ -50,227 +51,228 @@ export default class CustomSalaryItemSlide extends React.Component { const { formalModalVisible } = this.state; return (
-
- - 名称 - - { - this.handleChange({ name: value }); - }} - /> - - - - 薪资档案引用 - - { - this.handleChange({ useInEmployeeSalary: value ? 1 : 0 }); - }} - /> - - - - - 默认使用 - - { - this.handleChange({ useDefault: value ? 1 : 0 }); - }} - /> - - - + + {/*
*/} + {/* */} + {/* 名称*/} + {/* */} + {/* {*/} + {/* this.handleChange({ name: value });*/} + {/* }}*/} + {/* />*/} + {/* */} + {/* */} + {/* */} + {/* 薪资档案引用*/} + {/* */} + {/* {*/} + {/* this.handleChange({ useInEmployeeSalary: value ? 1 : 0 });*/} + {/* }}*/} + {/* />*/} + {/* */} + {/* */} + {/* */} + {/* */} + {/* 默认使用*/} + {/* */} + {/* {*/} + {/* this.handleChange({ useDefault: value ? 1 : 0 });*/} + {/* }}*/} + {/* />*/} + {/* */} + {/* */} + {/* */} - { - (systemType == 0 || isAdd) && - - - - 可见性 - - { - let payload = {}; - (value === "0" || value === "") && (payload.taxAgentIds = ""); - payload.sharedType = value; - this.handleChange(payload); - }} - style={{ width: "200px" }} - /> - - - - - } - { - sharedType === "1" && - - - - 可见性范围 - - { - this.handleChange({ taxAgentIds: value }); - }} - /> - - - - - } - - - - 字段类型 - - { - this.handleChange({ dataType: value }); - }} - style={{ width: "200px" }} - /> - - - - - - - - 舍入规则 - - { - this.handleChange({ roundingMode: value }); - }} - /> - - - - - - 保留小数位 - - { - this.handleChange({ pattern: value }); - }} - value={pattern} - style={{ width: "200px" }} - /> - - - - + {/* {*/} + {/* (systemType == 0 || isAdd) &&*/} + {/* */} + {/* */} + {/* */} + {/* 可见性*/} + {/* */} + {/* {*/} + {/* let payload = {};*/} + {/* (value === "0" || value === "") && (payload.taxAgentIds = "");*/} + {/* payload.sharedType = value;*/} + {/* this.handleChange(payload);*/} + {/* }}*/} + {/* style={{ width: "200px" }}*/} + {/* />*/} + {/* */} + {/* */} + {/* */} + {/* */} + {/* }*/} + {/* {*/} + {/* sharedType === "1" &&*/} + {/* */} + {/* */} + {/* */} + {/* 可见性范围*/} + {/* */} + {/* {*/} + {/* this.handleChange({ taxAgentIds: value });*/} + {/* }}*/} + {/* />*/} + {/* */} + {/* */} + {/* */} + {/* */} + {/* }*/} + {/* */} + {/* */} + {/* */} + {/* 字段类型*/} + {/* */} + {/* {*/} + {/* this.handleChange({ dataType: value });*/} + {/* }}*/} + {/* style={{ width: "200px" }}*/} + {/* />*/} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* 舍入规则*/} + {/* */} + {/* {*/} + {/* this.handleChange({ roundingMode: value });*/} + {/* }}*/} + {/* />*/} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* 保留小数位*/} + {/* */} + {/* {*/} + {/* this.handleChange({ pattern: value });*/} + {/* }}*/} + {/* value={pattern}*/} + {/* style={{ width: "200px" }}*/} + {/* />*/} + {/* */} + {/* */} + {/* */} + {/* */} - - 取值方式 - - { - this.handleChange({ - valueType: value, - formulaId: null, - formulaContent: "" - }); - }}/> - - - {(valueType == 2 || valueType == 3) && - - - {valueType == 2 ? "公式" : "SQL"} - - -
{ - if (this.props.record.canEdit || isAdd) { - editable && this.handleShowFormal(); - } - }}> - {formulaContent} -
- - } + {/* */} + {/* 取值方式*/} + {/* */} + {/* {*/} + {/* this.handleChange({*/} + {/* valueType: value,*/} + {/* formulaId: null,*/} + {/* formulaContent: ""*/} + {/* });*/} + {/* }}/>*/} + {/* */} + {/* */} + {/* {(valueType == 2 || valueType == 3) &&*/} + {/* */} + {/* */} + {/* {valueType == 2 ? "公式" : "SQL"}*/} + {/* */} + {/* */} + {/* {*/} + {/* if (this.props.record.canEdit || isAdd) {*/} + {/* editable && this.handleShowFormal();*/} + {/* }*/} + {/* }}>*/} + {/* {formulaContent}*/} + {/*
*/} + {/* */} + {/* }*/} - - 备注 - - { - this.handleChange({ description: value }); - }} - /> - - -
+ {/* */} + {/* 备注*/} + {/* */} + {/* {*/} + {/* this.handleChange({ description: value });*/} + {/* }}*/} + {/* />*/} + {/* */} + {/* */} + {/*
*/} {formalModalVisible && + { + _.map(salaryItemFields, item => { + const { key, label, type, viewAttr, tip, options } = item; + return + { + type === "INPUT" ? : + type === "SWITCH" ? : + type === "SELECT" ? + : + type === "RADIO" ? : + type === "TEXTAREA" ? : null + } + ; + }) + } + + ); + } +} + +export default SalaryItemForm;