From bc952ecaad62c2f4aa527be953de1aa0f0e8a4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 25 Aug 2023 14:42:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=9C=A8=E7=BA=BF=E7=94=B3?=
 =?UTF-8?q?=E6=8A=A5-=E7=94=B3=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/calculateDetail/index.less | 14 +++++++++++++-
 .../components/employeeDeclareDetailCalcDialog.js  |  2 +-
 .../hrmSalary/pages/employeedeclareDetail/index.js |  8 ++++----
 .../salary/components/taxFillingInfoDialog.js      |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.less b/pc4mobx/hrmSalary/pages/calculateDetail/index.less
index f821272b..ebc70aec 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.less
@@ -8,7 +8,19 @@
 
   .formWrapper {
     line-height: 40px;
-    border-bottom: 1px solid #eee;
+    border: 1px solid #eee;
+
+    .ant-col-12 {
+      padding: 0 16px;
+    }
+
+    & > div:first-child {
+      border-bottom: 1px solid #eee;
+
+      & > div:first-child {
+        border-right: 1px solid #e5e5e5;
+      }
+    }
   }
 
   .operateBarWrapper {
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js
index f4fa0756..9d6a18e8 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailCalcDialog.js
@@ -73,7 +73,7 @@ class EmployeeDeclareDetailCalcDialog extends Component {
             <span className="title">{getLabel(111, "报送失败数据详情")}</span>
           </Col>
           <Col span={12} className="declareCalcDialogTitle-right">
-            <Button type="primary" onClick={this.handleSubmit}>{getLabel(81272, "导出全部")}</Button>
+            {/*<Button type="primary" onClick={this.handleSubmit}>{getLabel(81272, "导出全部")}</Button>*/}
           </Col>
         </Row>)}
         style={{
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
index 97da8170..73539c8d 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
@@ -388,9 +388,9 @@ class Index extends Component {
     const menu = (
       <Menu onClick={this.handleMenuClick}>
         <Menu.Item key="1">{getLabel(32136, "批量删除")}</Menu.Item>
-        <Menu.Item key="2">{getLabel(111, "批量编辑")}</Menu.Item>
-        <Menu.Item key="3">{getLabel(81272, "导出全部")}</Menu.Item>
-        <Menu.Item key="4">{getLabel(543715, "导出所选")}</Menu.Item>
+        {/*<Menu.Item key="2">{getLabel(111, "批量编辑")}</Menu.Item>*/}
+        {/*<Menu.Item key="3">{getLabel(81272, "导出全部")}</Menu.Item>*/}
+        {/*<Menu.Item key="4">{getLabel(543715, "导出所选")}</Menu.Item>*/}
       </Menu>
     );
     const buttons = [
@@ -422,7 +422,7 @@ class Index extends Component {
         onClick={this.handleAdd}
         overlay={
           <Menu>
-            <Menu.Item key="1">{getLabel(32935, "导入")}</Menu.Item>
+            {/*<Menu.Item key="1">{getLabel(32935, "导入")}</Menu.Item>*/}
           </Menu>
         }
         type="primary">{getLabel(1421, "新增")}</Dropdown.Button>,
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxFillingInfoDialog.js b/pc4mobx/hrmSalary/pages/salary/components/taxFillingInfoDialog.js
index e9b46e40..36592033 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxFillingInfoDialog.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxFillingInfoDialog.js
@@ -18,7 +18,7 @@ const { getLabel } = WeaLocaleProvider;
 class TaxFilingInfoDialofg extends Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.visible !== this.props.visible && nextProps.visible) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible && !_.isEmpty(nextProps.taxAgentTaxReturnCheckFormDTO)) {
       const { taxAgentTaxReturnCheckFormDTO, taxAgentStore: { taxfillInfoForm } } = nextProps;
       taxfillInfoForm.initFormFields(taxFillCondition);
       const fields = _.map(taxFillCondition[0].items, it => {