From bb649ce6e3d79b0c77239fe2d15b05a3c5316c3c 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, 14 Feb 2023 16:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/calculateDetail/placeOnFileDetail.js  | 2 ++
 .../standingBookDetail/components/normal.js               | 8 ++++----
 .../standingBookDetail/components/regList.js              | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
index 7034d970..0ad0478a 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
@@ -48,6 +48,7 @@ export default class PlaceOnFileDetail extends React.Component {
         const payload = {
           type: "PR",
           listType: "",
+          hasOperate: false,
           url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
           queryParams: {
             salaryAcctRecordId,
@@ -78,6 +79,7 @@ export default class PlaceOnFileDetail extends React.Component {
     const payload = {
       type: "PR",
       listType: "",
+      hasOperate: false,
       url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
       queryParams: {
         salaryAcctRecordId,
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index b4d30a08..50279600 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -450,9 +450,9 @@ export default class NormalIndex extends Component {
   };
 
   render() {
-    const { remarks, billMonth, selectedKey, paymentOrganization } = this.props;
+    const { remarks, billMonth, selectedKey, paymentOrganization, standingBookStore } = this.props;
     const { selectedRowKeys, addProps, adjustSlide, importParams, returnEditPersonSlide } = this.state;
-    const { loading, form, condition, saveLoading } = this.props.standingBookStore;
+    const { loading } = standingBookStore;
     let { list, columns, total } = this.state.tableData;
     const rowSelection = {
       selectedRowKeys,
@@ -510,7 +510,7 @@ export default class NormalIndex extends Component {
         }
       };
     });
-    columns = [
+    !getQueryString("type") && (columns = [
       ...columns,
       {
         title: "操作",
@@ -529,7 +529,7 @@ export default class NormalIndex extends Component {
           );
         }
       }
-    ];
+    ]);
     return (
       <div className="normalWapper">
         {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
index b2dec6f0..50eea2cc 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
@@ -141,7 +141,7 @@ class RegList extends Component {
     return (
       <WeaTable
         rowKey="id"
-        columns={[
+        columns={!getQueryString("type") ? [
           ...columns,
           {
             title: "操作",
@@ -160,7 +160,7 @@ class RegList extends Component {
               );
             }
           }
-        ]}
+        ] : [...columns]}
         dataSource={dataSource}
         loading={loading.query}
         pagination={pagination}