diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
index 01730ef7..67c1ebef 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
@@ -75,7 +75,7 @@ export default class PhoneTemplate extends React.Component {
{
salaryItemSet.length > 0 &&
- salaryItemSet.map((group, index) => (
+ _.filter(salaryItemSet, it => (!_.isNil(it) && !_.isEmpty(it))).map((group, index) => (
{group.groupName}
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 d7c59f543486bd874f7a8741288177cbe47596f5 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 15:03:05 +0800
Subject: [PATCH 45/77] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E9=85=AC?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=88=86=E4=BA=AB=E6=8A=A5?=
=?UTF-8?q?=E8=A1=A8=2020230920?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/reportList.js | 21 +++++++++++--------
.../reportView/components/reportContent.js | 4 ++--
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
index 6510d5b1..30b8a474 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
@@ -73,7 +73,7 @@ class ReportList extends Component {
{
_.isEmpty(dataSource) ?
{getLabel(111, "暂无数据")}
:
_.map(dataSource, it => {
- const { reportName, dimension, id, dimensionId } = it;
+ const { reportName, dimension, id, dimensionId, isShare } = it;
return
this.handleGoReportView(id)}>
@@ -85,14 +85,17 @@ class ReportList extends Component {
- this.handleOptsClick(e, id, dimensionId)}>
- {getLabel(111, "编辑")}
- {getLabel(111, "删除")}
-
- }>
-
-
+ {
+ !isShare &&
+ this.handleOptsClick(e, id, dimensionId)}>
+ {getLabel(111, "编辑")}
+ {getLabel(111, "删除")}
+
+ }>
+
+
+ }
;
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
index 9ddc8380..c3e9d6e7 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
@@ -64,9 +64,9 @@ class ReportContent extends Component {
//数据透视弹框
if (id === "PIVOTCHART") {
const { record } = params;
- const { dimension: dimensionValue, isShare } = record;
+ const { dimension: dimensionValue } = record;
+ const { id: pivotId, dimensionId, isShare } = this.props.report;
if (isShare) return;
- const { id: pivotId, dimensionId } = this.props.report;
this.setState({
povitView: {
visible: true, id: pivotId, dimensionId, dimensionValue
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 46/77] =?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 d664ad27691a37b2f8515a53a61d86fcbaa6243c 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:03:24 +0800
Subject: [PATCH 47/77] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E9=85=AC?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=88=86=E4=BA=AB=E6=8A=A5?=
=?UTF-8?q?=E8=A1=A8=2020230920?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/apis/taxAgent.js | 18 +++++++-----------
.../statisticalMicroSettingsSlide.js | 2 +-
pc4mobx/hrmSalary/pages/reportView/index.js | 2 +-
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/pc4mobx/hrmSalary/apis/taxAgent.js b/pc4mobx/hrmSalary/apis/taxAgent.js
index 25747f12..1b0f58d8 100644
--- a/pc4mobx/hrmSalary/apis/taxAgent.js
+++ b/pc4mobx/hrmSalary/apis/taxAgent.js
@@ -1,5 +1,5 @@
import { WeaTools } from "ecCom";
-import { formPost, postFetch } from "../util/request";
+import { postFetch } from "../util/request";
//个税扣缴义务人列表
export const getTaxAgentList = (params) => {
@@ -7,9 +7,9 @@ export const getTaxAgentList = (params) => {
method: "POST",
mode: "cors",
headers: {
- "Content-Type": "application/json",
+ "Content-Type": "application/json"
},
- body: JSON.stringify(params),
+ body: JSON.stringify(params)
}).then((res) => res.json());
};
//同步人员范围
@@ -18,9 +18,9 @@ export const taxAgentRangeSync = (params) => {
method: "POST",
mode: "cors",
headers: {
- "Content-Type": "application/json",
+ "Content-Type": "application/json"
},
- body: JSON.stringify(params),
+ body: JSON.stringify(params)
}).then((res) => res.json());
};
@@ -108,12 +108,8 @@ export const taxAgentRangeImportData = (params) => {
};
//个税扣缴义务人下拉列表
-export const getTaxAgentSelectList = (params) => {
- return WeaTools.callApi(
- "/api/bs/hrmsalary/taxAgent/selectList",
- "GET",
- params
- );
+export const getTaxAgentSelectList = (isShare = false) => {
+ return WeaTools.callApi("/api/bs/hrmsalary/taxAgent/selectList", "GET", { isShare });
};
//当前登录人个税扣缴义务人下拉列表
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 536ad2da..65668107 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -67,7 +67,7 @@ class StatisticalMicroSettingsSlide extends Component {
}
getTaxAgentSelectList = (props) => {
- getTaxAgentSelectList().then(({ status, data }) => {
+ getTaxAgentSelectList(true).then(({ status, data }) => {
if (status) {
const conditions = _.map(condition, item => {
return {
diff --git a/pc4mobx/hrmSalary/pages/reportView/index.js b/pc4mobx/hrmSalary/pages/reportView/index.js
index 2db97c5c..ffe5a3db 100644
--- a/pc4mobx/hrmSalary/pages/reportView/index.js
+++ b/pc4mobx/hrmSalary/pages/reportView/index.js
@@ -93,7 +93,7 @@ class Index extends Component {
exportData = () => {
const { report } = this.state;
const { id, dimensionId, isShare } = report;
- window.open(`${window.location.origin}/api/bs/hrmsalary/report/statistics/report/exportData?id=${id}&dimensionId=${dimensionId}&isShare=${isShare}`, "_self");
+ window.open(`${window.location.origin}/api/bs/hrmsalary/report/statistics/report/exportData?id=${id}&dimensionId=${dimensionId}&isShare=${isShare}`, "_blank");
};
render() {
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 48/77] 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;
}
From c0220d88534260a838baa10a6c8a28b336d39845 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:29:50 +0800
Subject: [PATCH 49/77] hotfix/2.9.42309.01
---
.../hrmSalary/pages/socialSecurityBenefits/programme/columns.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
index b20698b6..80fe193f 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/columns.js
@@ -86,7 +86,7 @@ export const conditons = [
{
colSpan: 2,
conditionType: "SELECT",
- domkey: ["paymentType"],
+ domkey: ["paymentTypeEnum"],
fieldcol: 12,
isQuickSearch: true,
label: "缴纳类型",
From e7e4d17cfaf7b72aff6b78f569ce952446b96cf9 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:42:06 +0800
Subject: [PATCH 50/77] hotfix/2.9.42309.01
---
.../hrmSalary/pages/socialSecurityBenefits/programme/index.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
index 8ef780b3..c3673fae 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js
@@ -50,7 +50,7 @@ export default class Programme extends React.Component {
return {
...item,
items: _.map(item.items, o => {
- if (getKey(o) === "paymentType") {
+ if (getKey(o) === "paymentTypeEnum") {
return {
...o,
options: [
@@ -369,7 +369,7 @@ export default class Programme extends React.Component {
return {
...item,
items: _.map(item.items, o => {
- if (getKey(o) === "paymentType") {
+ if (getKey(o) === "paymentTypeEnum") {
return {
...o,
options: [
From 96032b5f1c9918098be7095061d194e2ea898fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 21 Sep 2023 10:17:06 +0800
Subject: [PATCH 51/77] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E9=85=AC?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=88=86=E4=BA=AB=E6=8A=A5?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/customStatisticsItemsModal.js | 22 ++++++++++++-------
.../components/povitpivotChartModal.js | 10 ++++-----
.../reportView/components/reportContent.js | 8 +++----
.../statisticalMicroSettingsSlide.js | 15 +++++--------
pc4mobx/hrmSalary/pages/reportView/index.less | 12 ++++++++++
5 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js b/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
index f87d7912..49f5a462 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
@@ -269,7 +269,7 @@ class CustomStatisticsItemsModal extends Component {
render() {
const { loading, columns, dataSource, formData } = this.state;
const { itemName, itemValue, itemValueSpan } = formData;
- const { statisticsItemId } = this.props;
+ const { statisticsItemId, isShare } = this.props;
const cols = _.map(columns, it => {
const { text, column } = it;
if (column === "ruleName" || column === "ratio" || column === "m2m" || column === "y2y") {
@@ -278,6 +278,7 @@ class CustomStatisticsItemsModal extends Component {
...it,
title:
!!child[`${key}Value`])}
onChange={val => this.handleChangeColumnAllChecked(`${key}Value`, val)}
/>
@@ -286,6 +287,7 @@ class CustomStatisticsItemsModal extends Component {
render: (txt, record) => {
return
this.handleChangeColumnCheckBox(`${key}Value`, val, record.id)}
/>
@@ -305,6 +307,7 @@ class CustomStatisticsItemsModal extends Component {
,
render: (txt, record) => {
return !!record["m2mValue"] && this.handleChangeColumnM2MValue(`${column.replace("Limit", "")}${type === "min" ? "LowerLimit" : "UpperLimit"}`, val, record.id)}
@@ -321,6 +324,7 @@ class CustomStatisticsItemsModal extends Component {
,
render: (txt, record) => {
return !!record["y2yValue"] && this.handleChangeColumnM2MValue(`${column.replace("Limit", "")}${type === "min" ? "LowerLimit" : "UpperLimit"}`, val, record.id)}
@@ -335,8 +339,10 @@ class CustomStatisticsItemsModal extends Component {
title={
{statisticsItemId ? getLabel(111, "编辑自定义统计项目") : getLabel(111, "新建自定义统计项目")}
-
+ {
+ !isShare &&
+ }
}
style={{ width: 900, height: 450 }}
@@ -348,7 +354,7 @@ class CustomStatisticsItemsModal extends Component {
({
@@ -381,7 +387,7 @@ class CustomStatisticsItemsModal extends Component {
- this.setState({ formData: { ...formData, itemName } })}/>
@@ -406,11 +412,11 @@ export default CustomStatisticsItemsModal;
* Date: 2023/4/23
*/
const IntervalSettingsComp = (props) => {
- const { LowerLimit, UpperLimit, onChange } = props;
+ const { LowerLimit, UpperLimit, onChange, isShare } = props;
return
- onChange("min", val)}/>
+ onChange("min", val)} disabled={isShare}/>
{`% <${getLabel(111, "增幅")}<`}
- onChange("max", val)}/>
+ onChange("max", val)} disabled={isShare}/>
%
;
};
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
index 4af04328..801bb99e 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
@@ -35,8 +35,8 @@ class PovitpivotChartModal extends Component {
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) {
- const { id, dimensionId, dimensionValue } = nextProps;
- this.getDataPerspective({ id, dimensionId, dimensionValue });
+ const { id, dimensionId, dimensionValue, isShare } = nextProps;
+ this.getDataPerspective({ id, dimensionId, dimensionValue, isShare });
} else {
this.setState({
dataSource: [],
@@ -63,13 +63,11 @@ class PovitpivotChartModal extends Component {
});
} else if (type === "turn") {
if (id === "PAGEINFO") {
- const { id, dimensionId, dimensionValue } = this.props;
+ const { id, dimensionId, dimensionValue, isShare } = this.props;
const { pageNum: current, size: pageSize } = params;
this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () =>
this.getDataPerspective({
- id,
- dimensionId,
- dimensionValue
+ id, dimensionId, dimensionValue, isShare
}));
}
}
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
index c3e9d6e7..70980238 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
@@ -26,7 +26,7 @@ class ReportContent extends Component {
chartsType: "0",
chartsInfo: {},
povitView: {
- visible: false, id: "",
+ visible: false, id: "", isShare: false,
dimensionId: "", dimensionValue: ""
},
rangSet: {
@@ -66,10 +66,9 @@ class ReportContent extends Component {
const { record } = params;
const { dimension: dimensionValue } = record;
const { id: pivotId, dimensionId, isShare } = this.props.report;
- if (isShare) return;
this.setState({
povitView: {
- visible: true, id: pivotId, dimensionId, dimensionValue
+ visible: true, id: pivotId, dimensionId, dimensionValue, isShare
}
});
}
@@ -262,7 +261,8 @@ class ReportContent extends Component {
{...povitView}
onCancel={() => this.setState({
povitView: {
- visible: false, id: "", dimensionId: "", dimensionValue: ""
+ visible: false, id: "", dimensionId: "", dimensionValue: "",
+ isShare: false
}
})}
/>
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 65668107..32f074d1 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -49,7 +49,7 @@ class StatisticalMicroSettingsSlide extends Component {
salaryMonth: [],
statisticalItemPayload: {
visible: false, id: "", dimension: "",
- statisticsItemId: ""
+ statisticsItemId: "", isShare: false
}
};
}
@@ -67,7 +67,7 @@ class StatisticalMicroSettingsSlide extends Component {
}
getTaxAgentSelectList = (props) => {
- getTaxAgentSelectList(true).then(({ status, data }) => {
+ getTaxAgentSelectList(props.isShare).then(({ status, data }) => {
if (status) {
const conditions = _.map(condition, item => {
return {
@@ -221,7 +221,7 @@ class StatisticalMicroSettingsSlide extends Component {
onClick={() => this.setState({
statisticalItemPayload: {
visible: true, id, dimension,
- statisticsItemId: ""
+ statisticsItemId: "", isShare
}
})}
/>
@@ -243,9 +243,8 @@ class StatisticalMicroSettingsSlide extends Component {
render: (txt, record) => {
return (
{
- if (isShare) return;
this.setState({
- statisticalItemPayload: { visible: true, id, dimension, statisticsItemId: record.id }
+ statisticalItemPayload: { visible: true, id, dimension, statisticsItemId: record.id, isShare }
});
}}>{txt}
);
@@ -315,10 +314,8 @@ class StatisticalMicroSettingsSlide extends Component {
{...statisticalItemPayload}
onCancel={(isRefresh) => this.setState({
statisticalItemPayload: {
- visible: false,
- id: "",
- dimension: "",
- statisticsItemId: ""
+ visible: false, id: "", dimension: "",
+ statisticsItemId: "", isShare: false
}
}, () => isRefresh && this.statisticsItemList(this.props.id))}
/>
diff --git a/pc4mobx/hrmSalary/pages/reportView/index.less b/pc4mobx/hrmSalary/pages/reportView/index.less
index 99d4d917..ecf9b997 100644
--- a/pc4mobx/hrmSalary/pages/reportView/index.less
+++ b/pc4mobx/hrmSalary/pages/reportView/index.less
@@ -204,6 +204,18 @@
.microSlideWrapper {
z-index: 999;
+ .wea-form-item-wrapper {
+ display: flex !important;
+
+ .wea-browser {
+ width: 100%;
+ }
+ }
+
+ .wea-form-item .wea-form-item-wrapper .wea-field-readonly {
+ white-space: pre-wrap !important;
+ }
+
.wea-slide-modal-title {
height: auto !important;
line-height: normal !important;
From 9030e2244997e4c426783b01ea80f60d5aff5763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 21 Sep 2023 12:04:55 +0800
Subject: [PATCH 52/77] hotfix/2.9.42309.01
---
.../pages/payroll/stepForm/baseInformForm.js | 1 +
.../standingBookDetail/components/adjustTable.js | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
index 94719f8d..b429cfb7 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
@@ -117,6 +117,7 @@ export default class BaseInformForm extends React.Component {
{
this.state.inited &&
{
if (index === idx) {
return {
- ...item,
+ ...item, adjustTo: "",
companyTotal: data[0].totalNum,
adjustToOptions: categoryType ? _.map(categoryType.split(","), tmpV => {
return _.find(item.categoryTypeOptions, tmpJ => tmpJ.key === tmpV);
@@ -330,7 +330,7 @@ class AdjustTable extends Component {
};
handleClick = (record) => {
- const { status, id, paymentOrganization, billMonth } = record;
+ const { status, id, paymentOrganization, billMonth, employeeId } = record;
const { targetOptions } = this.state;
if (status) {
Modal.confirm({
@@ -338,7 +338,8 @@ class AdjustTable extends Component {
content: "确定撤回吗？撤回后该笔调差将失效！",
onOk: () => {
const payload = { id, paymentOrganization, billMonth };
- compensationBack(payload).then(({ status, data, errormsg }) => {
+ compensationBack(payload).then(async ({ status, data, errormsg }) => {
+ const { data: categoryTypeOptions } = await compensationCategoryType({ id: _.find(targetOptions, child => child.employeeId == employeeId).target });
if (status) {
message.success(data || "撤回成功");
this.setState({
@@ -347,7 +348,11 @@ class AdjustTable extends Component {
return {
...it,
status: false,
- uuid: new Date().getTime() + idx
+ uuid: new Date().getTime() + idx,
+ categoryTypeOptions: _.map(categoryTypeOptions, child => ({
+ key: child.id,
+ showname: child.content
+ }))
};
}
return { ...it, uuid: new Date().getTime() + idx };
From 5b43e43f4a1ad12d8f6725d35a6bc77a385ac289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 21 Sep 2023 15:20:59 +0800
Subject: [PATCH 53/77] hotfix/2.9.42309.01
---
.../standingBookDetail/components/adjustTable.js | 8 +++++++-
.../components/adjustmentDefaultSlide.js | 2 +-
.../standingBookDetail/components/adjustmentSlide.js | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
index 2a1b9c6d..4d7a3bf8 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
@@ -410,7 +410,13 @@ class AdjustTable extends Component {
this.setState({
dataSource: _.map(this.state.dataSource, it => {
if (record.target === it.target && record.uuid === it.uuid) {
- return { ...it, status: true, id: successIds[0] };
+ return {
+ ...it, status: true, id: successIds[0],
+ targetOptions: _.map([_.find(targetOptions, o => o.employeeId == target)], v => ({
+ key: v.target.toString(),
+ showname: v.username
+ }))
+ };
}
return { ...it };
})
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js
index 5651926e..47542d39 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js
@@ -69,7 +69,7 @@ class AdjustmentDefaultSlide extends Component {
dataIndex: "categoryType", title: "统计调差福利类型（单位）",
render: (text, record) => {
return (
- {_.map(record.categoryTypeOptions, it => it.showname).join(",")}
+ {_.map(_.filter(record.categoryTypeOptions, o => (record.categoryType.split(",").includes(o.key))), it => it.showname).join(",")}
);
}
},
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
index 2fb3f37c..94c8d72d 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
@@ -83,6 +83,7 @@ class AdjustmentSlide extends Component {
};
handleSetasDefault = () => {
const { adjustDefSlide } = this.state;
+ console.log(this.adjustTableRef.state.dataSource);
this.setState({
adjustDefSlide: {
...adjustDefSlide,
From e4d9a2c545b7703d3afc91c795f0868957700d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 21 Sep 2023 15:45:58 +0800
Subject: [PATCH 54/77] hotfix/2.9.42309.01
---
.../components/salaryStatisticsDetailShareLogDialog.js | 6 +++---
pc4mobx/hrmSalary/pages/salaryItem/index.js | 2 +-
.../standingBookDetail/components/adjustTable.js | 2 +-
.../standingBookDetail/components/adjustmentSlide.js | 1 -
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
index 1632940f..51fdc5d0 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
@@ -158,9 +158,9 @@ class SalaryStatisticsDetailShareLogDialog extends Component {
title={
{getLabel(111, "1、分享状态为成功且撤回状态为空时，可操作撤回；")}
-
{getLabel(111, "2、撤回后不可重新分享；")}
-
{getLabel(111, "3、分享状态为失败，可操作重新分享；")}
-
{getLabel(111, "4、重新分享：以当前分享记录的分享报表、有效时间、渠道和说明重新分享，分享后自动刷新分享时间和分享状态")}
+ {/*
{getLabel(111, "2、撤回后不可重新分享；")}
*/}
+ {/*
{getLabel(111, "3、分享状态为失败，可操作重新分享；")}
*/}
+ {/*
{getLabel(111, "4、重新分享：以当前分享记录的分享报表、有效时间、渠道和说明重新分享，分享后自动刷新分享时间和分享状态")}
*/}
}
/>
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index c2c63718..a4ffcd0a 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -384,7 +384,7 @@ export default class SalaryItem extends React.Component {
onCancel={() => this.setState({
syncSalarySetDialog: {
...this.state.syncSalarySetDialog,
- visible: false, id: "", title: ""
+ visible: false, title: ""
}
})}
/>
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
index 4d7a3bf8..45023dba 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
@@ -409,7 +409,7 @@ class AdjustTable extends Component {
if (_.isEmpty(errorMessage)) {
this.setState({
dataSource: _.map(this.state.dataSource, it => {
- if (record.target === it.target && record.uuid === it.uuid) {
+ if (record.id === it.id || (!it.id && record.uuid === it.uuid)) {
return {
...it, status: true, id: successIds[0],
targetOptions: _.map([_.find(targetOptions, o => o.employeeId == target)], v => ({
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
index 94c8d72d..2fb3f37c 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
@@ -83,7 +83,6 @@ class AdjustmentSlide extends Component {
};
handleSetasDefault = () => {
const { adjustDefSlide } = this.state;
- console.log(this.adjustTableRef.state.dataSource);
this.setState({
adjustDefSlide: {
...adjustDefSlide,
From 12d4b5c33cf158f96281236c80803643a8b4a92a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 21 Sep 2023 16:13:18 +0800
Subject: [PATCH 55/77] hotfix/2.9.42309.01
---
.../standingBookDetail/components/adjustTable.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
index 45023dba..d8b91776 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
@@ -330,7 +330,7 @@ class AdjustTable extends Component {
};
handleClick = (record) => {
- const { status, id, paymentOrganization, billMonth, employeeId } = record;
+ const { status, id, paymentOrganization, billMonth, employeeId, target } = record;
const { targetOptions } = this.state;
if (status) {
Modal.confirm({
@@ -339,7 +339,7 @@ class AdjustTable extends Component {
onOk: () => {
const payload = { id, paymentOrganization, billMonth };
compensationBack(payload).then(async ({ status, data, errormsg }) => {
- const { data: categoryTypeOptions } = await compensationCategoryType({ id: _.find(targetOptions, child => child.employeeId == employeeId).target });
+ const { data: categoryTypeOptions } = await compensationCategoryType({ id: _.find(targetOptions, child => (child.employeeId == employeeId || child.employeeId == target)).target });
if (status) {
message.success(data || "撤回成功");
this.setState({
From 61637e6de7065768f5758234f9b4c9b227a08bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 21 Sep 2023 18:18:47 +0800
Subject: [PATCH 56/77] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E9=85=AC?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=88=86=E4=BA=AB=E6=8A=A5?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/reportList.js | 7 ++++
.../analysisOfSalaryStatistics/index.less | 41 +++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
index 30b8a474..af813553 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
@@ -97,6 +97,13 @@ class ReportList extends Component {
}
+ {
+ isShare &&
+
+
{getLabel(111, "被分享")}
+
+
;
})
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
index e0326f2a..5a3c335e 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
@@ -31,6 +31,47 @@
justify-content: space-between;
padding: 22px 0 22px 16px;
border: 1px solid #e5e5e5;
+ position: relative;
+
+ .ant-ribbon {
+ padding: 0 8px;
+ color: #1677ff;
+ font-size: 12px;
+ line-height: 22px;
+ list-style: none;
+ position: absolute;
+ top: 0;
+ white-space: nowrap;
+ background-color: #1677ff;
+ border-radius: 4px;
+
+ .ant-ribbon-text {
+ color: #FFF;
+ }
+
+ .ant-ribbon-corner {
+ position: absolute;
+ top: 100%;
+ width: 8px;
+ height: 8px;
+ color: currentcolor;
+ border: 4px solid;
+ transform: scaleY(.75);
+ transform-origin: top;
+ filter: brightness(75%);
+ }
+ }
+
+ .ant-ribbon-placement-end {
+ inset-inline-end: -8px;
+ border-end-end-radius: 0;
+
+ .ant-ribbon-corner {
+ inset-inline-end: 0;
+ border-inline-end-color: transparent;
+ border-block-end-color: transparent;
+ }
+ }
.cardLeft {
display: flex;
From 2c56e8dc065f8c13271f450cc1fa1d78d50624ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 25 Sep 2023 09:43:03 +0800
Subject: [PATCH 57/77] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=94=B9=E9=80=A0=EF=BC=88=E9=A1=B5=E9=9D=A2=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../doCalc/components/salaryEditCalcImport/index.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
index c2b370bf..44fa954e 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
@@ -41,10 +41,12 @@ class Index extends Component {
* Date: 2023/9/18
*/
renderFormComponent = () => {
- return
-
- ;
+ return
+
+
+
+
;
};
render() {
From ff3dd0ea604a5d2d0124afeaeca689fdd325dd5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 25 Sep 2023 15:35:11 +0800
Subject: [PATCH 58/77] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=94=B9=E9=80=A0=EF=BC=88=E9=A1=B5=E9=9D=A2=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../importDialog/components/impStep1.js | 11 +-
.../importDialog/components/impStep2.js | 4 +-
.../components/salaryEditCalcImport/index.js | 129 ++++++++++++++++--
.../hrmSalary/pages/calculate/doCalc/index.js | 10 +-
4 files changed, 132 insertions(+), 22 deletions(-)
diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
index 6ab09b3e..209125fb 100644
--- a/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
+++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
@@ -61,8 +61,15 @@ class ImpStep1 extends Component {
{getLabel(27577, "操作步骤")}
{`1. ${getLabel(30907, "第一步")},${getLabel(543205, "请选择导出的Excel文件或")}`}
- {getLabel(543207, "点击这里下载模板")}
+ {
+ typeof this.props.link === "string" ?
+ {getLabel(543207, "点击这里下载模板")} :
+ {getLabel(543207, "点击这里下载模板")}
+ }
+
{this.props.exportDataDom}
{`2. ${getLabel(543211, "第二步")},${getLabel(543212, "请一定要确定Excel文档中的格式是模板中的格式")},${getLabel(543213, "没有被修改掉")}；`}
diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js
index 8a7373d4..71c6e099 100644
--- a/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js
+++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js
@@ -21,8 +21,8 @@ class ImpStep2 extends Component {
}
init = () => {
- const { previewUrl, imageId } = this.props;
- const payload = { imageId };
+ const { previewUrl, imageId, extraPreview = {} } = this.props;
+ const payload = { imageId, ...extraPreview };
this.setState({ loading: true });
postFetch(previewUrl, payload).then(({ status, data }) => {
this.setState({ loading: false });
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
index 44fa954e..c41f294f 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
@@ -5,9 +5,12 @@
* Date: 2023/9/18
*/
import React, { Component } from "react";
-import { WeaLocaleProvider } from "ecCom";
-import { Badge, Button } from "antd";
+import { WeaCheckbox, WeaLocaleProvider } from "ecCom";
+import { Badge, Button, message } from "antd";
import ImportDialog from "../../../../../components/importDialog";
+import { cacheImportField, getImportField, importAcctResult } from "../../../../../apis/calculate";
+import AddHeaderFieldsModal from "../../../../calculateDetail/acctResult/importModal/addHeaderFieldsModal";
+import { convertToUrlString, getURLParameters } from "../../../../../util/url";
const getLabel = WeaLocaleProvider.getLabel;
@@ -16,24 +19,85 @@ class Index extends Component {
super(props);
this.state = {
salaryItemIds: "", //选择的导入表单项
+ exportTempUrl: "", //导出模板url
+ headerFieldsDialog: { visible: false, itemsByGroup: [], selectItems: "" },
importDialog: {
visible: false, title: "", nextloading: false,
- link: "", importResult: {}, imageId: ""
+ link: null, importResult: {}, imageId: "",
+ previewUrl: "/api/bs/hrmsalary/salaryacct/acctresult/preview",
+ extraPreview: { salaryAcctRecordId: "", salaryItemIds: "" }
}
};
}
- componentWillReceiveProps(nextProps, nextContext) {
+ async componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible) {
+ if (nextProps.salaryAcctRecordId && nextProps.visible) {
+ const { data } = await getImportField({ salaryAcctRecordId: nextProps.salaryAcctRecordId });
+ const { checkItems, itemsByGroup } = data;
+ const payload = {
+ exportData: false, salaryAcctRecordId: nextProps.salaryAcctRecordId,
+ salaryItemIds: checkItems.join(",")
+ };
+ this.setState({
+ exportTempUrl: `/api/bs/hrmsalary/salaryacct/acctresult/importtemplate/export?${convertToUrlString(payload)}`,
+ importDialog: {
+ ...this.state.importDialog,
+ extraPreview: { salaryAcctRecordId: nextProps.salaryAcctRecordId, salaryItemIds: checkItems.join(",") }
+ },
+ headerFieldsDialog: {
+ ...this.state.headerFieldsDialog,
+ selectItems: checkItems.join(","),
+ itemsByGroup: _.map(itemsByGroup, item => {
+ return {
+ ...item,
+ salaryItems: _.map(item.salaryItems, it => ({
+ ...it,
+ checked: false
+ }))
+ };
+ })
+ }
+ });
+ }
this.setState({
importDialog: {
- ...this.state.importDialog,
+ ...this.state.importDialog, link: this.handleExportTemp,
visible: nextProps.visible, title: nextProps.title
}
});
}
}
+ handleImport = (payload) => {
+ const { headerFieldsDialog: { selectItems: salaryItemIds }, importDialog } = this.state;
+ const { salaryAcctRecordId } = this.props;
+ this.setState({ importDialog: { ...importDialog, nextloading: true } });
+ importAcctResult({ ...payload, salaryItemIds, salaryAcctRecordId })
+ .then(({ data, status }) => {
+ this.setState({ importDialog: { ...importDialog, nextloading: false } });
+ if (status) {
+ this.setState({
+ importDialog: { ...importDialog, ...payload, importResult: data }
+ });
+ }
+ }).catch(() => this.setState({ importDialog: { ...importDialog, nextloading: false } }));
+ };
+ handleExportTemp = () => {
+ const { headerFieldsDialog: { selectItems }, exportTempUrl } = this.state;
+ if (!selectItems) {
+ message.error(getLabel(111, "请选择表头字段"));
+ } else {
+ window.open(exportTempUrl, "_blank");
+ }
+ };
+ handleSelectedField = () => {
+ this.setState({
+ headerFieldsDialog: {
+ ...this.state.headerFieldsDialog, visible: true
+ }
+ });
+ };
/*
* Author: 黎永顺
* Description:表单选项
@@ -41,25 +105,60 @@ class Index extends Component {
* Date: 2023/9/18
*/
renderFormComponent = () => {
+ const { selectItems } = this.state.headerFieldsDialog;
return
+ count={!_.isEmpty(selectItems) ? selectItems.split(",").length : 0}>
;
};
render() {
- const { importDialog } = this.state;
+ const { importDialog, headerFieldsDialog, exportTempUrl } = this.state;
+ const { salaryAcctRecordId } = this.props;
return (
-
this.setState(({
- importDialog: { ...importDialog, importResult: {}, imageId: "" }
- }))}
- nextCallback={imageId => this.handleImport({ imageId })}
- />
+
+ this.setState(({
+ importDialog: { ...importDialog, importResult: {}, imageId: "" }
+ }))}
+ exportDataDom={
+ {
+ const payload = {
+ exportData: val === "1", salaryAcctRecordId,
+ salaryItemIds: headerFieldsDialog.selectItems
+ };
+ this.setState(({
+ exportTempUrl: `/api/bs/hrmsalary/salaryacct/acctresult/importtemplate/export?${convertToUrlString(payload)}`
+ }));
+ }}
+ />
+ }
+ nextCallback={imageId => this.handleImport({ imageId })}
+ />
+ this.setState({
+ headerFieldsDialog: { ...headerFieldsDialog, visible: false }
+ })}
+ onAdd={selectItems => this.setState({
+ headerFieldsDialog: {
+ ...headerFieldsDialog,
+ visible: false, selectItems: selectItems.join(",")
+ }
+ }, () => {
+ const { selectItems: salaryItems } = this.state.headerFieldsDialog;
+ cacheImportField({ salaryItems: salaryItems ? salaryItems.split(",") : [] }).then();
+ })}
+ />
+
);
}
}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 17a2daf6..78a2db08 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -29,7 +29,7 @@ class Index extends Component {
this.state = {
selectedKey: "person", progressVisible: false, progress: 0,
customExpDialog: { visible: false, salaryAcctRecordId: "", checkItems: [], itemsByGroup: [] },
- salaryImpDialog: { visible: false, title: "" },
+ salaryImpDialog: { visible: false, title: "", salaryAcctRecordId: "" },
accountExceptInfo: "" //核算报错信息,
};
@@ -119,7 +119,11 @@ class Index extends Component {
break;
case "import":
this.setState({
- salaryImpDialog: { ...this.state.salaryImpDialog, visible: true, title: getLabel(111, "薪资导入") }
+ salaryImpDialog: {
+ ...this.state.salaryImpDialog,
+ salaryAcctRecordId, visible: true,
+ title: getLabel(111, "薪资导入")
+ }
});
break;
default:
@@ -216,7 +220,7 @@ class Index extends Component {
onCancel={(isFresh) => {
this.setState({
salaryImpDialog: { ...salaryImpDialog, visible: false }
- });
+ }, () => isFresh && this.calc.onAdSearch(false));
}}
/>
From d9a6f3907ca1d15a4277462f97a43d3778160d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 25 Sep 2023 16:20:56 +0800
Subject: [PATCH 59/77] =?UTF-8?q?hotfix/2.9.42310.01=20=E8=A1=A8=E5=8D=95?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=9A=90=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/analysisOfSalaryStatistics/components/conditions.js | 2 --
1 file changed, 2 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
index a622aefb..7bcac916 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
@@ -50,7 +50,6 @@ export const condition = [
options: [],
viewAttr: 2,
helpfulTip: "",
- hide: true
},
{
colSpan: 1,
@@ -92,7 +91,6 @@ export const reportCondition = [
rules: "required|string",
viewAttr: 3,
helpfulTip: "",
- hide: true
}
],
title: "",
From b54a561ba48bc2fd591e0438f2714060fd66c4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 26 Sep 2023 11:03:19 +0800
Subject: [PATCH 60/77] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=94=B9=E9=80=A0=EF=BC=88=E9=A1=B5=E9=9D=A2=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/salaryEditCalc/baseInfo.js | 59 +++++++
.../salaryEditCalc/editCalcTable.js | 19 ++-
.../salaryEditCalc/editSalaryCalcSlide.js | 160 ++++++++++++++++++
.../components/salaryEditCalc/index.less | 98 +++++++++++
.../pages/calculate/doCalc/index.less | 4 +
5 files changed, 338 insertions(+), 2 deletions(-)
create mode 100644 pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
create mode 100644 pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
new file mode 100644
index 00000000..3539ec72
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
@@ -0,0 +1,59 @@
+/*
+ * Author: 黎永顺
+ * name: 薪资基本信息
+ * Description:
+ * Date: 2023/9/25
+ */
+import React, { Component } from "react";
+import { WeaHelpfulTip, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import cs from "classnames";
+import { Col, Row } from "antd";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class EditSalaryBaseInfo extends Component {
+ render() {
+ const { baseInfo } = this.props;
+ return (
+
+ {getLabel(82743, "基础信息")}
+
+
+
+ );
+ }
+}
+
+export default EditSalaryBaseInfo;
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 07b25888..05479c3f 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -10,6 +10,7 @@ import { message, Modal, Spin } from "antd";
import { inject, observer } from "mobx-react";
import { acctResultList, updateLockStatus } from "../../../../../apis/calculate";
import ProgressModal from "../../../../../components/progressModal";
+import EditSalaryCalcSlide from "./editSalaryCalcSlide";
const getLabel = WeaLocaleProvider.getLabel;
@@ -20,7 +21,8 @@ class EditCalcTable extends Component {
super(props);
this.state = {
loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
- selectedRowKeys: [], progressVisible: false, progress: 0
+ selectedRowKeys: [], progressVisible: false, progress: 0,
+ salaryCalcSlide: { visible: false, id: "" }
};
this.timerLock = null;
}
@@ -51,6 +53,12 @@ class EditCalcTable extends Component {
const { salaryItemId, lockType: lockStatus } = params;
this.updateLockStatus({ lockStatus, salaryItemId });
break;
+ case "EDIT":
+ const { id: salaryCalcId } = params;
+ this.setState({
+ salaryCalcSlide: { visible: true, id: salaryCalcId }
+ });
+ break;
default:
break;
}
@@ -152,7 +160,7 @@ class EditCalcTable extends Component {
};
render() {
- const { loading, progressVisible, progress } = this.state;
+ const { loading, progressVisible, progress, salaryCalcSlide } = this.state;
return (
}
+ />
+
+ );
+ }
+}
+
+export default EditSalaryCalcSlide;
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index 62b7cc07..c0bce5e7 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -54,3 +54,101 @@
}
}
}
+
+.salary-calculate-esf-layout {
+
+ .titleDialog {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 46px 0 16px;
+
+ .titleCol {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ }
+
+ .titleLeftBox {
+ .titleIcon {
+ color: #fff;
+ margin: 0;
+ width: 40px;
+ height: 40px;
+ line-height: 40px;
+ font-size: 22px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #F14A2D;
+ border-radius: 50%;
+ }
+
+ .title {
+ font-size: 14px;
+ color: #333;
+ padding-left: 6px;
+ }
+ }
+
+ .titleRightBox {
+ justify-content: flex-end;
+ }
+ }
+
+ .wea-slide-modal-title {
+ border-bottom: 1px solid #e5e5e5 !important;
+ }
+
+ .wea-slide-modal-content {
+ height: 100%;
+
+ .salary-calculate-esf-area {
+ background: #f6f6f6;
+ height: 100%;
+ overflow-y: auto;
+ padding: 16px;
+
+ .esf-base-info-form, .wea-title, .wea-content {
+ padding: 0;
+ }
+
+ .esf-form-content {
+ background: #fff;
+ border: 1px solid #e5e5e5;
+ border-top: none;
+ border-bottom: none;
+
+ .esf-form-item {
+ border-bottom: 1px solid #e5e5e5;
+ }
+
+ .esf-form-last-item {
+ border-right: none !important;
+ }
+
+ .esf-form-odd-item {
+ border-right: 1px solid #e5e5e5;
+ }
+
+ .label {
+ color: #666;
+ }
+
+ .label, .value {
+ display: inline-block;
+ line-height: 24px;
+ padding: 8px 16px;
+ }
+ }
+
+ .wea-new-table {
+ background: #FFF;
+ }
+
+ .wea-search-group {
+ padding: 0;
+ }
+ }
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less
index 3923efea..b64a4dad 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.less
@@ -5,6 +5,10 @@
height: 100%;
background: #f6f6f6;
+ .wea-new-top-req {
+ z-index: 0 !important;
+ }
+
.wea-new-top-req-wapper .wea-new-top-req-title > div:last-child {
right: 16px;
}
From 929a5da68a8b409ad6c748409d170bb7100d3465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 26 Sep 2023 13:26:55 +0800
Subject: [PATCH 61/77] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=94=B9=E9=80=A0=EF=BC=88=E9=A1=B5=E9=9D=A2=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/calculate/doCalc/index.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 78a2db08..03267120 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -37,10 +37,6 @@ class Index extends Component {
this.timer = null;
}
- componentDidMount() {
- console.log(this.props);
- }
-
handleMenuClick = ({ key }) => {
switch (key) {
case "calc_selected":
@@ -126,10 +122,12 @@ class Index extends Component {
}
});
break;
+ case "offlineCompare":
+ window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/compareDetail?id=${salaryAcctRecordId}`, "_blank");
+ break;
default:
break;
}
- console.log(key);
};
renderReqBtns = () => {
const { selectedKey } = this.state;
From 4bb3bc403a9748da83ab9c0f1bbebfaaac330285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 26 Sep 2023 16:38:47 +0800
Subject: [PATCH 62/77] =?UTF-8?q?feature/2.9.42310.01-=E5=B7=A5=E8=B5=84?=
=?UTF-8?q?=E5=8D=95=E5=8F=91=E6=94=BE=E5=AF=BC=E5=87=BAPDF=2020230926?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/payroll/payrollGrant/index.js | 48 +++++++++++++++----
1 file changed, 38 insertions(+), 10 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index d52797f0..7818af09 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -306,7 +306,6 @@ export default class PayrollGrant extends React.Component {
const { selectedKey, showFeedbackColumn } = this.state;
const { payrollStore } = this.props;
const { salaryGrantTableStore: columns, salarySendDetailBaseInfo } = payrollStore;
- const notShowGrantOrWithdraw = salarySendDetailBaseInfo.haveBackCalc === 1 && salarySendDetailBaseInfo.salaryAcctType === "0";
return _.map([
..._.filter(toJS(columns), it => ((selectedKey === "0" && it.dataIndex !== "billReadStatus" && it.dataIndex !== "billConfirmStatus") || (selectedKey === "1" && !showFeedbackColumn && it.dataIndex !== "billReadStatus" && it.dataIndex !== "billConfirmStatus") || (selectedKey === "1" && showFeedbackColumn))),
{
@@ -315,14 +314,37 @@ export default class PayrollGrant extends React.Component {
dataIndex: "",
display: true,
render: (text, record) => {
- if (record.sendStatus === "1" && salarySendDetailBaseInfo.canSend) {
- return (
-
- );
+ if (record.sendStatus === "1") {
+ if (salarySendDetailBaseInfo.canSend) {
+ return (
+
+ );
+ } else {
+ return (
+
+ );
+ }
} else if (salarySendDetailBaseInfo.canSend) {
return (