Merge branch 'release/2.10.1.2402.01-个税' into custom-艾志工业-合并个税

pc4mobx/hrmSalary/pages/declareOnlineComparison/index.js

@@ -103,8 +103,14 @@ class Index extends Component {
               ]}
       >
         <WeaTable rowKey="id" dataSource={dataSource} pagination={pagination} bordered
-                  loading={loading} columns={columns} scroll={{ x: 1200, y: `calc(100vh - 170px)` }}
+                  loading={loading} scroll={{ x: 1200, y: `calc(100vh - 170px)` }}
                   className="online-comparison-table"
+                  columns={[
+                    { dataIndex: getLabel(25034, "姓名"), title: getLabel(25034, "姓名"), width: 150 },
+                    { dataIndex: getLabel(23787, "证件类型"), title: getLabel(23787, "证件类型"), width: 150 },
+                    { dataIndex: getLabel(1839, "证件号码"), title: getLabel(1839, "证件号码"), width: 180 },
+                    ...columns
+                  ]}
         />
       </WeaTop>
     );

pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js

@@ -203,6 +203,16 @@ class Index extends Component {
             this.getList(this.props);
           } else {
             message.error(errormsg || "操作失败");
+            this.setState({
+              dataSource: _.map(this.state.dataSource, item => {
+                if (item.id === id) {
+                  return {
+                    ...item, isUse: item.isUse
+                  };
+                }
+                return { ...item };
+              })
+            });
           }
         });
       },