From c9832d19265efa28d533ec488ee46c5064ac6667 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Mon, 28 Feb 2022 15:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4=E4=B9=89?=
 =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E9=A1=B5=E9=9D=A2=E7=BB=84=E4=BB=B6=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/common/columns.js           |   4 +-
 .../components/logViewModal/index.js          |  99 ++++++++++++++
 pc4mobx/hrmSalary/pages/taxAgent/editModal.js |  52 +++++++
 pc4mobx/hrmSalary/pages/taxAgent/index.js     | 129 ++----------------
 4 files changed, 165 insertions(+), 119 deletions(-)
 create mode 100644 pc4mobx/hrmSalary/components/logViewModal/index.js
 create mode 100644 pc4mobx/hrmSalary/pages/taxAgent/editModal.js

diff --git a/pc4mobx/hrmSalary/common/columns.js b/pc4mobx/hrmSalary/common/columns.js
index 3d539244..2ca2a203 100644
--- a/pc4mobx/hrmSalary/common/columns.js
+++ b/pc4mobx/hrmSalary/common/columns.js
@@ -34,4 +34,6 @@ export const logColumns = [
         dataIndex: 'title',
         key: 'title',
     }
-]
\ No newline at end of file
+]
+
+export const dataSource = [];
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/components/logViewModal/index.js b/pc4mobx/hrmSalary/components/logViewModal/index.js
new file mode 100644
index 00000000..d95ceb25
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/logViewModal/index.js
@@ -0,0 +1,99 @@
+import React from 'react'
+import { Button, Modal } from 'antd';
+import { WeaInput, WeaRangePicker, WeaTable} from 'ecCom'
+import { logColumns, dataSource } from "../../common/columns"
+
+export default class LogViewModal extends React.Component {
+    constructor(props) {
+        super(props)
+        this.state ={
+            value: ""
+        }
+    }
+    render() {
+        return (
+        <Modal title="操作日志" visible={this.props.visible}
+          onOk={() => alert("ok")} onCancel={this.props.onCancel}
+          className="logViewModal"
+          style={{ top: 150 }}
+          width={'80%'} height={'50%'}
+        >
+          <div className="searchBar">
+            <div className="searchBarItem searchDateRange">
+              <div className="searchBarLabel">操作时间</div>
+              <div>
+                <WeaRangePicker
+                  value={["2019-02-03", "2019-03-08"]}
+                  onChange={v => this.setState({ value: v })}
+                />
+              </div>
+            </div>
+            <div className="searchBarItem">
+              <div className="searchBarLabel">操作人</div>
+              <div>
+              <WeaInput
+                id="test"
+                style={{ width: 200 }}
+                value={this.state.value}
+                onChange={value => {
+                  console.log(value);
+                  this.setState({ value });
+                }}
+                customBlur={v => {
+                  console.log("custom blur", v);
+                }}
+                onFocus={v => console.log("focus", v)}
+                onBlur={v => console.log("blur", v)}
+              />
+              </div>
+            </div>
+
+            <div className="searchBarItem">
+              <div className='searchBarLabel'>对象</div>
+              <div>
+              <WeaInput
+                id="test"
+                style={{ width: 200 }}
+                value={this.state.value}
+                onChange={value => {
+                  console.log(value);
+                  this.setState({ value });
+                }}
+                customBlur={v => {
+                  console.log("custom blur", v);
+                }}
+                onFocus={v => console.log("focus", v)}
+                onBlur={v => console.log("blur", v)}
+              />
+              </div>
+            </div>
+
+            <div className="searchBarItem">
+              <div className='searchBarLabel'>操作类型</div>
+              <div>
+              <WeaInput
+                id="test"
+                style={{ width: 200 }}
+                value={this.state.value}
+                onChange={value => {
+                  console.log(value);
+                  this.setState({ value });
+                }}
+                customBlur={v => {
+                  console.log("custom blur", v);
+                }}
+                onFocus={v => console.log("focus", v)}
+                onBlur={v => console.log("blur", v)}
+              />
+              </div>
+            </div>
+            
+            <div className="searchBarItem">
+              <Button type="primary" className="searchBtn">搜索</Button>
+            </div>
+          </div>
+          <WeaTable columns={logColumns} dataSource={dataSource} />
+        </Modal>
+        )
+    }
+}
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
new file mode 100644
index 00000000..538d985b
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
@@ -0,0 +1,52 @@
+import React from 'react'
+import { Button, Modal } from 'antd';
+import { WeaInput, WeaRangePicker, WeaTable } from 'ecCom'
+import { logColumns, dataSource } from "../../common/columns"
+
+export default class EditModal extends React.Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            value: ""
+        }
+    }
+    render() {
+        return (
+            <Modal title={this.props.title} visible={modelVisiable}
+                onOk={() => alert("ok")} onCancel={this.props.onCancel}
+            >
+                <Row gutter={16}>
+                    <Col span={6}>
+                        <div className="formLabel">名称:</div>
+                    </Col>
+                    <Col span={18}>
+                        <WeaInput
+                            id="name"
+                            value={this.state.value}
+                            onChange={value => {
+                                console.log(value);
+                                this.setState({ value });
+                            }}
+                            customBlur={v => {
+                                console.log("custom blur", v);
+                            }}
+                            onFocus={v => console.log("focus", v)}
+                            onBlur={v => console.log("blur", v)}
+                        />
+                    </Col>
+
+
+                </Row>
+
+                <Row gutter={16} style={{ marginTop: "16px" }}>
+                    <Col span={6}>
+                        <div className="formLabel">备注:</div>
+                    </Col>
+                    <Col span={18}>
+                        <WeaTextarea value={this.state.value} onChange={(value) => { this.setState({ value }) }} />
+                    </Col>
+                </Row>
+            </Modal>
+        )
+    }
+}
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js
index 84e29886..f89ef9e1 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/index.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js
@@ -15,6 +15,7 @@ import "./index.less"
 import { columns, dataSource } from './columns';
 
 import { logColumns } from '../../common/columns'
