From bbc855d6bdc28ee389078eca5b30553a2681c8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 24 Feb 2023 15:52:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/salaryFile/editAgentModal.js        |  9 ++--
 .../pages/salaryFile/salaryItemChangeList.js  |  1 -
 .../pages/salaryFile/saralyFileViewSlide.js   |  2 +-
 .../hrmSalary/pages/taxAgent/personalScope.js | 51 ++++++++++---------
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/salaryFile/editAgentModal.js b/pc4mobx/hrmSalary/pages/salaryFile/editAgentModal.js
index f69c25e0..09de1ac9 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/editAgentModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/editAgentModal.js
@@ -22,7 +22,7 @@ export default class EditAgentModal extends React.Component {
             }
         }
 
-        
+
     }
 
     getAdjustReasonList() {
@@ -34,7 +34,6 @@ export default class EditAgentModal extends React.Component {
             item.selected = false
             return item;
         })
-        console.log("adjustReasonList:", adjustReasonList);
         return adjustReasonList
     }
 
@@ -101,7 +100,7 @@ export default class EditAgentModal extends React.Component {
 
 
         return (
-            <Modal title="个税扣缴义务人调整" width={800} visible={this.props.visible} onClose={this.props.onCancel} 
+            <Modal title="个税扣缴义务人调整" width={800} visible={this.props.visible} onClose={this.props.onCancel}
                 footer={
                     <Button type="primary" onClick={() => {
 this.handleSave()
@@ -142,7 +141,7 @@ this.handleChange({effectiveTime: value})
                         <Col span={8}>调整后<RequiredLabelTip /></Col>
                         <Col span={16}>
                             {
-                                this.state.initSelected && 
+                                this.state.initSelected &&
                                 <Select defaultValue={taxAgentId} value={taxAgentId} style={{ width: 200 }} onChange={(value) => this.handleChange({taxAgentId: value})}>
                                     {
                                         this.getTaxAgentList().map(item => (
@@ -158,4 +157,4 @@ this.handleChange({effectiveTime: value})
             </Modal>
         )
     }
-}
\ No newline at end of file
+}
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
index 874ee49a..49d82cd8 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
@@ -92,7 +92,6 @@ export default class SalaryItemChangeList extends React.Component {
   render() {
     const { salaryFileStore } = this.props;
     const { singleSalaryItemList } = salaryFileStore;
-    console.log(this.getColumns());
     return (
       <div>
         <UnifiedTable
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
index 946d2bc4..3abb7f69 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
@@ -151,7 +151,7 @@ export default class SalaryFileViewSlide extends React.Component {
                     {
                       item.dataType === "number" ?
                         <WeaInputNumber
-                          value={Number(item.value || "0")}
+                          value={!_.isNil(item.value) ? item.value : 0}
                           precision={2}
                           viewAttr={selectedKey === "pending" ? 2 : 1}
                           onChange={value => {
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js b/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
index 830e53c1..767822a1 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
@@ -27,10 +27,11 @@ export default class PersonalScope extends Component {
       pageObj: {
         current: 1,
         pageSize: 10,
-        total: 0,
-      },
+        total: 0
+      }
     };
   }
+
   componentDidMount() {
     this.getTaxAgentRangeForm();
     this.getTaxAgentRangeListInclude();
@@ -59,7 +60,7 @@ export default class PersonalScope extends Component {
             list: dataSource,
             pageNum: current,
             pageSize,
-            total,
+            total
           } = data;
           this.setState({
             columns,
@@ -67,8 +68,8 @@ export default class PersonalScope extends Component {
             pageObj: {
               current,
               pageSize,
-              total,
-            },
+              total
+            }
           });
         }
       }
@@ -87,7 +88,7 @@ export default class PersonalScope extends Component {
             list: dataSource,
             pageNum: current,
             pageSize,
-            total,
+            total
           } = data;
           this.setState({
             columns,
@@ -95,8 +96,8 @@ export default class PersonalScope extends Component {
             pageObj: {
               current,
               pageSize,
-              total,
-            },
+              total
+            }
           });
         }
       }
@@ -112,22 +113,24 @@ export default class PersonalScope extends Component {
       onOk: () => {
         taxAgentRangeDelete(ids).then(({ status, errorMsg }) => {
           if (status) {
+            this.tagAgentRef.onSelectChange([]);
             message.success("删除成功");
             tab == "1"
               ? this.getTaxAgentRangeListInclude({
-                  current: pageObj.current,
-                  pageSize: pageObj.pageSize,
-                })
+                current: pageObj.current,
+                pageSize: pageObj.pageSize
+              })
               : this.getTaxAgentRangeListExclude({
-                  current: pageObj.current,
-                  pageSize: pageObj.pageSize,
-                });
+                current: pageObj.current,
+                pageSize: pageObj.pageSize
+              });
           } else {
             message.error(errorMsg || "删除失败");
           }
         });
       },
-      onCancel() {},
+      onCancel() {
+      }
     });
   };
 
@@ -145,13 +148,13 @@ export default class PersonalScope extends Component {
           message.success("新增成功");
           includeType == "1"
             ? this.getTaxAgentRangeListInclude({
-                current: pageObj.current,
-                pageSize: pageObj.pageSize,
-              })
+              current: pageObj.current,
+              pageSize: pageObj.pageSize
+            })
             : this.getTaxAgentRangeListExclude({
-                current: pageObj.current,
-                pageSize: pageObj.pageSize,
-              });
+              current: pageObj.current,
+              pageSize: pageObj.pageSize
+            });
         } else {
           message.error(errormsg || "新增失败");
         }
@@ -167,7 +170,7 @@ export default class PersonalScope extends Component {
       employeeStatus,
       targetTypeList,
       submitLoading,
-      queryLoading,
+      queryLoading
     } = this.state;
     const { hideIconInTax, showSalaryItemBtn } = this.props.taxAgentStore;
     return (
@@ -189,8 +192,8 @@ export default class PersonalScope extends Component {
                 pageObj: {
                   ...pageObj,
                   current,
-                  pageSize,
-                },
+                  pageSize
+                }
               },
               () => {
                 tab == "1"