From 335624d91b167fb7b9f3817f55359e36dc2ab2ac 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, 20 Apr 2023 15:51:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E7=A4=BE=E4=BF=9D=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E5=8F=B0=E8=B4=A6=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E5=90=88=E8=AE=A1=E8=A1=8Cbug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=80=83=E6=83=85=E5=BC=95=E7=94=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/dataAcquisition/attendance/index.js          | 10 +++++-----
 .../standingBookDetail/components/normal.js            |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
index 4e5d734f..fca6e52a 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
@@ -56,17 +56,17 @@ class Index extends Component {
   };
   handleChangeSalaryMonth = (salaryMonth) => this.setState({ salaryMonth }, () => this.attendanceTableRef.getAttendanceList({ salaryYearMonth: _.compact(this.state.salaryMonth) }));
   handleAddAttendFileds = () => this.fieldMangRef.handleTriggerAttendFileds();
-  handleImportAttendanceData= ()=>{
+  handleImportAttendanceData = () => {
     this.attendanceTableRef.handleImportAttendanceData({
       visiable: true, params: {}, step: 0,
       columns: [], slideDataSource: [], importResult: []
     });
-  }
-  handleQuoteAttendanceData= ()=>{
+  };
+  handleQuoteAttendanceData = () => {
     this.attendanceTableRef.handleQuoteAttendanceData({
       visible: true, title: "引用考勤数据"
     });
-  }
+  };
 
   render() {
     const { selectedKey, salaryMonth, fieldName } = this.state;
@@ -82,7 +82,7 @@ class Index extends Component {
     return (
       <div className="attendanceRefWrapper">
         <WeaTab
-          datas={topTab} keyParam="viewcondition" selectedKey={selectedKey} buttons={buttons}
+          datas={topTab} keyParam="viewcondition" selectedKey={selectedKey} buttons={showOperateBtn ? buttons : []}
           searchType={selectedKey === "FIELD" ? ["base"] : []} searchsBasePlaceHolder="请输入字段名称"
           onChange={v => this.setState({ selectedKey: v })}
           searchsBaseValue={fieldName} onSearchChange={fieldName => this.setState({ fieldName })}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index b3b61565..08b5c839 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -78,7 +78,7 @@ export default class NormalIndex extends Component {
     if (type === "init") {
       const { selectedKey } = this.props;
       const { status, data: sysData } = await this.sysConfCodeRule();
-      const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum();
+      const { data: { sumRow: siaccountSum } } = status && sysData === "1" ? await this.siaccountDetailCommonListSum() : { data: { sumRow: {} } };
       this.setState({
         showSum: selectedKey === "1" && status && sysData === "1",
         siaccountSum
@@ -243,7 +243,7 @@ export default class NormalIndex extends Component {
   };
   getNormalList = async (payload = {}) => {
     const { status, data: sysData } = await this.sysConfCodeRule();
-    const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum();
+    const { data: { sumRow: siaccountSum } } = status && sysData === "1" ? await this.siaccountDetailCommonListSum() : { data: { sumRow: {} } };
     const { getNormalList } = this.props.standingBookStore;
     getNormalList({ ...payload }).then(({ list, columns = [], total }) => {
       this.setState({
@@ -255,7 +255,7 @@ export default class NormalIndex extends Component {
   };
   getSupplementaryList = async (payload = {}) => {
     const { status, data: sysData } = await this.sysConfCodeRule();
-    const { data: { sumRow: siaccountSum } } = await this.siaccountDetailCommonListSum();
+    const { data: { sumRow: siaccountSum } } = status && sysData === "1" ? await this.siaccountDetailCommonListSum() : { data: { sumRow: {} } };
     const { getSupplementaryList } = this.props.standingBookStore;
     getSupplementaryList({
       ...payload