diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index 4919e1d9..9872af6a 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -1,7 +1,7 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { Button, Dropdown, Menu, message, Modal, Switch } from "antd";
-import { WeaInputSearch, WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTop } from "ecCom";
+import { WeaInputLocale, WeaInputSearch, WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTop } from "ecCom";
import { renderLoading } from "../../util";
import CustomTab from "../../components/customTab";
import SystemSalaryItemModal from "./systemSalaryItemModal";
@@ -12,6 +12,7 @@ import CustomPaginationTable from "../../components/customPaginationTable";
import SyncToSalaryAccountSetDialog from "./syncToSalaryAccountSetDialog";
import "../socialSecurityBenefits/programme/index.less";
+const getMultiStrFromBase64 = WeaInputLocale.getMultiStrFromBase64;
const { getLabel } = WeaLocaleProvider;
@inject("salaryItemStore", "taxAgentStore", "salaryFileStore")
@observer
@@ -281,7 +282,7 @@ export default class SalaryItem extends React.Component {
const handleSlideSave = (continueFlag) => {
const { salaryItemStore: { saveItem, request, getTableDatas } } = this.props;
const payload = _.cloneDeep(request);
- const { name, sharedType, taxAgentIds } = request;
+ const { name, description, sharedType, taxAgentIds } = request;
if (!name || (sharedType === "1" && !taxAgentIds)) {
Modal.warning({
title: getLabel(131329, "信息确认"),
@@ -289,7 +290,11 @@ export default class SalaryItem extends React.Component {
});
return;
}
- saveItem(payload, continueFlag).then(() => {
+ saveItem({
+ ...payload,
+ name: name.indexOf("base64") === -1 ? name : getMultiStrFromBase64(name),
+ description: description.indexOf("base64") === -1 ? description : getMultiStrFromBase64(description)
+ }, continueFlag).then(() => {
getTableDatas({ ...this.state.searchParams }).then(res => {
this.setState({
searchParams: {
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index d3e14e8b..7b1d3ca0 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -9,6 +9,7 @@ import {
WeaCheckbox,
WeaFormItem,
WeaInput,
+ WeaInputLocale,
WeaInputNumber,
WeaLocaleProvider,
WeaSearchGroup,
@@ -18,6 +19,7 @@ import {
import { salaryItemFields, valTakeOptions } from "./columns";
const getLabel = WeaLocaleProvider.getLabel;
+const getMultiStrFromBase64 = WeaInputLocale.getMultiStrFromBase64;
class SalaryItemForm extends Component {
constructor(props) {
@@ -149,8 +151,8 @@ class SalaryItemForm extends Component {
{
(type === "INPUT" && display) ?
- (key === "originSqlContent" || key === "originFormulaContent") && onShowFormal(request["name"])}
onChange={v => this.handleChangeSalaryFiledItems(key, v)}/> :
(type === "SWITCH" && display) ?
@@ -183,7 +185,8 @@ class SalaryItemForm extends Component {
:
(type === "TEXTAREA" && display) ?
- this.handleChangeSalaryFiledItems(key, v)}/>
:
(type === "INPUTNUMBER" && display) ?
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsDialog.js
index 6d98cfc3..e4adb4b6 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsDialog.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsDialog.js
@@ -6,12 +6,13 @@
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
-import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
+import { WeaDialog, WeaInputLocale, WeaLocaleProvider, WeaTools } from "ecCom";
import { Button, message } from "antd";
import { getConditionDomkeys, getSearchs } from "../../../util";
import { createSICategory, getCustomCategoryForm, updateCustomCategory } from "../../../apis/welfareScheme";
const getLabel = WeaLocaleProvider.getLabel;
+const getMultiStrFromBase64 = WeaInputLocale.getMultiStrFromBase64;
const getKey = WeaTools.getKey;
const API = {
create: createSICategory, update: updateCustomCategory
@@ -47,9 +48,17 @@ class CustomBenefitsDialog extends Component {
programmeStore.cusBeneForm.initFormFields(this.state.conditions);
id &&
_.map(getConditionDomkeys(this.state.conditions), item => {
- programmeStore.cusBeneForm.updateFields({
- [item]: { value: item === "paymentScope" ? data["form"][item].join(",") : data["form"][item] }
- });
+ if (item === "insuranceName") {
+ programmeStore.cusBeneForm.updateFields({
+ [item]: {
+ value: getMultiStrFromBase64(data["form"][item])
+ }
+ });
+ } else {
+ programmeStore.cusBeneForm.updateFields({
+ [item]: { value: item === "paymentScope" ? data["form"][item].join(",") : data["form"][item] }
+ });
+ }
});
});
}