From 9ea15a32187a1947de461c8d48f45ed82a8f5172 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Fri, 18 Mar 2022 09:41:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=8F=91=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payroll/columns.js    |  7 +-
 pc4mobx/hrmSalary/pages/payroll/index.js      | 71 ++++++++++++++++++-
 .../pages/payroll/payrollGrant/index.js       |  3 +-
 .../payrollGrant/payrollWithdrawModal.js      |  2 +-
 4 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/columns.js b/pc4mobx/hrmSalary/pages/payroll/columns.js
index b7fbb69a..c90c0788 100644
--- a/pc4mobx/hrmSalary/pages/payroll/columns.js
+++ b/pc4mobx/hrmSalary/pages/payroll/columns.js
@@ -39,8 +39,8 @@ export const columns = [
 export const tempateColumns = [
     {
         title: "工资单模板名称",
-        dataIndex: "title",
-        key: "title"
+        dataIndex: "username",
+        key: "username"
     },
     {
         title: "所属薪资账套",
@@ -195,7 +195,8 @@ export const payrollGrantDetailColumns = [
 
 export const dataSource = [
     {
-        title: "测试"
+        title: "测试",
+        username: "测试"
     }
 ];
 
diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js
index 0d49e351..e10542ea 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/index.js
@@ -12,6 +12,7 @@ import CustomTab from '../../components/customTab';
 import ContentWrapper from '../../components/contentWrapper';
 
 import { columns, dataSource, tempateColumns } from './columns';
+import StepSlide from '../../components/stepSlide'
 
 const { MonthPicker } = DatePicker;
 
@@ -25,7 +26,8 @@ export default class Payroll extends React.Component {
       selectedKey: "0",
       startDate: moment(new Date()).format("YYYY-MM"),
       endDate: moment(new Date()).format("YYYY-MM"),
-      selectedKey: "0"
+      selectedKey: "0",
+      stepSlideVisible: false
     }
     columns.map(item => {
       if(item.dataIndex == "cz") {
@@ -40,6 +42,16 @@ export default class Payroll extends React.Component {
         }
       }
     })
+
+    tempateColumns.map(item => {
+      if(item.dataIndex == "username") {
+        item.render = (text) => {
+          return (
+            <a onClick={() => {this.setState({stepSlideVisible: true})}}>{text}</a>
+          )
+        }
+      }
+    })
   }
   render() {
     const { baseTableStore } = this.props;
@@ -135,6 +147,63 @@ export default class Payroll extends React.Component {
             
           </WeaTop>
         </WeaRightMenu>
+
+        {
+              this.state.stepSlideVisible && <StepSlide 
+              visible={this.state.stepSlideVisible} 
+              currentStep={currentStep}
+              onCancel={() => {this.setState({stepSlideVisible: false})}}
+              customOperate = {
+                <div style={{display: "inline-block"}}>
+                    {
+                        currentStep == 0 && <Button type="primary" onClick={() => {nextStep()}}>保存并进入下一步</Button>
+                    }
+                    {
+                        currentStep == 1 && <div style={{display: "inline-block"}}>
+                            <Button type="default" onClick={() => {this.setState({stepSlideVisible: false})}}>完成，跳过所有步骤</Button>
+                            <Button type="primary" style={{marginLeft: "10px"}} onClick={() => {nextStep()}}>下一步</Button>
+                        </div>
+                    }
+                    {
+                      (currentStep == 2 || currentStep == 3) && <div>
+                        <Button type="default" onClick={() => {this.setState({stepSlideVisible: false})}}>完成，跳过所有步骤</Button>
+                        <Button type="default" style={{marginLeft: "10px"}} onClick={() => {prevStep()}}>上一步</Button>
+                        <Button type="primary" onClick={() => {nextStep()}}>保存并进入下一步</Button>
+                      </div>
+                    }
+                    {
+                      currentStep == 4 &&
+                      <div>
+                        <Button type="default" style={{marginRight: "10px"}} onClick={() => {prevStep()}}>上一步</Button>
+                        <Button type="primary" onClick={() => {this.setState({stepSlideVisible: false})}}>完成</Button>
+                      </div>
+                      
+                    }
+                </div>
+              }
+              title="新建账套"
+              content={
+                <div>
+                  {
+                    currentStep == 0 && <SlideBaseForm />
+                  }
+                  {
+                    currentStep == 1 && <SlideRefereUser />
+                  }
+                  {
+                    currentStep == 2 && <SalaryItemForm />
+                  }
+                  {
+                    currentStep == 3 && <CalRulesForm />
+                  }
+                  {
+                    currentStep == 4 && <ValidRulesForm />
+                  }
+                </div>
+              
+              }
+              />
+            }
       </div>
     )
   }
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index 6c8e0064..3d46494b 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -5,6 +5,7 @@ import { Menu, Button, Dropdown, Table } from 'antd'
 import CustomTab from '../../../components/customTab'
 import "./index.less"
 import PayrollGrantModal from './payrollGrantModal'
+import PayrollWithdrawModal from './payrollWithdrawModal'
 
 export default class PayrollGrant extends React.Component {
     constructor(props) {
@@ -91,7 +92,7 @@ export default class PayrollGrant extends React.Component {
                 }
 
                 {
-                    this.state.payrollWithdrawVisible && <PayrollWithDrawModal
+                    this.state.payrollWithdrawVisible && <PayrollWithdrawModal
                     visible={this.state.payrollWithdrawVisible}
                     onCancel={() => {this.setState({payrollWithdrawVisible: false})}}
                     />
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollWithdrawModal.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollWithdrawModal.js
index dc354d96..4658f935 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollWithdrawModal.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollWithdrawModal.js
@@ -3,7 +3,7 @@ import { WeaInputSearch, WeaHelpfulTip } from "ecCom"
 import { payrollGrantColumns, dataSource } from "../columns"
 import { Menu, Button,Table, Modal, Dropdown } from "antd"
 
-export default class PayrollWithDrawModal extends React.Component {
+export default class PayrollWithdrawModal extends React.Component {
     
     render() {
         const menu = (