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 = ; break; case 1: - CurrentDom = this.taxInfoRef = dom} taxAgentId={taxAgentId}/>; + CurrentDom = this.taxInfoRef = dom} taxAgentId={taxAgentId} isChief={isChief}/>; break; case 2: CurrentDom = ; 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"] }] : [] } }); }