From fabe3561fdda7605d2b9bb5deebe092de2d55e0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 9 Oct 2023 15:55:28 +0800
Subject: [PATCH] =?UTF-8?q?custom-=E8=89=BE=E5=BF=97=E5=B7=A5=E4=B8=9A-?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataAcquisition/cumDeduct/columns.js      | 18 ++++++------
 .../dataAcquisition/cumSituation/columns.js   | 28 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
index 8a35e6e9..b6617b7d 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
@@ -315,15 +315,15 @@ export const situationModalColumns = [
     key: "addUpSubtraction"
   },
   {
-    title: "累计社保个人合计",
+    title: "累计专项扣除",
     dataIndex: "addUpSocialSecurityTotal",
     key: "addUpSocialSecurityTotal"
   },
-  {
-    title: "累计公积金个人合计",
-    dataIndex: "addUpAccumulationFundTotal",
-    key: "addUpAccumulationFundTotal"
-  },
+  // {
+  //   title: "累计公积金个人合计",
+  //   dataIndex: "addUpAccumulationFundTotal",
+  //   key: "addUpAccumulationFundTotal"
+  // },
   {
     title: "累计子女教育",
     dataIndex: "addUpChildEducation",
@@ -355,7 +355,7 @@ export const situationModalColumns = [
     key: "addUpEnterpriseAndOther"
   },
   {
-    title: "累计其他免税扣除",
+    title: "累计其他扣除",
     dataIndex: "addUpOtherDeduction",
     key: "addUpOtherDeduction"
   },
@@ -365,7 +365,7 @@ export const situationModalColumns = [
     key: "addUpTaxExemptIncome"
   },
   {
-    title: "累计准予扣除的捐赠额",
+    title: "累计准予扣除的捐赠",
     dataIndex: "addUpAllowedDonation",
     key: "addUpAllowedDonation"
   },
@@ -375,7 +375,7 @@ export const situationModalColumns = [
     key: "addUpTaxSavings"
   },
   {
-    title: "累计已预扣预缴税额",
+    title: "已缴税额",
     dataIndex: "addUpAdvanceTax",
     key: "addUpAdvanceTax"
   },
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
index 7ebb597d..02288b8b 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
@@ -92,23 +92,23 @@ export const dataCollectCondition = [
         conditionType: "INPUTNUMBER",
         domkey: ["addUpSocialSecurityTotal"],
         fieldcol: 14,
-        label: "累计社保个人合计",
-        labelcol: 8,
-        value: "",
-        precision: 2,
-        viewAttr: 2
-      },
-      {
-        conditionType: "INPUTNUMBER",
-        domkey: ["addUpAccumulationFundTotal"],
-        fieldcol: 14,
-        label: "累计公积金个人合计",
+        label: "累计专项扣除",
         labelcol: 8,
         value: "",
         precision: 2,
         viewAttr: 2
       },
 
+      // {
+      //   conditionType: "INPUTNUMBER",
+      //   domkey: ["addUpAccumulationFundTotal"],
+      //   fieldcol: 14,
+      //   label: "累计公积金个人合计",
+      //   labelcol: 8,
+      //   value: "",
+      //   precision: 2,
+      //   viewAttr: 2
+      // },
       // {
       //   conditionType: "INPUTNUMBER",
       //   domkey: ["addUpChildEducation"],
@@ -184,7 +184,7 @@ export const dataCollectCondition = [
         conditionType: "INPUTNUMBER",
         domkey: ["addUpOtherDeduction"],
         fieldcol: 14,
-        label: "累计其他免税扣除",
+        label: "累计其他扣除",
         labelcol: 8,
         value: "",
         precision: 2,
@@ -204,7 +204,7 @@ export const dataCollectCondition = [
         conditionType: "INPUTNUMBER",
         domkey: ["addUpAllowedDonation"],
         fieldcol: 14,
-        label: "累计准予扣除的捐赠额",
+        label: "累计准予扣除的捐赠",
         labelcol: 8,
         value: "",
         precision: 2,
@@ -224,7 +224,7 @@ export const dataCollectCondition = [
         conditionType: "INPUTNUMBER",
         domkey: ["addUpAdvanceTax"],
         fieldcol: 14,
-        label: "累计已预扣预缴税额",
+        label: "已缴税额",
         labelcol: 8,
         value: "",
         precision: 2,