From 9cacf05b6d718b04f3d9a80062128aa56b8ec580 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, 4 Apr 2023 17:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E4=BA=A7=E5=93=81-=E5=BE=80?=
 =?UTF-8?q?=E6=9C=9F=E7=B4=AF=E8=AE=A1=E6=83=85=E5=86=B5=EF=BC=88=E5=B7=A5?=
 =?UTF-8?q?=E8=B5=84=E3=80=81=E8=96=AA=E9=87=91=EF=BC=89=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=85=AC=E7=A7=AF=E9=87=91=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B9=E4=BB=A5=E5=8F=8A=E5=85=B6=E4=BB=96=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acctResult/importModal/selectFieldModal.js           | 5 ++++-
 pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js    | 2 +-
 .../pages/dataAcquisition/otherDeduct/columns.js         | 9 +++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js
index bacbe74c..f288cc35 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js
@@ -109,7 +109,10 @@ export default class SelectFieldModal extends React.Component {
 
   // 添加按钮点击回调
   handleAddClick = async () => {
-    const { status } = await this.cacheImportField();
+    //薪资核算详情页面的导入表单字段缓存功能
+    if (window.location.hash.indexOf("calculateDetail") !== -1) {
+      const { status } = await this.cacheImportField();
+    }
     this.props.onAdd(this.fieldData);
     this.props.onCancel();
   };
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
index 8bc29bd1..579cb872 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
@@ -154,7 +154,7 @@ class DataTables extends Component {
       dataSource={dataSource}
       pagination={pagination}
       loading={loading.query}
-      xWidth={getColumns.length * 120}
+      xWidth={getColumns.length * 150}
     />;
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
index cb2efd8f..6f542381 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
@@ -103,6 +103,15 @@ export const dataCollectCondition = [
         labelcol: 8,
         value: "",
         viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["privatePension"],
+        fieldcol: 14,
+        label: "个人养老金",
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
       }
     ],
     title: "数据采集",