From 78dda90119b6ba8ed6c16f7bc05568b68fac8b03 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Mon, 18 Apr 2022 09:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/importModal/modalStep1.js      |   2 +-
 pc4mobx/hrmSalary/index.js                    |   2 +
 pc4mobx/hrmSalary/pages/payroll/index.js      |  69 +++++++++++++++---
 .../pages/payroll/stepForm/showSettingForm.js |   2 +-
 .../payroll/templatePreview/computer.png      | Bin 0 -> 2524 bytes
 .../templatePreview/computerTemplate/index.js |  21 ++++++
 .../pages/payroll/templatePreview/index.js    |  39 ++++++++++
 .../pages/payroll/templatePreview/index.less  |  27 +++++++
 .../payroll/templatePreview/phone_new.png     | Bin 0 -> 2450 bytes
 9 files changed, 150 insertions(+), 12 deletions(-)
 create mode 100644 pc4mobx/hrmSalary/pages/payroll/templatePreview/computer.png
 create mode 100644 pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
 create mode 100644 pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js
 create mode 100644 pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
 create mode 100644 pc4mobx/hrmSalary/pages/payroll/templatePreview/phone_new.png

diff --git a/pc4mobx/hrmSalary/components/importModal/modalStep1.js b/pc4mobx/hrmSalary/components/importModal/modalStep1.js
index 3c810b47..16bf8b7b 100644
--- a/pc4mobx/hrmSalary/components/importModal/modalStep1.js
+++ b/pc4mobx/hrmSalary/components/importModal/modalStep1.js
@@ -28,7 +28,7 @@ export default class ModalStep1 extends React.Component {
         const dragger = {
             name: 'file',
             multiple: false,
-            action: "handleCancel",	//上传地址
+            action: "/api/doc/upload/uploadFile",	//上传地址
             onChange: (info) => {
                 const { status } = info.file;
                 if (status !== 'uploading') {
diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js
index 55ccf955..091a8b90 100644
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@@ -24,6 +24,7 @@ import PlaceOnFileDetail from './pages/calculateDetail/placeOnFileDetail';
 import CompareDetail from './pages/calculateDetail/compareDetail'
 import GenerateDeclarationDetail from './pages/declare/generateDeclarationDetail'
 import BaseForm from './components';
+import TemplatePreview from './pages/payroll/templatePreview'
 
 
 import stores from './stores';
@@ -93,6 +94,7 @@ const Routes = (
     <Route key='payroll' path='payroll' component={Payroll} />
     <Route key='payrollGrant' path='payrollGrant' component={PayrollGrant} />
     <Route key="payrollDetail" path="payrollDetail" component={PayrollDetail} />
+    <Route key="templatePreview" path="templatePreview" component={TemplatePreview} />
     <Route key='declare' path='declare' component={Declare} />
     <Route key='generateDeclarationDetail' path='generateDeclarationDetail' component={GenerateDeclarationDetail} />
     
diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js
index 3ffac0c0..bcc5aaa4 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/index.js
@@ -32,10 +32,8 @@ export default class Payroll extends React.Component {
     this.state = {
       value: "",
       selectedKey: "0",
-      startDate: moment(new Date()).format("YYYY-MM"),
-      endDate: moment(new Date()).format("YYYY-MM"),
-      selectedKey: "0",
-      stepSlideVisible: false,
+      startDate: "",
+      endDate: "",
       currentStep: 0,
       stepSlideVisible: false,
       selectedTab: 0,
@@ -49,12 +47,12 @@ export default class Payroll extends React.Component {
     }
     columns.map(item => {
       if(item.dataIndex == "cz") {
-        item.render = () => {
+        item.render = (text, record) => {
           return (
             <div>
               <a onClick={() => {window.open("/spa/hrmSalary/static/index.html#/main/hrmSalary/payrollGrant")}}>工资单发放</a>
-              <a style={{marginLeft: "10px"}}>查看详情</a>
-              <a style={{marginLeft: "10px"}}>更新模板</a>
+              <a onClick={window.open("/spa/hrmSalary/static/index.html#/main/hrmSalary/payrollDetail")}>查看详情</a>
+              <a onClick={this.handleUpdateTemplate(record)}>更新模板</a>
             </div>
           )
         }
@@ -83,6 +81,17 @@ export default class Payroll extends React.Component {
     })
   }
 
+  // 更新模板
+  handleUpdateTemplate(record) {
+    alert(JSON.stringify(record))
+    this.setState({
+      selectedKey: "1",
+      editSlideVisible: true,
+      templateCurrentId: record.templateId
+
+    })
+  }
+
   // 工资单模板-新建表单变化监听
   handleBaseInfoChange(request) {
     const { payrollStore: {setTemplateBaseData}} = this.props;
@@ -167,6 +176,46 @@ export default class Payroll extends React.Component {
       },
     });
   }
+
+  // 开始日期修改
+  handleStartDateChange(value) {
+    this.setState({
+      startDate: value
+    })
+
+    const { payrollStore } = this.props;
+    const { getPayrollList } = payrollStore;
+    let salaryYearMonth = []
+    if(value != "") {
+      salaryYearMonth.push(value)
+    }
+    if(this.state.endDate != "") {
+      salaryYearMonth.push(this.state.endDate);
+    }
+    getPayrollList({salaryYearMonth})
+
+  } 
+
+  // 结束日期修改
+  handleEndDateChange(value) {
+    this.setState({endDate: value})
+    const { payrollStore } = this.props;
+    const { getPayrollList } = payrollStore;
+    let salaryYearMonth = []
+    if(this.state.startDate != "") {
+      salaryYearMonth.push(this.state.startDate)
+    }
+    if(value != "") {
+      salaryYearMonth.push(value)
+    }
+    getPayrollList({salaryYearMonth})
+  }
+
+
+  // 预览
+  handlePreview() {
+    window.open("/spa/hrmSalary/static/index.html#/main/hrmSalary/templatePreview")
+  }
   
 
   render() {
@@ -219,13 +268,13 @@ export default class Payroll extends React.Component {
             <WeaDatePicker
                 format="yyyy-MM"
                 value={this.state.startDate}
-                onChange={value => this.props.onStartDateChange(value)}
+                onChange={value => this.handleStartDateChange(value)}
             />
             <span className="between"> 至 </span>
             <WeaDatePicker
                 format="yyyy-MM"
                 value={this.state.endDate}
-                onChange={value => this.props.onEndDateChange(value)}
+                onChange={value => this.handleEndDateChange(value)}
             />
           </div>
         </div>
@@ -330,7 +379,7 @@ export default class Payroll extends React.Component {
                     currentStep == 1 && <div style={{display: "inline-block"}}>
                         <Button type="default" style={{marginRight: "10px"}}>上一步</Button>
                         <Button type="primary" onClick={() => {this.handleSave()}}>保存</Button>
-                        <Button type="default" style={{marginLeft: "10px"}}>预览</Button>
+                        <Button type="default" style={{marginLeft: "10px"}} onClick={() => {this.handlePreview()}}>预览</Button>
                     </div>
                 }
             </div>
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
index 07d3eefd..345de372 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/showSettingForm.js
@@ -82,7 +82,7 @@ export default class ShowSettingForm extends React.Component {
                             </Col>
                         </Row>
                         <Row className="formItem">
-                            <Col span={4}>工资单主题</Col>
+                            <Col span={4}>工资单背景</Col>
                             <Col span={20}>
                                 <BackgroundUpload imageUrl={background} onChange={(value) => {this.handleChange({background: value})}}/>
                                 {/* <Dragger {...dropProps} style={{width: "100px"}}>
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computer.png b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computer.png
new file mode 100644
index 0000000000000000000000000000000000000000..535b91b90a1ef9112aa76a9f4fa35897e4e7d80f
GIT binary patch
literal 2524
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
F{t4uE3yc5&

literal 0
HcmV?d00001

diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
new file mode 100644
index 00000000..6c5281a5
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
@@ -0,0 +1,21 @@
+import React from 'react'
+
+export default class ComputerTemplate extends React.Component {
+    
+    render() {
+        return (
+            <div className="computerTemplate">
+                <div className="titleWrapper">
+                    测试标题
+                </div>
+                <div className="background-wrapper">
+
+                </div>
+
+                <div className="sobItemWrapper">
+                    
+                </div>
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js
new file mode 100644
index 00000000..25a04f85
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.js
@@ -0,0 +1,39 @@
+import React from 'react'
+import phone from './phone_new.png'
+import computer from './computer.png'
+import './index.less'
+
+export default class TemplatePreview extends React.Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            selectKey: "0"
+        }
+    }
+
+    handleSelectClick(selectKey) {
+        this.setState({selectKey})
+    }
+    
+    render() {
+        const { selectKey } = this.state;
+        return (
+            <div className="templatePreview">
+                <div className="headerWrapper">
+                    <div className="iconsWrapper">
+                        <div onClick={() => {this.handleSelectClick("0")}} className={selectKey == "0" ? "iconWrapper activeIconWrapper" : "iconWrapper" }>
+                            <img src={computer} />
+                        </div>
+                        <div onClick={() => {this.handleSelectClick("1")}} className={selectKey == "1" ? "iconWrapper activeIconWrapper" : "iconWrapper"}>
+                            <img src={phone}/>
+                        </div>
+                    </div>
+                </div>
+
+                <div className="contentWrapper">
+                    
+                </div>
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
new file mode 100644
index 00000000..3d4c23ca
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
@@ -0,0 +1,27 @@
+.templatePreview {
+    .headerWrapper {
+        background-color: #0270c1;
+        height: 55px;
+        line-height: 55px;
+        text-align: center;
+        .iconsWrapper {
+            display: inline-block;
+            width: 150px;
+            height: 55px;
+            .iconWrapper {
+                display: inline-block;
+                width: 50px;
+                height: 55px;
+                line-height: 75px;
+                text-align: center;
+                img {
+                    width: 30px;
+                    height: 30px;
+                }
+            }
+            .activeIconWrapper {
+                background-color: #1c87d3;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phone_new.png b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phone_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a1acf818fbc0308bed065255723b8e4983d4732
GIT binary patch
literal 2450
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-ahlfz!v+#WAEJ
z?(N)zeIltMt?z3YB4@qe6aT=V);3q@+NS0o47&uI)poIeo3%pF{1XFP*)FvQeKUSA
zY`8F2P3J3PU9iREo)Zb>zH^PY=he>jVY+*D`M=+De|_?=;!<m7XHh87X>8#IQZ|e%
z4_`GL@a9n9n9j~3(2~u-^qFHr^O?uTcAGgdIGP2SB%f1mQ24y#<GNk}hY7tRXJ>ro
zP&i?ew<lYfMIc4l)%ckW6Ngd1^!r;JjlP^l$0|&f?saus=ig@*^jRtSpPb<3>*r_w
zESY#jv?a%Bg5j~>f*<o-V&WXtvm+ky3w}&ayBB#l$$!(aYfU|dYKrUJk1U<+@M!OG
zp&jyq@#)W0d``PZJ06oTS9+9o`r0erQe)%%tI^j^hF=K+n$<2?`1?tP$BpI#ThII{
z>wg?xm|+c69Io`}oz{!*(NC_P*>gQ}O&HMRb8bf#cg(O``{<#%LG7+mMdSL<^P`H7
z<u%nv3d&~(Ox&g1xZddVWZ8b*`Uq*D5zmz#6;?jF9r57jnVL(9SNxi4qy*=eYb-s;
zGe7m2IPbF#zb2cGj&iFhmlE3AXI5@JD6^Jj=DxkN_MLrH_={y;%Cn!B<By#TzmUoP
z(^x6a(o#rBOyNU#+Pp}G=U0@iIE}t7snj<9>G_-Q!Z8Wq<uA{*%$1*c^U<v=!y{L2
zNiaK>?W_52E#Ua=ap<QEmWx-L6s)#wOJTXV&`m%#I@+k|MSyZg-&$Qs$C4F-F2}D;
z>rt?}!m%hh+Z!mK#d2}uR#oK=KGUWbH*QT5bZM7zEXm0|$+5_}7sZ%QGLAXjxBt5w
zziVcESE}U8*2VSqdvafV`1(BF`q!T=i^OHkZU6tV<eUFEZq487HJ|$=o32FG9G+UR
zIcZ~%;F2&!j-b{3mgS$tW-qv2B(Nl6{u_m@T#gf>YBw~Cyk>Un5<SEhv|4~=<yCfT
zkBxRf1&Tx~ICInSNB`rpHxqVOma~NZ+#qSq(ex%lqv;LDs!xd=i?Z3V`-n;bGinU(
zL^B#T0}wVg?gF<TeY3x4@l01z&>fgNzrQ?x`7t!379RIKZ(rYc_<7zNW4AQ9b?NiB
zPqp55RN(wAxyL)YSIK<Q)!}gL+S)_4%!!`8kI#{P5|(yP$IR{I(*pDSlTqKIuk^^W
zIF`BeC|EbGs*z}Vam$fFxwTH?#KG3D+awP8zw&=9;Bsey^1clU)qkVkNv?S^|Cr*5
zp0HJWSshDy6(}$EFjH_$guuI_n_^i{&(Ao$|DQu0|K(4mbN!U8PrNLM|FTB3e1a>x
z%~1muOV=OXbEO=oDgC@JL!gX(Vt8!6;K#1FEpuL^viv)B##mOM^w*5<g)Vbm2Y5A0
zf~p6$Vw>M{Z|KS;_pl3o^y^N%W`E@HnLRuH8UFjZ^dm_4yYi#mVu#n%ckmm1KKJYR
z3)K@hJAQ0+*5pmAP&Tg5HgKOWo1&H6^D)(>=FY+yqUS$^rqykF^!0!C%iMiOtprkT
zxyrd7Sslw2byLP)`H|D~yU9uSy(Tbwu5&$NuDyH1E}id-&+NIII%8UsjEB+RB$==O
zGj6=Jib$F^t=xV4ZAZS@a>+5B9lO0v{Ez(?+A(Y9_kZ74h{|0Eo6tP>Ns&uTe}}jB
zn>1eUec)=EKRe>h9Mf%LPfp|+{q1>T>oT*rbI%9c$rAU=e?}fZy#iSCD=*q3CYbMb
z<TZPIcdVf_$1hu@W$WXOKKJvU`JHpbmvht9pqa&%OdOkJyeCNsIZS9<YILax*ut=!
zrednnpup>$y5uRa;ZdaHndQOYC^hYr$7w-_2~Q&?U75hpWTG>5;xu40<@83Cm5Pik
pnGssby6y~)(~>=doSEvG{XQ)dxgVR^4QymFc)I$ztaD0e0s#KRI(z^C

literal 0
HcmV?d00001