diff --git a/pc4mobx/hrmSalary/apis/welfareScheme.js b/pc4mobx/hrmSalary/apis/welfareScheme.js index 979ebc72..ca918411 100644 --- a/pc4mobx/hrmSalary/apis/welfareScheme.js +++ b/pc4mobx/hrmSalary/apis/welfareScheme.js @@ -39,7 +39,13 @@ export const getCopyForm = params => { return WeaTools.callApi('/api/bs/hrmsalary/scheme/copyForm', 'get', params); }; export const copyScheme = params => { - return WeaTools.callApi('/api/bs/hrmsalary/scheme/copyScheme', 'get', params); + return fetch(`/api/bs/hrmsalary/scheme/copyScheme?id=${params.id}&schemeName=${params.schemeName}`, { + method: 'GET', + mode: 'cors', + headers: { + 'Content-Type': 'application/json' + }, + }).then(res => res.json()) }; export const deleteScheme = params => { return fetch('/api/bs/hrmsalary/scheme/delete', { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js index 4a945429..50e7410e 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js @@ -1,6 +1,5 @@ import React from "react"; import { inject, observer } from "mobx-react"; -import { toJS } from "mobx"; import { Button, Col, DatePicker, Dropdown, Menu, message, Modal, Row, Switch } from "antd"; import { WeaDatePicker, WeaInputSearch, WeaRightMenu, WeaSelect, WeaSlideModal, WeaTop } from "ecCom"; import moment from "moment"; @@ -18,6 +17,7 @@ import TwoColContent from "../../../components/twoColContent"; import TipLabel from "../../../components/TipLabel"; import ItemMangeFormModal from "./itemMangeFormModal"; import CustomPaginationTable from "../../../components/customPaginationTable"; +import "../otherDeduct/index.less" const MonthPicker = DatePicker.MonthPicker; @@ -459,7 +459,7 @@ export default class Attendance extends React.Component { }; const renderCustomOperate = () => { - return ( + return ([
{showOperateBtn &&
- ); + ]); }; const handleItemSearch = value => { @@ -868,6 +868,7 @@ export default class Attendance extends React.Component { />} {slideVisiable && { - reject("方案名称重复"); - message.error(`${err}方案名称重复`); }) }) } @@ -288,7 +285,7 @@ export class ProgrammeStore { reject(); return } - API.createSICategory(params).then(res => { + API.createSICategory({...params, paymentScope: params.paymentScope.split(",")}).then(res => { if(res.status) { message.success("新增成功") resolve() @@ -297,6 +294,8 @@ export class ProgrammeStore { reject() message.error(res.errormsg || "新增失败") } + }).catch(()=>{ + message.error("新增失败") }) })