From ea3cfbe0fc6416ff9d980d69bda69df4fe5fe52d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 24 Aug 2023 17:20:41 +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

---
 .../pages/intelligentCalculateSalarySettings/index.js      | 6 +++---
 pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js | 2 +-
 .../pages/salary/components/taxDeclarationInfo.js          | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/index.js b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/index.js
index cfd7d7fc..f6c2984c 100644
--- a/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/index.js
+++ b/pc4mobx/hrmSalary/pages/intelligentCalculateSalarySettings/index.js
@@ -6,9 +6,9 @@ import InsufficientTrafficAlert from "./components/insufficientTrafficAlert";
 const getLabel = WeaLocaleProvider.getLabel;
 const tabs = [
   { key: "ENABLE_SETTINGS", title: getLabel(111, "启用设置") },
-  { key: "INTERFACE_FLOW_STATISTICS", title: getLabel(111, "接口流量统计") },
-  { key: "INSUFFICIENT_TRAFFIC_ALERT", title: getLabel(111, "流量不足提醒") },
-  { key: "TRAFFIC_USAGE_RECORD", title: getLabel(111, "流量使用记录") }
+  // { key: "INTERFACE_FLOW_STATISTICS", title: getLabel(111, "接口流量统计") },
+  // { key: "INSUFFICIENT_TRAFFIC_ALERT", title: getLabel(111, "流量不足提醒") },
+  // { key: "TRAFFIC_USAGE_RECORD", title: getLabel(111, "流量使用记录") }
 ];
 
 class Index extends Component {
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
index 702ba603..ca7d134f 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
@@ -181,7 +181,7 @@ class TaxAgentSlide extends Component {
         CurrentDom = <BaseSettings decentralization={decentralization} isChief={isChief}/>;
         break;
       case 1:
-        CurrentDom = <TaxDeclarationInfo ref={dom => this.taxInfoRef = dom} taxAgentId={taxAgentId}/>;
+        CurrentDom = <TaxDeclarationInfo ref={dom => this.taxInfoRef = dom} taxAgentId={taxAgentId} isChief={isChief}/>;
         break;
       case 2:
         CurrentDom = <PersonalScope taxAgentId={taxAgentId}/>;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
index 219ea494..ad346f44 100644
--- a/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
@@ -37,7 +37,8 @@ class TaxDeclarationInfo extends Component {
     this.setState({
       fieldItem: _.filter(_.map(fieldList, item => ({
         ...item,
-        label: getLabel(item.lanId, item.label)
+        label: getLabel(item.lanId, item.label),
+        viewAttr: this.props.isChief ? item.viewAttr : 1
       })), it => it.key !== "account" && it.key !== "realNamePassword")
     }, () => {
       this.taxReturnGetForm();
@@ -58,10 +59,10 @@ class TaxDeclarationInfo extends Component {
               }
               return {
                 ...pre,
-                cityVal: [{ id: data[cur], name: data["cityname"] }],
                 [cur]: `${data["nation"]}-${data["province"]}-${data[cur]}`
               };
-            }, {})
+            }, {}),
+            cityVal: (data["city"] && data["cityName"]) ? [{ id: data["city"], name: data["cityName"] }] : []
           }
         });
       }