Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线

pc4mobx/hrmSalary/apis/taxAgent.js

@@ -100,6 +100,10 @@ export const hasIconInTax = (params) => {
 };
 
 /**权限-角色相关*/
+//同步业务线
+export const syncAuth = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/sync", params);
+};
 //角色列表
 export const getRoleList = (params) => {
   return postFetch("/api/bs/hrmsalary/auth/role/list", params);

pc4mobx/hrmSalary/pages/roleManagement/index.js

@@ -31,7 +31,7 @@ class Index extends Component {
       dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 },
       loading: false, selectedRowKeys: [], addRoleDialog: { taxAgentId: "", visible: false },
       roleSetDialog: { visible: false, roleId: "", name: "", selectedKey: "" },
-      logDialogVisible: false, filterConditions: "", showSearchAd: false
+      logDialogVisible: false, filterConditions: "", showSearchAd: false, syncLoading: false
     };
   }
 
@@ -39,6 +39,18 @@ class Index extends Component {
     this.getRoleList();
   }
 
+  syncAuth = () => {
+    this.setState({ syncLoading: true });
+    API.syncAuth().then(({ status, errormsg }) => {
+      this.setState({ syncLoading: false });
+      if (status) {
+        message.success(getLabel(111, "操作成功！"));
+        this.getRoleList();
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
   getRoleList = () => {
     const { taxAgentStore: { advanceForm } } = this.props, { pageInfo } = this.state;
     const paylaod = {
@@ -133,7 +145,7 @@ class Index extends Component {
   render() {
     const {
       dataSource, columns, pageInfo, loading, selectedRowKeys, addRoleDialog, roleSetDialog,
-      logDialogVisible, filterConditions, showSearchAd
+      logDialogVisible, filterConditions, showSearchAd, syncLoading
     } = this.state;
     const { taxAgentStore: { PageAndOptAuth } } = this.props;
     const admin = PageAndOptAuth.opts.includes("admin");
@@ -141,10 +153,11 @@ class Index extends Component {
       key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
       content: getLabel(545781, "操作日志")
     }];
-    const buttons = [
+    let buttons = [
       <Button type="primary" onClick={() => this.setState({
         addRoleDialog: { taxAgentId: "", visible: true }
       })}>{getLabel(111, "新建")}</Button>,
+      <Button type="ghost" loading={syncLoading} onClick={this.syncAuth}>{getLabel(111, "同步")}</Button>,
       <Button type="ghost" disabled={_.isEmpty(selectedRowKeys)}
               onClick={() => this.deleteAuthRole(selectedRowKeys)}>{getLabel(111, "批量删除")}</Button>,
       <AdvanceInputBtn onOpenAdvanceSearch={() => this.setState({ showSearchAd: true })}
@@ -167,8 +180,7 @@ class Index extends Component {
     const rowSelection = {
       selectedRowKeys, onChange: (selectedRowKeys) => this.setState({ selectedRowKeys })
     };
-    !admin && buttons.shift();
-    !admin && buttons.shift();
+    !admin && (buttons = buttons.slice(-1));
     return (
       <WeaTop title={getLabel(111, "业务线管理")} icon={<i className="icon-coms-Flow-setting"/>} iconBgcolor="#F14A2D"
               buttons={buttons} className="rolemanagement-index" showDropIcon dropMenuDatas={dropMenuDatas}