+import LogViewModal from '../../components/logViewModal';
 
 const { MonthPicker } = DatePicker;
 
@@ -132,125 +133,17 @@ export default class TaxAgent extends React.Component {
           </WeaTop>
         </WeaRightMenu>
 
-        <Modal title="新增个税扣缴义务人" visible={modelVisiable}
-          onOk={() => alert("ok")} onCancel={() => setModelVisiable(false)}
-        >
-          <Row gutter={16}>
-            <Col span={6}>
-              <div className="formLabel">名称:</div>
-            </Col>
-            <Col span={18}>
-              <WeaInput
-                id="name"
-                value={this.state.value}
-                onChange={value => {
-                  console.log(value);
-                  this.setState({ value });
-                }}
-                customBlur={v => {
-                  console.log("custom blur", v);
-                }}
-                onFocus={v => console.log("focus", v)}
-                onBlur={v => console.log("blur", v)}
-              />
-            </Col>
+          
+        <EditModal 
+          title={"新增个税扣缴义务人"}
+          visible={this.state.modelVisiable}
+          onCancel={this.setState({modelVisiable: false})}
+        />
 
-            
-          </Row>
-
-          <Row gutter={16} style={{marginTop: "16px"}}>
-          <Col span={6}>
-              <div className="formLabel">备注:</div>
-            </Col>
-            <Col span={18}>
-              <WeaTextarea value={this.state.value} onChange={(value) => { this.setState({ value }) }} />
-            </Col>
-         </Row>
-        </Modal>
-
-
-        <Modal title="操作日志" visible={this.state.logViewVisiable}
-          onOk={() => alert("ok")} onCancel={()=>{this.setState({logViewVisiable: false})}}
-          className="logViewModal"
-          style={{ top: 150 }}
-          width={'80%'} height={'50%'}
-        >
-          <div className="searchBar">
-            <div className="searchBarItem searchDateRange">
-              <div className="searchBarLabel">操作时间</div>
-              <div>
-                <WeaRangePicker
-                  value={["2019-02-03", "2019-03-08"]}
-                  onChange={v => this.setState({ value: v })}
-                />
-              </div>
-            </div>
-            <div className="searchBarItem">
-              <div className="searchBarLabel">操作人</div>
-              <div>
-              <WeaInput
-                id="test"
-                style={{ width: 200 }}
-                value={this.state.value}
-                onChange={value => {
-                  console.log(value);
-                  this.setState({ value });
-                }}
-                customBlur={v => {
-                  console.log("custom blur", v);
-                }}
-                onFocus={v => console.log("focus", v)}
-                onBlur={v => console.log("blur", v)}
-              />
-              </div>
-            </div>
-
-            <div className="searchBarItem">
-              <div className='searchBarLabel'>对象</div>
-              <div>
-              <WeaInput
-                id="test"
-                style={{ width: 200 }}
-                value={this.state.value}
-                onChange={value => {
-                  console.log(value);
-                  this.setState({ value });
-                }}
-                customBlur={v => {
-                  console.log("custom blur", v);
-                }}
-                onFocus={v => console.log("focus", v)}
-                onBlur={v => console.log("blur", v)}
-              />
-              </div>
-            </div>
-
-            <div className="searchBarItem">
-              <div className='searchBarLabel'>操作类型</div>
-              <div>
-              <WeaInput
-                id="test"
-                style={{ width: 200 }}
-                value={this.state.value}
-                onChange={value => {
-                  console.log(value);
-                  this.setState({ value });
-                }}
-                customBlur={v => {
-                  console.log("custom blur", v);
-                }}
-                onFocus={v => console.log("focus", v)}
-                onBlur={v => console.log("blur", v)}
-              />
-              </div>
-            </div>
-            
-            <div className="searchBarItem">
-              <Button type="primary" className="searchBtn">搜索</Button>
-            </div>
-          </div>
-          <WeaTable columns={logColumns} dataSource={dataSource} />
-        </Modal>
+        <LogViewModal 
+          visible={this.state.logViewVisiable}
+          onCancel={() => {this.setState({logViewVisiable: false})}}
+        />
       </div>
     )
   }