From 0e4587d18d124fea54a29cf603cbcc56eb00d1d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 8 Nov 2022 09:08:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A1=B9=E9=99=84=E5=8A=A0=E6=89=A3?=
 =?UTF-8?q?=E9=99=A4=E5=AF=BC=E5=85=A5=E5=AD=97=E6=AE=B5=E7=9A=84=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataAcquisition/cumDeduct/columns.js      | 72 +++++++++++++++++++
 .../specialAddDeduction/index.js              | 46 ++++++++++--
 2 files changed, 113 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
index fed2a7cb..8bb48c16 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
@@ -139,6 +139,78 @@ export const modalColumns = [
     key: "addUpIllnessMedical"
   }
 ];
+export const specialModalColumns = [
+  {
+    title: "姓名",
+    dataIndex: "username",
+    key: "username"
+  },
+  {
+    title: "个税扣缴义务人",
+    dataIndex: "taxAgentName",
+    key: "taxAgentName"
+  },
+  {
+    title: "部门",
+    dataIndex: "departmentName",
+    key: "departmentName"
+  },
+  {
+    title: "手机号",
+    dataIndex: "mobile",
+    key: "mobile"
+  },
+  {
+    title: "工号",
+    dataIndex: "jobNum",
+    key: "jobNum"
+  },
+  {
+    title: "证件号码",
+    dataIndex: "idNo",
+    key: "idNo"
+  },
+  {
+    title: "入职日期",
+    dataIndex: "hiredate",
+    key: "hiredate"
+  },
+  {
+    title: "子女教育",
+    dataIndex: "childrenEducation",
+    key: "childrenEducation"
+  },
+  {
+    title: "继续教育",
+    dataIndex: "continuingEducation",
+    key: "continuingEducation"
+  },
+  {
+    title: "住房贷款利息",
+    dataIndex: "housingLoanInterest",
+    key: "housingLoanInterest"
+  },
+  {
+    title: "住房租金",
+    dataIndex: "housingRent",
+    key: "housingRent"
+  },
+  {
+    title: "赡养老人",
+    dataIndex: "supportingElder",
+    key: "supportingElder"
+  },
+  {
+    title: "婴幼儿照护",
+    dataIndex: "infantCare",
+    key: "infantCare"
+  },
+  {
+    title: "大病医疗",
+    dataIndex: "seriousIllnessTreatment",
+    key: "seriousIllnessTreatment"
+  }
+];
 
 
 export const dataSource = [];
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
index a9b7d33c..bd97ff8b 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { Button, Col, Dropdown, Menu, message, Modal, Popover, Row } from "antd";
-import { WeaPopoverHrm, WeaSelect, WeaSlideModal, WeaTab, WeaTable, WeaTop } from "ecCom";
+import { WeaPopoverHrm, WeaSelect, WeaSlideModal, WeaTab, WeaTable, WeaTools, WeaTop } from "ecCom";
 import InlineForm from "./components/inlineForm";
 import { getSearchs, renderLoading } from "../../../util";
 import * as API from "../../../apis/special";
@@ -10,7 +10,7 @@ import AddItems from "../addItems";
 import SpecialAddContent from "./components/specialAddContent";
 import { condition } from "./components/condition";
 import ImportModal from "../../../components/importModal";
-import { modalColumns } from "../cumDeduct/columns";
+import { specialModalColumns } from "../cumDeduct/columns";
 import "./index.less";
 
 @inject("specialAddStore", "taxAgentStore")
@@ -87,6 +87,7 @@ class SpecialAddDeduction extends Component {
       this.setState({ loading: { ...loading, query: false } });
       if (status) {
         const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+        const { userid } = WeaTools.ls.getJSONObj("theme-account") || {};
         this.setState({
           pageInfo: { ...pageInfo, current, pageSize, total },
           dataSource,
@@ -123,6 +124,17 @@ class SpecialAddDeduction extends Component {
                     }}>
                       查看明细
                     </a>
+                    {
+                      (!this.props.taxAgentStore.showOperateBtn && userid == record.employeeId) &&
+                      <Popover
+                        overlayClassName="moreIconWrapper"
+                        placement="bottomRight"
+                        content={<Menu onClick={(e) => this.handleOperate(e, record)}>
+                          <Menu.Item key="edit">编辑</Menu.Item>
+                        </Menu>} title="">
+                        <i className="icon-coms-more"/>
+                      </Popover>
+                    }
                     {
                       this.props.taxAgentStore.showOperateBtn &&
                       <Popover
@@ -383,6 +395,7 @@ class SpecialAddDeduction extends Component {
       drawerParams,
       importParams
     } = this.state;
+    const { userid } = WeaTools.ls.getJSONObj("theme-account") || {};
     const { taxAgentStore, specialAddStore: { advanceForm, addForm } } = this.props;
     const { showOperateBtn, taxAgentAdminOption } = taxAgentStore;
     const rowSelection = {
@@ -504,6 +517,12 @@ class SpecialAddDeduction extends Component {
               pagination={pagination}
               loading={loading.query}
             />
+            {
+              console.log(drawerParams.editId.employeeId, userid)
+            }
+            {
+              console.log((showOperateBtn && !drawerParams.isView) || (!showOperateBtn && userid == drawerParams.editId.employeeId))
+            }
             <WeaSlideModal
               className="specialAddSlideWrapper"
               {...drawerParams}
@@ -532,9 +551,26 @@ class SpecialAddDeduction extends Component {
                     };
                     this.handleSaveSpecialList(payload);
                   }}
-                  editable={showOperateBtn && !drawerParams.isView}
+                  editable={(showOperateBtn && !drawerParams.isView)}
                   showOperateBtn={showOperateBtn}
-                  customOperate={(showOperateBtn && drawerParams.isView) ? customBtns : []}
+                  customOperate={(showOperateBtn && drawerParams.isView) ? customBtns : (!showOperateBtn && userid == drawerParams.editId.employeeId) ? [
+                    <Button type="primary" className="saveBtn" onClick={() => {
+                      const { baseInfo } = this.addItemRef.state;
+                      const bool = _.every(_.pick(baseInfo, ["taxAgentId", "employeeId"]), v => !_.isEmpty(v));
+                      if (!bool && _.isEmpty(drawerParams.editId)) {
+                        Modal.warning({
+                          title: "信息确认",
+                          content: "必要信息不完整，红色*为必填项！"
+                        });
+                        return;
+                      }
+                      const payload = {
+                        ..._.pick(baseInfo, ["taxAgentId", "employeeId", "taxAgentName"]),
+                        ...addForm.getFormParams()
+                      };
+                      this.handleSaveSpecialList(payload);
+                    }} loading={drawerParams.loading}>保存</Button>
+                  ] : []}
                 />
               }
               content={
@@ -575,7 +611,7 @@ class SpecialAddDeduction extends Component {
               <ImportModal
                 needimportSelected //下载模板需要带上导入所选项
                 params={importParams.payload}
-                columns={modalColumns}
+                columns={specialModalColumns}
                 step={importParams.step}
                 setStep={(step) => this.setState({ importParams: { ...importParams, step } })}
                 slideDataSource={importParams.slideDataSource}