diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
index c9d85ff8..5b2ca302 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js
@@ -11,15 +11,16 @@ class AllWithoutPay extends Component {
message.warning("未选择条目");
return;
}
- API.gotoStop(selectedRowKeys).then(({ status, errormsg }) => {
+ API.gotoStop(selectedRowKeys).then(({ status, data, errormsg }) => {
if (status) {
- message.success("操作成功!");
+ const { msg } = data;
+ message.info(msg || "操作成功!");
refreshList();
} else {
message.error(errormsg || "操作失败!");
}
});
- }else{
+ } else {
const { pageInfo } = this.props;
if (pageInfo.total === 0) {
message.warning("您没有需要处理的待停薪人员！");
@@ -31,7 +32,7 @@ class AllWithoutPay extends Component {
onOk: () => {
API.allGotoStop({}).then(({ status, data, errormsg }) => {
if (status) {
- const { msg }= data;
+ const { msg } = data;
message.info(msg || "操作成功!");
refreshList();
} else {
From b22b41382f4ba8339eb93a0b6345fab079a261a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 20 Sep 2023 16:51:00 +0800
Subject: [PATCH 13/14] =?UTF-8?q?hotfix/2.9.42309.01=2020230920-=E7=A4=BE?=
=?UTF-8?q?=E4=BF=9D=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../programme/columns.js | 141 +++++-------------
.../programme/defaultSlideForm.js | 5 +
.../socialSecurityBenefits/programme/index.js | 123 +++++++++------
pc4mobx/hrmSalary/stores/programme.js | 30 ++--
4 files changed, 130 insertions(+), 169 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
index 5acd68bf..b20698b6 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
@@ -1,114 +1,10 @@
-// 社保
-export const socialSecurityColumns = [{
- title: "方案名称",
- dataIndex: "title",
- key: "title"
-}, {
- title: "缴纳类型",
- dataIndex: "username",
- key: "username"
-}, {
- title: "缴纳范围",
- dataIndex: "projectName",
- key: "projectName"
-}, {
- title: "备注",
- dataIndex: "customer",
- key: "customer"
-}, {
- title: "操作",
- dataIndex: "customer",
- key: "customer"
-}];
-
-// 公积金
-export const accumulationFundColumns = [{
- title: "方案名称",
- dataIndex: "title",
- key: "title"
-}, {
- title: "缴纳类型",
- dataIndex: "username",
- key: "username"
-}, {
- title: "缴纳范围",
- dataIndex: "projectName",
- key: "projectName"
-}, {
- title: "备注",
- dataIndex: "customer",
- key: "customer"
-}, {
- title: "操作",
- dataIndex: "customer",
- key: "customer"
-}];
-
-// 企业年金及其他福利
-export const otherBenefitsColumns = [
- {
- title: "方案名称",
- dataIndex: "title",
- key: "title"
-
- },
- {
- title: "缴纳类型",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "缴纳范围",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "备注",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "操作",
- dataIndex: "title",
- key: "title"
- }
-];
-
-export const CustomBenefitsColumns = [
- {
- title: "福利名称",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "启用",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "类型",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "缴纳对象",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "操作",
- dataIndex: "title",
- key: "title"
- }
-];
-
export const insertUpdateColumns = [
{
title: "类型名称",
dataIndex: "insuranceName",
key: "insuranceName",
width: 120,
- fixed: 'left'
+ fixed: "left"
},
{
title: "是否缴费",
@@ -172,8 +68,39 @@ export const insertUpdateColumns = [
}
];
-
-export const dataSource = [];
+export const conditons = [
+ {
+ items: [
+ {
+ colSpan: 2,
+ conditionType: "INPUT",
+ domkey: ["schemeName"],
+ fieldcol: 12,
+ isQuickSearch: true,
+ label: "方案名称",
+ lanId: 33162,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
+ },
+ {
+ colSpan: 2,
+ conditionType: "SELECT",
+ domkey: ["paymentType"],
+ fieldcol: 12,
+ isQuickSearch: true,
+ label: "缴纳类型",
+ lanId: 543163,
+ labelcol: 6,
+ value: "",
+ options: [],
+ viewAttr: 2
+ }
+ ],
+ title: "",
+ defaultshow: true
+ }
+];
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
index fabf6a86..e7c215c2 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
@@ -141,6 +141,11 @@ export default class DefaultSlideForm extends React.Component {
key: "2",
selected: true,
showname: "2"
+ },
+ {
+ key: "3",
+ selected: false,
+ showname: "3"
}
];
item.render = (text, record) => {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
index 1181f8a0..8ef780b3 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
@@ -2,9 +2,8 @@ import React from "react";
import { inject, observer } from "mobx-react";
import { toJS } from "mobx";
import { Button, Dropdown, Menu, message, Modal } from "antd";
-import { WeaLocaleProvider, WeaNewScroll, WeaSelect, WeaSlideModal, WeaTop } from "ecCom";
-import { renderNoright } from "../../../util";
-import CustomTab from "../../../components/customTab";
+import { WeaLocaleProvider, WeaNewScroll, WeaSelect, WeaSlideModal, WeaTab, WeaTools, WeaTop } from "ecCom";
+import { getSearchs, renderNoright } from "../../../util";
import SlideModalTitle from "../../../components/slideModalTitle";
import TipLabel from "../../../components/TipLabel";
import DefaultSlideForm from "./defaultSlideForm";
@@ -14,8 +13,10 @@ import CustomPaginationTable from "../../../components/customPaginationTable";
import TwoColContent from "../../../components/twoColContent";
import CopySchemaModal from "./copySchemaModal";
import CustomBenefitsTable from "./customBenefitsTable";
+import { conditons } from "./columns";
import "./index.less";
+const getKey = WeaTools.getKey;
const { getLabel } = WeaLocaleProvider;
@inject("programmeStore", "taxAgentStore", "salaryFileStore")
@observer
@@ -30,7 +31,8 @@ export default class Programme extends React.Component {
copyModalValue: "",
copyId: "",
customNewVisible: false,
- customEdit: false
+ customEdit: false,
+ showSearchAd: false
};
this.pageInfo = { current: 1, pageSize: 10 };
@@ -38,12 +40,29 @@ export default class Programme extends React.Component {
componentWillMount() {
const { programmeStore, salaryFileStore, taxAgentStore } = this.props;
- const { doInit } = programmeStore;
+ const { doInit, planSearchForm } = programmeStore;
doInit();
const { commonEnumList } = salaryFileStore;
commonEnumList("user", { enumClass: "com.engine.salary.enums.sicategory.SharedTypeEnum" });
const { getTaxAgentSelectListAsAdmin } = taxAgentStore;
getTaxAgentSelectListAsAdmin();
+ planSearchForm.initFormFields(_.map(conditons, item => {
+ return {
+ ...item,
+ items: _.map(item.items, o => {
+ if (getKey(o) === "paymentType") {
+ return {
+ ...o,
+ options: [
+ { key: "SCHEME_TOWN", showname: getLabel(19702, "城镇") },
+ { key: "SCHEME_VILLAGE", showname: getLabel(19703, "农村") }
+ ]
+ };
+ }
+ return { ...o };
+ })
+ };
+ }));
}
// 增加编辑功能，重写columns绑定事件
@@ -173,6 +192,7 @@ export default class Programme extends React.Component {
}
render() {
+ const { showSearchAd } = this.state;
const { programmeStore, taxAgentStore: { showOperateBtn } } = this.props;
const { loading, hasRight, form, getTableDatas } = programmeStore;
const {
@@ -187,7 +207,8 @@ export default class Programme extends React.Component {
customNewVisible,
tableDataSource,
tableColumns,
- tablePageInfo
+ tablePageInfo,
+ planSearchForm
} = programmeStore;
if (!hasRight && !loading) return renderNoright();
@@ -317,59 +338,65 @@ export default class Programme extends React.Component {
const { programmeStore: { initSlideParms } } = this.props;
initSlideParms();
};
-
+ const customButtons = [
+
{
+ setCustomSelectkey(v);
+ this.customBenefitsTableRef.getCustomCategoryList({ current: 1, welfareTypeEnum: v });
+ }}
+ />
+ ];
+ const tabButtons = [
+
+ ];
return (
} // 左侧图标
- iconBgcolor="#F14A2D" // 左侧图标背景色
- showDropIcon={false} // 是否显示下拉按钮
+ title="社保福利方案" icon={
}
+ iconBgcolor="#F14A2D" showDropIcon={false}
>
-
- {/* 操作按钮权限 */}
- {showOperateBtn &&
- }
-
- {selectedKey == "custom" &&
- {
- setCustomSelectkey(v);
- this.customBenefitsTableRef.getCustomCategoryList({ current: 1, welfareTypeEnum: v });
- }}
- />}
-
- }
+ this.setState({ showSearchAd: bool })}
+ advanceHeight={200} searchsAd={getSearchs(planSearchForm, _.map(conditons, item => {
+ return {
+ ...item,
+ items: _.map(item.items, o => {
+ if (getKey(o) === "paymentType") {
+ return {
+ ...o,
+ options: [
+ { key: "SCHEME_TOWN", showname: getLabel(19702, "城镇") },
+ { key: "SCHEME_VILLAGE", showname: getLabel(19703, "农村") }
+ ]
+ };
+ }
+ return { ...o };
+ })
+ };
+ }), 2, false)}
+ onAdSearch={() => getTableDatas(selectedKey)}
+ onAdReset={v => planSearchForm.resetForm()}
+ onSearch={() => getTableDatas(selectedKey)}
onChange={v => {
setSelectedKey(v);
handleSlideClose();
- if (v == "custom") {
- // 自定义福利
- } else {
- getTableDatas(v);
- }
+ v !== "custom" && getTableDatas(v);
}}
+ onSearchChange={v => planSearchForm.updateFields({ schemeName: v })} // 在搜索框中输入的文字改变时的回调: 这里需要同步高级搜索和外部搜索框的值
+ searchsBaseValue={planSearchForm.getFormParams().schemeName}
+ buttons={!showOperateBtn ? [] : selectedKey !== "custom" ? tabButtons : [...tabButtons, ...customButtons]}
/>
- {selectedKey == "custom"
+ {selectedKey === "custom"
? {
this.loading = true;
- const formParams = this.form.getFormParams() || {};
- params = params || formParams;
- params.welfareTypeEnum = selectKey;
- API.getTable(params).then(action(res => {
- if (res.status) { // 接口请求成功/失败处理
- // this.tableStore.getDatas(res.data.datas); // table 请求数据
- this.tableDataSource = res.data.list ? res.data.list : [];
- this.tableColumns = res.data.columns;
- this.tablePageInfo = res.data;
- } else {
- message.error(res.errormsg || "接口调用失败！");
- }
- this.loading = false;
- }));
+ API.getTable({ ...params, ...this.planSearchForm.getFormParams(), welfareTypeEnum: selectKey })
+ .then(action(res => {
+ if (res.status) { // 接口请求成功/失败处理
+ // this.tableStore.getDatas(res.data.datas); // table 请求数据
+ this.tableDataSource = res.data.list ? res.data.list : [];
+ this.tableColumns = res.data.columns;
+ this.tablePageInfo = res.data;
+ } else {
+ message.error(res.errormsg || "接口调用失败！");
+ }
+ this.loading = false;
+ }));
};
From 26fdf624bbc82e1b6db5f48401a83897011df6de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 20 Sep 2023 17:25:56 +0800
Subject: [PATCH 14/14] hotfix/2.9.42309.01
---
.../standingBookDetail/components/adjustmentSlide.js | 2 +-
.../standingBookDetail/components/index.less | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
index 90fe32b1..2fb3f37c 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
@@ -73,7 +73,7 @@ class AdjustmentSlide extends Component {
const { data: dataMsg, errorMessage = [] } = data;
const msg = dataMsg + errorMessage.join(",");
!_.isEmpty(errorMessage) ? message.error(msg) : message.success(msg || "保存成功");
- _.isEmpty(errorMessage) &&
+ // _.isEmpty(errorMessage) &&
this.adjustTableRef.getCompensationList().then(r => {
});
} else {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
index 7bb28208..0481abfb 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
@@ -4,10 +4,6 @@
height: 100%;
background: #f6f6f6;
- .wea-new-top-req-wapper .wea-new-top-req-main {
- background: #f6f6f6 !important;
- }
-
.wea-new-top-req-wapper .wea-new-top-req {
z-index: 0 !important;
}