From 133ded004464811d14d90c629f9d07db8cab6da9 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Mon, 28 Feb 2022 16:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8A=BD=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/taxAgent/editModal.js |  8 +++-----
 pc4mobx/hrmSalary/pages/taxAgent/index.js     | 11 ++++++-----
 pc4mobx/hrmSalary/stores/taxAgent.js          |  5 -----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
index 538d985b..00158928 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import { Button, Modal } from 'antd';
-import { WeaInput, WeaRangePicker, WeaTable } from 'ecCom'
+import { Button, Modal, Row, Col } from 'antd';
+import { WeaTextarea, WeaInput } from "ecCom";
 import { logColumns, dataSource } from "../../common/columns"
 
 export default class EditModal extends React.Component {
@@ -12,7 +12,7 @@ export default class EditModal extends React.Component {
     }
     render() {
         return (
-            <Modal title={this.props.title} visible={modelVisiable}
+            <Modal title={this.props.title} visible={this.props.visible}
                 onOk={() => alert("ok")} onCancel={this.props.onCancel}
             >
                 <Row gutter={16}>
@@ -34,8 +34,6 @@ export default class EditModal extends React.Component {
                             onBlur={v => console.log("blur", v)}
                         />
                     </Col>
-
-
                 </Row>
 
                 <Row gutter={16} style={{ marginTop: "16px" }}>
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js
index f89ef9e1..c871f6ab 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/index.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js
@@ -16,6 +16,7 @@ import { columns, dataSource } from './columns';
 
 import { logColumns } from '../../common/columns'
 import LogViewModal from '../../components/logViewModal';
+import EditModal from './editModal'
 
 const { MonthPicker } = DatePicker;
 
@@ -28,7 +29,8 @@ export default class TaxAgent extends React.Component {
       value: "",
       selectedKey: "0",
       searchValue: "",
-      logViewVisiable: false
+      logViewVisiable: false,
+      modalVisiable: false
     }
   }
 
@@ -74,7 +76,7 @@ export default class TaxAgent extends React.Component {
 
     const renderSearchOperationItem = () => {
       return <div>
-        <Button type="primary" onClick={() => { setModelVisiable(true) }}>新增</Button>
+        <Button type="primary" onClick={() => { this.setState({modalVisiable: true}) }}>新增</Button>
         {'  '}
         <WeaInputSearch
           value={this.state.searchValue}
@@ -132,12 +134,11 @@ export default class TaxAgent extends React.Component {
 
           </WeaTop>
         </WeaRightMenu>
-
           
         <EditModal 
           title={"新增个税扣缴义务人"}
-          visible={this.state.modelVisiable}
-          onCancel={this.setState({modelVisiable: false})}
+          visible={this.state.modalVisiable}
+          onCancel={() => {this.setState({modalVisiable: false})}}
         />
 
         <LogViewModal 
diff --git a/pc4mobx/hrmSalary/stores/taxAgent.js b/pc4mobx/hrmSalary/stores/taxAgent.js
index 53904327..22699f10 100644
--- a/pc4mobx/hrmSalary/stores/taxAgent.js
+++ b/pc4mobx/hrmSalary/stores/taxAgent.js
@@ -15,11 +15,6 @@ export class TaxAgentStore {
   @observable showSearchAd = false; // 高级搜索面板显示
   @observable loading = true; // 数据加载状态
 
-  @observable modelVisiable = false; // 对话框显示隐藏
-
-  @action
-  setModelVisiable = visiable => this.modelVisiable = visiable
-
   // 初始化操作
   @action
   doInit = () => {