diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
index 27a9ee0a..ec715d23 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
@@ -171,6 +171,11 @@
.wea-search-group {
padding-left: 0;
padding-right: 0;
+ margin-bottom: 16px;
+
+ .wea-form-cell {
+ padding: 0;
+ }
}
.titleNormalWrapper {
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js
index d476edbd..83ddde51 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js
@@ -5,19 +5,73 @@
* Date: 2023/07/19
*/
import React, { Component } from "react";
-import { WeaLocaleProvider, WeaSlideModal } from "ecCom";
+import { inject, observer } from "mobx-react";
+import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaSlideModal } from "ecCom";
+import { Button } from "antd";
+import { WeaSwitch } from "comsMobx";
import SlideModalTitle from "../../../components/slideModalTitle";
import SalaryItemForm from "../../salaryItem/salaryItemForm";
+import { sxwzApprovalConditions } from "../config";
import "./index.less";
const getLabel = WeaLocaleProvider.getLabel;
+@inject("ledgerStore")
+@observer
class LedgerSalaryItemEditSlide extends Component {
constructor(props) {
super(props);
- this.state = {};
+ this.state = {
+ conditions: []
+ };
}
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ const { ledgerStore: { sxwzForm } } = nextProps;
+ this.setState({
+ conditions: _.map(sxwzApprovalConditions, item => {
+ return {
+ ...item, title: getLabel(111, "审批配置"),
+ items: _.map(item.items, o => ({ ...o, label: getLabel(o.lanId, o.label) }))
+ };
+ })
+ }, () => sxwzForm.initFormFields(this.state.conditions));
+ }
+ }
+
+ /*
+ * Author: 黎永顺
+ * Description: 陕西万众-审批配置渲染表单
+ * Params:
+ * Date: 2023/12/29
+ */
+ renderSxwzForm = (form, condition) => {
+ const { isFormInit } = form, formParams = form.getFormParams();
+ let group = [];
+ isFormInit && condition && condition.map(c => {
+ let items = [];
+ c.items.map(fields => {
+ items.push({
+ com: (
+
+
+ ),
+ colSpan: 1,
+ hide: fields.hide
+ });
+ });
+ group.push(
+ {getLabel(111, "同步审批信息至账套")}}
+ />);
+ });
+ return group;
+ };
handleChange = (params) => {
const request = { ...this.props.request, ...params };
const key = Object.keys(params)[0];
@@ -26,6 +80,8 @@ class LedgerSalaryItemEditSlide extends Component {
handleShowFormal = (salaryItemName) => this.props.onEditFormnul(salaryItemName);
render() {
+ const { conditions } = this.state;
+ const { ledgerStore: { sxwzForm } } = this.props;
return (
}
+ {/*陕西万众-流程审批配置*/}
+ {this.renderSxwzForm(sxwzForm, conditions)}
}
/>
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/config.js b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
index 9af48b4d..ef2555e8 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/config.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
@@ -803,3 +803,31 @@ export const keepDecimalPlaces = [
showname: "5"
}
];
+//陕西万众-薪资账套中薪资项目的审批配置项
+export const sxwzApprovalConditions = [
+ {
+ items: [
+ {
+ conditionType: "SWITCH",
+ domkey: ["showInWorkflow"],
+ fieldcol: 14,
+ label: "审批时展示",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
+ },
+ {
+ conditionType: "SWITCH",
+ domkey: ["sumInWorkflow"],
+ fieldcol: 14,
+ label: "审批时求和",
+ lanId: 111,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
+ }
+ ],
+ defaultshow: true
+ }
+];
diff --git a/pc4mobx/hrmSalary/stores/ledger.js b/pc4mobx/hrmSalary/stores/ledger.js
index 8dc46dc8..1e2382f0 100644
--- a/pc4mobx/hrmSalary/stores/ledger.js
+++ b/pc4mobx/hrmSalary/stores/ledger.js
@@ -13,6 +13,7 @@ export class LedgerStore {
@observable copyForm = new WeaForm(); // 复制form
@observable categoryForm = new WeaForm(); // 新增分类form
@observable searchForm = new WeaForm(); // 查询form
+ @observable sxwzForm = new WeaForm(); // 陕西万众-审批配置form
/*******************************************************/