+ {taxfillInfoForm.getFormParams().divideFiling === getLabel(538048, "是") ? getLabel(537558, "保存") : getLabel(545147, "知道了")}
+
+ ] : [
+
+ ]
+ }
+ style={{
+ width: 850,
+ height: 480,
+ minHeight: 200,
+ minWidth: 380,
+ maxHeight: "50%",
+ maxWidth: "50%",
+ overflow: "hidden",
+ transform: "translate(0px, 0px)"
+ }}
+ >
+
+ {
+ Object.prototype.toString.call(taxAgentTaxReturnCheckFormDTO) === "[object Object]" ?
+
+ {getSearchs(taxfillInfoForm, taxFillCondition, 1)}
+ {taxfillInfoForm.getFormParams().divideFiling === getLabel(538048, "是") && getSearchs(deptfillInfoForm, deptFillCondition, 1)}
+ :
+ ({
+ dataIndex: o.dataIndex,
+ width: 200,
+ title: getLabel(o.titleId, o.title)
+ }))}
+ scroll={{ x: 1200 }} rowSelection={rowSelection}
+ />
+ }
+
+
+ );
+ }
+}
+
+export default TaxFilingInfoDialofg;
diff --git a/pc4mobx/hrmSalary/pages/salary/index.less b/pc4mobx/hrmSalary/pages/salary/index.less
new file mode 100644
index 00000000..de04ce9f
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/index.less
@@ -0,0 +1,43 @@
+.salaryAgentWrapper {
+ .comContent {
+
+ .customTitleWrapper {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .ant-btn {
+ margin-left: 10px;
+ border-radius: 0;
+ padding: 0;
+ background: transparent;
+ border: none;
+ font-size: 20px;
+ line-height: 20px;
+ }
+
+ .ant-btn.ant-btn-primary[disabled] {
+ color: #d8d8d8;
+ }
+
+ .ant-btn.ant-btn-primary {
+ color: #55a1f8;
+ }
+ }
+
+ .tdEllipsis {
+ display: inline-block;
+ width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ }
+
+ .ant-col-10 {
+ span:nth-child(2) {
+ //margin-top: -6px;
+ }
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/salary/taxAgent.js b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
new file mode 100644
index 00000000..4ab69a82
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
@@ -0,0 +1,254 @@
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { Button, message, Modal } from "antd";
+import { WeaCheckbox, WeaFormItem, WeaInputSearch, WeaLocaleProvider, WeaSearchGroup, WeaTop } from "ecCom";
+import { apiflowBillingConfigStatus } from "../../apis/intelligentCalculateSalarySettings";
+import ComHint from "./components/comHint";
+import TaxAgentTable from "./components/taxAgentTable";
+import TaxAgentSlide from "./components/taxAgentSlide";
+import * as API from "../../apis/taxAgent";
+import LogDialog from "../../components/logViewModal";
+import "./index.less";
+
+const { getLabel } = WeaLocaleProvider;
+
+@inject("taxAgentStore")
+@observer
+class TaxAgent extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ syncLoading: false, //同步人员范围loading
+ searchValue: "",
+ decentralization: "0", //启用分权
+ permission: {},
+ taxAgentSlideProps: {
+ isEdit: false, visible: false, title: getLabel(543629, "新增个税扣缴义务人"),
+ taxAgentId: "", current: 0, salaryOn: true
+ },
+ logDialogVisible: false,
+ filterConditions: "[]"
+ };
+ this.taxAgentTableRef = null;
+ }
+
+ componentDidMount() {
+ this.getTaxAgentBaseForm();
+ this.getPermission();
+ this.apiflowBillingConfigStatus();
+ }
+
+ getTaxAgentBaseForm = () => {
+ API.getTaxAgentBaseForm().then(({ status, data }) => {
+ if (status) {
+ const { devolutionStatus } = data;
+ this.setState({ decentralization: String(devolutionStatus || 0) });
+ }
+ });
+ };
+ getPermission = () => {
+ const { taxAgentStore: { getPermission } } = this.props;
+ getPermission().then(({ status, data }) => {
+ if (status) {
+ this.setState({ permission: data });
+ }
+ });
+ };
+ apiflowBillingConfigStatus = () => {
+ const { taxAgentSlideProps } = this.state;
+ apiflowBillingConfigStatus().then(({ status, data }) => {
+ if (status) this.setState({ taxAgentSlideProps: { ...taxAgentSlideProps, salaryOn: data } });
+ });
+ };
+ /*
+ * Author: 黎永顺
+ * Description:开启关闭个税扣缴义务人开关
+ * Params:
+ * Date: 2022/11/29
+ */
+ taxAgentBaseSave = devolutionStatus => {
+ this.setState({ decentralization: this.state.decentralization }, () => {
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: `${getLabel(33703, "确认")}${devolutionStatus === "0" ? getLabel(26471, "停用") : getLabel(26472, "启用")}${getLabel(524044, "分权")}?`,
+ onOk: () => {
+ const paylaod = { devolutionStatus };
+ const { taxAgentStore } = this.props;
+ const { taxAgentBaseSave, setSalarytaxAgentForm } = taxAgentStore;
+ taxAgentBaseSave(paylaod).then(({ status, errormsg }) => {
+ if (status) {
+ message.success(`${devolutionStatus === "0" ? "停用" : "启用"}分权成功`);
+ this.getTaxAgentBaseForm();
+ this.getPermission();
+ this.taxAgentTableRef.getTaxAgentList();
+ setSalarytaxAgentForm();
+ } else {
+ message.error(errormsg || `${devolutionStatus === "0" ? "停用" : "启用"}分权失败`);
+ }
+ });
+ }
+ });
+ });
+ };
+ /*
+ * Author: 黎永顺
+ * Description:
+ * Params:添加个税扣缴义务人
+ * Date: 2022/11/29
+ */
+ handleAddTaxAgent = () => {
+ this.setState({
+ taxAgentSlideProps: {
+ ...this.state.taxAgentSlideProps,
+ visible: true, current: 0
+ }
+ });
+ };
+ /*
+ * Author: 黎永顺
+ * Description:启用分权
+ * Params:
+ * Date: 2022/12/1
+ */
+ taxAgentRangeSync = () => {
+ const { taxAgentStore } = this.props;
+ const { taxAgentRangeSync } = taxAgentStore;
+ this.setState({ syncLoading: true });
+ taxAgentRangeSync({}).then(({ status, data, errormsg }) => {
+ this.setState({ syncLoading: false });
+ if (status) {
+ message.success(data || getLabel(30700, "操作成功"));
+ this.taxAgentTableRef.getTaxAgentList();
+ } else {
+ message.error(data || errormsg || getLabel(30651, "操作失败"));
+ }
+ });
+ };
+ handelResetSlide = (isUpdate = false) => {
+ const { taxAgentStore } = this.props;
+ const { salarytaxAgentForm } = taxAgentStore;
+ this.setState({
+ taxAgentSlideProps: {
+ ...this.state.taxAgentSlideProps,
+ isEdit: false,
+ visible: false,
+ title: getLabel(543629, "新增个税扣缴义务人"),
+ taxAgentId: "",
+ current: 0
+ }
+ }, () => {
+ isUpdate && this.taxAgentTableRef.getTaxAgentList();
+ salarytaxAgentForm.resetForm();
+ });
+ };
+ handleOperate = (type, itemId, current = 0) => {
+ switch (type) {
+ case "edit":
+ this.setState({
+ taxAgentSlideProps: {
+ ...this.state.taxAgentSlideProps,
+ visible: true, title: getLabel(543632, "编辑个税扣缴义务人"),
+ taxAgentId: itemId, current, isEdit: true
+ }
+ });
+ break;
+ case "delete":
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(388758, "确认要删除吗?"),
+ onOk: () => {
+ API.deleteTaxAgent([itemId]).then(({ status, errormsg }) => {
+ if (status) {
+ message.success(getLabel(502230, "删除成功"));
+ this.taxAgentTableRef.getTaxAgentList();
+ } else {
+ message.error(errormsg || getLabel(20462, "删除失败"));
+ }
+ });
+ }
+ });
+ break;
+ case "log":
+ this.setState({
+ logDialogVisible: true,
+ filterConditions: itemId ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${itemId}\"}]` : "[]"
+ });
+ break;
+ default:
+ break;
+ }
+ };
+
+ render() {
+ const {
+ searchValue, decentralization, taxAgentSlideProps,
+ permission, syncLoading, logDialogVisible, filterConditions
+ } = this.state;
+ const btns = [
+ this.setState({ searchValue })}
+ placeholder={getLabel(543634, "请输入个税扣缴义务人名称")}
+ onSearch={() => this.taxAgentTableRef.getTaxAgentList()}
+ />
+ ];
+ const customTitle =
+ {getLabel(537996, "个税扣缴义务人")}
+ {
+ permission.isChief &&
+
+ }
+
;
+ return (
+
+
}
+ iconBgcolor="#F14A2D"
+ buttons={btns}
+ showDropIcon onDropMenuClick={key => this.handleOperate(key)}
+ dropMenuDatas={[
+ {
+ key: "log", icon:
,
+ content: getLabel(545781, "操作日志")
+ }
+ ]}
+ >
+
+ {
+ permission.isChief &&
+
+
+
+
+
+ }
+
+ this.taxAgentTableRef = dom}/>
+
+
+
+
this.taxAgentTableRef.getTaxAgentList()}
+ onCancel={(isUpdate = false) => this.handelResetSlide(isUpdate)}
+ />
+ {/*操作日志*/}
+ this.setState({ logDialogVisible: false })}/>
+
+ 1、个税扣缴义务人与档案中的个税扣缴义务人匹配，修改个税扣缴义务人名称，薪资档案的个税扣缴义务人数据同步更新；
,
- 2、删除个税扣缴义务人需先确认档案里无人员使用该个税扣缴义务人，否则不予删除；
,
- 3、开启分权，需维护个税扣缴义务人的管理员；当前总管理员默认有管理员的权限；
+ {getLabel(111, "1、个税扣缴义务人与档案中的个税扣缴义务人匹配，修改个税扣缴义务人名称，薪资档案的个税扣缴义务人数据同步更新；")}
,
+ {getLabel(111, "2、删除个税扣缴义务人需先确认档案里无人员使用该个税扣缴义务人，否则不予删除；")}
,
+ {getLabel(111, "3、只有薪酬总管理员能够操作个税扣缴义务人的增减和开启/关闭分权；")}
,
+ {getLabel(111, "4、开启分权，需维护个税扣缴义务人的管理员；当前总管理员默认有管理员的权限；")}
];
} else {
return [];
@@ -30,7 +34,7 @@ class ComHint extends Component {
render() {
return (
-
小提示
+
{getLabel(111, "小提示")}
{this.renderTips()}
diff --git a/pc4mobx/hrmSalary/pages/salary/components/index.less b/pc4mobx/hrmSalary/pages/salary/components/index.less
index be539899..0bd7ee92 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/index.less
+++ b/pc4mobx/hrmSalary/pages/salary/components/index.less
@@ -28,6 +28,7 @@
width: 100%;
margin: 16px 0;
border: 1px solid #e5e5e5;
+ background: #FFF;
.hintHeader {
background: #f6f6f6;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
index 97ebff1e..074d2590 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
@@ -229,7 +229,6 @@ class TaxAgentSlide extends Component {
handleChangeSlideTab = (current) => {
this.setState({ current: Number(current) });
};
-
handleSubmit = (selectKey) => {
const { taxFilingInfoDialofg, taxAgentId } = this.state;
const { fieldForm } = this.taxInfoRef.state;
@@ -267,14 +266,48 @@ class TaxAgentSlide extends Component {
};
render() {
- const tabs = [
- { key: 0, title: getLabel(82751, "基础设置") },
- { key: 1, title: getLabel(544342, "报税信息") },
- { key: 2, title: getLabel(124810, "人员范围") }
+ const {
+ isEdit, title, visible, onCancel, salaryOn, decentralization, isChief, taxAgentStore: { showOperateBtn }
+ } = this.props;
+ const { current, taxAgentId, taxFilingInfoDialofg, loading, verifyLoading } = this.state;
+ let tabs = [
+ {
+ key: 0, title: getLabel(82751, "基础设置"),
+ createBtns: [
+
+ ],
+ editBtns: [
+
+ ],
+ children:
+ },
+ {
+ key: 1, title: getLabel(544342, "报税信息"),
+ createBtns: [
+ ,
+
+ ],
+ editBtns: [
+
+ ],
+ children: this.taxInfoRef = dom} taxAgentId={taxAgentId} isChief={isChief}/>
+ },
+ {
+ key: 2, title: getLabel(124810, "人员范围"),
+ createBtns: [
+
+ ],
+ editBtns: [],
+ children:
+ }
];
- const { isEdit, title, visible, onCancel, salaryOn, taxAgentStore: { showOperateBtn } } = this.props;
- const { current, taxAgentId, taxFilingInfoDialofg } = this.state;
- const tabData = !salaryOn ? _.filter(tabs, it => it.key !== 1) : tabs;
+ tabs = !salaryOn ? _.filter(tabs, it => it.key !== 1) : tabs;
return (
{
- _.map(tabData, item => {
+ _.map(tabs, item => {
const { key, title } = item;
return ;
})
}
}
- {
- this.renderChildren()
- }
+ {_.find(tabs, o => current === o.key).children}
-
onOperate("edit", record.id)}>{getLabel(501169, "编辑")}
{
isChief &&
-
onOperate("delete", record.id)}>{getLabel(535052, "删除")}
}
- onOperate("log", record.id)}>{getLabel(545781, "操作日志")}
diff --git a/pc4mobx/hrmSalary/pages/salary/index.less b/pc4mobx/hrmSalary/pages/salary/index.less
index de04ce9f..6c63517f 100644
--- a/pc4mobx/hrmSalary/pages/salary/index.less
+++ b/pc4mobx/hrmSalary/pages/salary/index.less
@@ -1,5 +1,37 @@
.salaryAgentWrapper {
+ .wea-new-top-content {
+ background: #f6f6f6;
+ padding: 8px 16px 0;
+ }
+
+ .wea-new-top {
+ .wea-input-focus {
+ height: 31.36px;
+ line-height: 0;
+ }
+ }
+
.comContent {
+ .wea-search-group:first-child {
+ margin-bottom: 16px;
+ }
+
+ .wea-search-group {
+ padding: 0;
+ background: #fff;
+
+ .wea-title {
+ padding: 0 10px;
+ }
+
+ .wea-content {
+ padding: 0;
+
+ .wea-form-item {
+ padding-left: 18px;
+ }
+ }
+ }
.customTitleWrapper {
width: 100%;
diff --git a/pc4mobx/hrmSalary/pages/salary/taxAgent.js b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
index 03e55f5d..300037c3 100644
--- a/pc4mobx/hrmSalary/pages/salary/taxAgent.js
+++ b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
@@ -5,8 +5,8 @@ import { WeaCheckbox, WeaFormItem, WeaInputSearch, WeaLocaleProvider, WeaSearchG
import ComHint from "./components/comHint";
import TaxAgentTable from "./components/taxAgentTable";
import TaxAgentSlide from "./components/taxAgentSlide";
-import * as API from "../../apis/taxAgent";
import LogDialog from "../../components/logViewModal";
+import * as API from "../../apis/taxAgent";
import "./index.less";
const { getLabel } = WeaLocaleProvider;
@@ -20,10 +20,9 @@ class TaxAgent extends Component {
syncLoading: false, //同步人员范围loading
searchValue: "",
decentralization: "0", //启用分权
- permission: {},
taxAgentSlideProps: {
isEdit: false, visible: false, title: getLabel(543629, "新增个税扣缴义务人"),
- taxAgentId: "", current: 0, salaryOn: true
+ taxAgentId: "", current: 0, salaryOn: false
},
logDialogVisible: false,
filterConditions: "[]"
@@ -33,7 +32,6 @@ class TaxAgent extends Component {
componentDidMount() {
this.getTaxAgentBaseForm();
- this.getPermission();
}
getTaxAgentBaseForm = () => {
@@ -44,14 +42,6 @@ class TaxAgent extends Component {
}
});
};
- getPermission = () => {
- const { taxAgentStore: { getPermission } } = this.props;
- getPermission().then(({ status, data }) => {
- if (status) {
- this.setState({ permission: data });
- }
- });
- };
/*
* Author: 黎永顺
* Description:开启关闭个税扣缴义务人开关
@@ -71,7 +61,6 @@ class TaxAgent extends Component {
if (status) {
message.success(`${devolutionStatus === "0" ? "停用" : "启用"}分权成功`);
this.getTaxAgentBaseForm();
- this.getPermission();
this.taxAgentTableRef.getTaxAgentList();
setSalarytaxAgentForm();
} else {
@@ -172,9 +161,9 @@ class TaxAgent extends Component {
};
render() {
+ const { taxAgentStore: { PageAndOptAuth: permission } } = this.props;
const {
- searchValue, decentralization, taxAgentSlideProps,
- permission, syncLoading, logDialogVisible, filterConditions
+ searchValue, decentralization, taxAgentSlideProps, syncLoading, logDialogVisible, filterConditions
} = this.state;
const btns = [
}
iconBgcolor="#F14A2D"
- buttons={btns}
+ buttons={showOperateBtn ? btns : btns.slice(1)}
showDropIcon onDropMenuClick={key => this.handleOperate(key)}
dropMenuDatas={[
{
@@ -214,13 +204,13 @@ class TaxAgent extends Component {
{
permission.isChief &&
-
+
}
-
+
this.taxAgentTableRef = dom}/>
diff --git a/pc4mobx/hrmSalary/stores/taxAgent.js b/pc4mobx/hrmSalary/stores/taxAgent.js
index 94d9898f..d4e25ec5 100644
--- a/pc4mobx/hrmSalary/stores/taxAgent.js
+++ b/pc4mobx/hrmSalary/stores/taxAgent.js
@@ -9,6 +9,11 @@ import { PAGE } from "../config";
const { TableStore } = WeaTableNew;
export class TaxAgentStore {
+ @observable salarytaxAgentForm = new WeaForm(); //新版个税扣缴义务人表单实体
+ @observable taxfillInfoForm = new WeaForm(); //报税信息查看form
+ @action setTaxfillInfoForm = () => this.taxfillInfoForm = new WeaForm(); //报税信息form初始化
+ @observable deptfillInfoForm = new WeaForm(); //报税信息部门备案form
+ @action initDeptfillInfoForm = () => this.deptfillInfoForm = new WeaForm(); //报税信息部门备案form初始化
@observable advanceForm = new WeaForm(); //权限-角色高级搜索form表单
@observable roleForm = new WeaForm(); //权限-角色form表单
@action initRoleForm = () => this.roleForm = new WeaForm();
@@ -52,6 +57,8 @@ export class TaxAgentStore {
@action setStatisticsReportBtn = bool => (this.statisticsReportBtn = bool);//薪酬统计报表权限
@action setPayrollPermission = bool => (this.payrollPermission = bool);// 薪资核算页面权限
+ @action setSalarytaxAgentForm = () => (this.salarytaxAgentForm = new WeaForm());//薪资项目权限
+
// 初始化操作
@action
doInit = params => {
From 255e8d87602a2a8cda3469f57f2528097e3fe3b6 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, 9 Oct 2024 10:22:00 +0800
Subject: [PATCH 05/11] =?UTF-8?q?feature/2.15.1.2407.01-=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../custom-title/weaReqTitle/index.js | 2 +-
.../custom-title/weaTopTitle/index.js | 2 +-
.../pages/salary/components/baseSettings.js | 2 +-
.../pages/salary/components/index.less | 17 ++++++++++
.../pages/salary/components/personalScope.js | 6 ++--
.../salary/components/personalScopeTable.js | 7 ++--
.../pages/salary/components/taxAgentSlide.js | 33 +++++--------------
pc4mobx/hrmSalary/pages/salary/index.less | 26 +++++++++++++++
8 files changed, 61 insertions(+), 34 deletions(-)
diff --git a/pc4mobx/hrmSalary/components/custom-title/weaReqTitle/index.js b/pc4mobx/hrmSalary/components/custom-title/weaReqTitle/index.js
index 69766076..7ff800ce 100644
--- a/pc4mobx/hrmSalary/components/custom-title/weaReqTitle/index.js
+++ b/pc4mobx/hrmSalary/components/custom-title/weaReqTitle/index.js
@@ -7,7 +7,7 @@ class Index extends Component {
render() {
return (
} iconBgcolor="#F14A2D"
+ title={this.props.title || getLabel(111, "编辑账套")} icon={} iconBgcolor="#F14A2D"
showDropIcon={false} tabDatas={this.props.tabDatas} {...this.props}
/>
);
diff --git a/pc4mobx/hrmSalary/components/custom-title/weaTopTitle/index.js b/pc4mobx/hrmSalary/components/custom-title/weaTopTitle/index.js
index d265c8eb..0e90c2e2 100644
--- a/pc4mobx/hrmSalary/components/custom-title/weaTopTitle/index.js
+++ b/pc4mobx/hrmSalary/components/custom-title/weaTopTitle/index.js
@@ -6,7 +6,7 @@ const getLabel = WeaLocaleProvider.getLabel;
class Index extends Component {
render() {
return (
- }
+ }
iconBgcolor="#F14A2D" {...this.props}/>
);
}
diff --git a/pc4mobx/hrmSalary/pages/salary/components/baseSettings.js b/pc4mobx/hrmSalary/pages/salary/components/baseSettings.js
index 5e24cb5c..a534feb0 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/baseSettings.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/baseSettings.js
@@ -20,7 +20,7 @@ class BaseSettings extends Component {
render() {
const { taxAgentStore: { salarytaxAgentForm }, decentralization, isChief } = this.props;
return (
-
+
{
decentralization === "0" ?
getSearchs(salarytaxAgentForm, convertConditon(decentralizationConditions, !isChief), 1, false) :
diff --git a/pc4mobx/hrmSalary/pages/salary/components/index.less b/pc4mobx/hrmSalary/pages/salary/components/index.less
index 0bd7ee92..921c6451 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/index.less
+++ b/pc4mobx/hrmSalary/pages/salary/components/index.less
@@ -1,4 +1,21 @@
.taxAgentSlideContent {
+ height: 100%;
+ background: #F6F6F6;
+
+ .ant-steps {
+ margin: 0 0 20px 0 !important;
+ padding-top: 20px;
+ }
+
+ .personal-scope {
+ padding: 8px 16px;
+ height: 100%;
+
+ .wea-tab, .wea-new-table {
+ background: #FFF;
+ }
+ }
+
.baseSettingWrapper, .taxDeclarationInfoWrapper {
padding: 12px 12px 12px 20px;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
index 66070632..37356d3d 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
@@ -191,18 +191,18 @@ class PersonalScope extends Component {
value={searchValue}
onChange={searchValue => this.setState({ searchValue })}
placeholder="请输入对象"
- onSearch={() => this.personalScopeTableRef.getPersonalScopeList()}
+ onSearch={() => this.personalScopeTableRef.getPersonalScopeList(selectedKey, 1)}
/>
] : [
this.setState({ searchValue })}
placeholder="请输入对象"
- onSearch={() => this.personalScopeTableRef.getPersonalScopeList()}
+ onSearch={() => this.personalScopeTableRef.getPersonalScopeList(selectedKey, 1)}
/>];
(selectedKey === "listExclude" || selectedKey === "listExt") && btns.shift();
return (
-
+
{
+ getPersonalScopeList = (tabActive = this.props.tabActive, current) => {
const { searchValue, taxAgentId } = this.props;
const { pageInfo, loading } = this.state;
const payload = {
- taxAgentId,
- targetName: searchValue,
- ...pageInfo
+ taxAgentId, targetName: searchValue, ...pageInfo, current: current || pageInfo.current
};
this.setState({ loading: { ...loading, query: true } });
APIFox[tabActive](payload).then(({ status, data }) => {
@@ -129,6 +127,7 @@ class PersonalScopeTable extends Component {
pagination={pagination}
loading={loading.query}
columns={columns}
+ scroll={{ y: `calc(100vh - 230px)` }}
/>
);
}
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
index 074d2590..1a6140cd 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
@@ -8,12 +8,13 @@ import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { Button, message, Modal } from "antd";
import { WeaLocaleProvider, WeaSlideModal, WeaSteps } from "ecCom";
-import SlideModalTitle from "../../../components/slideModalTitle";
import { decentralizationConditions, editConditions } from "../../taxAgent/editConditions";
import BaseSettings, { convertConditon } from "./baseSettings";
import PersonalScope from "./personalScope";
import TaxDeclarationInfo from "./taxDeclarationInfo";
import TaxFilingInfoDialofg from "./taxFillingInfoDialog";
+import WeaTopTitle from "../../../components/custom-title/weaTopTitle";
+import WeaReqTitle from "../../../components/custom-title/weaReqTitle";
import * as API from "../../../apis/taxAgent";
import { registrationCheck } from "../../../apis/taxAgent";
import "./index.less";
@@ -226,9 +227,6 @@ class TaxAgentSlide extends Component {
}
return CurrentDom;
};
- handleChangeSlideTab = (current) => {
- this.setState({ current: Number(current) });
- };
handleSubmit = (selectKey) => {
const { taxFilingInfoDialofg, taxAgentId } = this.state;
const { fieldForm } = this.taxInfoRef.state;
@@ -267,7 +265,7 @@ class TaxAgentSlide extends Component {
render() {
const {
- isEdit, title, visible, onCancel, salaryOn, decentralization, isChief, taxAgentStore: { showOperateBtn }
+ isEdit, title, visible, onCancel, salaryOn, decentralization, isChief, taxAgentStore: { PageAndOptAuth }
} = this.props;
const { current, taxAgentId, taxFilingInfoDialofg, loading, verifyLoading } = this.state;
let tabs = [
@@ -308,28 +306,15 @@ class TaxAgentSlide extends Component {
}
];
tabs = !salaryOn ? _.filter(tabs, it => it.key !== 1) : tabs;
+ const showOperateBtn = PageAndOptAuth.opts.includes("admin");
return (
{
- }}
- selectedTab={current}
- customOperate={this.renderCustomOperate()}
- subItemChange={this.handleChangeSlideTab}
- />
+ !taxAgentId ? current === o.key).createBtns}/> :
+ current === o.key).editBtns : []}
+ tabDatas={tabs} selectedKey={String(current)} title={title}
+ onChange={cur => this.setState({ current: parseInt(cur) })}/>
}
content={
diff --git a/pc4mobx/hrmSalary/pages/salary/index.less b/pc4mobx/hrmSalary/pages/salary/index.less
index 6c63517f..e6dacf00 100644
--- a/pc4mobx/hrmSalary/pages/salary/index.less
+++ b/pc4mobx/hrmSalary/pages/salary/index.less
@@ -72,4 +72,30 @@
//margin-top: -6px;
}
}
+
+ .taxAgentSlide {
+ .wea-slide-modal-title {
+ height: auto;
+ line-height: normal;
+ text-align: left;
+ background: #FFF;
+
+ .wea-new-top .ant-col-10 {
+ padding-right: 45px !important;
+ }
+ }
+
+ .rodal-close {
+ z-index: 99;
+ top: 10px !important;
+ }
+
+ .wea-new-top-req-wapper .wea-new-top-req-title > div:last-child {
+ right: 45px !important;
+ }
+
+ .wea-slide-modal-content {
+ height: 100%;
+ }
+ }
}
From b23662c09eb82229403c2d2318bba7892bdd3872 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, 9 Oct 2024 11:10:21 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feature/2.15.1.2407.01-=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/salary/components/personalScope.js | 5 +-
.../pages/salary/components/taxAgentSlide.js | 63 ++-----------------
2 files changed, 7 insertions(+), 61 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
index 37356d3d..fa392444 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
@@ -157,7 +157,8 @@ class PersonalScope extends Component {
selectedKey, searchValue, rowKeys, personalAddModal,
importParams, previewDataSource, extEmpsWitch, loading
} = this.state;
- const { taxAgentStore: { hideIconInTax, showSalaryItemBtn }, taxAgentId } = this.props;
+ const { taxAgentStore: { PageAndOptAuth }, taxAgentId } = this.props;
+ const showOperateBtn = PageAndOptAuth.opts.includes("admin");
const topTab = [
{
title: "管理范围",
@@ -172,7 +173,7 @@ class PersonalScope extends Component {
viewcondition: "listExt"
}
];
- const btns = (hideIconInTax || showSalaryItemBtn) ? [
+ const btns = showOperateBtn ? [
],
editBtns: [],
children:
@@ -311,7 +255,8 @@ class TaxAgentSlide extends Component {
current === o.key).createBtns}/> :
+ !this.props.taxAgentId ?
+ current === o.key).createBtns}/> :
current === o.key).editBtns : []}
tabDatas={tabs} selectedKey={String(current)} title={title}
onChange={cur => this.setState({ current: parseInt(cur) })}/>
From 94a4d3a93005dee9046fcea8eb64a2608346d006 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, 9 Oct 2024 14:51:55 +0800
Subject: [PATCH 07/11] =?UTF-8?q?feature/2.15.1.2407.01-=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/salary/components/constants.js | 32 +++-
.../salary/components/personalScopeModal.js | 169 ++++++++++--------
pc4mobx/hrmSalary/stores/taxAgent.js | 2 +
3 files changed, 128 insertions(+), 75 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salary/components/constants.js b/pc4mobx/hrmSalary/pages/salary/components/constants.js
index 8682937c..58da8c6b 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/constants.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/constants.js
@@ -238,7 +238,6 @@ export const deptFillCondition = [
defaultshow: true
}
];
-
export const taxFillColumns = [
{
dataIndex: "taxCode",
@@ -292,3 +291,34 @@ export const taxFillColumns = [
titleId: "545141"
}
];
+export const personScopeConditions = [
+ {
+ items: [
+ {
+ conditionType: "SELECT_LINKAGE",
+ domkey: ["targetParams"],
+ fieldcol: 16,
+ label: "对象类型",
+ lanId: 111,
+ labelcol: 8,
+ options: [],
+ rules: "required|string",
+ selectLinkageDatas: {},
+ viewAttr: 3
+ },
+ {
+ conditionType: "SELECT",
+ domkey: ["employeeStatus"],
+ fieldcol: 16,
+ label: "选择员工状态",
+ lanId: 111,
+ labelcol: 8,
+ value: "",
+ detailtype: "2",
+ rules: "required|string",
+ viewAttr: 3
+ }
+ ],
+ defaultshow: true
+ }
+];
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
index 9e4c09af..a5ad7786 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
@@ -5,17 +5,23 @@
* Date: 2022/11/30
*/
import React, { Component } from "react";
-import { WeaBrowser, WeaDialog, WeaFormItem, WeaSearchGroup, WeaSelect } from "ecCom";
+import { inject, observer } from "mobx-react";
+import { WeaBrowser, WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
import { Button, message, Modal } from "antd";
import { getTaxAgentRangeForm, taxAgentRangeSave } from "../../../apis/taxAgent";
-import { SelectWithAll } from "../../socialSecurityBenefits/standingBookDetail/components/regAddEmployee";
-import "./index.less";
+import { personScopeConditions } from "./constants";
+import { getSearchs } from "../../../util";
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore")
+@observer
class PersonalScopeModal extends Component {
constructor(props) {
super(props);
this.state = {
- loading: false,
+ loading: false, conditions: [],
employeeStatus: [],
targetTypeList: [],
targetType: "EMPLOYEE",
@@ -26,8 +32,15 @@ class PersonalScopeModal extends Component {
};
}
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) this.getTaxAgentRangeForm();
+ if (nextProps.visible !== this.props.visible && !nextProps.visible) {
+ this.props.taxAgentStore.initPersonScopeForm();
+ }
+ }
+
componentDidMount() {
- this.getTaxAgentRangeForm();
+ // this.getTaxAgentRangeForm();
}
getTaxAgentRangeForm = () => {
@@ -36,8 +49,22 @@ class PersonalScopeModal extends Component {
const { employeeStatus, targetTypeList } = data;
this.setState({
targetTypeList: _.map(targetTypeList, it => ({ key: it.id, showname: it.name })),
- employeeStatus: _.map(employeeStatus, it => ({ key: it.id, showname: it.name }))
- });
+ employeeStatus: _.map(employeeStatus, it => ({ key: it.id, showname: it.name })),
+ conditions: _.map(personScopeConditions, item => ({
+ ...item, items: _.map(item.items, o => {
+ if (getKey(o) === "employeeStatus") {
+ return {
+ ...o, label: getLabel(o.lanId, o.label),
+ options: _.map(employeeStatus, it => ({ key: it.id, showname: it.name }))
+ };
+ }
+ return {
+ ...o, label: getLabel(o.lanId, o.label),
+ options: _.map(targetTypeList, it => ({ key: it.id, showname: it.name }))
+ };
+ })
+ }))
+ }, () => this.props.taxAgentStore.personScopeForm.initFormFields(this.state.conditions));
}
});
};
@@ -111,78 +138,72 @@ class PersonalScopeModal extends Component {
};
render() {
- const { onCancel, title, visible } = this.props;
- const { employeeStatus, targetTypeList, targetType, status, statusAll, loading } = this.state;
+ const { onCancel, title, visible, taxAgentStore: { personScopeForm } } = this.props;
+ const { employeeStatus, targetTypeList, targetType, status, statusAll, loading, conditions } = this.state;
const buttons = [
,
];
return (
- {
- this.handleReset();
- onCancel();
- }}
- >
-
-
-
- this.setState({ targetType })}
- />
- {this.renderBrowser()}
-
-
- {
- SelectWithAll({
- label: "选择员工状态",
- options: employeeStatus,
- detailtype: 2,
- valueAll: statusAll,
- value: status,
- onChangeAll: ({ selected }) => {
- if (selected) {
- this.setState({
- status: _.map(employeeStatus, it => it.key).join(","),
- statusAll: selected
- });
- } else {
- this.setState({
- status: "",
- statusAll: selected
- });
- }
- },
- onChange: ({ selected }) => {
- const bool = _.every(_.map(employeeStatus, it => it.key), item => selected.split(",").includes(item));
- if (bool) {
- this.setState({
- status: selected,
- statusAll: "0"
- });
- } else {
- this.setState({
- status: selected,
- statusAll: ""
- });
- }
- }
- })
- }
-
+ {
+ this.handleReset();
+ onCancel();
+ }}>
+ {getSearchs(personScopeForm, conditions, 1, false)}
+ {/**/}
+ {/* */}
+ {/* */}
+ {/* this.setState({ targetType })}*/}
+ {/* />*/}
+ {/* {this.renderBrowser()}*/}
+ {/*
*/}
+ {/* */}
+ {/* {*/}
+ {/* SelectWithAll({*/}
+ {/* label: "选择员工状态",*/}
+ {/* options: employeeStatus,*/}
+ {/* detailtype: 2,*/}
+ {/* valueAll: statusAll,*/}
+ {/* value: status,*/}
+ {/* onChangeAll: ({ selected }) => {*/}
+ {/* if (selected) {*/}
+ {/* this.setState({*/}
+ {/* status: _.map(employeeStatus, it => it.key).join(","),*/}
+ {/* statusAll: selected*/}
+ {/* });*/}
+ {/* } else {*/}
+ {/* this.setState({*/}
+ {/* status: "",*/}
+ {/* statusAll: selected*/}
+ {/* });*/}
+ {/* }*/}
+ {/* },*/}
+ {/* onChange: ({ selected }) => {*/}
+ {/* const bool = _.every(_.map(employeeStatus, it => it.key), item => selected.split(",").includes(item));*/}
+ {/* if (bool) {*/}
+ {/* this.setState({*/}
+ {/* status: selected,*/}
+ {/* statusAll: "0"*/}
+ {/* });*/}
+ {/* } else {*/}
+ {/* this.setState({*/}
+ {/* status: selected,*/}
+ {/* statusAll: ""*/}
+ {/* });*/}
+ {/* }*/}
+ {/* }*/}
+ {/* })*/}
+ {/* }*/}
+ {/**/}
);
}
diff --git a/pc4mobx/hrmSalary/stores/taxAgent.js b/pc4mobx/hrmSalary/stores/taxAgent.js
index d4e25ec5..45fe8041 100644
--- a/pc4mobx/hrmSalary/stores/taxAgent.js
+++ b/pc4mobx/hrmSalary/stores/taxAgent.js
@@ -12,6 +12,8 @@ export class TaxAgentStore {
@observable salarytaxAgentForm = new WeaForm(); //新版个税扣缴义务人表单实体
@observable taxfillInfoForm = new WeaForm(); //报税信息查看form
@action setTaxfillInfoForm = () => this.taxfillInfoForm = new WeaForm(); //报税信息form初始化
+ @observable personScopeForm = new WeaForm(); //个税扣缴义务人新增人员form
+ @action initPersonScopeForm = () => this.personScopeForm = new WeaForm(); //个税扣缴义务人新增人员form初始化
@observable deptfillInfoForm = new WeaForm(); //报税信息部门备案form
@action initDeptfillInfoForm = () => this.deptfillInfoForm = new WeaForm(); //报税信息部门备案form初始化
@observable advanceForm = new WeaForm(); //权限-角色高级搜索form表单
From cd768fff67e12635c0cc98cbad4b39b528dcc451 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, 9 Oct 2024 17:02:14 +0800
Subject: [PATCH 08/11] =?UTF-8?q?feature/2.15.1.2407.01-=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/salary/components/constants.js | 21 +++++++++++----
.../salary/components/personalScopeModal.js | 26 ++++++++++++++-----
2 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salary/components/constants.js b/pc4mobx/hrmSalary/pages/salary/components/constants.js
index 58da8c6b..b457ae44 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/constants.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/constants.js
@@ -297,22 +297,33 @@ export const personScopeConditions = [
{
conditionType: "SELECT_LINKAGE",
domkey: ["targetParams"],
- fieldcol: 16,
+ fieldcol: 18,
label: "对象类型",
lanId: 111,
- labelcol: 8,
+ labelcol: 6,
options: [],
rules: "required|string",
- selectLinkageDatas: {},
+ selectLinkageDatas: {
+ EMPLOYEE: {
+ conditionType: "TEXTAREA",
+ domkey: ["target"],
+ fieldcol: 24,
+ label: "",
+ labelcol: 0,
+ value: "",
+ rules: "required|string",
+ viewAttr: 3
+ }
+ },
viewAttr: 3
},
{
conditionType: "SELECT",
domkey: ["employeeStatus"],
- fieldcol: 16,
+ fieldcol: 18,
label: "选择员工状态",
lanId: 111,
- labelcol: 8,
+ labelcol: 6,
value: "",
detailtype: "2",
rules: "required|string",
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
index a5ad7786..f8aced8d 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
@@ -23,7 +23,6 @@ class PersonalScopeModal extends Component {
this.state = {
loading: false, conditions: [],
employeeStatus: [],
- targetTypeList: [],
targetType: "EMPLOYEE",
targetTypeIds: "",
targetTypeIdsNames: "",
@@ -48,14 +47,15 @@ class PersonalScopeModal extends Component {
if (status) {
const { employeeStatus, targetTypeList } = data;
this.setState({
- targetTypeList: _.map(targetTypeList, it => ({ key: it.id, showname: it.name })),
- employeeStatus: _.map(employeeStatus, it => ({ key: it.id, showname: it.name })),
- conditions: _.map(personScopeConditions, item => ({
+ employeeStatus, conditions: _.map(personScopeConditions, item => ({
...item, items: _.map(item.items, o => {
if (getKey(o) === "employeeStatus") {
return {
...o, label: getLabel(o.lanId, o.label),
- options: _.map(employeeStatus, it => ({ key: it.id, showname: it.name }))
+ options: [
+ { key: "ALL", showname: getLabel(111, "全选") },
+ ..._.map(employeeStatus, it => ({ key: it.id, showname: it.name }))
+ ]
};
}
return {
@@ -128,6 +128,20 @@ class PersonalScopeModal extends Component {
}}
/>;
};
+ handleChange = (params) => {
+ const { taxAgentStore: { personScopeForm } } = this.props, { employeeStatus } = this.state;
+ const key = _.keys(params)[0], value = params[key].value;
+ if (
+ (key === "employeeStatus" && value.indexOf("ALL") !== -1)
+ // (key === "employeeStatus" && value.indexOf("ALL") === -1 && _.every(employeeStatus, o => value.indexOf(o.id) !== -1))
+ ) {
+ personScopeForm.updateFields({ [key]: { value: "ALL," + _.map(employeeStatus, o => o.id).join(",") } });
+ } else if (key === "employeeStatus" && value.indexOf("ALL") === -1) {
+ console.log(1)
+ // personScopeForm.updateFields({ [key]: { value: "" } });
+ }
+ console.log(params);
+ };
handleReset = () => {
this.setState({
targetType: "EMPLOYEE",
@@ -150,7 +164,7 @@ class PersonalScopeModal extends Component {
this.handleReset();
onCancel();
}}>
- {getSearchs(personScopeForm, conditions, 1, false)}
+ {getSearchs(personScopeForm, conditions, 1, false, this.handleChange)}
{/**/}
{/*
Date: Fri, 11 Oct 2024 10:01:46 +0800
Subject: [PATCH 09/11] =?UTF-8?q?feature/2.15.1.2407.01-=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/salary/components/constants.js | 137 +++++++++++++++--
.../salary/components/personalScopeModal.js | 142 ++++++++++--------
2 files changed, 202 insertions(+), 77 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salary/components/constants.js b/pc4mobx/hrmSalary/pages/salary/components/constants.js
index b457ae44..ac81a719 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/constants.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/constants.js
@@ -302,20 +302,9 @@ export const personScopeConditions = [
lanId: 111,
labelcol: 6,
options: [],
- rules: "required|string",
- selectLinkageDatas: {
- EMPLOYEE: {
- conditionType: "TEXTAREA",
- domkey: ["target"],
- fieldcol: 24,
- label: "",
- labelcol: 0,
- value: "",
- rules: "required|string",
- viewAttr: 3
- }
- },
- viewAttr: 3
+ viewAttr: 3,
+ rules: "selectLinkageRequired",
+ selectLinkageDatas: {}
},
{
conditionType: "SELECT",
@@ -326,10 +315,126 @@ export const personScopeConditions = [
labelcol: 6,
value: "",
detailtype: "2",
- rules: "required|string",
+ rules: "required",
viewAttr: 3
- }
+ },
],
defaultshow: true
}
];
+export const scopeSelectLinkageDatas = {
+ EMPLOYEE:{
+ browserConditionParam: {
+ completeParams: {},
+ dataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ pageSize: 10,
+ linkUrl: "",
+ type: "17",
+ viewAttr: 3,
+ rules:'required',
+ title: ""
+ },
+ conditionType: "BROWSER",
+ domkey: ["target"],
+ fieldcol: 24,
+ label: "",
+ labelcol: 0,
+ value: "",
+ rules: "required",
+ viewAttr: 3
+ },
+ DEPT:{
+ browserConditionParam: {
+ completeParams: {},
+ dataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ pageSize: 10,
+ linkUrl: "",
+ type: "57",
+ viewAttr: 3,
+ rules:'required',
+ title: ""
+ },
+ conditionType: "BROWSER",
+ domkey: ["target"],
+ fieldcol: 24,
+ label: "",
+ labelcol: 0,
+ value: "",
+ rules: "required",
+ viewAttr: 3
+ },
+ SUBCOMPANY:{
+ browserConditionParam: {
+ completeParams: {},
+ dataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ pageSize: 10,
+ linkUrl: "",
+ type: "164",
+ viewAttr: 3,
+ rules:'required',
+ title: ""
+ },
+ conditionType: "BROWSER",
+ domkey: ["target"],
+ fieldcol: 24,
+ label: "",
+ labelcol: 0,
+ value: "",
+ rules: "required",
+ viewAttr: 3
+ },
+ POSITION:{
+ browserConditionParam: {
+ completeParams: {},
+ dataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ pageSize: 10,
+ linkUrl: "",
+ type: "278",
+ viewAttr: 3,
+ rules:'required',
+ title: ""
+ },
+ conditionType: "BROWSER",
+ domkey: ["target"],
+ fieldcol: 24,
+ label: "",
+ labelcol: 0,
+ value: "",
+ rules: "required",
+ viewAttr: 3
+ },
+ SQL: {
+ conditionType: "TEXTAREA",
+ domkey: ["target"],
+ fieldcol: 24,
+ label: "",
+ labelcol: 0,
+ value: "",
+ rules: "required",
+ viewAttr: 3
+ }
+};
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
index f8aced8d..9ad50c15 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
@@ -6,11 +6,11 @@
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
-import { WeaBrowser, WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
+import { WeaSwitch } from "comsMobx";
+import { WeaBrowser, WeaCheckbox, WeaDialog, WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
import { Button, message, Modal } from "antd";
import { getTaxAgentRangeForm, taxAgentRangeSave } from "../../../apis/taxAgent";
-import { personScopeConditions } from "./constants";
-import { getSearchs } from "../../../util";
+import { personScopeConditions, scopeSelectLinkageDatas } from "./constants";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
@@ -33,9 +33,7 @@ class PersonalScopeModal extends Component {
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) this.getTaxAgentRangeForm();
- if (nextProps.visible !== this.props.visible && !nextProps.visible) {
- this.props.taxAgentStore.initPersonScopeForm();
- }
+ if (nextProps.visible !== this.props.visible && !nextProps.visible) this.props.taxAgentStore.initPersonScopeForm();
}
componentDidMount() {
@@ -52,15 +50,13 @@ class PersonalScopeModal extends Component {
if (getKey(o) === "employeeStatus") {
return {
...o, label: getLabel(o.lanId, o.label),
- options: [
- { key: "ALL", showname: getLabel(111, "全选") },
- ..._.map(employeeStatus, it => ({ key: it.id, showname: it.name }))
- ]
+ options: _.map(employeeStatus, it => ({ key: it.id, showname: it.name }))
};
}
return {
...o, label: getLabel(o.lanId, o.label),
- options: _.map(targetTypeList, it => ({ key: it.id, showname: it.name }))
+ options: _.map(targetTypeList, it => ({ key: it.id, showname: it.name })),
+ selectLinkageDatas: scopeSelectLinkageDatas[_.head(targetTypeList).id]
};
})
}))
@@ -69,33 +65,44 @@ class PersonalScopeModal extends Component {
});
};
taxAgentRangeSave = () => {
- const { status, targetTypeIds, targetType } = this.state;
- const { includeType, taxAgentId, onSuccess, onCancel } = this.props;
- if (_.isEmpty(status) || _.isEmpty(targetTypeIds)) {
- Modal.warning({
- title: "信息确认",
- content: "必要信息不完整，红色*为必填项！"
- });
- return;
- }
- const payload = {
- employeeStatus: status.split(","),
- includeType,
- targetParams: _.map(targetTypeIds.split(","), it => ({ targetType, targetId: it })),
- taxAgentId
- };
- this.setState({ loading: true });
- taxAgentRangeSave(payload).then(({ status, errormsg }) => {
- this.setState({ loading: false });
- if (status) {
- message.success("保存成功");
- this.handleReset();
- onSuccess();
- onCancel();
+ const { taxAgentStore: { personScopeForm } } = this.props;
+ personScopeForm.validateForm().then(f => {
+ if (f.isValid) {
+ console.log(70, personScopeForm.getFormParams());
+
+
+ const { status, targetTypeIds, targetType } = this.state;
+ const { includeType, taxAgentId, onSuccess, onCancel } = this.props;
+ if (_.isEmpty(status) || _.isEmpty(targetTypeIds)) {
+ Modal.warning({
+ title: "信息确认",
+ content: "必要信息不完整，红色*为必填项！"
+ });
+ return;
+ }
+ const payload = {
+ employeeStatus: status.split(","),
+ includeType,
+ targetParams: _.map(targetTypeIds.split(","), it => ({ targetType, targetId: it })),
+ taxAgentId
+ };
+ this.setState({ loading: true });
+ taxAgentRangeSave(payload).then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success("保存成功");
+ this.handleReset();
+ onSuccess();
+ onCancel();
+ } else {
+ message.error(errormsg || "保存失败");
+ }
+ }).catch(() => this.setState({ loading: true }));
} else {
- message.error(errormsg || "保存失败");
+ f.showErrors();
+ this.forceUpdate();
}
- }).catch(() => this.setState({ loading: true }));
+ });
};
renderBrowser = () => {
const { targetType, targetTypeIds, targetTypeIdsNames } = this.state;
@@ -128,27 +135,44 @@ class PersonalScopeModal extends Component {
}}
/>;
};
+ renderForm = () => {
+ const { taxAgentStore: { personScopeForm } } = this.props;
+ const { conditions, employeeStatus } = this.state, { isFormInit } = personScopeForm,
+ formParams = personScopeForm.getFormParams();
+ const checked = formParams.employeeStatus && _.every(_.map(employeeStatus, o => o.id), k => formParams.employeeStatus.indexOf(k) !== -1);
+ let group = [];
+ isFormInit && conditions.map(c => {
+ let items = [];
+ c.items.map(fields => {
+ items.push({
+ com: (
+
+ {
+ getKey(fields) === "employeeStatus" &&
+
+ }
+
+ ),
+ hide: fields.hide
+ });
+ });
+ group.push();
+ });
+ return group;
+ };
+ handleChangeAll = (val) => {
+ const { taxAgentStore: { personScopeForm } } = this.props, { employeeStatus } = this.state;
+ val === "1" ? personScopeForm.updateFields({ employeeStatus: { value: _.map(employeeStatus, o => o.id).join(",") } }) :
+ personScopeForm.updateFields({ employeeStatus: { value: "" } });
+ };
handleChange = (params) => {
const { taxAgentStore: { personScopeForm } } = this.props, { employeeStatus } = this.state;
const key = _.keys(params)[0], value = params[key].value;
- if (
- (key === "employeeStatus" && value.indexOf("ALL") !== -1)
- // (key === "employeeStatus" && value.indexOf("ALL") === -1 && _.every(employeeStatus, o => value.indexOf(o.id) !== -1))
- ) {
- personScopeForm.updateFields({ [key]: { value: "ALL," + _.map(employeeStatus, o => o.id).join(",") } });
- } else if (key === "employeeStatus" && value.indexOf("ALL") === -1) {
- console.log(1)
- // personScopeForm.updateFields({ [key]: { value: "" } });
- }
- console.log(params);
- };
- handleReset = () => {
- this.setState({
- targetType: "EMPLOYEE",
- targetTypeIds: "",
- status: "",
- statusAll: ""
- });
+ console.log(params, key, value);
};
render() {
@@ -156,15 +180,11 @@ class PersonalScopeModal extends Component {
const { employeeStatus, targetTypeList, targetType, status, statusAll, loading, conditions } = this.state;
const buttons = [
,
-
+
];
return (
- {
- this.handleReset();
- onCancel();
- }}>
- {getSearchs(personScopeForm, conditions, 1, false, this.handleChange)}
+
+ {this.renderForm()}
{/**/}
{/*
Date: Fri, 11 Oct 2024 11:11:06 +0800
Subject: [PATCH 10/11] =?UTF-8?q?feature/2.15.1.2407.01-=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/salary/components/constants.js | 2 +-
.../pages/salary/components/personalScope.js | 10 ++--
.../salary/components/personalScopeModal.js | 48 ++++++-------------
3 files changed, 19 insertions(+), 41 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salary/components/constants.js b/pc4mobx/hrmSalary/pages/salary/components/constants.js
index ac81a719..dc2422a0 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/constants.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/constants.js
@@ -296,7 +296,7 @@ export const personScopeConditions = [
items: [
{
conditionType: "SELECT_LINKAGE",
- domkey: ["targetParams"],
+ domkey: ["targetType"],
fieldcol: 18,
label: "对象类型",
lanId: 111,
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
index fa392444..698d181d 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
@@ -228,14 +228,10 @@ class PersonalScope extends Component {
{...personalAddModal}
taxAgentId={taxAgentId}
onSuccess={() => this.personalScopeTableRef.getPersonalScopeList()}
- onCancel={() =>
+ onCancel={(callback) =>
this.setState({
- personalAddModal: {
- ...personalAddModal,
- visible: false,
- includeType: ""
- }
- })
+ personalAddModal: { ...personalAddModal, visible: false, includeType: "" }
+ }, () => callback && callback())
}
/>
{importParams.visible && (
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
index 9ad50c15..ab9d5dcb 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
@@ -8,7 +8,7 @@ import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { WeaSwitch } from "comsMobx";
import { WeaBrowser, WeaCheckbox, WeaDialog, WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
-import { Button, message, Modal } from "antd";
+import { Button, message } from "antd";
import { getTaxAgentRangeForm, taxAgentRangeSave } from "../../../apis/taxAgent";
import { personScopeConditions, scopeSelectLinkageDatas } from "./constants";
@@ -55,8 +55,10 @@ class PersonalScopeModal extends Component {
}
return {
...o, label: getLabel(o.lanId, o.label),
- options: _.map(targetTypeList, it => ({ key: it.id, showname: it.name })),
- selectLinkageDatas: scopeSelectLinkageDatas[_.head(targetTypeList).id]
+ options: _.map(targetTypeList, it => ({
+ key: it.id, showname: it.name, selected: it.id === "EMPLOYEE"
+ })),
+ selectLinkageDatas: { ...scopeSelectLinkageDatas }
};
})
}))
@@ -68,39 +70,25 @@ class PersonalScopeModal extends Component {
const { taxAgentStore: { personScopeForm } } = this.props;
personScopeForm.validateForm().then(f => {
if (f.isValid) {
- console.log(70, personScopeForm.getFormParams());
-
-
- const { status, targetTypeIds, targetType } = this.state;
- const { includeType, taxAgentId, onSuccess, onCancel } = this.props;
- if (_.isEmpty(status) || _.isEmpty(targetTypeIds)) {
- Modal.warning({
- title: "信息确认",
- content: "必要信息不完整，红色*为必填项！"
- });
- return;
- }
+ const { employeeStatus, targetType, target } = personScopeForm.getFormParams();
+ const { includeType, taxAgentId } = this.props;
const payload = {
- employeeStatus: status.split(","),
- includeType,
- targetParams: _.map(targetTypeIds.split(","), it => ({ targetType, targetId: it })),
- taxAgentId
+ includeType, taxAgentId,
+ employeeStatus: employeeStatus.split(","),
+ targetParams: _.map(target.split(","), it => ({ targetType, targetId: it }))
};
this.setState({ loading: true });
taxAgentRangeSave(payload).then(({ status, errormsg }) => {
this.setState({ loading: false });
if (status) {
- message.success("保存成功");
- this.handleReset();
- onSuccess();
- onCancel();
+ message.success(getLabel(111, "操作成功！"));
+ this.props.onCancel(this.props.onSuccess);
} else {
- message.error(errormsg || "保存失败");
+ message.error(errormsg);
}
}).catch(() => this.setState({ loading: true }));
} else {
f.showErrors();
- this.forceUpdate();
}
});
};
@@ -154,8 +142,7 @@ class PersonalScopeModal extends Component {
}
-
+
),
hide: fields.hide
});
@@ -169,18 +156,13 @@ class PersonalScopeModal extends Component {
val === "1" ? personScopeForm.updateFields({ employeeStatus: { value: _.map(employeeStatus, o => o.id).join(",") } }) :
personScopeForm.updateFields({ employeeStatus: { value: "" } });
};
- handleChange = (params) => {
- const { taxAgentStore: { personScopeForm } } = this.props, { employeeStatus } = this.state;
- const key = _.keys(params)[0], value = params[key].value;
- console.log(params, key, value);
- };
render() {
const { onCancel, title, visible, taxAgentStore: { personScopeForm } } = this.props;
const { employeeStatus, targetTypeList, targetType, status, statusAll, loading, conditions } = this.state;
const buttons = [
,
-
+
];
return (
From 167c2c5a2013addca927c488d237455ec0e5dc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 11 Oct 2024 15:19:38 +0800
Subject: [PATCH 11/11] =?UTF-8?q?feature/2.15.1.2407.01-=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/salary/components/index.less | 12 ++
.../pages/salary/components/personalScope.js | 106 ++++++----------
.../salary/components/personalScopeModal.js | 113 ++----------------
3 files changed, 56 insertions(+), 175 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/salary/components/index.less b/pc4mobx/hrmSalary/pages/salary/components/index.less
index 921c6451..9eed4669 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/index.less
+++ b/pc4mobx/hrmSalary/pages/salary/components/index.less
@@ -14,6 +14,18 @@
.wea-tab, .wea-new-table {
background: #FFF;
}
+
+ .icon-refresh {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 20px;
+ height: 20px;
+ color: #fff;
+ background: #55a1f8;
+ cursor: pointer;
+ border-radius: 3px;
+ }
}
.baseSettingWrapper, .taxDeclarationInfoWrapper {
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
index 698d181d..451fbda8 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
@@ -5,22 +5,22 @@
* Date: 2022/11/30
*/
import React, { Component } from "react";
-import { Button, message, Modal } from "antd";
+import { message, Modal } from "antd";
import { inject, observer } from "mobx-react";
-import { WeaButtonIcon, WeaInputSearch, WeaTab } from "ecCom";
+import { WeaButtonIcon, WeaInputSearch, WeaLocaleProvider, WeaTab } from "ecCom";
import {
taxAgentRangeDelete,
taxAgentRangeExtDelete,
taxAgentRangeExtSave,
- taxAgentRangeImportData,
- taxAgentRangePreview
+ taxAgentRangeImportData
} from "../../../apis/taxAgent";
import { sysinfo } from "../../../apis/ruleconfig";
import PersonalScopeTable from "./personalScopeTable";
import PersonalScopeModal from "./personalScopeModal";
-import ImportModal from "../../../components/importModal";
+import ImportDialog from "../../../components/importDialog";
import ExternalPersonModal from "../../../components/externalPersonModal";
-import { importEmployColumns } from "../../taxAgent/columns";
+
+const getLabel = WeaLocaleProvider.getLabel;
@inject("taxAgentStore")
@observer
@@ -28,17 +28,14 @@ class PersonalScope extends Component {
constructor(props) {
super(props);
this.state = {
- searchValue: "", selectedKey: "listInclude",
- rowKeys: [], personalAddModal: {
- visible: false, externalVisible: false,
- title: "关联人员", includeType: ""
- },
- previewDataSource: [], importParams: {
- visible: false,
- step: 0,
- importResult: {}
- }, extEmpsWitch: "1", //非系统人员开关， 1： 开启， 0：关闭
- loading: false
+ searchValue: "", selectedKey: "listInclude", rowKeys: [], loading: false,
+ extEmpsWitch: "1", //非系统人员开关， 1： 开启， 0：关闭
+ personalAddModal: { visible: false, externalVisible: false, title: getLabel(111, "关联人员"), includeType: "" },
+ importParams: {
+ visible: false, title: getLabel(111, "数据导入"), nextloading: false, importResult: {}, imageId: "",
+ link: `/api/bs/hrmsalary/taxAgent/range/downloadTemplate?taxAgentId=${props.taxAgentId}`,
+ previewUrl: "/api/bs/hrmsalary/taxAgent/range/preview"
+ }
};
this.personalScopeTableRef = null;
}
@@ -103,26 +100,15 @@ class PersonalScope extends Component {
}
});
};
- salaryArchivePreview = (params) => {
- taxAgentRangePreview(params).then(({ status, data }) => {
- if (status) {
- const { preview } = data;
- this.setState({
- previewDataSource: preview
- });
- }
- });
- };
handleImportFile = (params) => {
- const { taxAgentId } = this.props;
- taxAgentRangeImportData({ ...params, taxAgentId }).then(({ status, data }) => {
+ const { taxAgentId } = this.props, { importParams } = this.state;
+ this.setState({ importParams: { ...importParams, nextloading: true } });
+ taxAgentRangeImportData({ ...params, taxAgentId }).then(({ status, errormsg, data }) => {
+ this.setState({ importParams: { ...importParams, nextloading: false } });
if (status) {
- this.setState({
- importParams: {
- ...this.state.importParams,
- importResult: data
- }
- });
+ this.setState({ importParams: { ...importParams, importResult: data } });
+ } else {
+ message.warning(errormsg);
}
});
};
@@ -153,10 +139,7 @@ class PersonalScope extends Component {
};
render() {
- const {
- selectedKey, searchValue, rowKeys, personalAddModal,
- importParams, previewDataSource, extEmpsWitch, loading
- } = this.state;
+ const { selectedKey, searchValue, rowKeys, personalAddModal, importParams, extEmpsWitch, loading } = this.state;
const { taxAgentStore: { PageAndOptAuth }, taxAgentId } = this.props;
const showOperateBtn = PageAndOptAuth.opts.includes("admin");
const topTab = [
@@ -174,12 +157,9 @@ class PersonalScope extends Component {
}
];
const btns = showOperateBtn ? [
- ,
+ {
+ this.setState({ importParams: { ...importParams, visible: true } });
+ }}>,
callback && callback())
}
/>
- {importParams.visible && (
- {
- this.setState({ importParams: { ...this.state.importParams, step } });
- }}
- importResult={importParams.importResult}
- onFinish={() => {
- this.setState({
- importParams: {
- ...this.state.importParams,
- visible: false
- }
- }, () => this.personalScopeTableRef.getPersonalScopeList());
- }}
- previewImport={(params) => this.salaryArchivePreview(params)}
- importFile={(params) => this.handleImportFile(params)}
- templateLink={`/api/bs/hrmsalary/taxAgent/range/downloadTemplate?taxAgentId=${taxAgentId}`}
- visiable={importParams.visible}
- onCancel={() => {
- this.setState({ importParams: { ...this.state.importParams, visible: false } });
- }}
- />
- )}
+ this.setState({ importParams: { ...importParams, imageId } })}
+ nextUplaodCallback={imageId => this.handleImportFile({ imageId })}
+ onResetImportResult={() => this.setState(({
+ importParams: { ...importParams, importResult: {}, imageId: "" }
+ }))}
+ onCancel={(callback) => this.setState({
+ importParams: { ...importParams, visible: false }
+ }, () => callback && this.personalScopeTableRef.getPersonalScopeList(selectedKey, 1))}/>
{this.renderForm()}
- {/**/}
- {/* */}
- {/* */}
- {/* this.setState({ targetType })}*/}
- {/* />*/}
- {/* {this.renderBrowser()}*/}
- {/*
*/}
- {/* */}
- {/* {*/}
- {/* SelectWithAll({*/}
- {/* label: "选择员工状态",*/}
- {/* options: employeeStatus,*/}
- {/* detailtype: 2,*/}
- {/* valueAll: statusAll,*/}
- {/* value: status,*/}
- {/* onChangeAll: ({ selected }) => {*/}
- {/* if (selected) {*/}
- {/* this.setState({*/}
- {/* status: _.map(employeeStatus, it => it.key).join(","),*/}
- {/* statusAll: selected*/}
- {/* });*/}
- {/* } else {*/}
- {/* this.setState({*/}
- {/* status: "",*/}
- {/* statusAll: selected*/}
- {/* });*/}
- {/* }*/}
- {/* },*/}
- {/* onChange: ({ selected }) => {*/}
- {/* const bool = _.every(_.map(employeeStatus, it => it.key), item => selected.split(",").includes(item));*/}
- {/* if (bool) {*/}
- {/* this.setState({*/}
- {/* status: selected,*/}
- {/* statusAll: "0"*/}
- {/* });*/}
- {/* } else {*/}
- {/* this.setState({*/}
- {/* status: selected,*/}
- {/* statusAll: ""*/}
- {/* });*/}
- {/* }*/}
- {/* }*/}
- {/* })*/}
- {/* }*/}
- {/**/}
);
}