feature/V2-dev合并多语言

This commit is contained in:
黎永顺 2023-12-01 11:01:48 +08:00
parent a702e31295
commit 8ca2462507
3 changed files with 27 additions and 10 deletions

View File

@ -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: {

View File

@ -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) ?
<WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
<WeaInput viewAttr={viewAttr} value={value}
inputType={!isLan ? "normal" : "multilang"}
<WeaInput viewAttr={viewAttr} value={!isLan ? value : getMultiStrFromBase64(value)}
inputType={!isLan ? "normal" : "multilang"} isBase64={!isLan}
onClick={() => (key === "originSqlContent" || key === "originFormulaContent") && onShowFormal(request["name"])}
onChange={v => this.handleChangeSalaryFiledItems(key, v)}/></WeaFormItem> :
(type === "SWITCH" && display) ?
@ -183,7 +185,8 @@ class SalaryItemForm extends Component {
</WeaFormItem> :
(type === "TEXTAREA" && display) ?
<WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
<WeaTextarea value={value} viewAttr={viewAttr} minRows={3} inputType="multilang"
<WeaTextarea value={getMultiStrFromBase64(value)} viewAttr={viewAttr} minRows={3}
inputType="multilang"
onChange={v => this.handleChangeSalaryFiledItems(key, v)}/>
</WeaFormItem> :
(type === "INPUTNUMBER" && display) ?

View File

@ -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] }
});
}
});
});
}