From 44dde8cf51e1f499bee32059557e5fcf571ff899 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 6 Jan 2025 18:07:39 +0800
Subject: [PATCH] =?UTF-8?q?release/2.19.1.2501.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataAcquisition/otherDeduct/index.js      |  4 ++--
 .../otherDeduct/taxSetDialog.js               |  2 +-
 .../taxDeclareDetailImportDialog.js           | 19 +++++++++++++------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
index aa2c832e..b7785f38 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
@@ -298,14 +298,14 @@ class Index extends Component {
           items: _.map(it.items, o => ({
             ...o, label: getLabel(o.lanId, o.label),
             extraDom: !_.isEmpty(editId) &&
-              <a href="javascript:void(0);" className="extra_tax" title={getLabel(111, "添加明细")}
+              <a href="javascript:void(0);" className="extra_tax" title={getLabel(111, "添加附表")}
                  onClick={() => this.setState({
                    taxSetDialog: {
                      visible: true, dataType: o.dataType, id: editId.id,
                      label: getLabel(o.lanId, o.label)
                    }
                  })}>
-                <i className="icon-coms-mulujibenxinxi"/>
+                <i className="icon-coms02-Preview-1"/>
               </a>
           }))
         };
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js
index 3680b10a..97fbb38c 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js
@@ -104,7 +104,7 @@ class TaxSetDialog extends Component {
       selectedRowKeys, onChange: (selectedRowKeys) => this.setState({ selectedRowKeys })
     };
     return (<WeaDialog {...this.props} initLoadCss className="sys-salary-wrapper" ref={dom => this.taxSetRef = dom}
-                       title={`${getLabel(111, "数据采集明细")}（${this.props.label}）`}
+                       title={`${getLabel(111, "附表明细")}（${this.props.label}）`}
                        style={{
                          width: "60vw", height: 600, minHeight: 200, minWidth: 380, maxHeight: "90%",
                          maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclareDetailImportDialog.js b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclareDetailImportDialog.js
index bbda7660..6553f6e4 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclareDetailImportDialog.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclareDetailImportDialog.js
@@ -5,7 +5,7 @@
  * Date: 2023/12/28
  */
 import React, { Component } from "react";
-import { WeaLocaleProvider } from "ecCom";
+import { WeaCheckbox, WeaLocaleProvider } from "ecCom";
 import { message } from "antd";
 import ImportDialog from "../../../components/importDialog";
 import * as API from "../../../apis/declare";
@@ -17,7 +17,7 @@ class TaxDeclareDetailImportDialog extends Component {
     super(props);
     this.state = {
       importDialog: {
-        visible: false, title: "", nextloading: false,
+        visible: false, title: "", nextloading: false, hasData: "0",
         link: null, importResult: {}, imageId: "", taxDeclarationId: "",
         previewUrl: "/api/bs/hrmsalary/taxdeclaration/preview",
         extraPreview: { taxDeclarationId: "" }
@@ -49,16 +49,16 @@ class TaxDeclareDetailImportDialog extends Component {
       }).catch(() => this.setState({ importDialog: { ...importDialog, nextloading: false } }));
   };
   handleExportTemp = () => {
-    const { importDialog: { taxDeclarationId } } = this.state;
+    const { importDialog: { taxDeclarationId, hasData } } = this.state;
     message.destroy();
     message.loading(getLabel(111, "下载中"), 0);
-    const promise = API.taxdeclarationExportTemplate({ taxDeclarationId });
+    const promise = API.taxdeclarationExportTemplate({ taxDeclarationId, hasData: hasData === "1" });
     message.destroy();
   };
   handleCancel = () => {
     this.setState({
       importDialog: {
-        visible: false, title: "", nextloading: false,
+        visible: false, title: "", nextloading: false, hasData: "0",
         link: null, importResult: {}, imageId: "", taxDeclarationId: "",
         previewUrl: "/api/bs/hrmsalary/taxdeclaration/preview"
       }
@@ -71,10 +71,17 @@ class TaxDeclareDetailImportDialog extends Component {
       <ImportDialog
         {...importDialog} onCancel={this.handleCancel}
         onResetImportResult={() => this.setState(({
-          importDialog: { ...importDialog, importResult: {}, imageId: "" }
+          importDialog: { ...importDialog, importResult: {}, imageId: "", hasData: "0" }
         }))}
         nextCallback={imageId => this.setState({ importDialog: { ...importDialog, imageId } })}
         nextUplaodCallback={imageId => this.handleImport({ imageId })}
+        exportDataDom={
+          <WeaCheckbox
+            content={getLabel(543208, "导出现有数据")} value={importDialog.hasData}
+            helpfulTip={getLabel(111, "提示：建议先导出现有最新数据，修改后再导入")}
+            onChange={val => this.setState({ importDialog: { ...importDialog, hasData: val } })}
+          />
+        }
       />
     );
   }