From c628b482f93fc181d5fa330f70dbb3388f9f2183 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, 14 Aug 2023 17:08:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=80=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/baseInfo.js | 33 +++++++- .../employeeDeclareDetailCalcDialog.js | 50 +++++++++++ .../employeeDeclareDetailSchemaEditDialog.js | 36 +++++++- .../pages/employeedeclareDetail/constants.js | 65 +++++++++++++++ .../pages/employeedeclareDetail/index.js | 32 ++++++- .../pages/employeedeclareDetail/index.less | 83 ++++++++++++++++++- pc4mobx/hrmSalary/stores/employeeDeclare.js | 1 + 7 files changed, 290 insertions(+), 10 deletions(-) create mode 100644 pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/baseInfo.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/baseInfo.js index f8a45616..549a0dba 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/baseInfo.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/baseInfo.js @@ -7,20 +7,51 @@ import React, { Component } from "react"; import { WeaLocaleProvider } from "ecCom"; import { getQueryString } from "../../../util/url"; +import EmployeeDeclareDetailCalcDialog from "./employeeDeclareDetailCalcDialog"; const { getLabel } = WeaLocaleProvider; class BaseInfo extends Component { + constructor(props) { + super(props); + this.state = { + declareCalcDialog: { + visible: false + } + }; + } + + handleOpenFailDialog = () => { + this.setState({ + declareCalcDialog: { + visible: true + } + }); + }; + render() { + const { declareCalcDialog } = this.state; return (
{getLabel(537996, "个税扣缴义务人")}:{getQueryString("taxName")}
- {getLabel(111, "报送失败")}:  0 + {getLabel(111, "报送失败")}:  0 {getLabel(111, "未报送")}:  0
+ {/*报送失败数据查看*/} + { + this.setState({ + declareCalcDialog: { + visible: false + } + }); + }} + />
); } diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js new file mode 100644 index 00000000..83e88345 --- /dev/null +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js @@ -0,0 +1,50 @@ +/* + * Author: 黎永顺 + * name: 报送信息-失败查看弹框 + * Description: + * Date: 2023/8/14 + */ +import React, { Component } from "react"; +import { WeaDialog, WeaLocaleProvider, WeaTable } from "ecCom"; +import { Button, Col, Row } from "antd"; + +const { getLabel } = WeaLocaleProvider; + +class EmployeeDeclareDetailCalcDialog extends Component { + + render() { + return ( + + + {getLabel(111, "报送失败数据详情")} + + + + + )} + style={{ + width: 1150, + height: 606.6, + minHeight: 200, + minWidth: 380, + maxHeight: "90%", + maxWidth: "90%", + overflow: "hidden", + transform: "translate(0px, 0px)" + }} + > +
+ +
+
+ ); + } +} + +export default EmployeeDeclareDetailCalcDialog; diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js index 55f278e7..dc483a65 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js @@ -7,11 +7,37 @@ import React, { Component } from "react"; import { WeaLocaleProvider, WeaSlideModal } from "ecCom"; import { Button, Col, Row } from "antd"; +import { inject, observer } from "mobx-react"; +import { declareConditions } from "../constants"; +import { getSearchs } from "../../../util"; const { getLabel } = WeaLocaleProvider; +@inject("employeeDeclareStore") +@observer class EmployeeDeclareDetailSchemaEditDialog extends Component { + componentDidMount() { + const { employeeDeclareStore: { declareForm } } = this.props; + declareForm.initFormFields(declareConditions); + } + + componentWillReceiveProps(nextProps, nextContext) { + } + + handleSubmit = () => { + const { employeeDeclareStore: { declareForm: form } } = this.props; + form.validateForm().then(f => { + if (f.isValid) { + const payload = form.getFormParams(); + console.log(payload); + } else { + f.showErrors(); + } + }); + }; + render() { + const { employeeDeclareStore: { declareForm: form } } = this.props; return ( - - + +
{getLabel(111, "本月新增数据")} - + + + )} - content={(
Content
)} + content={(
{getSearchs(form, declareConditions, 1)}
)} /> ); } diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js index ab5a82c6..9134619a 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/constants.js @@ -26,6 +26,7 @@ export const submitStatus = [ } ]; + export const advanceConditions = [ { items: [ @@ -185,3 +186,67 @@ export const advanceConditions = [ defaultshow: true } ]; + +export const declareConditions = [ + { + items: [ + { + colSpan: 2, + fieldcol: 12, + labelcol: 6, + rules: "selectLinkageRequired", + conditionType: "SELECT_LINKAGE", + selectLinkageDatas: { + "1": { + browserConditionParam: { + completeParams: {}, + conditionDataParams: {}, + dataParams: {}, + destDataParams: {}, + hasAddBtn: false, + hasAdvanceSerach: true, + idSeparator: ",", + isAutoComplete: 1, + isDetail: 0, + isMultCheckbox: false, + isSingle: true, + linkUrl: "", + pageSize: 10, + quickSearchName: "", + replaceDatas: [], + title: "", + type: "1" + }, + conditionType: "BROWSER", + domkey: ["INPUT"] + }, + "2": { + conditionType: "CHECKBOX", + domkey: ["CHECKBOX"] + } + }, + options: [ + { key: "1", showname: "今天" }, + { key: "2", showname: "本周" } + ], + domkey: ["secleve"], + label: "系统名称", + lanId: 111, + viewAttr: 3 + }, + { + colSpan: 1, + conditionType: "INPUT", + domkey: ["keyword"], + fieldcol: 12, + label: "证件姓名", + lanId: 111, + labelcol: 6, + value: "", + rules: "required", + viewAttr: 3 + } + ], + defaultshow: true + } +]; diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js index 10474d27..022bbf27 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js @@ -8,6 +8,7 @@ import React, { Component } from "react"; import { WeaDatePicker, WeaLocaleProvider, WeaSelect, WeaTab, WeaTop } from "ecCom"; import { Button, Dropdown, Menu, Spin } from "antd"; import BaseInfo from "./components/baseInfo"; +import EmployeeDeclareDetailSchemaEditDialog from "./components/employeeDeclareDetailSchemaEditDialog"; import { advanceConditions, submitStatus } from "./constants"; import { getSearchs } from "../../util"; import { inject, observer } from "mobx-react"; @@ -25,7 +26,10 @@ class Index extends Component { selectedKey: "0", showSearchAd: false, declareStatus: "ALL", - taxCycle: new Date() + taxCycle: new Date(), + declareEditDialog: { + visible: false + } }; } @@ -34,12 +38,17 @@ class Index extends Component { document.title = getLabel(544289, "人员信息报送"); advanceForm.initFormFields(advanceConditions); window.addEventListener("message", this.handleReceive, false); + this.setCss(); } componentWillUnmount() { window.removeEventListener("message", this.handleReceive, false); } + setCss = () => { + $($("head")[0]).append(""); + }; + handleReceive = ({ data }) => { const { type, payload: { id, params } = {} } = data; if (type === "init") { @@ -55,9 +64,16 @@ class Index extends Component { const childFrameObj = document.getElementById("atdTable"); childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({}), "*"); }; + handleAdd = () => { + this.setState({ + declareEditDialog: { + visible: true + } + }); + }; render() { - const { selectedKey, showSearchAd, declareStatus, taxCycle } = this.state; + const { selectedKey, showSearchAd, declareStatus, taxCycle, declareEditDialog } = this.state; const { taxAgentStore: { showOperateBtn }, employeeDeclareStore: { advanceForm: form } } = this.props; const menu = ( @@ -100,6 +116,7 @@ class Index extends Component { advanceHeight={300} searchsAd={getSearchs(form, toJS(advanceConditions), 2)} buttons={[ {getLabel(32935, "导入")} @@ -126,6 +143,17 @@ class Index extends Component { id="atdTable" /> + {/*新增编辑报送信息*/} + { + this.setState({ + declareEditDialog: { + visible: false + } + }); + }} + /> diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less index d303eded..946f67aa 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less @@ -70,15 +70,92 @@ } -.ant-calendar-picker-container { - right: 0 !important; - left: auto !important; +//.ant-calendar-picker-container { +// right: 0 !important; +// left: auto !important; +//} + +.wea-slide-modal-title { + border-bottom: 1px solid #e5e5e5 !important; +} + +.wea-slide-modal-content { + height: 100%; +} + +.declareSchemeDialogTitle { + border-bottom: 1px solid #e5e5e5; + + .declareSchemeDialogTitle-left { + text-align: left; + padding-left: 16px; + + .icon-circle-base { + background: rgb(241, 74, 45); + } + + .title { + color: #111; + font-weight: 700; + } + } + + .declareSchemeDialogTitle-right { + text-align: right; + padding-right: 56px; + } } .declareSchemeDialog { height: 100%; padding: 16px; overflow-y: auto; + background: #f6f6f6; + + .wea-search-group .wea-content { + padding: 0; + } + + .wea-search-group { + border: 1px solid #e5e5e5; + border-bottom: none; + background: #fff; + + .wea-form-item { + padding: 5px 16px; + border-bottom: 1px solid #e5e5e5; + } + } + + .wea-search-group, .wea-form-cell { + padding: 0; + } +} + +.declareCalcDialog { + .declareCalcDialogTitle { + display: flex; + align-items: center; + + .declareCalcDialogTitle-left { + text-align: left; + + .title { + color: #111; + font-weight: 700; + } + } + + .declareCalcDialogTitle-right { + text-align: right; + } + } + + .declareCalcDialogContent { + height: 100%; + padding: 16px; + background: #f6f6f6; + } } .flex { diff --git a/pc4mobx/hrmSalary/stores/employeeDeclare.js b/pc4mobx/hrmSalary/stores/employeeDeclare.js index 9566d8c9..d4e9961e 100644 --- a/pc4mobx/hrmSalary/stores/employeeDeclare.js +++ b/pc4mobx/hrmSalary/stores/employeeDeclare.js @@ -5,6 +5,7 @@ const { TableStore } = WeaTableNew; export class EmployeeDeclareStore { @observable advanceForm = new WeaForm(); //人员信息报送详情页面,高级搜索form实例 + @observable declareForm = new WeaForm(); //人员信息报送详情页面,新增编辑报送信息form实例 @observable tableStore = new TableStore(); @action("...")