diff --git a/pc4mobx/hrmSalary/apis/datapush.js b/pc4mobx/hrmSalary/apis/datapush.js
new file mode 100644
index 00000000..fb26cf9b
--- /dev/null
+++ b/pc4mobx/hrmSalary/apis/datapush.js
@@ -0,0 +1,46 @@
+import { WeaTools } from "ecCom";
+import { postFetch } from "../util/request";
+// 推送配置列表
+export const getPushSettingList = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/setting/list", params);
+};
+// 保存推送配置
+export const savePushSetting = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/setting/save", params);
+};
+// 删除推送配置
+export const deletePushSetting = (params) => {
+  return WeaTools.callApi("/api/bs/hrmsalary/push/setting/delete", "GET", params);
+};
+// 推送配置明细列表
+export const getPushItemList = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/item/list", params);
+};
+// 保存推送配置明细
+export const savePushItemList = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/item/save", params);
+};
+// 删除推送配置明细
+export const deletePushItemList = (params) => {
+  return WeaTools.callApi("/api/bs/hrmsalary/push/item/delete", "GET", params);
+};
+// 推送记录列表
+export const getPushRecordList = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/record/list", params);
+};
+// 推送记录详细列表
+export const getPushRecordDetail = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/record/detail", params);
+};
+// 推送记录-推送
+export const pushRecords = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/record/push", params);
+};
+// 推送记录-撤回
+export const withdrawRecords = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/record/withdraw", params);
+};
+//创建推送记录
+export const createPushRecords = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/record/create", params);
+};
diff --git a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
index f197ba27..75e3eb73 100644
--- a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
+++ b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
@@ -45,11 +45,13 @@ export const doSecondAuth = (params, headers) => {
 export const getPasswordForm = params => {
   return WeaTools.callApi("/api/hrm/secondarypwd/getPasswordForm", "GET", params);
 };
-export const checkPassword = params => {
-  return WeaTools.callApi("/api/hrm/secondarypwd/checkPassword", "POST", params);
+export const checkPassword = (params, headers) => {
+  return formHeaderPost("/api/hrm/secondarypwd/checkPassword", "POST", params, headers);
+  // return WeaTools.callApi("/api/hrm/secondarypwd/checkPassword", "POST", params);
 };
-export const saveSecondaryPwd = params => {
-  return WeaTools.callApi("/api/hrm/secondarypwd/saveSecondaryPwd", "POST", params);
+export const saveSecondaryPwd = (params, headers) => {
+  return formHeaderPost("/api/hrm/secondarypwd/saveSecondaryPwd", "POST", params, headers);
+  // return WeaTools.callApi("/api/hrm/secondarypwd/saveSecondaryPwd", "POST", params);
 };
 export const salaryBillGetToken = params => {
   return postFetch("/api/bs/hrmsalary/salaryBill/getToken", params);
diff --git a/pc4mobx/hrmSalary/apis/payroll.js b/pc4mobx/hrmSalary/apis/payroll.js
index 48fcecb2..fdef4e0e 100644
--- a/pc4mobx/hrmSalary/apis/payroll.js
+++ b/pc4mobx/hrmSalary/apis/payroll.js
@@ -202,26 +202,38 @@ export const salaryBillSendSum = (params) => {
   return postFetch("/api/bs/hrmsalary/salaryBill/send/sum", params);
 };
 //工资单发放-发送短信验证码
-export const sendMobileCode = (params) => {
-  return postFetch("/api/bs/hrmsalary/salaryBill/sendMobileCode", params);
+export const sendMobileCode = (params, header = {}) => {
+  return postFetch("/api/bs/hrmsalary/salaryBill/sendMobileCode", params, header);
+};
+//工资单发放-发送短信验证码
+export const checkMobileCode = (params, header = {}) => {
+  return postFetch("/api/bs/hrmsalary/salaryBill/checkMobileCode", params, header);
 };
 //工资单-验证方式
 export const payrollCheckType = params => {
   return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/payrollCheckType", "GET", params);
 };
 //工资单-反馈验证
-export const feedBackSalaryBill = params => {
+export const feedBackSalaryBill = async params => {
   const { header, ...payload } = params;
-  return fetch(`/api/bs/hrmsalary/salaryBill/feedBackSalaryBill?${convertToUrlString(payload)}`, {
+  const res = await fetch(`/api/bs/hrmsalary/salaryBill/feedBackSalaryBill?${convertToUrlString(payload)}`, {
     method: "GET",
     mode: "cors",
     headers: { "Content-Type": "application/json", ...header }
-  }).then(res => res.json());
+  });
+  return await res.json();
   // return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/feedBackSalaryBill", "GET", params);
 };
 //工资单-确认
-export const confirmSalaryBill = params => {
-  return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/confirmSalaryBill", "GET", params);
+export const confirmSalaryBill = async params => {
+  const { header, ...payload } = params;
+  const res = await fetch(`/api/bs/hrmsalary/salaryBill/confirmSalaryBill?${convertToUrlString(payload)}`, {
+    method: "GET",
+    mode: "cors",
+    headers: { "Content-Type": "application/json", ...header }
+  });
+  return await res.json();
+  // return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/confirmSalaryBill", "GET", params);
 };
 
 // 工资单基础设置-获取设置列表
diff --git a/pc4mobx/hrmSalary/apis/standingBook.js b/pc4mobx/hrmSalary/apis/standingBook.js
index 5182ea00..9d0f9f46 100644
--- a/pc4mobx/hrmSalary/apis/standingBook.js
+++ b/pc4mobx/hrmSalary/apis/standingBook.js
@@ -15,10 +15,18 @@ export const getTabList = (params) => {
 export const getNormalList = (params) => {
   return postFetch("/api/bs/hrmsalary/siaccount/detail/common/list", params);
 };
+//社会福利台账-获取正常缴纳列表合计行
+export const getNormalListSum = (params) => {
+  return postFetch("/api/bs/hrmsalary/siaccount/detail/common/list/sum", params);
+};
 //社会福利台账-获取补缴列表
 export const getSupplementaryList = (params) => {
   return postFetch("/api/bs/hrmsalary/siaccount/detail/supplementary/list", params);
 };
+//社会福利台账-获取补缴列表合计
+export const getSupplementaryListSum = (params) => {
+  return postFetch("/api/bs/hrmsalary/siaccount/detail/supplementary/list/sum", params);
+};
 
 //社会福利台账-获取总览列表
 export const getOverViewList = (params) => {
@@ -122,10 +130,18 @@ export const saveRecession = (params) => {
 export const recessionList = (params) => {
   return postFetch("/api/bs/hrmsalary/siaccount/detail/recession/list", params);
 };
+//查询退差列表合计行
+export const recessionListSum = (params) => {
+  return postFetch("/api/bs/hrmsalary/siaccount/detail/recession/list/sum", params);
+};
 //查询补差列表
 export const balanceList = (params) => {
   return postFetch("/api/bs/hrmsalary/siaccount/detail/balance/list", params);
 };
+//查询补差列表合计行
+export const balanceListSum = (params) => {
+  return postFetch("/api/bs/hrmsalary/siaccount/detail/balance/list/sum", params);
+};
 //删除退差数据
 export const delRecession = (params) => {
   return postFetch("/api/bs/hrmsalary/siaccount/delRecession", params);
@@ -205,3 +221,11 @@ export const cacheWelfareListField = (params) => {
 export const cacheBalanceWelfareList = (params) => {
   return postFetch("/api/bs/hrmsalary/siaccount/cacheBalanceWelfareList", params);
 };
+// 社保福利台账正常缴纳-增加人员并核算
+export const addSocialAcctEmp = (params) => {
+  return postFetch("/api/bs/hrmsalary/siaccount/addSocialAcctEmp", params);
+};
+// 社保福利台账正常缴纳-增加人员并核算
+export const deleteSocialAcctEmp = (params) => {
+  return postFetch("/api/bs/hrmsalary/siaccount/deleteSocialAcctEmp", params);
+};
diff --git a/pc4mobx/hrmSalary/apis/statistics.js b/pc4mobx/hrmSalary/apis/statistics.js
index a4d16bbc..9f2aa6d4 100644
--- a/pc4mobx/hrmSalary/apis/statistics.js
+++ b/pc4mobx/hrmSalary/apis/statistics.js
@@ -142,6 +142,10 @@ export const savePageListSetting = (params) => {
 export const savePageListTemplate = (params) => {
   return postFetch("/api/bs/hrmsalary/common/pageList/template/save", params);
 };
+// 薪酬统计报表-导出模板示例下载
+export const downloadPageListTemplate = (params) => {
+  return postExportFetch("/api/bs/hrmsalary/common/pageList/template/file/download", params);
+};
 //薪酬统计报表-获取页面模板
 export const getPageListTemplatelist = (params) => {
   return postFetch("/api/bs/hrmsalary/common/pageList/template/list", params);
diff --git a/pc4mobx/hrmSalary/apis/taxAgent.js b/pc4mobx/hrmSalary/apis/taxAgent.js
index 4e38cf8d..27d4be56 100644
--- a/pc4mobx/hrmSalary/apis/taxAgent.js
+++ b/pc4mobx/hrmSalary/apis/taxAgent.js
@@ -12,7 +12,7 @@ export const taxAgentRangeSync = (params) => {
 
 // 系统管理员权限
 export const getPermission = (params) => {
-  return WeaTools.callApi("/api/bs/hrmsalary/taxAgent/permission", "GET", params);
+  return WeaTools.callApi("/api/bs/hrmsalary/auth/permission", "GET", params);
 };
 
 //获取个税扣缴义务人表单
@@ -102,3 +102,73 @@ export const getTaxAgentSelectListAsAdmin = (params) => {
 export const hasIconInTax = (params) => {
   return WeaTools.callApi("/api/bs/hrmsalary/sys/conf/code?code=hideIconInTax", "GET", 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);
+};
+//保存角色
+export const saveAuthRole = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/role/save", params);
+};
+//删除角色
+export const deleteAuthRole = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/role/delete", params);
+};
+//成员列表
+export const authMemberList = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/member/list", params);
+};
+//保存成员
+export const saveAuthMember = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/member/save", params);
+};
+//数据列表
+export const authDataList = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/data/list", params);
+};
+//删除成员
+export const deleteAuthMember = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/member/delete", params);
+};
+//删除数据
+export const deleteAuthData = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/data/delete", params);
+};
+//保存数据
+export const saveAuthData = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/data/save", params);
+};
+//同步数据
+export const syncAuthData = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/data/sync", params);
+};
+//同步成员
+export const syncAuthMember = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/member/sync", params);
+};
+//保存权限
+export const saveAuthOpt = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/opt/save", params);
+};
+//权限项
+export const getAuthOptTree = (params) => {
+  return WeaTools.callApi("/api/bs/hrmsalary/auth/opt/tree", "GET", params);
+};
+//业务线详情
+export const getRole = (params) => {
+  return WeaTools.callApi("/api/bs/hrmsalary/auth/role/getRole", "GET", params);
+};
+//成员明细列表
+export const authMemberDetail = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/member/detail", params);
+};
+//数据明细列表
+export const authDataDetail = (params) => {
+  return postFetch("/api/bs/hrmsalary/auth/data/detail", params);
+};
diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js b/pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
index 3f1dbc54..562ea657 100644
--- a/pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
@@ -33,18 +33,17 @@ class AssociativeSearchMult extends Component {
     }
   }
 
-  handleSearch = (value) => {
-    this.setState({ loading: true });
-    this.getData(value);
-  };
+  handleSearch = (value) => this.getData(value);
   getData = (name = "") => {
-    const { browserConditionParam } = this.props;
+    const { browserConditionParam, tags } = this.props;
+    if (tags) return;
     const {
       completeURL, filterByName, searchParamsKey, convertDatasource, dataParams = {}
     } = browserConditionParam;
     if (_.trim(name)) {
       let payload = { ...dataParams };
       searchParamsKey && (payload = { ...payload, [searchParamsKey]: name, current: 1, pageSize: 9999 });
+      this.setState({ loading: true });
       postFetch(completeURL, payload).then(({ status, data }) => {
         this.setState({ loading: false });
         if (status && data.list) {
@@ -105,7 +104,7 @@ class AssociativeSearchMult extends Component {
 
   render() {
     const { data, dropdownWidth } = this.state;
-    const { viewAttr, selectedValues, datas, isSingle, browserConditionParam = {} } = this.props;
+    const { viewAttr, selectedValues, datas, isSingle, browserConditionParam = {}, tags } = this.props;
     const clsname = classNames({
       "required": (viewAttr === 3 || viewAttr === "3") && _.isEmpty(selectedValues),
       "mr12": viewAttr === "3" && _.isEmpty(selectedValues),
@@ -127,7 +126,7 @@ class AssociativeSearchMult extends Component {
       );
     }
     let options = data.map(d => <Option key={d.id} title={d.name}>{d.name}</Option>);
-    selectedValues && selectedValues.map((v) => {
+    !tags && selectedValues && selectedValues.map((v) => {
       v && options.unshift(<Option key={v} title={datas[v].name}>{datas[v].name}</Option>);
     });
     const select = <Select
diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js b/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
index 4cb5a125..28193704 100644
--- a/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
@@ -62,6 +62,8 @@ class CustomBrowserDialog extends Component {
           listDatas: convertDatasource ? convertDatasource(data.list) : data.list,
           pageInfo: { ...pageInfo, current, pageSize, total }
         });
+      } else if (status && data.modeList) {
+        this.setState({ listDatas: _.map(data.modeList, o => ({ ...o, id: o.name })) });
       } else {
         this.setState({ listDatas: _.map(data, o => ({ ...o, id: String(o.id) })) });
       }
diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/index.js b/pc4mobx/hrmSalary/components/CustomBrowser/index.js
index f77d566d..65bbefbd 100644
--- a/pc4mobx/hrmSalary/components/CustomBrowser/index.js
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/index.js
@@ -97,17 +97,11 @@ class Index extends Component {
     }, () => {
       this.props.onChange && this.props.onChange(values.join(","));
       this.props.onCustomChange && this.props.onCustomChange(this.state.selectedData);
-      if (form) {
-        form.updateFields({
-          [getKey(fieldConfig)]: { value: this.state.searchKeys.join(",") }
-        });
-      }
+      if (form) form.updateFields({ [getKey(fieldConfig)]: { value: this.state.searchKeys.join(",") } });
     });
   };
   onBrowerClick = (keys, selectedObj) => {
-    if (_.isEmpty(keys)) {
-      this.setState({ searchKeys: [], selectedData: {}, rightDatas: [] });
-    }
+    if (_.isEmpty(keys)) this.setState({ searchKeys: [], selectedData: {}, rightDatas: [] });
     this.setState({ browserDialog: { visible: true } });
   };
 
diff --git a/pc4mobx/hrmSalary/components/FormInfo/index.js b/pc4mobx/hrmSalary/components/FormInfo/index.js
index d6940489..d0d87963 100644
--- a/pc4mobx/hrmSalary/components/FormInfo/index.js
+++ b/pc4mobx/hrmSalary/components/FormInfo/index.js
@@ -67,7 +67,7 @@ export default class FormInfo extends Component {
           }
         }
         coms != null && formItems.push({
-          com: (<WeaFormItem {...itemProps}>{coms}</WeaFormItem>),
+          com: (<WeaFormItem {...itemProps}>{coms}</WeaFormItem>), hide: field.hide,
           col
         });
 
diff --git a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
index d8824c8b..a053cfa7 100644
--- a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
+++ b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
@@ -95,7 +95,7 @@ class PersonalScopeTable extends Component {
 
   render() {
     const { dataSource, columns, pageInfo, loading, selectedRowKeys } = this.state;
-    const { onChangeSelectKey } = this.props;
+    const { onChangeSelectKey, showOperateBtn } = this.props;
     const pagination = {
       ...pageInfo,
       showTotal: total => `共 ${total} 条`,
@@ -128,7 +128,7 @@ class PersonalScopeTable extends Component {
     return (
       <WeaTable
         rowKey="id"
-        rowSelection={rowSelection}
+        rowSelection={showOperateBtn ? rowSelection : null}
         dataSource={dataSource}
         pagination={pagination}
         loading={loading.query}
diff --git a/pc4mobx/hrmSalary/components/UnifiedTable/index.js b/pc4mobx/hrmSalary/components/UnifiedTable/index.js
index f8cbff97..cff25bf6 100644
--- a/pc4mobx/hrmSalary/components/UnifiedTable/index.js
+++ b/pc4mobx/hrmSalary/components/UnifiedTable/index.js
@@ -12,7 +12,7 @@ class Index extends Component {
       } else if (index === 1) {
         return { ...item, fixed: "left", width: 176 };
       }
-      if (item.dataIndex === "operate") {
+      if (item.dataIndex === "operate" || item.dataIndex === "opts") {
         return { ...item, fixed: "right", width: item.width || "120px" };
       }
       return { ...item, width: "33%" };
diff --git a/pc4mobx/hrmSalary/components/captchaModal/index.js b/pc4mobx/hrmSalary/components/captchaModal/index.js
index a7f00b9b..87da6745 100644
--- a/pc4mobx/hrmSalary/components/captchaModal/index.js
+++ b/pc4mobx/hrmSalary/components/captchaModal/index.js
@@ -6,31 +6,32 @@
  */
 import React, { Component } from "react";
 import { WeaDialog, WeaError, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
-import { sendMobileCode } from "../../apis/payroll";
-import { Button } from "antd";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import { checkMobileCode, sendMobileCode } from "../../apis/payroll";
+import { getQueryString } from "../../util/url";
+import FormInfo from "../FormInfo";
+import { captchaCondition } from "../../pages/mobilePayroll/pwdCondtion";
+import MobileModal from "../../pages/mobilePayroll/mobileModal";
+import { Button, message } from "antd";
 import "./index.less";
 
+const form = new WeaForm();
 const { getLabel } = WeaLocaleProvider;
 
 class Index extends Component {
   constructor(props) {
     super(props);
-    this.state = {
-      captcha: "",
-      time: 60
-    };
+    this.state = { captcha: "", time: 60 };
     this.timeRef = null;
   }
 
+  componentDidMount() {
+    form.initFormFields(captchaCondition);
+  }
+
   componentWillUnmount() {
     clearInterval(this.timeRef);
-  }
-
-  componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.visible !== this.props.visible && !nextProps.visible) {
-      clearInterval(this.timeRef);
-      this.setState({ captcha: "", time: 60 });
-    }
+    this.setState({ captcha: "", time: 60 });
   }
 
   handleSendCaptcha = () => {
@@ -48,44 +49,73 @@ class Index extends Component {
       }
     });
   };
-  handleConfirm = () => {
-    if (!this.state.captcha) {
+  handleConfirm = async () => {
+    const type = getQueryString("type"), f = await form.validateForm();
+    if (!this.state.captcha && type !== "phone") {
       this.refs.weaError.showError();
-      // return
+      return;
+    } else if (!f.isValid && type === "phone") {
+      f.showErrors();
+      return;
     }
-    this.props.onCancel();
-    this.props.onConfirm();
+    checkMobileCode({ id: this.props.id, mobileCode: this.state.captcha }).then(({ status, errormsg }) => {
+      if (status) {
+        this.props.onCancel();
+        this.props.onConfirm();
+      } else {
+        message.error(errormsg);
+      }
+    });
   };
 
   render() {
-    const { captcha, time } = this.state;
-    return (
-      <WeaDialog
-        initLoadCss {...this.props} style={{ width: 550 }}
-        className="captchaWrapper" title={getLabel(111, "验证码验证")}
-        buttons={[
-          <Button type="primary" onClick={this.handleConfirm}>{getLabel(826, "确定")}</Button>
-        ]}
-      >
-        <WeaSearchGroup needTigger={false} title="" showGroup>
-          <WeaFormItem
-            label={getLabel(111, "验证码")}
-            labelCol={{ span: 8 }}
-            wrapperCol={{ span: 16 }}
-          >
-            <WeaError tipPosition="bottom" ref="weaError" error={getLabel(826, "验证码未填写")}>
-              <div className="captchaInputBox">
-                <WeaInput value={captcha} onChange={captcha => this.setState({ captcha })}/>
-                <Button type="primary" onClick={this.handleSendCaptcha} disabled={time !== 60}>
-                  {
-                    time === 60 ? getLabel(111, "发送验证码") : `${time}S`
-                  }
-                </Button>
-              </div>
-            </WeaError>
-          </WeaFormItem>
-        </WeaSearchGroup>
-      </WeaDialog>
+    const { captcha, time } = this.state, type = getQueryString("type");
+    const itemRender = {
+      mobileCode: (field, textAreaProps, form, formParams) => {
+        return (<div className="captchaInputBox">
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} form={form} formParams={formParams}
+                     onChange={() => this.setState({ captcha: form.getFormParams().mobileCode })}/>
+          <Button type="primary" onClick={this.handleSendCaptcha} disabled={time !== 60}>
+            {
+              time === 60 ? getLabel(111, "发送验证码") : `${time}S`
+            }
+          </Button>
+        </div>);
+      }
+    };
+    return (<React.Fragment>
+        {
+          type === "phone" ? <MobileModal title={getLabel(111, "验证码验证")} onConfirm={this.handleConfirm}>
+              <FormInfo center={false} itemRender={itemRender} form={form} formFields={captchaCondition}/>
+            </MobileModal> :
+            <WeaDialog
+              initLoadCss {...this.props} style={{ width: 550 }}
+              className="captchaWrapper" title={getLabel(111, "验证码验证")}
+              buttons={[
+                <Button type="primary" onClick={this.handleConfirm}>{getLabel(826, "确定")}</Button>
+              ]}
+            >
+              <WeaSearchGroup needTigger={false} title="" showGroup>
+                <WeaFormItem
+                  label={getLabel(111, "验证码")}
+                  labelCol={{ span: 8 }}
+                  wrapperCol={{ span: 16 }}
+                >
+                  <WeaError tipPosition="bottom" ref="weaError" error={getLabel(111, "验证码未填写")}>
+                    <div className="captchaInputBox">
+                      <WeaInput value={captcha} onChange={captcha => this.setState({ captcha })}/>
+                      <Button type="primary" onClick={this.handleSendCaptcha} disabled={time !== 60}>
+                        {
+                          time === 60 ? getLabel(111, "发送验证码") : `${time}S`
+                        }
+                      </Button>
+                    </div>
+                  </WeaError>
+                </WeaFormItem>
+              </WeaSearchGroup>
+            </WeaDialog>
+        }
+      </React.Fragment>
     );
   }
 }
diff --git a/pc4mobx/hrmSalary/components/captchaModal/index.less b/pc4mobx/hrmSalary/components/captchaModal/index.less
index 4f8d23b7..2728112b 100644
--- a/pc4mobx/hrmSalary/components/captchaModal/index.less
+++ b/pc4mobx/hrmSalary/components/captchaModal/index.less
@@ -5,25 +5,25 @@
     .wea-form-item-wrapper {
       .wea-error {
         width: 100%;
-
-        .captchaInputBox {
-          display: flex;
-          align-items: center;
-
-          .wea-input-normal {
-            flex: 1;
-          }
-
-          button {
-            padding: 8px 10px;
-            border-radius: 0;
-            min-width: 80px;
-            text-align: center;
-            height: 30px;
-            line-height: 15px;
-          }
-        }
       }
     }
   }
 }
+
+.captchaInputBox {
+  display: flex;
+  align-items: center;
+
+  .wea-input-normal {
+    flex: 1;
+  }
+
+  button {
+    padding: 8px 10px;
+    border-radius: 0;
+    min-width: 80px;
+    text-align: center;
+    height: 30px;
+    line-height: 15px;
+  }
+}
diff --git a/pc4mobx/hrmSalary/components/custom-title/weaReqTitle/index.js b/pc4mobx/hrmSalary/components/custom-title/weaReqTitle/index.js
index 69766076..7ff800ce 100644
--- a/pc4mobx/hrmSalary/components/custom-title/weaReqTitle/index.js
+++ b/pc4mobx/hrmSalary/components/custom-title/weaReqTitle/index.js
@@ -7,7 +7,7 @@ class Index extends Component {
   render() {
     return (
       <WeaReqTop
-        title={getLabel(111, "编辑账套")} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
+        title={this.props.title || getLabel(111, "编辑账套")} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
         showDropIcon={false} tabDatas={this.props.tabDatas} {...this.props}
       />
     );
diff --git a/pc4mobx/hrmSalary/components/custom-title/weaTopTitle/index.js b/pc4mobx/hrmSalary/components/custom-title/weaTopTitle/index.js
index d265c8eb..0e90c2e2 100644
--- a/pc4mobx/hrmSalary/components/custom-title/weaTopTitle/index.js
+++ b/pc4mobx/hrmSalary/components/custom-title/weaTopTitle/index.js
@@ -6,7 +6,7 @@ const getLabel = WeaLocaleProvider.getLabel;
 class Index extends Component {
   render() {
     return (
-      <WeaTop title={getLabel(111, "新建账套")} icon={<i className="icon-coms-fa"/>}
+      <WeaTop title={this.props.title || getLabel(111, "新建账套")} icon={<i className="icon-coms-fa"/>}
               iconBgcolor="#F14A2D" {...this.props}/>
     );
   }
diff --git a/pc4mobx/hrmSalary/components/index.js b/pc4mobx/hrmSalary/components/index.js
deleted file mode 100644
index 74d0b74a..00000000
--- a/pc4mobx/hrmSalary/components/index.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import React from "react";
-import { inject, observer } from "mobx-react";
-import { toJS } from "mobx";
-
-import { Button } from "antd";
-import { WeaLogView } from "comsMobx";
-import { WeaLocaleProvider, WeaNewScroll, WeaTop } from "ecCom";
-
-import { getSearchs, renderLoading, renderNoright } from "../util"; // 从util文件引入公共的方法
-
-const getLabel = WeaLocaleProvider.getLabel;
-const WeaLogViewComp = WeaLogView.Component;
-
-@inject("baseFormStore")
-@observer
-export default class BaseForm extends React.Component {
-  componentWillMount() { // 初始化渲染页面
-    const { baseFormStore: { doInit } } = this.props;
-    doInit();
-  }
-
-  componentWillReceiveProps(nextProps) {
-    const { baseFormStore: { doInit } } = this.props;
-    if (this.props.location.key !== nextProps.location.key) { // 手动刷新、切换菜单 重新初始化
-      doInit();
-    }
-  }
-
-  // 渲染右键菜单和顶部下拉菜单
-  getRightMenu() {
-    const { baseFormStore: { setLogVisible, saveForm } } = this.props;
-    let btnArr = [
-      {
-        key: "BTN_SAVE",
-        icon: <i className="icon-coms-Preservation"/>,
-        content: `${getLabel(86, "保存")}`,
-        onClick: () => saveForm()
-      },
-      {
-        key: "log",
-        content: getLabel(83, "日志"),
-        icon: <i className="icon-coms-Print-log"/>,
-        onClick: () => setLogVisible(true)
-      }];
-    return btnArr;
-  }
-
-  render() {
-    /*  页面渲染说明：
-      1、判断是否无权限： 是显示无权限页面
-      2、渲染form页面:
-        2-1: WeaRightMenu 右键菜单
-        2-2: WeaTop: 顶部: 包括下拉菜单
-        2-3: renderLoading: 加载数据中的loading效果(统一封装在util中)
-        2-4: WeaNewScroll 顶部以下超长滚动处理
-        2-5: 通过getSearchs方法渲染form
-    */
-    const { baseFormStore } = this.props;
-    const {
-      loading,
-      hasRight,
-      form,
-      condition,
-      logVisible,
-      logStore,
-      saveLoading,
-      setLogVisible,
-      saveForm
-    } = baseFormStore; // 从后台取数据 和 方法
-
-    if (!hasRight && !loading) { // 无权限处理
-      return renderNoright();
-    }
-
-    const btns = [ // 顶部按钮
-      <Button type="primary" loading={saveLoading} onClick={() => saveForm()}>保存</Button>
-    ];
-    const collectParams = { // 收藏功能配置
-      favname: "基础表单",
-      favouritetype: 1,
-      objid: 0,
-      link: "wui/index.html#/ns_demo01/index",
-      importantlevel: 1
-    };
-    return (
-      <WeaTop
-        title="基础表单" // title
-        icon={<i className="icon-coms-fa"/>} // 左侧图标
-        iconBgcolor="#F14A2D" // 左侧图标背景色
-        buttons={btns} // 顶部按钮: 这里是保存按钮，不需要可以不显示
-        buttonSpace={10} // 按钮之间的间隔
-        showDropIcon={true} // 是否显示右侧下拉按钮
-        dropMenuDatas={this.getRightMenu()} // 下拉菜单（和页面的右键菜单相同）
-        dropMenuProps={{ collectParams }} // 收藏功能: 配置之后显示 收藏、帮助、显示页面地址 这3个功能
-      >
-        {loading ? renderLoading() :
-          <WeaNewScroll height="100%">
-            {getSearchs(form, toJS(condition), 1)}
-          </WeaNewScroll>
-        }
-        <WeaLogViewComp // 日志功能（一般后端的应用设置是需要的）
-          visible={logVisible} // 日志弹框的显示隐藏
-          onCancel={() => setLogVisible(false)} // 关闭日志弹框时的操作：设置logVisible属性为false
-          logStore={logStore} // 日志的store
-          logType="1" // 模块编码: 该参数要根据模块来给
-          logSmallType="1" // 细分模块编码: 该参数要根据模块来给
-        />
-      </WeaTop>
-    );
-  }
-}
diff --git a/pc4mobx/hrmSalary/components/pcTemplate/content.js b/pc4mobx/hrmSalary/components/pcTemplate/content.js
index 6bc3c60e..1665ac9e 100644
--- a/pc4mobx/hrmSalary/components/pcTemplate/content.js
+++ b/pc4mobx/hrmSalary/components/pcTemplate/content.js
@@ -10,7 +10,7 @@ class Content extends Component {
     const { onlyOneGrup, showData } = dealTemplate(_.filter(itemTypeList, o => !!o), "pc");
     return (
       <div className="salary-preview-container">
-        <div style={{ border: "10px solid #F3F9FF" }}>
+        <div style={{ border: "10px solid #F3F9FF", width: "100%" }}>
           <div className="edition-center">
             <div className="header">
               <div className="header-title">{theme || ""}</div>
diff --git a/pc4mobx/hrmSalary/components/pcTemplate/index.less b/pc4mobx/hrmSalary/components/pcTemplate/index.less
index 4f834426..6ea7eaa5 100644
--- a/pc4mobx/hrmSalary/components/pcTemplate/index.less
+++ b/pc4mobx/hrmSalary/components/pcTemplate/index.less
@@ -155,13 +155,14 @@
               .item-count {
                 //flex-basis: 328px;
                 flex: 1;
-                padding-left: 16px;
+                padding: 12px 16px;
                 height: 100%;
-                line-height: 40px;
                 background: #fff;
                 font-size: 12px;
                 color: #5F5F5F;
                 word-break: break-all;
+                display: flex;
+                align-items: center;
               }
             }
           }
diff --git a/pc4mobx/hrmSalary/config.js b/pc4mobx/hrmSalary/config.js
new file mode 100644
index 00000000..d040ac73
--- /dev/null
+++ b/pc4mobx/hrmSalary/config.js
@@ -0,0 +1,25 @@
+export const PAGE = {
+  "salaryArchive": ["/hrmSalary/salaryFile"], //薪资档案
+  "salarySob": ["/hrmSalary/ledger"], //薪资账套
+  "salaryAcct": ["/hrmSalary/calculate", "/hrmSalary/calcView"], //薪资核算
+  "salaryBill": ["/hrmSalary/payroll", "/hrmSalary/payrollGrant", "/hrmSalary/payrollDetail"], //工资单
+  "taxDeclaration": ["/hrmSalary/declare", "/hrmSalary/generateDeclarationDetail"], //个税
+  "addUpDeduction": ["/dataAcquisition/cumDeduct"], //累计专项附加扣除
+  "specialAddDeduction": ["/dataAcquisition/specialAddDeduction"], //专项附加扣除
+  "otherDeduction": ["/dataAcquisition/otherDeduct"], //其他免税扣除
+  "addUpSituation": ["/dataAcquisition/cumSituation"], //往期累计情况
+  "attendQuote": ["/dataAcquisition/attendance"], //考勤引用
+  "myBill": ["/hrmSalary/mySalary", "/hrmSalary/mySalaryMobile"], //薪资福利
+  "taxAgent": ["/hrmSalary/taxAgent"], //个税扣缴义务人
+  "auth": ["/hrmSalary/roleManagement"], //业务管理线
+  "variableArchive": ["/hrmSalary/variableSalary"], //浮动薪酬
+  "siAccount": ["/socialSecurityBenefits/standingBook", "/socialSecurityBenefits/standingBookDetail", "/socialSecurityBenefits/sbofflineComparison"], //社保福利台账
+  "siArchive": ["/socialSecurityBenefits/archives"], //社保档案
+  "salaryField": ["/hrmSalary/fieldManagement"], //字段管理
+  "salaryItem": ["/hrmSalary/salaryItem"], //薪资项目管理
+  "siScheme": ["/socialSecurityBenefits/programme"], //社保福利方案
+  "report": ["/hrmSalary/analysisOfSalaryStatistics", "/hrmSalary/reportView"], //报表
+  "dataPush": ["/hrmSalary/datapush"], //数据推送
+  "adjustRecord": ["/hrmSalary/adjustSalaryManage"] //调薪管理
+};
+export const EXCLUDE_PAGE = ["mobilepayroll"];
diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js
index 23c9a6e9..becc56ed 100644
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@@ -28,7 +28,7 @@ import PayrollDetail from "./pages/payroll/payrollDetail/payrollDetail";
 // import Declare from "./pages/declare";
 import Declare from "./pages/declare/declare"; //重构的个税申报表
 import TaxRate from "./pages/taxRate";
-import TaxAgent from "./pages/taxAgent";
+import TaxAgent from "./pages/salary/taxAgent";
 import CalculateDetail from "./pages/calculateDetail";
 import PlaceOnFileDetail from "./pages/calculateDetail/placeOnFileDetail";
 import CompareDetail from "./pages/calculateDetail/compareDetail";
@@ -42,6 +42,7 @@ import MobilePayroll from "./pages/mobilePayroll";
 import SysConfig from "./pages/sysConfig";
 import RuleConfig from "./pages/ruleConfig/ruleConfig";
 import Appconfig from "./pages/appConfig";
+import RoleManagement from "./pages/roleManagement";
 import FieldManagement from "./pages/fieldManagement";
 import AnalysisOfSalaryStatistics from "./pages/analysisOfSalaryStatistics";
 import EmployeeList from "./pages/employeeView";
@@ -53,6 +54,7 @@ import AdjustSalaryManage from "./pages/adjustSalaryManage";
 import TopologyMap from "./pages/topologyMap";
 import SupplementaryCalc from "./pages/supplementaryCalc";
 import VariableSalary from "./pages/variableSalary";
+import Datapush from "./pages/datapush";
 import Layout from "./layout";
 
 import CustomRoutes from "./pages/custom-pages";
@@ -66,6 +68,7 @@ getLocaleLabel = function (nextState, replace, callback) {
 };
 const SocialSecurityBenefits = (props) => props.children;
 const DataAcquisition = (props) => props.children;
+
 const Routes = (
   <Route key="hrmSalary" path="hrmSalary" onEnter={getLocaleLabel} component={Layout}>
     <Route key="historicalPayroll" path="historicalPayroll" component={HistoricalPayroll}/>
@@ -112,9 +115,11 @@ const Routes = (
     <Route key="sysconfig" path="sysconfig" component={SysConfig}/>
     <Route key="sysconfig-1" path="sysconfig-1" component={RuleConfig}/>
     <Route key="appconfig" path="appconfig" component={Appconfig}/>
+    <Route key="roleManagement" path="roleManagement" component={RoleManagement}/>
     <Route key="fieldManagement" path="fieldManagement" component={FieldManagement}/>
     <Route key="analysisOfSalaryStatistics" path="analysisOfSalaryStatistics" component={AnalysisOfSalaryStatistics}/>
     <Route key="analysisOfSalaryStatisticsId" path="analysisOfSalaryStatistics/:employeeId" component={EmployeeList}/>
+    <Route key="datapush" path="datapush" component={Datapush}/>
     <Route key="reportView" path="reportView" component={ReportView}/>
     <Route key="externalPersonManage" path="externalPersonManage" component={ExternalPersonManage}/>
     <Route key="topologyView" path="topologyView/:salarySobId/:salaryItemId" component={TopologyMap}/>
diff --git a/pc4mobx/hrmSalary/layout.js b/pc4mobx/hrmSalary/layout.js
index 39c9d174..6d5e8161 100644
--- a/pc4mobx/hrmSalary/layout.js
+++ b/pc4mobx/hrmSalary/layout.js
@@ -8,12 +8,17 @@
   * @description:
 */
 import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
 import { WeaLocaleProvider, WeaTools } from "ecCom";
+import Authority from "./pages/mySalary/authority";
+import { EXCLUDE_PAGE } from "./config";
 import stores from "./stores";
 
 const { ls } = WeaTools;
 const { getLabel } = WeaLocaleProvider;
 
+@inject("taxAgentStore")
+@observer
 class Layout extends Component {
   constructor(props) {
     super(props);
@@ -22,6 +27,8 @@ class Layout extends Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
     if (window.e9LibsConfigCustomF && _.some(window.e9LibsConfigCustomF, o => (_.some(o, k => k === "h_hrmSalary")))) {
+      stores.baseFormStore.initForm();
+      stores.baseFormStore.initFormExtra();
       if (window.location.hash.indexOf("payroll") !== -1) {
         window.localStorage.removeItem("template-basedata");
         window.localStorage.removeItem("salary-showset");
@@ -40,7 +47,11 @@ class Layout extends Component {
       let header = document.getElementById("container");
       header.appendChild(link);
       top.$(".ant-message").remove();
-      window.location.hash.indexOf("mobilepayroll") === -1 && stores.taxAgentStore.getPermission();
+      if (_.every(EXCLUDE_PAGE, page => window.location.hash.indexOf(page) === -1)) {
+        stores.taxAgentStore.getPermission();
+      } else {
+        stores.taxAgentStore.initPageAndOptAuth();
+      }
     }
     window.addEventListener("storage", this.setFontSize);
   }
@@ -68,9 +79,10 @@ class Layout extends Component {
   };
 
   render() {
-    return (
-      <WeaLocaleProvider>{this.props.children}</WeaLocaleProvider>
-    );
+    const { taxAgentStore: { PageAndOptAuth, loading } } = this.props;
+    return (<WeaLocaleProvider>
+      <Authority store={{ loading, hasRight: PageAndOptAuth.able }}>{this.props.children}</Authority>
+    </WeaLocaleProvider>);
   }
 }
 
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
index 924662b3..80f7e4dd 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js
@@ -153,6 +153,36 @@ export const salaryDetailSearchConditions = [
         multiple: true,
         viewAttr: 2
       },
+      {
+        browserConditionParam: {
+          completeParams: {},
+          conditionDataParams: {},
+          dataParams: {},
+          destDataParams: {},
+          hasAddBtn: false,
+          hasAdvanceSerach: false,
+          idSeparator: ",",
+          isAutoComplete: 1,
+          isDetail: 0,
+          isMultCheckbox: false,
+          isSingle: false,
+          icon: "icon-coms-hrm",
+          linkUrl: "",
+          pageSize: 10,
+          quickSearchName: "",
+          replaceDatas: [],
+          title: "",
+          type: "17",
+          viewAttr: 2
+        },
+        colSpan: 1,
+        conditionType: "BROWSER",
+        domkey: ["employeeIds"],
+        fieldcol: 16,
+        label: getLabel(111, "人员"),
+        labelcol: 8,
+        viewAttr: 2
+      },
       {
         browserConditionParam: {
           completeParams: {},
@@ -232,6 +262,25 @@ export const tempCondition = [
         rules: "required|string",
         viewAttr: 3
       },
+      {
+        conditionType: "UPLOAD",
+        domkey: ["fileId"],
+        fieldcol: 14,
+        label: "导出模板",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        datas: [],
+        multiSelection: false,
+        showClearAll: false,
+        showListBottom: true,
+        showListTop: true,
+        maxFilesNumber: 1,
+        limitType: "xlsx",
+        uploadUrl: "/api/doc/upload/uploadFile",
+        category: "111",
+        viewAttr: 2
+      },
       {
         conditionType: "SELECT",
         domkey: ["sharedType"],
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index 657c4dfb..1775ee97 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -32,7 +32,8 @@ class SalaryDetails extends Component {
     this.state = {
       loading: false, dataSource: [], columns: [], selectedRowKeys: [], tempPageList: [], sumRow: {},
       pageInfo: { current: 1, pageSize: 10, total: 0 }, payload: {}, templateId: "", tempManageQuery: false,
-      showTotalCell: false, updateSum: true, tempDialog: { visible: false, setting: [], id: "", template: {} },
+      showTotalCell: false, updateSum: true,
+      tempDialog: { visible: false, setting: [], heads: [], id: "", template: {} },
       transferDialog: {
         visible: false, searchParamsKey: "name", saveLoading: false,
         dataParams: { page: "salary_details_report" },
@@ -108,12 +109,13 @@ class SalaryDetails extends Component {
   getSalaryList = (props) => {
     const { attendanceStore: { salaryDetailSearchForm, tableStore }, dateRange } = props || this.props;
     const [startDateStr, endDateStr] = dateRange;
-    const { taxAgentIds, subcompanyIds, departmentIds, ...extra } = salaryDetailSearchForm.getFormParams();
+    const { taxAgentIds, subcompanyIds, departmentIds, employeeIds, ...extra } = salaryDetailSearchForm.getFormParams();
     const { pageInfo, transferDialog, updateSum } = this.state;
     const payload = {
       taxAgentIds: taxAgentIds ? taxAgentIds.split(",") : [],
       departmentIds: departmentIds ? departmentIds.split(",") : [],
       subcompanyIds: subcompanyIds ? subcompanyIds.split(",") : [],
+      employeeIds: employeeIds ? employeeIds.split(",") : [],
       ...extra, ...pageInfo, startDateStr, endDateStr
     };
     this.setState({ loading: true });
@@ -164,7 +166,7 @@ class SalaryDetails extends Component {
       this.postMessageToChild({
         dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, sumRow,
         columns: _.map(columns, (it, idx) => ({
-          dataIndex: it.column || it.dataIndex, title: it.text || it.title, calcDetail: true,
+          dataIndex: it.column || it.dataIndex, title: it.text || it.title, calcDetail: true, showSee: false,
           width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : (it.width || it.oldWidth),
           fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "",
           ellipsis: true
@@ -200,9 +202,14 @@ class SalaryDetails extends Component {
   };
   handelAddTemp = (templateId = "") => {
     const { tempDialog, tempPageList } = this.state;
+    if (_.isEmpty(this.transferRef.state.rightDatas)) {
+      message.warning(getLabel(111, "请选择设置！"));
+      return;
+    }
     this.setState({
       tempDialog: {
-        ...tempDialog, visible: true, setting: _.map(this.transferRef.state.rightDatas, o => o.id)
+        ...tempDialog, visible: true, setting: _.map(this.transferRef.state.rightDatas, o => o.id),
+        heads: _.map(this.transferRef.state.rightDatas, o => o.name)
         // template: _.find(tempPageList, o => o.key === templateId)
       }
     });
@@ -303,7 +310,7 @@ class SalaryDetails extends Component {
           {/*薪资明细模板设置*/}
           <SalaryDetailsTempDialog {...tempDialog}
                                    onCancel={callback => this.setState({
-                                     tempDialog: { ...tempDialog, visible: false, setting: [] }
+                                     tempDialog: { ...tempDialog, visible: false, setting: [], heads: [] }
                                    }, () => callback && callback())}
                                    onSuccess={this.getPageListTemplatelist}/>
           {/*薪资明细自定义列模板管理*/}
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetailsTempDialog.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetailsTempDialog.js
index 5fc57e80..8c971aae 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetailsTempDialog.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetailsTempDialog.js
@@ -9,10 +9,11 @@
 */
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
-import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
+import { WeaDialog, WeaLoadingGlobal, WeaLocaleProvider, WeaTools } from "ecCom";
 import { tempCondition } from "./conditions";
 import { getTaxAgentSelectList } from "../../../apis/taxAgent";
 import * as API from "../../../apis/statistics";
+import { downloadPageListTemplate } from "../../../apis/statistics";
 import { Button, message } from "antd";
 import { getSearchs } from "../../../util";
 
@@ -57,6 +58,13 @@ class SalaryDetailTempDialog extends Component {
                   value: id ? template["limitIds"].join(",") : "",
                   options: _.map(data, o => ({ key: o.id, showname: o.content }))
                 };
+              } else if (getKey(o) === "fileId") {
+                return {
+                  ...o, label: getLabel(o.lanId, o.label), value: id ? template[getKey(o)] : "",
+                  datas: id && template[getKey(o)] ? [
+                    { fileid: template[getKey(o)], filename: template["fileName"], showDelete: true }
+                  ] : [], labelExtra: getLabel(111, "下载示例"), labelType: "download"
+                };
               }
               return { ...o, label: getLabel(o.lanId, o.label), value: id ? template[getKey(o)] : "" };
             })
@@ -73,12 +81,13 @@ class SalaryDetailTempDialog extends Component {
     tempForm.validateForm().then(f => {
       if (f.isValid) {
         this.setState({ loading: true });
-        const { limitIds, ...formVal } = tempForm.getFormParams();
+        const { limitIds, fileId, ...formVal } = tempForm.getFormParams();
         const payload = {
           page: "salary_details_report", setting, id, ...formVal,
           limitIds: !_.isEmpty(limitIds) ? limitIds.split(",") : []
         };
-        API.savePageListTemplate(payload).then(({ status, errormsg }) => {
+        API.savePageListTemplate(_.assign(payload, fileId ? { fileId } : {})).then(({ status, errormsg }) => {
+          this.setState({ loading: false });
           if (status) {
             message.success(getLabel(111, "操作成功！"));
             this.props.onCancel(this.props.onSuccess());
@@ -92,6 +101,12 @@ class SalaryDetailTempDialog extends Component {
     }).catch(() => this.setState({ loading: false }));
   };
   formFieldChange = (field) => {
+    if (field === "download") {
+      const { setting, heads } = this.props;
+      WeaLoadingGlobal.start();
+      const promise = downloadPageListTemplate({ setting, heads });
+      return;
+    }
     const key = Object.keys(field)[0], value = field[key].value;
     this.setState({
       conditions: _.map(this.state.conditions, item => ({
@@ -101,6 +116,12 @@ class SalaryDetailTempDialog extends Component {
               ...o, hide: value !== "0", viewAttr: value === "0" ? 3 : 1,
               rules: value === "0" ? "required|string" : ""
             };
+          } else if (key === "fileId" && getKey(o) === "fileId") {
+            return {
+              ...o, value, datas: value ? _.map(field[key].valueSpan, o => ({
+                fileid: o.fileid, filename: o.filename, showDelete: true
+              })) : []
+            };
           }
           return { ...o };
         })
@@ -118,7 +139,8 @@ class SalaryDetailTempDialog extends Component {
       <WeaDialog
         {...this.props} style={{ width: 480, height: 127 }} initLoadCss title={getLabel(111, "模板保存")}
         buttons={[<Button type="primary" onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>]}>
-        <div className="form-dialog-layout">{getSearchs(tempForm, conditions, 1, false, this.formFieldChange)}</div>
+        <div
+          className="form-dialog-layout tempDialog">{getSearchs(tempForm, conditions, 1, false, this.formFieldChange)}</div>
       </WeaDialog>
     );
   }
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempAdminDialog.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempAdminDialog.js
index 0006cac0..8eecb1ab 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempAdminDialog.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempAdminDialog.js
@@ -40,6 +40,11 @@ class SalaryTempAdminDialog extends Component {
 
   render() {
     const { dataSource, selectedKeys } = this.state, { dataParams } = this.props;
+    const heads = _.reduce(selectedKeys, (pre, cur) => {
+      const item = dataSource.find(data => data.id === cur);
+      if (item) pre.push(item.name);
+      return pre;
+    }, []);
     return (<WeaDialog
       {...this.props} initLoadCss ref={dom => this.dialog = dom} title={getLabel(111, "模板管理")}
       className="temp_admin_dialog" style={{
@@ -47,7 +52,7 @@ class SalaryTempAdminDialog extends Component {
       maxHeight: "90%", maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
     }} buttons={[
       <Button type="primary"
-              onClick={() => this.props.onAddTemp(dataParams.id, selectedKeys)}>{getLabel(111, "确 定")}</Button>,
+              onClick={() => this.props.onAddTemp(dataParams.id, selectedKeys, heads)}>{getLabel(111, "确 定")}</Button>,
       <Button type="ghost" onClick={this.props.onCancel}>{getLabel(111, "取 消")}</Button>
     ]}>
       <WeaTransfer data={dataSource} selectedKeys={selectedKeys} onChange={v => this.setState({ selectedKeys: v })}
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempMangerDialog.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempMangerDialog.js
index 4f5696c9..9b309e4d 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempMangerDialog.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryTempMangerDialog.js
@@ -20,7 +20,7 @@ class SalaryTempMangerDialog extends Component {
     super(props);
     this.state = {
       selectedRowKeys: [], tempAdminDialog: { visible: false, dataParams: { page: "salary_details_report" } },
-      tempDialog: { visible: false, setting: [], id: "", template: {} }
+      tempDialog: { visible: false, setting: [], heads: [], id: "", template: {} }
     };
   }
 
@@ -31,10 +31,10 @@ class SalaryTempMangerDialog extends Component {
   handleTempAdminCols = (params = {}) => this.setState({
     tempAdminDialog: { visible: true, dataParams: { ...this.state.tempAdminDialog.dataParams, ...params } }
   });
-  handelAddTemp = (id = "", setting = []) => {
+  handelAddTemp = (id = "", setting = [], heads = []) => {
     this.setState({
       tempDialog: {
-        visible: true, setting, id, template: _.find(this.tempManageRef.state.listDatas, o => o.id === id)
+        visible: true, setting, heads, id, template: _.find(this.tempManageRef.state.listDatas, o => o.id === id)
       }
     });
   };
@@ -76,7 +76,7 @@ class SalaryTempMangerDialog extends Component {
       {/*薪资明细模板设置*/}
       <SalaryDetailsTempDialog {...tempDialog}
                                onCancel={callback => this.setState({
-                                 tempDialog: { ...tempDialog, visible: false, setting: [] }
+                                 tempDialog: { ...tempDialog, visible: false, setting: [], heads: [] }
                                }, () => callback && callback())}
                                onSuccess={() => this.setState({
                                  tempAdminDialog: { visible: false, dataParams: { page: "salary_details_report" } }
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
index f7c2ca7a..ad620f88 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
@@ -271,7 +271,7 @@ class Index extends Component {
 
   render() {
     const {
-      taxAgentStore: { statisticsReportBtn, PageAndOptAuth },
+      taxAgentStore: { PageAndOptAuth },
       attendanceStore: { statisticsForm, reportForm, tableStore }
     } = this.props;
     const {
@@ -279,6 +279,7 @@ class Index extends Component {
       reportName, keyword, year, logDialogVisible, filterConditions,
       dateRange, showSearchAd, isQuery
     } = this.state;
+    const statisticsReportBtn = PageAndOptAuth.opts.includes("admin");
     const buttons = selectedKey === "statistics" ? [
       <Button type="primary" onClick={() => this.handleReqBtnsClick("addReport")}>{getLabel(111, "新建报表")}</Button>,
       <Button type="ghost"
@@ -289,7 +290,7 @@ class Index extends Component {
                       onSearch={() => this.handleReqBtnsClick("search")}/>
     ] : selectedKey === "detail" ? [
       <span className="employeeYearWrapper">
-        <span>{getLabel(111, "年薪资核算人员明细：")}</span>
+        <span>{getLabel(111, "年度：")}</span>
         <WeaDatePicker value={year} format="YYYY" onChange={year => this.setState({ year })}/>
       </span>,
       <WeaInputSearch placeholder={getLabel(111, "请输入姓名、工号、身份证号")} className="search"
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
index 40c137f0..1b5c5dc5 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.less
@@ -182,7 +182,7 @@
     }
 
     .wea-advanced-searchsAd {
-      height: 155px;
+      height: 200px;
       overflow: hidden auto;
 
       .formItem-delete {
@@ -382,3 +382,17 @@
 
   }
 }
+
+.tempDialog {
+  .wea-form-item-label {
+    min-height: 50px;
+  }
+
+  .wea-form-item-label-extra {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    cursor: pointer;
+    color: #4d7ad8;
+  }
+}
diff --git a/pc4mobx/hrmSalary/pages/appConfig/index.js b/pc4mobx/hrmSalary/pages/appConfig/index.js
index aee9eb68..e13000eb 100644
--- a/pc4mobx/hrmSalary/pages/appConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/appConfig/index.js
@@ -94,8 +94,8 @@ class AppConfig extends Component {
     } = this.state;
     const btns = [
       <Button type="primary" loading={loading} onClick={this.appSettingSave}>保存</Button>,
-      // <Button type="ghost" onClick={() => this.handleOperate("import")}>{getLabel(111, "迁入")}</Button>,
-      // <Button type="ghost" onClick={() => this.handleOperate("export")}>{getLabel(111, "迁出")}</Button>
+      <Button type="ghost" onClick={() => this.handleOperate("import")}>{getLabel(111, "迁入")}</Button>,
+      <Button type="ghost" onClick={() => this.handleOperate("export")}>{getLabel(111, "迁出")}</Button>
     ];
     const items = [
       {
diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js
index e6207394..3a7b563d 100644
--- a/pc4mobx/hrmSalary/pages/calculate/calculate.js
+++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js
@@ -6,7 +6,8 @@
  */
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
-import { WeaLocaleProvider, WeaTop } from "ecCom";
+import { WeaLocaleProvider, WeaTools, WeaTop } from "ecCom";
+import { WeaForm } from "comsMobx";
 import { Button, message, Modal } from "antd";
 import moment from "moment";
 import CalculateQuery from "./components/calculateQuery";
@@ -15,9 +16,15 @@ import CalculateDialog from "./components/calculateDialog";
 import ProgressModal from "../../components/progressModal";
 import LogDialog from "../../components/logViewModal";
 import { backCalculate, deleteSalaryacct, fileSalaryAcct, reAccounting } from "../../apis/calculate";
+import FormInfo from "../../components/FormInfo";
+import { queryConditions } from "./config";
+import { postFetch } from "../../util/request";
+import cs from "classnames";
 import "./index.less";
 
+const getKey = WeaTools.getKey;
 const getLabel = WeaLocaleProvider.getLabel;
+const form = new WeaForm();
 
 @inject("calculateStore", "taxAgentStore")
 @observer
@@ -31,17 +38,33 @@ class Calculate extends Component {
           moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"),
           moment(new Date()).endOf("year").format("YYYY-MM")
         ]
-      }, isRefresh: false, logDialogVisible: false,
+      }, isRefresh: false, logDialogVisible: false, conditions: [],
       progressModule: { visible: false, progress: 0, title: getLabel(111, "正在归档中请稍后") },
-      calcDaialog: { visible: false, title: "" }
+      calcDaialog: { visible: false, title: "" }, showAdvance: false
     };
     this.timer = null;
     this.handleDebounce = null;
   }
 
+  async componentDidMount() {
+    const { data } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" });
+    this.setState({
+      conditions: _.map(queryConditions, item => ({
+        ...item, items: _.map(item.items, o => {
+          o = { ...o, label: getLabel(o.lanId, o.label) };
+          if (getKey(o) === "taxAgentIds") {
+            return { ...o, options: _.map(data, k => ({ key: k.id + "", showname: k.name })) };
+          }
+          return { ...o };
+        })
+      }))
+    }, () => form.initFormFields(this.state.conditions));
+  }
+
   renderCalculateOpts = () => {
-    const { taxAgentStore: { showOperateBtn } } = this.props;
-    const { queryParams, isRefresh } = this.state;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const { queryParams, isRefresh, showAdvance } = this.state;
+    const admin = PageAndOptAuth.opts.includes("admin");
     let calculateOpts = [
       <Button type="primary" onClick={() => this.setState({
         calcDaialog: {
@@ -49,12 +72,13 @@ class Calculate extends Component {
           title: getLabel(538780, "核算")
         }
       })}>{getLabel(538780, "核算")}</Button>,
-      <CalculateQuery queryParams={queryParams} onChange={v => this.setState({
-        isRefresh: _.keys(v)[0] === "name" ? isRefresh : !isRefresh,
-        queryParams: { ...queryParams, ...v }
-      })} onSearch={() => this.setState({ isRefresh: !isRefresh })}/>
+      <CalculateQuery queryParams={queryParams} onAdvance={() => this.setState({ showAdvance: !showAdvance })}
+                      onChange={v => this.setState({
+                        isRefresh: _.keys(v)[0] === "name" ? isRefresh : !isRefresh,
+                        queryParams: { ...queryParams, ...v }
+                      })} onSearch={() => this.setState({ isRefresh: !isRefresh })}/>
     ];
-    return !showOperateBtn ? calculateOpts.slice(1) : calculateOpts;
+    return !admin ? calculateOpts.slice(1) : calculateOpts;
   };
   handleCalcOpts = ({ key }, record) => {
     const { isRefresh, progressModule } = this.state, { id } = record;
@@ -188,7 +212,9 @@ class Calculate extends Component {
   };
 
   render() {
-    const { queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible, filterConditions } = this.state;
+    const {
+      queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible, filterConditions, conditions, showAdvance
+    } = this.state;
     return (
       <WeaTop title={getLabel(538011, "薪资核算")} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
               buttons={this.renderCalculateOpts()} className="calculate-main-layout" showDropIcon
@@ -198,10 +224,20 @@ class Calculate extends Component {
                   key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
                   content: getLabel(545781, "操作日志")
                 }
-              ]}
-      >
+              ]}>
         <div className="calculate-body">
-          <CalculateTablelist queryParams={queryParams} isRefresh={isRefresh} onCalcOpts={this.handleCalcOpts}/>
+          <div className={cs("advance-calc", { "show-advance-calc": showAdvance })}>
+            <FormInfo center={false} itemRender={{}} form={form} formFields={conditions} colCount={2}/>
+            <div className="advance-calc-btns">
+              <Button type="primary"
+                      onClick={() => this.setState({ isRefresh: !isRefresh })}>{getLabel(111, "搜索")}</Button>
+              <Button type="ghost" onClick={() => form.resetForm()}>{getLabel(111, "重置")}</Button>
+              <Button type="ghost"
+                      onClick={() => this.setState({ showAdvance: !showAdvance })}>{getLabel(111, "取消")}</Button>
+            </div>
+          </div>
+          <CalculateTablelist form={form} queryParams={queryParams} isRefresh={isRefresh}
+                              onCalcOpts={this.handleCalcOpts}/>
           <CalculateDialog {...calcDaialog}
                            onCancel={(bool, id) => this.setState({
                              calcDaialog: { ...calcDaialog, visible: false },
diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js
index 00cd202d..0c74ccd5 100644
--- a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js
@@ -21,11 +21,14 @@ class Index extends Component {
           <MonthRangePicker dateRange={dateRange} viewAttr={2}
                             onChange={v => this.props.onChange({ dateRange: v })}/>
         </div>
-        <WeaInputSearch value={name}
-                        placeholder={getLabel(543431, "请输入薪资账套名称")}
-                        onChange={v => this.props.onChange({ name: v })}
-                        onSearch={this.props.onSearch}
-        />
+        <div className="advance-custom">
+          <WeaInputSearch value={name}
+                          placeholder={getLabel(543431, "请输入薪资账套名称")}
+                          onChange={v => this.props.onChange({ name: v })}
+                          onSearch={this.props.onSearch}
+          />
+          <a href="javascript:void(0);" onClick={this.props.onAdvance}>{getLabel(111, "高级搜索")}</a>
+        </div>
       </div>
     );
   }
diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
index eecfa1db..0b4ea0a0 100644
--- a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
@@ -29,12 +29,14 @@ class Index extends Component {
   }
 
   getSalaryAcctList = (props) => {
-    const { pageInfo } = this.state;
-    const { queryParams } = props;
+    const { pageInfo } = this.state, { queryParams, form } = props;
+    const { taxAgentIds } = form.getFormParams();
     const { dateRange, ...extra } = queryParams;
     const [startMonthStr, endMonthStr] = dateRange || [];
     const params = { startMonthStr, endMonthStr, ...extra };
-    const payload = { ...pageInfo, ...params };
+    const payload = {
+      ...pageInfo, ...params, taxAgentIds: taxAgentIds ? taxAgentIds.split(",") : []
+    };
     this.setState({ loading: true });
     getSalaryAcctList(payload).then(({ status, data }) => {
       this.setState({ loading: false });
@@ -73,7 +75,12 @@ class Index extends Component {
                   </span>,
                   render: (__, record) => {
                     const { operate: opts = [] } = record;
-                    const operate = [...opts, { index: "log", text: getLabel(30586, "查看日志") }];
+                    const admin = record.opts.includes("admin");
+                    const operate = admin ? [...opts, { index: "log", text: getLabel(30586, "查看日志") }] : [
+                      { index: "3", text: getLabel(111, "查看") },
+                      { index: "null", text: "" },
+                      { index: "log", text: getLabel(30586, "查看日志") }
+                    ];
                     return <React.Fragment>
                       {
                         _.map(operate.slice(0, 2), f => (
diff --git a/pc4mobx/hrmSalary/pages/calculate/config.js b/pc4mobx/hrmSalary/pages/calculate/config.js
new file mode 100644
index 00000000..02da5b10
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculate/config.js
@@ -0,0 +1,19 @@
+export const queryConditions = [
+  {
+    items: [
+      {
+        conditionType: "SELECT",
+        domkey: ["taxAgentIds"],
+        fieldcol: 14,
+        label: "个税扣缴义务人",
+        lanI: 111,
+        multiple: true,
+        options: [],
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      }
+    ],
+    defaultshow: true
+  }
+];
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
index 2380cfae..1e6eaac0 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/baseInfo.js
@@ -46,7 +46,8 @@ class EditSalaryBaseInfo extends Component {
       default:
         break;
     }
-    return <WeaBrowser {...browserType} viewAttr={3} value={value} valueSpan={valueSpan} inputStyle={{ width: 200 }}
+    return <WeaBrowser {...browserType} viewAttr={this.props.viewAttr === 1 ? 1 : 3}
+                       value={value} valueSpan={valueSpan} inputStyle={{ width: 200 }}
                        onChange={(value, valueSpan) => this.props.onChange(_.map(this.props.baseInfo, it => {
                          if (fieldCode === it.fieldCode) {
                            return { ...it, fieldValue: value, fieldValueObj: { id: value, name: valueSpan } };
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/calcAnchorList.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/calcAnchorList.js
new file mode 100644
index 00000000..a8cecca3
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/calcAnchorList.js
@@ -0,0 +1,110 @@
+/*
+  *  核算编辑
+  *  数据查看锚点
+  * @Author:    黎永顺
+  * @Date:      2025/2/10
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import classnames from "classnames";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class CalcAnchorList extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      collapsed: false, currentIndex: 0
+    };
+    this.isClickRef = null;
+    this.timerRef = null;
+  }
+
+  componentDidMount() {
+    document.getElementById("salary_anchor_area").addEventListener("scroll", this.handlerScroll);
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
+      collapsed: false,
+      currentIndex: 0
+    });
+  }
+
+  componentWillUnmount() {
+    document.getElementById("salary_anchor_area").removeEventListener("scroll", this.handlerScroll);
+  }
+
+  handlerScroll = () => {
+    // 点击锚点时，不执行滚动函数
+    if (this.isClickRef) return;
+    // 获取滚动容器的滚动高度（这里相对于#salary_anchor_area滚动的）
+    const scrollTop = document.getElementById("salary_anchor_area").scrollTop;
+    // 获取所有wea-search-group anchor_开头的元素集合
+    const contentList = document.querySelectorAll("[class^='wea-search-group anchor_']");
+    const offsetTopArr = [];
+    contentList.forEach((item) => {
+      // 获取每个wea-search-group anchor_开头的元素的offsetTop
+      offsetTopArr.push(item.offsetTop);
+    });
+    for (let i = 0; i < offsetTopArr.length; i++) {
+      // 当滚动条高度达到对应wea-search-group anchor_开头的元素的滚动高度、则将锚点设置为高亮状态
+      if (scrollTop + 190 >= offsetTopArr[i]) this.setState({ currentIndex: i });
+    }
+  };
+  onClickAnchor = (item, index) => {
+    const anchorElement = document.getElementById("salary_anchor_area");
+    const el = document.querySelector(`.anchor_${item.salarySobItemGroupId}`);
+    if (el) {
+      anchorElement.scroll({ top: el.offsetTop, behavior: "smooth" });
+    }
+    this.setState({ currentIndex: index });
+    // 点击时设置为true,为了防止同时执行滚动事件
+    this.isClickRef = true;
+    // 清除定时器，防止滚动事件触发、出现走马灯闪烁问题
+    if (this.timerRef) clearTimeout(this.timerRef);
+    this.timerRef = setTimeout(() => {
+      this.isClickRef = false;
+    }, 1000);
+  };
+
+  render() {
+    const { collapsed, currentIndex } = this.state, { datas } = this.props;
+    return (
+      <div id="anchorList-contianer" style={{ position: "sticky", top: 8, zIndex: 10086 }}>
+        <div className={classnames("anchor-list-wrapper", { "anchor-list-collapsed": collapsed })}>
+          {
+            collapsed ?
+              <div className="anchor-list-collapsed-btn">
+                <i className="icon-coms02-Initialize-template"
+                   onClick={() => this.setState({ collapsed: !collapsed })}/>
+              </div> :
+              <React.Fragment>
+                <div className="anchor-list-header">
+                  <i className="icon-coms-right" onClick={() => this.setState({ collapsed: !collapsed })}/>
+                </div>
+                <div className="anchor-list">
+                  <div className="anchor-list-ink">
+                    <span className="anchor-list-ink-ball visible"
+                          style={{ top: `${2.5 + currentIndex * 27.7}px`, height: 23 }}/>
+                  </div>
+                  {_.map(datas, (o, i) => (
+                    <div className={classnames("anchor-list-link", { "anchor-list-link-active": currentIndex === i })}
+                         onClick={() => this.onClickAnchor(o, i)}>
+                      <span
+                        className={classnames("anchor-list-link-title", { "anchor-list-link-title-active": currentIndex === i })}>{o.salarySobItemGroupName}</span>
+                    </div>)
+                  )}
+                </div>
+              </React.Fragment>
+          }
+        </div>
+      </div>
+    );
+  }
+}
+
+export default CalcAnchorList;
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index aa6baf65..986bb1bb 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -30,7 +30,7 @@ class EditCalcTable extends Component {
     this.state = {
       loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
       selectedRowKeys: [], progressVisible: false, progress: 0,
-      salaryCalcSlide: { visible: false, id: "" }, originPayloadData: {},
+      salaryCalcSlide: { visible: false, id: "", viewAttr: 2 }, originPayloadData: {},
       batchUpdateDialog: {
         visible: false, salaryAcctRecordId: "", idList: [], salaryItemId: "",
         conditions: [], pattern: 0, dataType: ""
@@ -73,9 +73,9 @@ class EditCalcTable extends Component {
           this.updateEmpLockStatus({ ...params });
           break;
         case "EDIT":
-          const { id: salaryCalcId } = params;
+          const { id: salaryCalcId, showSee } = params;
           this.setState({
-            salaryCalcSlide: { visible: true, id: salaryCalcId }
+            salaryCalcSlide: { visible: true, id: salaryCalcId, viewAttr: showSee ? 1 : 2 }
           });
           break;
         case "DIAGRAM":
@@ -238,7 +238,7 @@ class EditCalcTable extends Component {
       "总计": getLabel(523, "总计"), "批量解锁": getLabel(111, "批量解锁"),
       "批量锁定": getLabel(111, "批量锁定"), "批量更新": getLabel(111, "批量更新"),
       "查看拓扑图": getLabel(111, "查看拓扑图"), "锁定": getLabel(111, "锁定"),
-      "解锁": getLabel(111, "解锁")
+      "解锁": getLabel(111, "解锁"), "查看": getLabel(111, "查看")
     };
     this.setState({ originPayloadData: { ...payload, i18n } });
     const childFrameObj = document.getElementById("atdTable");
@@ -269,7 +269,7 @@ class EditCalcTable extends Component {
           const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : "";
           this.postMessageToChild({
             dataSource, pageInfo, selectedRowKeys, showTotalCell: this.props.showTotalCell, sumRowlistUrl, payload,
-            calcDetail,
+            calcDetail, showSee: calcDetail,
             columns: _.every(traverse(columns, calcDetail), (it, idx) => !it.fixed) ? _.map(traverse(columns, calcDetail), (it, idx) => ({
               ...it,
               fixed: idx < 2 ? "left" : false
@@ -304,10 +304,7 @@ class EditCalcTable extends Component {
           />
           <EditSalaryCalcSlide {...salaryCalcSlide}
                                onClose={(isFresh) => this.setState({
-                                 salaryCalcSlide: {
-                                   visible: false,
-                                   id: ""
-                                 }
+                                 salaryCalcSlide: { visible: false, id: "", viewAttr: 2 }
                                }, () => isFresh === "true" && this.queryCalcResultList())}/>
           {
             progressVisible &&
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
index 235bac13..239ccb9e 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
@@ -12,9 +12,9 @@ import PayrollItemsTable from "../../../../calculateDetail/payrollItemsTable";
 import IssuedAndReissueTable from "../../../../calculateDetail/issuedAndReissueTable";
 import { acctresultDetail, saveAcctResult } from "../../../../../apis/calculate";
 import { toDecimal_n } from "../../../../../util";
+import CalcAnchorList from "./calcAnchorList";
 import "./index.less";
 
-
 const getLabel = WeaLocaleProvider.getLabel;
 
 class EditSalaryCalcSlide extends Component {
@@ -29,7 +29,7 @@ class EditSalaryCalcSlide extends Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.visible !== this.props.visible && nextProps.visible) this.acctresultDetail(nextProps.id);
-    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({ selectedKey: "0" });
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({ selectedKey: "0" }, () => document.getElementById("salary_anchor_area").scrollTop = 0);
   }
 
   acctresultDetail = (id) => {
@@ -43,14 +43,17 @@ class EditSalaryCalcSlide extends Component {
     });
   };
   renderTitle = () => {
-    const { loading } = this.state;
+    const { loading } = this.state, { viewAttr } = this.props;
     return <div className="titleDialog">
       <div className="titleCol titleLeftBox">
         <div className="titleIcon"><i className="icon-coms-fa"/></div>
-        <div className="title">{getLabel(543559, "编辑薪资")}</div>
+        <div className="title">{viewAttr === 2 ? getLabel(543559, "编辑薪资") : getLabel(111, "查看薪资")}</div>
       </div>
       <div className="titleCol titleRightBox">
-        <Button type="primary" onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>
+        {
+          viewAttr === 2 &&
+          <Button type="primary" onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>
+        }
       </div>
     </div>;
   };
@@ -88,7 +91,7 @@ class EditSalaryCalcSlide extends Component {
   save = () => {
     const { id: salaryAcctEmpId } = this.props;
     const { issuedAndReissueItems, itemsByGroup, baseInfo } = this.state;
-    if (_.every(baseInfo, it => !it.canEdit || (it.canEdit && !it.fieldValue))) {
+    if (!_.every(baseInfo, (item) => (!item.canEdit || !!item.fieldValue))) {
       Modal.warning({
         title: getLabel(131329, "信息确认"),
         content: getLabel(518702, "必要信息不完整，红色*为必填项！")
@@ -96,7 +99,8 @@ class EditSalaryCalcSlide extends Component {
       return;
     }
     const payload = {
-      salaryAcctEmpId, employeeInfos: baseInfo,
+      salaryAcctEmpId,
+      employeeInfos: _.map(baseInfo, o => ({ ...o, fieldValue: o.fieldValue.id || o.fieldValue })),
       items: [
         ..._.reduce(itemsByGroup, (pre, cur) => {
           return [
@@ -139,7 +143,9 @@ class EditSalaryCalcSlide extends Component {
           className="salary-calculate-esf-layout" {...this.props}
           top={0} width={60} height={100} measure={"%"}
           direction={"right"} title={this.renderTitle()}
-          content={<div className="salary-calculate-esf-area">
+          content={<div className="salary-calculate-esf-area" id="salary_anchor_area">
+            {/*锚点*/}
+            <CalcAnchorList datas={itemsByGroup} visible={this.props.visible}/>
             <EditSalaryBaseInfo {...this.props} baseInfo={baseInfo}
                                 onChange={baseInfo => this.setState({ baseInfo })}/>
             <WeaTab keyParam="viewcondition" className="calc-esf-tab"
@@ -148,12 +154,14 @@ class EditSalaryCalcSlide extends Component {
             />
             {
               selectedKey === "0" && _.map(itemsByGroup, item => {
-                return <PayrollItemsTable {...item} onChangeIssueReissueValue={this.handleItemValueChange}/>;
+                return <PayrollItemsTable {...this.props} {...item}
+                                          onChangeIssueReissueValue={this.handleItemValueChange}/>;
               })
             }
             {
               selectedKey === "1" &&
               <IssuedAndReissueTable
+                {...this.props}
                 dataSource={issuedAndReissueItems}
                 onChangeIssueReissueValue={this.handleItemValueChange}
               />
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index e2d8ce9b..75d2f103 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -142,6 +142,7 @@
     height: 100%;
 
     .salary-calculate-esf-area {
+      position: relative;
       background: #f6f6f6;
       height: 100%;
       overflow-y: auto;
@@ -149,6 +150,10 @@
 
       .esf-base-info-form, .wea-title, .wea-content {
         padding: 0;
+
+        .ant-row {
+          height: 100%;
+        }
       }
 
       .esf-form-content {
@@ -191,6 +196,111 @@
       .wea-search-group {
         padding: 0;
       }
+
+      //锚点按钮
+      .anchor-list-collapsed {
+        padding: 0 !important;
+      }
+
+      .anchor-list-wrapper {
+        position: absolute;
+        right: 0;
+        margin: 10px 15px 20px;
+        padding: 8px 10px;
+        overflow: auto;
+        background-color: #fff;
+        box-shadow: 0 3px 12px 0 rgba(0, 0, 0, .12);
+        border-radius: 3px;
+        cursor: pointer;
+
+        .anchor-list-collapsed-btn {
+          opacity: .5;
+          background: #000;
+          color: #fff;
+          border-radius: 3px;
+          width: 30px;
+          height: 30px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 16px;
+        }
+
+        .anchor-list-header {
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          min-width: 130px;
+          padding: 5px;
+        }
+
+        .anchor-list {
+          padding: 0 10px;
+          position: relative;
+          margin-top: 10px;
+          transition: margin-top .3s;
+          max-height: 80vh;
+          overflow: auto;
+
+          .anchor-list-ink {
+            position: absolute;
+            top: 0;
+            left: 5px;
+            height: 100%;
+
+            .anchor-list-ink-ball.visible {
+              display: inline-block;
+            }
+
+            .anchor-list-ink-ball {
+              position: absolute;
+              left: 50%;
+              display: none;
+              width: 3px;
+              height: 8px;
+              background-color: #5d9cec;
+              border: 1.5px solid #5d9cec;
+              border-radius: 8px;
+              transform: translateX(-50%);
+              transition: top .3s ease-in-out;
+            }
+          }
+
+          .anchor-list-ink:before {
+            position: relative;
+            display: block;
+            width: 1px;
+            height: 100%;
+            margin: 0 auto;
+            background-color: #f0f0f0;
+            content: " ";
+          }
+
+          .anchor-list-link {
+            padding: 7px 0 7px 10px;
+            line-height: 1.143;
+
+            .anchor-list-link-title {
+              position: relative;
+              display: block;
+              overflow: hidden;
+              color: #666;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              transition: all .3s;
+              cursor: pointer;
+              outline: none;
+              text-decoration: none;
+              background-color: transparent;
+            }
+          }
+
+          .anchor-list-link-active > .anchor-list-link-title {
+            color: #5d9cec;
+          }
+        }
+      }
+
     }
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/layout.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/layout.js
index 15fa78ed..aaae18a1 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/layout.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/layout.js
@@ -18,23 +18,21 @@ class Layout extends Component {
   }
 
   salaryacctAcctresultCheckAuth = () => {
-    const { taxAgentStore: { getPermission } } = this.props;
-    this.setState({ store: { ...this.state.store, loading: true } });
-    getPermission().then(({ data }) => {
-      const { isOpenDevolution } = data;
-      if (isOpenDevolution) {
-        const { routeParams: { salaryAcctRecordId } } = this.props;
-        salaryacctAcctresultCheckAuth({ salaryAcctRecordId }).then(({ status, data }) => {
-          this.setState({ store: { ...this.state.store, loading: false, hasRight: status && data } }, () => {
-            this.state.store.hasRight && this.props.init && this.props.init();
-          });
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const { isOpenDevolution } = PageAndOptAuth;
+    if (isOpenDevolution) {
+      const { routeParams: { salaryAcctRecordId } } = this.props;
+      this.setState({ store: { ...this.state.store, loading: true } });
+      salaryacctAcctresultCheckAuth({ salaryAcctRecordId }).then(({ status, data }) => {
+        this.setState({ store: { ...this.state.store, loading: false, hasRight: status && data } }, () => {
+          this.state.store.hasRight && this.props.init && this.props.init();
         });
-      } else {
-        this.setState({ store: { ...this.state.store, loading: false, hasRight: true } }, () => {
-          this.props.init && this.props.init();
-        });
-      }
-    }).catch(() => this.setState({ store: { ...this.state.store, loading: false } }));
+      });
+    } else {
+      this.setState({ store: { ...this.state.store, loading: false, hasRight: true } }, () => {
+        this.props.init && this.props.init();
+      });
+    }
   };
 
   render() {
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less
index 045f4b8c..2e73f6b2 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/index.less
@@ -62,6 +62,24 @@
     }
   }
 
+  .advance-custom {
+    display: flex;
+    align-items: center;
+
+    & > a {
+      border-radius: 0;
+      height: 28px;
+      position: relative;
+      color: #474747;
+      padding: 4px 15px;
+      background-color: transparent;
+      display: flex;
+      align-items: center;
+      border: 1px solid #d9d9d9;
+      border-left: none
+    }
+  }
+
   .wea-input-focus {
     margin-top: -4px;
   }
@@ -72,6 +90,32 @@
     overflow-y: hidden;
   }
 
+  .advance-calc {
+    display: none;
+    background: #FFF;
+    margin-bottom: 8px;
+
+    .advance-calc-btns {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 15px 0;
+      border-top: 1px solid #dadada;
+
+      button {
+        margin-right: 15px;
+      }
+    }
+
+    .wea-search-group, .wea-content {
+      padding: 0;
+    }
+  }
+
+  .show-advance-calc {
+    display: block;
+  }
+
   .calculate-body {
     height: 100%;
     width: 100%;
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
index 49085673..26476e79 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetail.js
@@ -36,21 +36,19 @@ export default class CompareDetail extends React.Component {
       current: 1
     };
     fetchComparisonResultList(params);
-    this.salaryacctAcctresultCheckAuth({ salaryAcctRecordId: getQueryString("id") })
+    this.salaryacctAcctresultCheckAuth({ salaryAcctRecordId: getQueryString("id") });
   }
 
   salaryacctAcctresultCheckAuth = (params) => {
-    const { taxAgentStore: { getPermission } } = this.props;
-    getPermission().then(({ data }) => {
-      const { isOpenDevolution } = data;
-      if (isOpenDevolution) {
-        salaryacctAcctresultCheckAuth(params).then(({ status, data }) => {
-          this.setState({ calculateAuth: data && status });
-        });
-      } else {
-        this.setState({ calculateAuth: true });
-      }
-    });
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const { isOpenDevolution } = PageAndOptAuth;
+    if (isOpenDevolution) {
+      salaryacctAcctresultCheckAuth(params).then(({ status, data }) => {
+        this.setState({ calculateAuth: data && status });
+      });
+    } else {
+      this.setState({ calculateAuth: true });
+    }
   };
 
   getColumns = (columns) => {
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
index 5b882dee..238b9e29 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js
@@ -69,17 +69,15 @@ export default class CalculateDetail extends React.Component {
   }
 
   salaryacctAcctresultCheckAuth = (params) => {
-    const { taxAgentStore: { getPermission } } = this.props;
-    getPermission().then(({ data }) => {
-      const { isOpenDevolution } = data;
-      if (isOpenDevolution) {
-        salaryacctAcctresultCheckAuth(params).then(({ status, data }) => {
-          this.setState({ calculateAuth: data && status });
-        });
-      } else {
-        this.setState({ calculateAuth: true });
-      }
-    });
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const { isOpenDevolution } = PageAndOptAuth;
+    if (isOpenDevolution) {
+      salaryacctAcctresultCheckAuth(params).then(({ status, data }) => {
+        this.setState({ calculateAuth: data && status });
+      });
+    } else {
+      this.setState({ calculateAuth: true });
+    }
   };
 
   Input = (value, key) => {
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/issuedAndReissueTable.js b/pc4mobx/hrmSalary/pages/calculateDetail/issuedAndReissueTable.js
index bf1c1286..65189b7e 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/issuedAndReissueTable.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/issuedAndReissueTable.js
@@ -29,10 +29,11 @@ class IssuedAndReissueTable extends Component {
           />
         </span>,
         render: (text, record) => {
-          const { canEdit, pattern } = record;
+          const { canEdit, pattern } = record, { viewAttr } = this.props;
           return <WeaInputNumber
             disabled={!canEdit}
             min={0}
+            viewAttr={viewAttr}
             precision={pattern || 2}
             value={text || 0}
             onChange={(value) => onChangeIssueReissueValue(record.salaryItemName, value, "issuedAndReissueItems")}
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/payrollItemsTable.js b/pc4mobx/hrmSalary/pages/calculateDetail/payrollItemsTable.js
index 9d2ddfce..9f196d5f 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/payrollItemsTable.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/payrollItemsTable.js
@@ -37,8 +37,9 @@ class PayrollItemsTable extends Component {
         </span>,
         width: "20%",
         render: (text, record) => {
-          const { canEdit, dataType, pattern } = record;
+          const { canEdit, dataType, pattern } = record, { viewAttr } = this.props;
           return dataType === "number" ? <WeaInputNumber
+            viewAttr={viewAttr}
             disabled={!canEdit}
             precision={!_.isNil(pattern) ? pattern : 0}
             value={text || 0}
@@ -46,6 +47,7 @@ class PayrollItemsTable extends Component {
           /> : <WeaInput
             disabled={!canEdit}
             value={text}
+            viewAttr={viewAttr}
             onChange={(value) => onChangeIssueReissueValue(record.salaryItemId, value, "itemsByGroup", salarySobItemGroupId)}
           />;
         }
@@ -66,7 +68,7 @@ class PayrollItemsTable extends Component {
       }
     ];
     return (
-      <WeaSearchGroup title={salarySobItemGroupName} showGroup needTigger>
+      <WeaSearchGroup title={salarySobItemGroupName} showGroup needTigger className={`anchor_${salarySobItemGroupId}`}>
         <WeaTable
           rowKey="salaryItemId"
           dataSource={dataSource}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
index dd103159..9869b50e 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
@@ -11,7 +11,6 @@ import {
   deleteAttendance,
   getAttendanceFieldSettingList,
   getAttendanceList,
-  getLedgerList,
   getSalaryCycleAndAttendCycle,
   importAttendQuoteData,
   returnToAttendanceFieldSettingDefault,
@@ -26,6 +25,7 @@ import moment from "moment";
 import SelectItemsWrapper from "../../../../components/selectItemsModal/selectItemsWrapper";
 import AttendanceRefrenceDataModal from "./attendanceRefrenceDataModal";
 import AttendanceDataViewSlide from "./attendanceDataViewSlide";
+import { postFetch } from "../../../../util/request";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -51,7 +51,7 @@ class AttendanceDataComp extends Component {
       },
       fieldSetPayload: { visible: false, title: "", children: null },
       attendanceReferencePayload: { visible: false, title: "" },
-      attendanceViewPayload: { visible: false, attendQuoteId: "", salaryYearMonth: "" }
+      attendanceViewPayload: { visible: false, attendQuoteId: "", salaryYearMonth: "", showOperateBtn: false }
     };
   }
 
@@ -85,25 +85,26 @@ class AttendanceDataComp extends Component {
   };
   getLedgerList = (importData) => {
     const { importFormPayload } = this.state;
-    getLedgerList().then(({ status, data }) => {
-      if (status) {
-        this.setState({
-          importFormPayload: {
-            ...importFormPayload, salarySobId: _.head(data).id,
-            salarySobList: _.map(data, it => ({ key: it.id, showname: it.content }))
-          }
-        }, async () => {
-          const { importFormPayload } = this.state;
-          const { salaryYearMonth, salarySobId } = importFormPayload;
-          const payload = { salaryYearMonthStr: salaryYearMonth, salarySobId };
-          const { data } = await getSalaryCycleAndAttendCycle(payload);
+    postFetch("/api/bs/hrmsalary/salarysob/listAuth", { filterType: "ADMIN_DATA" })
+      .then(({ status, data }) => {
+        if (status) {
           this.setState({
-            importData: { ...importData, params: { salaryYearMonth, salarySobId } },
-            importFormPayload: { ...importFormPayload, ...data }
+            importFormPayload: {
+              ...importFormPayload, salarySobId: String(_.head(data).id),
+              salarySobList: _.map(data, it => ({ key: String(it.id), showname: it.name }))
+            }
+          }, async () => {
+            const { importFormPayload } = this.state;
+            const { salaryYearMonth, salarySobId } = importFormPayload;
+            const payload = { salaryYearMonthStr: salaryYearMonth, salarySobId };
+            const { data } = await getSalaryCycleAndAttendCycle(payload);
+            this.setState({
+              importData: { ...importData, params: { salaryYearMonth, salarySobId } },
+              importFormPayload: { ...importFormPayload, ...data }
+            });
           });
-        });
-      }
-    });
+        }
+      });
   };
   handleChangeImportPayload = (key, value) => {
     const { importFormPayload, importData } = this.state;
@@ -149,11 +150,11 @@ class AttendanceDataComp extends Component {
       }
     });
   };
-  handleViewAttendanceData = ({ id, attendCycle }) => {
+  handleViewAttendanceData = ({ id, attendCycle, opts = [] }) => {
     const { attendanceViewPayload } = this.state;
     this.setState({
       attendanceViewPayload: {
-        ...attendanceViewPayload,
+        ...attendanceViewPayload, showOperateBtn: opts.includes("admin"),
         visible: true, attendQuoteId: id,
         salaryYearMonth: attendCycle
       }
@@ -287,7 +288,7 @@ class AttendanceDataComp extends Component {
       dataSource, columns, pageInfo, loading, importData, importFormPayload, fieldSetPayload,
       attendanceReferencePayload, attendanceViewPayload
     } = this.state;
-    const { showOperateBtn, salaryYearMonth } = this.props;
+    const { salaryYearMonth } = this.props;
     const pagination = {
       ...pageInfo,
       showTotal: total => `共 ${total} 条`,
@@ -315,10 +316,11 @@ class AttendanceDataComp extends Component {
               width: 120,
               dataIndex: "operate",
               render: (_, record) => {
+                const { opts = [] } = record;
                 return (
                   <div className="linkWapper">
                     <a href="javascript: void(0);" onClick={() => this.handleViewAttendanceData(record)}>查看</a>
-                    {showOperateBtn &&
+                    {opts.includes("admin") &&
                       <React.Fragment>
                         <a href="javascript: void(0);" style={{ marginRight: 10 }}
                            onClick={() => this.handleDeleteAttendanceData(record)}>删除</a>
@@ -336,9 +338,18 @@ class AttendanceDataComp extends Component {
                       </React.Fragment>
                     }
                     {
-                      !showOperateBtn &&
-                      <a href="javascript:void(0)"
-                         onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
+                      !opts.includes("admin") &&
+                      <Dropdown
+                        overlay={
+                          <Menu>
+                            <Menu.Item>
+                              <a href="javascript:void(0)"
+                                 onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
+                            </Menu.Item>
+                          </Menu>
+                        }>
+                        <a href="javascript:void(0)"><i className="icon-coms-more"/></a>
+                      </Dropdown>
                     }
                   </div>
                 );
@@ -361,14 +372,13 @@ class AttendanceDataComp extends Component {
         {/* 考勤数据引用 */}
         <AttendanceRefrenceDataModal {...attendanceReferencePayload} onCancel={this.handleCloseQuoteModal}/>
         {/* 考勤数据查看 */}
-        <AttendanceDataViewSlide {...attendanceViewPayload} showOperateBtn={showOperateBtn}
-                                 onClose={() => this.setState({
-                                   attendanceViewPayload: {
-                                     ...attendanceViewPayload,
-                                     visible: false,
-                                     attendQuoteId: ""
-                                   }
-                                 })}/>
+        <AttendanceDataViewSlide {...attendanceViewPayload} onClose={() => this.setState({
+          attendanceViewPayload: {
+            ...attendanceViewPayload,
+            visible: false,
+            attendQuoteId: ""
+          }
+        })}/>
       </React.Fragment>
     );
   }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
index be64c8e8..2f4804b6 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
@@ -5,9 +5,9 @@
  * Date: 2023/3/7
  */
 import React, { Component } from "react";
-import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTable, WeaTop } from "ecCom";
-import { Button } from "antd";
+import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTop } from "ecCom";
 import { viewAttendQuote } from "../../../../apis/attendance";
+import { Button, Spin } from "antd";
 import "./index.less";
 
 const { getLabel } = WeaLocaleProvider;
@@ -16,11 +16,31 @@ class AttendanceDataViewSlide extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      loading: { query: false }, keyword: "", dataSource: [], columns: [],
-      pageInfo: { current: 1, pageSize: 10, total: 0 }
+      loading: { query: false }, keyword: "", dataSource: [], pageInfo: { current: 1, pageSize: 10, total: 0 }
     };
   }
 
+  componentDidMount() {
+    window.addEventListener("message", this.handleReceive, false);
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener("message", this.handleReceive, false);
+  }
+
+  handleReceive = async ({ data }) => {
+    const { type, payload: { id, params } = {} } = data;
+    if (type === "turn") {
+      switch (id) {
+        case "PAGEINFO":
+          this.setState({ pageInfo: { ...this.state.pageInfo, ...params } }, () => this.viewAttendQuote());
+          break;
+        default:
+          break;
+      }
+    }
+  };
+
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.visible !== this.props.visible && nextProps.visible) {
       document.querySelector(".attendanceRefWrapper").classList.add("zIndex0-attendance");
@@ -33,19 +53,29 @@ class AttendanceDataViewSlide extends Component {
 
   viewAttendQuote = (extraPayload = {}, props) => {
     const { loading, pageInfo, keyword } = this.state;
-    const { attendQuoteId } = props;
+    const { attendQuoteId } = props || this.props;
     this.setState({ loading: { ...loading, query: true } });
     viewAttendQuote({ ...pageInfo, attendQuoteId, keyword, ...extraPayload }).then(({ status, data }) => {
       this.setState({ loading: { ...loading, query: false } });
       if (status) {
         const { columns, list: dataSource, pageNum: current, pageSize, total } = data.pageInfo;
         this.setState({
-          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
-          columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : null }))
-        });
+          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource
+        }, () => this.postMessageToChild({
+          pageInfo: this.state.pageInfo, dataSource, showRowSelection: false, unitTableType: "attendanceView",
+          columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : false }))
+        }));
       }
     }).catch(() => this.setState({ loading: { ...loading, query: false } }));
   };
+  postMessageToChild = (payload = {}) => {
+    const i18n = {
+      "操作": getLabel(30585, "操作"), "编辑": getLabel(111, "编辑"), "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条")
+    };
+    const childFrameObj = document.getElementById("attendanceViewTable");
+    childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
+  };
   handleExportAttendQuote = () => {
     if (!this.handleDebounce) {
       this.handleDebounce = _.debounce(() => {
@@ -60,24 +90,7 @@ class AttendanceDataViewSlide extends Component {
 
   render() {
     const { showOperateBtn, salaryYearMonth, ...extra } = this.props;
-    const { columns, dataSource, loading, pageInfo, keyword } = this.state;
-    const pagination = {
-      ...pageInfo,
-      showTotal: (total) => `共 ${total} 条`,
-      pageSizeOptions: ["10", "20", "50", "100"],
-      showSizeChanger: true,
-      showQuickJumper: true,
-      onShowSizeChange: (current, pageSize) => {
-        this.setState({
-          pageInfo: { ...pageInfo, current, pageSize }
-        }, () => this.viewAttendQuote({}, this.props));
-      },
-      onChange: (current) => {
-        this.setState({
-          pageInfo: { ...pageInfo, current }
-        }, () => this.viewAttendQuote({}, this.props));
-      }
-    };
+    const { loading, keyword } = this.state;
     const btns = [
       <Button type="primary" onClick={this.handleExportAttendQuote}>{getLabel(81272, "导出全部")}</Button>,
       <WeaInputSearch
@@ -100,9 +113,16 @@ class AttendanceDataViewSlide extends Component {
                            <div>{getLabel(543376, "考勤周期")}：{salaryYearMonth}</div>
                            <div></div>
                          </div>
-                         <WeaTable
-                           columns={columns} dataSource={dataSource} bordered pagination={pagination}
-                           loading={loading.query} scroll={{ x: 1200, y: `calc(100vh - 240px)` }}/>
+                         <div style={{ height: `calc(100% - 40px)` }}>
+                           <Spin spinning={loading.query}>
+                             <iframe
+                               style={{ border: 0, width: "100%", height: "100%" }}
+                               // src="http://localhost:7607/#/unitTable"
+                               src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/unitTable"
+                               id="attendanceViewTable"
+                             />
+                           </Spin>
+                         </div>
                        </div>
                      }
       />
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js
index c8fdb4b9..87f06a11 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js
@@ -13,7 +13,6 @@ import { getSearchs } from "../../../../util";
 import {
   checkOperation,
   getAttendanceFieldSettingList,
-  getLedgerList,
   returnToAttendanceFieldSettingDefault,
   saveAttendanceFieldSetting,
   saveAttendanceFieldSettingAsDefault,
@@ -21,6 +20,7 @@ import {
 } from "../../../../apis/attendance";
 import SelectItemModal from "../../../../components/selectItemsModal";
 import SelectItemsWrapper from "../../../../components/selectItemsModal/selectItemsWrapper";
+import { postFetch } from "../../../../util/request";
 import "./index.less";
 
 @inject("attendanceStore")
@@ -46,25 +46,26 @@ class AttendanceRefrenceDataModal extends Component {
 
   getLedgerList = () => {
     const { attendanceStore: { refenceform } } = this.props;
-    getLedgerList().then(({ status, data }) => {
-      if (status) {
-        this.setState({
-          condition: _.map(reFrenceConditions, (item) => {
-            const { items } = item;
-            return {
-              ...item,
-              items: _.map(items, child => {
-                const { domkey } = child;
-                if (domkey[0] === "salarySobIds") {
-                  return { ...child, options: _.map(data, it => ({ key: it.id, showname: it.content })) };
-                }
-                return { ...child };
-              })
-            };
-          })
-        }, () => refenceform.initFormFields(this.state.condition));
-      }
-    });
+    postFetch("/api/bs/hrmsalary/salarysob/listAuth", { filterType: "ADMIN_DATA" })
+      .then(({ status, data }) => {
+        if (status) {
+          this.setState({
+            condition: _.map(reFrenceConditions, (item) => {
+              const { items } = item;
+              return {
+                ...item,
+                items: _.map(items, child => {
+                  const { domkey } = child;
+                  if (domkey[0] === "salarySobIds") {
+                    return { ...child, options: _.map(data, it => ({ key: String(it.id), showname: it.name })) };
+                  }
+                  return { ...child };
+                })
+              };
+            })
+          }, () => refenceform.initFormFields(this.state.condition));
+        }
+      });
   };
   /*
    * Author: 黎永顺
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less
index 51316cab..8b586900 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less
@@ -54,8 +54,8 @@
       margin-bottom: 8px;
     }
 
-    .wea-new-table {
-      background: #FFF;
+    .ant-spin-nested-loading, .ant-spin-container {
+      height: 100%;
     }
   }
 
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
index e27fc31e..1a2de172 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
@@ -78,7 +78,8 @@ class Index extends Component {
 
   render() {
     const { selectedKey, salaryMonth, fieldName, logDialogVisible, filterConditions } = this.state;
-    const { taxAgentStore: { showOperateBtn } } = this.props;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const topTab = [
       { title: "考勤数据", key: "DATA" },
       { title: "字段管理", key: "FIELD" }
@@ -115,7 +116,6 @@ class Index extends Component {
                 selectedKey === "DATA" ?
                   <AttendanceDataComp
                     ref={dom => this.attendanceTableRef = dom}
-                    showOperateBtn={showOperateBtn}
                     salaryYearMonth={salaryMonth}
                     onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
                   /> :
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
index 4bba03cd..9c36b02a 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
@@ -5,11 +5,13 @@
  * Date: 2023/2/20
  */
 import React, { Component } from "react";
-import { WeaSearchGroup, WeaTable } from "ecCom";
+import { WeaLocaleProvider, WeaSearchGroup, WeaTable } from "ecCom";
 import { getTableRecordDate } from "../../../apis/cumDeduct";
 import { DataCollectionDateRangePick, DataCollectionSelect, Input } from "../cumDeduct";
 import "./index.less";
 
+const getLabel = WeaLocaleProvider.getLabel;
+
 class TableRecord extends Component {
   constructor(props) {
     super(props);
@@ -167,11 +169,11 @@ class TableRecord extends Component {
     };
     const items = screenParams.length === 1 ? [
       {
-        com: Input({ value: record.username })
+        com: Input({ label: getLabel(111, "姓名"), value: record.username })
       }
     ] : [
       {
-        com: Input({ value: record.username })
+        com: Input({ label: getLabel(111, "姓名"), value: record.username })
       },
       {
         com: DataCollectionSelect({
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index 867c8423..7b1bf8ff 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -28,6 +28,7 @@ import TableRecord from "../components/tableRecord";
 import { dataCollectCondition } from "./columns";
 import { removePropertyCondition } from "../../../util/response";
 import { convertToUrlString } from "../../../util/url";
+import { postFetch } from "../../../util/request";
 import { getDomkes } from "../../../util";
 import Layout from "../layout";
 import moment from "moment";
@@ -66,7 +67,8 @@ class Index extends Component {
       exportPayloadUrl: "",
       exportPayloadType: false,
       advanceCondition: null,
-      targetid: ""
+      targetid: "",
+      taxAgentOption: []
     };
     this.tableRef = null;
     this.addItemRef = null;
@@ -103,11 +105,15 @@ class Index extends Component {
    * Params:
    * Date: 2023/2/20
    */
-  getAdvanceCondition = () => {
+  getAdvanceCondition = async () => {
     const { cumDeductStore: { form } } = this.props;
+    const { data: authTaxAgent } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" });
     getCumDeductSaCondition().then(({ status, data }) => {
       if (status) {
-        this.setState({ advanceCondition: removePropertyCondition(data.condition) });
+        this.setState({
+          advanceCondition: removePropertyCondition(data.condition),
+          taxAgentOption: _.map(authTaxAgent, g => ({ key: String(g.id), showname: g.name }))
+        });
         form.initFormFields(removePropertyCondition(data.condition));
       }
     });
@@ -236,7 +242,8 @@ class Index extends Component {
     }
   };
   handleSaveData = () => {
-    const { cumDeductStore: { addForm }, taxAgentStore: { taxAgentOption } } = this.props;
+    const { cumDeductStore: { addForm } } = this.props, { slidePayload } = this.state;
+    const taxAgentOption = slidePayload.children.props.taxAgentOption;
     addForm.validateForm().then(f => {
       if (f.isValid) {
         const payload = {
@@ -260,10 +267,11 @@ class Index extends Component {
    * Params: screenParams规则：日期必须放在数组最后一位，人员信息必须第一位
    * Date: 2023/2/20
    */
-  handleAddData = (title = "新建", editId = {}) => {
-    const { taxAgentStore, cumDeductStore: { addForm } } = this.props;
+  handleAddData = async (title = "新建", editId = {}) => {
+    const { data } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" });
+    const taxAgentOption = _.map(data, o => ({ key: String(o.id), showname: o.name }));
+    const { cumDeductStore: { addForm } } = this.props;
     const { slidePayload } = this.state;
-    const { taxAgentOption } = taxAgentStore;
     const conditions = _.map(dataCollectCondition, (it, idx) => {
       if (idx === 0) {
         return {
@@ -349,8 +357,7 @@ class Index extends Component {
    * Date: 2023/2/17
    */
   getScreen = () => {
-    const { taxAgentStore: { taxAgentOption } } = this.props;
-    const { declareMonth, taxAgentId, innerWidth } = this.state;
+    const { declareMonth, taxAgentId, innerWidth, taxAgentOption } = this.state;
     const items = [
       {
         com: DataCollectionDatePicker({
@@ -463,10 +470,11 @@ class Index extends Component {
    * Params:
    * Date: 2023/2/20
    */
-  handleOpenImport = () => {
+  handleOpenImport = async () => {
+    const { data } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" });
+    const taxAgentOption = _.map(data, o => ({ key: String(o.id), showname: o.name }));
     const { importPayload } = this.state;
     const { importOpts } = importPayload;
-    const { taxAgentStore: { taxAgentOption } } = this.props;
     this.setState({
       importPayload: {
         ...importPayload,
@@ -498,7 +506,7 @@ class Index extends Component {
   };
 
   render() {
-    const { taxAgentStore: { showOperateBtn }, cumDeductStore: { form } } = this.props;
+    const { cumDeductStore: { form } } = this.props;
     const {
       declareMonth, taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition,
       importPayload, exportPayloadType, targetid
@@ -519,7 +527,6 @@ class Index extends Component {
           ref={dom => this.tableRef = dom}
           url="/api/bs/hrmsalary/addUpDeduction/list"
           payload={tablePayload}
-          showOperateBtn={showOperateBtn}
           onTableOperate={this.handleTableOperate}
           onViewDetails={(record) => this.handleAddData("累计专项附加扣除记录", record)}
           form={form}
@@ -557,8 +564,10 @@ export const DataCollectionSelect = (props) => {
 };
 
 export const Input = (props) => {
-  const { value } = props;
-  return (<WeaInput value={value} viewAttr={1}/>);
+  const { value, label } = props;
+  return (<WeaFormItem label={label} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
+    <WeaInput value={value} viewAttr={1}/>
+  </WeaFormItem>);
 };
 export const DataCollectionDateRangePick = (props) => {
   const { range, label, onChange, format = "YYYY-MM", key } = props;
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
index 64cdd59e..dbd9da42 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
@@ -27,6 +27,7 @@ import { dataCollectCondition, taxOptions } from "./columns";
 import AddItems from "../addItems";
 import TableRecord from "../components/tableRecord";
 import { convertToUrlString } from "../../../util/url";
+import { postFetch } from "../../../util/request";
 import { getDomkes } from "../../../util";
 
 const getKey = WeaTools.getKey;
@@ -63,7 +64,8 @@ class Index extends Component {
       exportPayloadUrl: "",
       exportPayloadType: false,
       advanceCondition: null,
-      targetid: ""
+      targetid: "",
+      taxAgentOption: []
     };
     this.tableRef = null;
     this.addItemRef = null;
@@ -80,11 +82,15 @@ class Index extends Component {
    * Params:
    * Date: 2023/2/20
    */
-  getAdvanceCondition = () => {
+  getAdvanceCondition = async () => {
+    const { data: authTaxAgent } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" });
     const { cumSituationStore: { form } } = this.props;
     getCumSituationSaCondition().then(({ status, data }) => {
       if (status) {
-        this.setState({ advanceCondition: removePropertyCondition(data.condition) });
+        this.setState({
+          advanceCondition: removePropertyCondition(data.condition),
+          taxAgentOption: _.map(authTaxAgent, g => ({ key: String(g.id), showname: g.name }))
+        });
         form.initFormFields(removePropertyCondition(data.condition));
       }
     });
@@ -142,10 +148,11 @@ class Index extends Component {
    * Params: screenParams规则：日期必须放在数组最后一位，人员信息必须第一位
    * Date: 2023/2/20
    */
-  handleAddData = (title = "新建", editId = {}) => {
-    const { taxAgentStore, cumSituationStore: { addForm } } = this.props;
+  handleAddData = async (title = "新建", editId = {}) => {
+    const { data } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" });
+    const taxAgentOption = _.map(data, o => ({ key: String(o.id), showname: o.name }));
+    const { cumSituationStore: { addForm } } = this.props;
     const { slidePayload } = this.state;
-    const { taxAgentOption } = taxAgentStore;
     const conditions = _.map(dataCollectCondition, (it, idx) => {
       if (idx === 0) {
         return {
@@ -324,8 +331,7 @@ class Index extends Component {
    * Date: 2023/2/17
    */
   getScreen = () => {
-    const { taxAgentStore: { taxAgentOption } } = this.props;
-    const { declareMonth, year, taxAgentId, innerWidth } = this.state;
+    const { declareMonth, year, taxAgentId, innerWidth, taxAgentOption } = this.state;
     const items = [
       {
         com: DataCollectionDatePicker({
@@ -389,7 +395,8 @@ class Index extends Component {
     this.props.cumSituationStore.initAddForm();
   };
   handleSaveData = () => {
-    const { cumSituationStore: { addForm }, taxAgentStore: { taxAgentOption } } = this.props;
+    const { cumSituationStore: { addForm } } = this.props, { slidePayload } = this.state;
+    const taxAgentOption = slidePayload.children.props.taxAgentOption;
     addForm.validateForm().then(f => {
       if (f.isValid) {
         const payload = {
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
index a36aa418..efd888c6 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
@@ -27,8 +27,6 @@ class Layout extends Component {
   }
 
   componentDidMount() {
-    const { taxAgentStore: { fetchTaxAgentOption } } = this.props;
-    fetchTaxAgentOption();
     window.addEventListener("resize", this.resizeUpdate);
   }
 
@@ -91,7 +89,7 @@ class Layout extends Component {
   render() {
     const { showSearchAd, logDialogVisible, filterConditions } = this.state;
     const {
-      title, btns, leftComp, children, taxAgentStore: { showOperateBtn },
+      title, btns, leftComp, children, taxAgentStore: { PageAndOptAuth },
       slidePayload, onClose, form, condition, onImportFile,
       onAdSearch, onCancel, importPayload, logFunction, onClearTargrtid
     } = this.props;
@@ -100,6 +98,7 @@ class Layout extends Component {
       visible: importVisiable, importFormComponent, importOpts,
       importResult, templateLink, previewUrl
     } = importPayload;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     return (
       <div className="layoutWrapper">
         <WeaTop title={title} buttons={showOperateBtn ? btns : []}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
index 8f786982..03ae9ae7 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
@@ -29,6 +29,7 @@ import { dataCollectCondition } from "./columns";
 import AddItems from "../addItems";
 import TableRecord from "../components/tableRecord";
 import { convertToUrlString } from "../../../util/url";
+import { postFetch } from "../../../util/request";
 import { getDomkes } from "../../../util";
 
 const getKey = WeaTools.getKey;
@@ -64,7 +65,8 @@ class Index extends Component {
       exportPayloadUrl: "",
       exportPayloadType: false,
       advanceCondition: null,
-      targetid: ""
+      targetid: "",
+      taxAgentOption: []
     };
     this.tableRef = null;
     this.addItemRef = null;
@@ -81,11 +83,15 @@ class Index extends Component {
   * Params:
   * Date: 2023/2/20
   */
-  getAdvanceCondition = () => {
+  getAdvanceCondition = async () => {
+    const { data: authTaxAgent } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" });
     const { otherDeductStore: { form } } = this.props;
     getOtherDeductSaCondition().then(({ status, data }) => {
       if (status) {
-        this.setState({ advanceCondition: removePropertyCondition(data.condition) });
+        this.setState({
+          advanceCondition: removePropertyCondition(data.condition),
+          taxAgentOption: _.map(authTaxAgent, g => ({ key: String(g.id), showname: g.name }))
+        });
         form.initFormFields(removePropertyCondition(data.condition));
       }
     });
@@ -270,10 +276,11 @@ class Index extends Component {
  * Params: screenParams规则：日期必须放在数组最后一位，人员信息必须第一位
  * Date: 2023/2/20
  */
-  handleAddData = (title = "新建", editId = {}) => {
-    const { taxAgentStore, otherDeductStore: { addForm } } = this.props;
+  handleAddData = async (title = "新建", editId = {}) => {
+    const { data } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" });
+    const taxAgentOption = _.map(data, o => ({ key: String(o.id), showname: o.name }));
+    const { otherDeductStore: { addForm } } = this.props;
     const { slidePayload } = this.state;
-    const { taxAgentOption } = taxAgentStore;
     const conditions = _.map(dataCollectCondition, (it, idx) => {
       if (idx === 0) {
         return {
@@ -359,8 +366,7 @@ class Index extends Component {
    * Date: 2023/2/17
    */
   getScreen = () => {
-    const { taxAgentStore: { taxAgentOption } } = this.props;
-    const { declareMonth, taxAgentId, innerWidth } = this.state;
+    const { declareMonth, taxAgentId, innerWidth, taxAgentOption } = this.state;
     const items = [
       {
         com: DataCollectionDatePicker({
@@ -404,7 +410,8 @@ class Index extends Component {
     this.props.otherDeductStore.initAddForm();
   };
   handleSaveData = () => {
-    const { otherDeductStore: { addForm }, taxAgentStore: { taxAgentOption } } = this.props;
+    const { otherDeductStore: { addForm } } = this.props, { slidePayload } = this.state;
+    const taxAgentOption = slidePayload.children.props.taxAgentOption;
     addForm.validateForm().then(f => {
       if (f.isValid) {
         const payload = {
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
index 5986baae..f9c2134d 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
@@ -20,6 +20,7 @@ import { condition } from "./components/condition";
 import AddItems from "../addItems";
 import TableRecord from "../components/tableRecord";
 import { convertToUrlString } from "../../../util/url";
+import { postFetch } from "../../../util/request";
 import { getDomkes } from "../../../util";
 
 const getKey = WeaTools.getKey;
@@ -53,7 +54,8 @@ class Index extends Component {
       exportPayloadUrl: "",
       exportPayloadType: false,
       advanceCondition: null,
-      targetid: ""
+      targetid: "",
+      taxAgentOption: []
     };
     this.tableRef = null;
     this.addItemRef = null;
@@ -105,11 +107,15 @@ class Index extends Component {
    * Params:
    * Date: 2023/2/20
    */
-  getAdvanceCondition = () => {
+  getAdvanceCondition = async () => {
+    const { data: authTaxAgent } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" });
     const { specialAddStore: { advanceForm } } = this.props;
     getSearchCondition().then(({ status, data }) => {
       if (status) {
-        this.setState({ advanceCondition: removePropertyCondition(data.condition) });
+        this.setState({
+          advanceCondition: removePropertyCondition(data.condition),
+          taxAgentOption: _.map(authTaxAgent, g => ({ key: String(g.id), showname: g.name }))
+        });
         advanceForm.initFormFields(removePropertyCondition(data.condition));
       }
     });
@@ -208,8 +214,7 @@ class Index extends Component {
   * Date: 2023/2/17
   */
   getScreen = () => {
-    const { taxAgentStore: { taxAgentOption } } = this.props;
-    const { taxAgentId } = this.state;
+    const { taxAgentId, taxAgentOption } = this.state;
     const items = [
       {
         com: DataCollectionSelect({
@@ -258,10 +263,11 @@ class Index extends Component {
    * Params: screenParams规则：日期必须放在数组最后一位，人员信息必须第一位
    * Date: 2023/2/20
    */
-  handleAddData = (title = "新建", editId = {}) => {
-    const { taxAgentStore, specialAddStore: { addForm } } = this.props;
+  handleAddData = async (title = "新建", editId = {}) => {
+    const { data } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" });
+    const taxAgentOption = _.map(data, o => ({ key: String(o.id), showname: o.name }));
+    const { specialAddStore: { addForm } } = this.props;
     const { slidePayload } = this.state;
-    const { taxAgentOption } = taxAgentStore;
     const conditions = _.map(condition, (it, idx) => {
       if (idx === 0) {
         return {
@@ -342,7 +348,8 @@ class Index extends Component {
     this.props.specialAddStore.initAddForm();
   };
   handleSaveData = () => {
-    const { specialAddStore: { addForm }, taxAgentStore: { taxAgentOption } } = this.props;
+    const { specialAddStore: { addForm } } = this.props, { slidePayload } = this.state;
+    const taxAgentOption = slidePayload.children.props.taxAgentOption;
     addForm.validateForm().then(f => {
       if (f.isValid) {
         const payload = {
@@ -371,10 +378,11 @@ class Index extends Component {
  * Params:
  * Date: 2023/2/20
  */
-  handleOpenImport = () => {
+  handleOpenImport = async () => {
+    const { data } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" });
+    const taxAgentOption = _.map(data, o => ({ key: String(o.id), showname: o.name }));
     const { importPayload } = this.state;
     const { importOpts } = importPayload;
-    const { taxAgentStore: { taxAgentOption } } = this.props;
     this.setState({
       importPayload: {
         ...importPayload,
@@ -405,7 +413,7 @@ class Index extends Component {
   };
 
   render() {
-    const { taxAgentStore: { showOperateBtn }, specialAddStore: { advanceForm } } = this.props;
+    const { specialAddStore: { advanceForm } } = this.props;
     const {
       taxAgentId, slidePayload, saveLoading, exportPayloadUrl, advanceCondition, importPayload,
       exportPayloadType, targetid
@@ -427,7 +435,6 @@ class Index extends Component {
           url="/api/bs/hrmsalary/specialAddDeduction/list"
           payload={tablePayload}
           isSpecial
-          showOperateBtn={showOperateBtn}
           onTableOperate={this.handleTableOperate}
           onViewDetails={(record) => this.handleAddData("专项附加扣除记录", record)}
           form={advanceForm}
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/DPDialog/index.js b/pc4mobx/hrmSalary/pages/datapush/components/DPDialog/index.js
new file mode 100644
index 00000000..5e17f5d5
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/components/DPDialog/index.js
@@ -0,0 +1,171 @@
+/*
+  *  数据推送
+  *  新增编辑
+  * @Author:    黎永顺
+  * @Date:      2024/11/19
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaButtonIcon, WeaLocaleProvider, WeaSearchGroup, WeaSlideModal, WeaTable, WeaTools } from "ecCom";
+import PDetailDialog from "../PDDialog";
+import { postFetch } from "../../../../util/request";
+import * as API from "../../../../apis/datapush";
+import { conditions } from "../../conditions";
+import { Button, message, Modal } from "antd";
+import { formRender } from "../../formRender";
+
+const getLabel = WeaLocaleProvider.getLabel;
+const getKey = WeaTools.getKey;
+
+@inject("baseFormStore") @observer
+class Index extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      conditions: [], loading: false, columns: [], dataSource: [],
+      PDDialog: { visible: false, title: "", settingId: "", detail: {} } //推送明细弹框
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) {
+      document.querySelector(".datapush_wrapper").classList.add("zIndex0-weaslide-title");
+      this.initForm(nextProps);
+    }
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) {
+      document.querySelector(".datapush_wrapper").classList.remove("zIndex0-weaslide-title");
+      this.props.baseFormStore.initForm();
+    }
+  }
+
+  initForm = async (props) => {
+    const { detail } = props;
+    const { data: salarySobList } = await postFetch("/api/bs/hrmsalary/salarysob/listAuth", { filterType: "ADMIN_DATA" });
+    this.setState({
+      conditions: _.map(conditions, item => ({
+        ...item, title: getLabel(item.lanId, item.title), items: _.map(item.items, o => {
+          o = { ...o, label: getLabel(o.lanId, o.label), value: detail[getKey(o)] || "" };
+          if (getKey(o) === "salarySobIds") {
+            return {
+              ...o, value: detail[getKey(o)] ? detail[getKey(o)] : "",
+              options: _.map(salarySobList, o => ({ key: String(o.id), showname: o.name }))
+            };
+          } else if (getKey(o) === "able") {
+            return { ...o, value: !_.isEmpty(detail) ? String(detail[getKey(o)]) : o.value };
+          }
+          return { ...o };
+        })
+      }))
+    }, () => {
+      props.baseFormStore.form.initFormFields(this.state.conditions);
+      !_.isEmpty(detail) && this.getPushItemList(props);
+    });
+  };
+  getPushItemList = (props) => {
+    const { detail } = props || this.props;
+    const { id: settingId } = detail;
+    API.getPushItemList({ settingId }).then(({ status, data }) => {
+      if (status) {
+        const { columns, list: dataSource } = data;
+        this.setState({
+          dataSource, columns: [...columns, {
+            title: getLabel(111, "操作"), width: 120, render: (__, record) => (<React.Fragment>
+              <a href="javascript: void(0);" style={{ marginRight: 10 }}
+                 onClick={() => this.handleOpts("edit", record)}>{getLabel(111, "编辑")}</a>
+              <a href="javascript: void(0);" style={{ marginRight: 10 }}
+                 onClick={() => this.handleOpts("del", record.id)}>{getLabel(111, "删除")}</a>
+            </React.Fragment>)
+          }],
+          PDDialog: { ...this.state.PDDialog, settingId }
+        });
+      }
+    });
+  };
+  handleOpts = (type, detail = {}) => {
+    switch (type) {
+      case "edit":
+        const { PDDialog } = this.state;
+        this.setState({ PDDialog: { ...PDDialog, visible: true, title: getLabel(111, "编辑"), detail } });
+        break;
+      case "del":
+        Modal.confirm({
+          title: getLabel(111, "信息确认"),
+          content: getLabel(111, "确认要删除吗?"),
+          onOk: () => {
+            API.deletePushItemList({ id: detail }).then(({ status, errormsg }) => {
+              if (status) {
+                message.success(getLabel(111, "删除成功"));
+                this.getPushItemList();
+              } else {
+                message.error(errormsg);
+              }
+            });
+          }
+        });
+        break;
+      default:
+        break;
+    }
+  };
+  save = () => {
+    const { baseFormStore: { form }, detail } = this.props;
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        const { salarySobIds, ...payload } = form.getFormParams();
+        this.setState({ loading: true });
+        API.savePushSetting({ ...payload, salarySobIds: salarySobIds.split(","), id: detail.id })
+          .then(({ status, errormsg }) => {
+            this.setState({ loading: false });
+            if (status) {
+              message.success(getLabel(30700, "操作成功"));
+              this.props.onClose(this.props.onSearch());
+            } else {
+              message.error(errormsg);
+            }
+          }).catch(() => this.setState({ loading: false }));
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+  renderTitle = () => {
+    const { loading } = this.state, { title } = this.props;
+    return <div className="titleDialog">
+      <div className="titleCol titleLeftBox">
+        <div className="titleIcon"><i className="icon-coms-fa"/></div>
+        <div className="title">{title}</div>
+      </div>
+      <div className="titleCol titleRightBox">
+        <Button type="primary" loading={loading} onClick={this.save}>{getLabel(537558, "保存")}</Button>
+      </div>
+    </div>;
+  };
+
+  render() {
+    const { baseFormStore: { form }, detail } = this.props, { conditions, columns, dataSource, PDDialog } = this.state;
+    return (<WeaSlideModal
+      className="pushdata_create_dialog" {...this.props} direction="right"
+      top={0} width={800} height={100} measureT="%" measureX="px" measureY="%" title={this.renderTitle()}
+      content={<div className="form-dialog-layout">
+        {formRender(form, conditions)}
+        {!_.isEmpty(detail) &&
+          <WeaSearchGroup title={getLabel(111, "推送明细")} showGroup needTigger className="pushdata_detail">
+            <div className="opts">
+              <WeaButtonIcon buttonType="add" type="primary" title={getLabel(111, "添加")}
+                             onClick={() => this.setState({
+                               PDDialog: { ...PDDialog, visible: true, title: getLabel(111, "新建") }
+                             })}/>
+            </div>
+            <WeaTable pagination={false} columns={columns} dataSource={dataSource} bordered/>
+            <PDetailDialog {...PDDialog} onSearch={this.getPushItemList}
+                           onCancel={() => this.setState({ PDDialog: { ...PDDialog, visible: false, detail: {} } })}/>
+          </WeaSearchGroup>}
+      </div>}
+    />);
+  }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/customTreeSelect.js b/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/customTreeSelect.js
new file mode 100644
index 00000000..bc8ad18a
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/customTreeSelect.js
@@ -0,0 +1,95 @@
+/*
+  *  数据推送
+  *   自定义薪资项目选择树
+  * @Author:    黎永顺
+  * @Date:      2024/11/20
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import { TreeSelect } from "antd";
+import { formualSearchField, formualSearchGroup } from "../../../../apis/item";
+import cs from "classnames";
+
+const getLabel = WeaLocaleProvider.getLabel;
+const TreeNode = TreeSelect.TreeNode;
+
+class CustomTreeSelect extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { sourceList: [] };
+  }
+
+  componentDidMount() {
+    formualSearchGroup({ referenceType: "sql" }).then(({ status, data }) => {
+      if (status) this.setState({ sourceList: _.map(data, o => ({ ...o, isLeaf: true })) });
+    });
+  }
+
+  getSourceItem = (sourceId) => {
+    formualSearchField({ sourceId, extendParam: { referenceType: "sql" } }).then(({ status, data }) => {
+      if (status) {
+        this.setState({
+          sourceList: _.map(this.state.sourceList, o => {
+            if (o.key === sourceId) return {
+              ...o,
+              children: _.map(data, k => ({ key: k.fieldId, value: k.name, fieldType: k.fieldType, isLeaf: false }))
+            };
+            return { ...o };
+          })
+        });
+      }
+    });
+  };
+  generateTreeNodes = (data) => {
+    const treeNodes = [], showData = [...data];
+    showData.map((item) => {
+      let title = (
+        <div className="weapp-excel-code-action-list-variable">
+          <span className="weapp-excel-code-action-list-variable-name">{item.value}</span>
+          {
+            item.fieldType ?
+              <span
+                className={cs("weapp-excel-code-action-list-variable-tip", { "danger": item.fieldType === "string" })}>{item.fieldType === "number" ? getLabel(111, "数字") : getLabel(111, "文本")}</span> :
+              <span></span>
+          }
+        </div>
+      );
+      treeNodes.push(<TreeNode className="no-child-item" title={title} key={item.key} value={item.key}/>);
+    });
+    return treeNodes;
+  };
+  handleSelect = (nodeValue) => {
+    const { form } = this.props, { sourceList } = this.state;
+    const [source, __] = nodeValue.split("_");
+    const itemName = _.find(_.find(sourceList, o => o.key === source).children, k => k.key === nodeValue).value;
+    form.updateFields({ item: nodeValue, itemName, source });
+  };
+
+  render() {
+    const { sourceList } = this.state, { detail } = this.props;
+    const { itemName } = detail;
+    return (
+      <TreeSelect dropdownStyle={{ maxHeight: 320, overflow: "auto" }} defaultValue={itemName}
+                  dropdownMatchSelectWidth className="custom_item_treeselect" showSearch
+                  loadData={(node) => this.getSourceItem(node.props.value)}
+                  onSelect={this.handleSelect}
+                  treeNodeFilterProp="title"
+                  filterTreeNode={(inputValue, treeNode) => {
+                    const title = treeNode.props.title.props ? treeNode.props.title.props.children[0].props.children : treeNode.props.title;
+                    return title.toLowerCase().indexOf(inputValue.toLowerCase()) >= 0;
+                  }}>
+        {
+          _.map(sourceList, o => (
+            <TreeNode title={o.value} key={o.key} value={o.key} isLeaf={o.isLeaf} selectable={false}>
+              {this.generateTreeNodes(o.children || [])}
+            </TreeNode>))
+        }
+      </TreeSelect>
+    );
+  }
+}
+
+export default CustomTreeSelect;
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/index.js b/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/index.js
new file mode 100644
index 00000000..94b3d818
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/index.js
@@ -0,0 +1,96 @@
+/*
+  * 数据推送
+  * 推送明细新增编辑
+  * @Author:    黎永顺
+  * @Date:      2024/11/20
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
+import { commonEnumList } from "../../../../apis/ruleconfig";
+import * as API from "../../../../apis/datapush";
+import { PDConditions } from "../../conditions";
+import { Button, message } from "antd";
+import { formRender } from "../../formRender";
+
+
+const getLabel = WeaLocaleProvider.getLabel;
+const getKey = WeaTools.getKey;
+
+@inject("baseFormStore")
+@observer
+class Index extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      conditions: [], loading: false
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) this.initForm(nextProps);
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) nextProps.baseFormStore.initFormExtra();
+  }
+
+  initForm = async (props) => {
+    const { detail = {} } = props;
+    const { data: fieldType } = await commonEnumList({ enumClass: "com.engine.salary.enums.push.PushItemFieldEnum" });
+    this.setState({
+      conditions: _.map(PDConditions, item => ({
+        ...item, items: _.map(item.items, o => {
+          o = { ...o, label: getLabel(o.lanId, o.label), value: detail[getKey(o)] || "" };
+          if (getKey(o) === "fieldType") {
+            return {
+              ...o, value: detail[getKey(o)] ? String(detail[getKey(o)]) : "",
+              options: _.map(fieldType, o => ({ key: o.enum, showname: o.defaultLabel }))
+            };
+          }
+          return { ...o };
+        })
+      }))
+    }, () => {
+      props.baseFormStore.formExtra.initFormFields(this.state.conditions);
+    });
+  };
+  save = () => {
+    const { baseFormStore: { formExtra }, detail: { id }, settingId } = this.props;
+    formExtra.validateForm().then(f => {
+      if (f.isValid) {
+        const payload = formExtra.getFormParams();
+        this.setState({ loading: true });
+        API.savePushItemList({ ...payload, settingId, id })
+          .then(({ status, errormsg }) => {
+            this.setState({ loading: false });
+            if (status) {
+              message.success(getLabel(30700, "操作成功"));
+              this.props.onCancel(this.props.onSearch());
+            } else {
+              message.error(errormsg);
+            }
+          }).catch(() => this.setState({ loading: false }));
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+
+  render() {
+    const { baseFormStore: { formExtra }, detail } = this.props, { loading, conditions } = this.state;
+    return (
+      <WeaDialog
+        {...this.props} style={{ width: 480, height: 174 }} initLoadCss className="Pdetail_dialog"
+        buttons={[
+          <Button onClick={this.props.onCancel}>{getLabel(111, "取消")}</Button>,
+          <Button type="primary" onClick={this.save} loading={loading}>{getLabel(111, "保存")}</Button>
+        ]}
+      >
+        <div className="form-dialog-layout">{formRender(formExtra, conditions, detail)}</div>
+      </WeaDialog>
+    );
+  }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/datapushList/index.js b/pc4mobx/hrmSalary/pages/datapush/components/datapushList/index.js
new file mode 100644
index 00000000..83b83ac1
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/components/datapushList/index.js
@@ -0,0 +1,86 @@
+/*
+  *  数据推送列表
+  *
+  * @Author:    黎永顺
+  * @Date:      2024/11/19
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaCheckbox, WeaLocaleProvider, WeaTable } from "ecCom";
+import * as API from "../../../../apis/datapush";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class Index extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      columns: [], dataSource: [], loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 }
+    };
+  }
+
+  componentDidMount() {
+    this.getPushSettingList();
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.isQuery !== this.props.isQuery) this.setState({
+      pageInfo: { ...this.state.pageInfo, current: 1 }
+    }, () => this.getPushSettingList(nextProps));
+  }
+
+  getPushSettingList = (props) => {
+    const { pageInfo } = this.state, { query } = props || this.props;
+    const payload = { ...pageInfo, ...query };
+    this.setState({ loading: true });
+    API.getPushSettingList(payload).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+        this.setState({
+          pageInfo: { ...pageInfo, current, pageSize, total },
+          dataSource: _.map(dataSource, o => ({
+            ...o, salarySobs: _.map(o.salarySobs, k => k.name).join(","),
+            salarySobIds: _.map(o.salarySobs, k => k.id).join(",")
+          })),
+          columns: [..._.map(columns, o => {
+            if (o.dataIndex === "able") return {
+              ...o, render: v => (<WeaCheckbox value={String(v)} disabled display="switch"/>)
+            };
+            return { ...o };
+          }), {
+            title: getLabel(111, "操作"), dataIndex: "opts", width: 120, render: (__, record) => (<React.Fragment>
+              <a href="javascript: void(0);" style={{ marginRight: 10 }}
+                 onClick={() => this.props.onChange("edit", record)}>{getLabel(111, "编辑")}</a>
+              <a href="javascript: void(0);" style={{ marginRight: 10 }}
+                 onClick={() => this.props.onChange("del", record.id)}>{getLabel(111, "删除")}</a>
+            </React.Fragment>)
+          }]
+        });
+      }
+    });
+  };
+
+  render() {
+    const { columns, dataSource, loading, pageInfo } = this.state;
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+      showQuickJumper: true,
+      showSizeChanger: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => this.getPushSettingList());
+      },
+      onChange: current => {
+        this.setState({ pageInfo: { ...pageInfo, current } }, () => this.getPushSettingList());
+      }
+    };
+    return (<WeaTable loading={loading} dataSource={dataSource} columns={columns} pagination={pagination}
+                      scroll={{ y: `calc(100vh - 182px)` }}/>);
+  }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
new file mode 100644
index 00000000..e0bd1255
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
@@ -0,0 +1,149 @@
+/*
+  * 数据推送记录
+  * 创建
+  * @Author:    黎永顺
+  * @Date:      2025/4/15
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaDialog, WeaFormItem, WeaLocaleProvider, WeaTable, WeaTools } from "ecCom";
+import FormInfo from "../../../../components/FormInfo";
+import { RQconditions } from "../../conditions";
+import { MonthRangePicker } from "../../../reportView/components/statisticalMicroSettingsSlide";
+import { getSalaryAcctList } from "../../../../apis/calculate";
+import { createPushRecords } from "../../../../apis/datapush";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import { Button, message } from "antd";
+import moment from "moment";
+
+const form = new WeaForm();
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
+class CreatePushRecordDialog extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      dataSource: [], columns: [], loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
+      conditions: []
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) {
+      this.setState({
+        conditions: _.map(RQconditions, item => ({
+          ...item,
+          items: _.map(item.items, o => {
+            o = { ...o, label: getLabel(o.lanId, o.label) };
+            if (getKey(o) === "startMonthStr") {
+              return {
+                ...o, value: moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM")
+              };
+            } else if (getKey(o) === "endMonthStr") {
+              return {
+                ...o, value: moment(new Date()).endOf("year").format("YYYY-MM")
+              };
+            }
+            return o;
+          })
+        }))
+      }, () => {
+        form.initFormFields(this.state.conditions);
+        this.getSalaryAcctList();
+      });
+    } else {
+      form.resetForm();
+    }
+  }
+
+  getSalaryAcctList = () => {
+    const { pageInfo } = this.state, payload = { ...pageInfo, ...form.getFormParams() };
+    this.setState({ loading: true });
+    getSalaryAcctList(payload).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+        this.setState({
+          dataSource, pageInfo: { current, pageSize, total },
+          columns: _.filter(columns, it => (it.dataIndex !== "backCalcStatus" && it.dataIndex !== "acctTimes" && it.dataIndex !== "operate"))
+        });
+      }
+    }).catch(() => this.setState({ loading: false }));
+  };
+  save = (record) => {
+    this.setState({ loading: true });
+    createPushRecords({ salaryAcctRecordIds: [record.id] }).then(({ status, errormsg }) => {
+      this.setState({ loading: false });
+      if (status) {
+        message.success(getLabel(111, "操作成功！"));
+        this.props.onCancel(this.props.onSuccess);
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
+
+  render() {
+    const { loading, conditions, dataSource, columns, pageInfo } = this.state;
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+      showQuickJumper: true,
+      showSizeChanger: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => this.getSalaryAcctList());
+      },
+      onChange: current => {
+        this.setState({ pageInfo: { ...pageInfo, current } }, () => this.getSalaryAcctList());
+      }
+    };
+    const itemRender = {
+      name: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} form={form} formParams={formParams}
+                           onChange={_.debounce(() => this.getSalaryAcctList(), 500)}/>);
+      },
+      startMonthStr: () => null,
+      endMonthStr: () => null
+    };
+    const childrenComponents = {
+      startMonthStr: () => {
+        const { startMonthStr, endMonthStr } = form.getFormParams();
+        const coms = [], { fieldMap } = form;
+        const dateRange = [startMonthStr, endMonthStr];
+        coms.push(
+          <WeaFormItem label={<span>{fieldMap["startMonthStr"].label}</span>} labelCol={{ span: 6 }}
+                       wrapperCol={{ span: 14 }}>
+            <MonthRangePicker dateRange={dateRange} viewAttr={2} onChange={v => {
+              const [v1, v2] = v;
+              form.updateFields({ startMonthStr: v1, endMonthStr: v2 });
+              this.getSalaryAcctList();
+            }}/>
+          </WeaFormItem>
+        );
+        return [{ com: coms, col: 2 }];
+      }
+    };
+    const scrollHeight = this.refs.recordRef ? this.refs.recordRef.state.height - 162 : 606;
+
+    return (<WeaDialog {...this.props} initLoadCss className="record-dialog" title={getLabel(111, "创建推送记录")}
+                       ref="recordRef"
+                       style={{
+                         width: 1000, height: 580, minHeight: 200, minWidth: 380, maxHeight: "70%", maxWidth: "90%",
+                         overflow: "hidden", transform: "translate(0px, 0px)"
+                       }} buttons={[
+      <Button onClick={() => this.props.onCancel()}>{getLabel(111, "取消")}</Button>
+    ]}>
+      <FormInfo className="record-form" center={false} itemRender={itemRender} colCount={2}
+                form={form} formFields={conditions} childrenComponents={childrenComponents}/>
+      <WeaTable className="wea-browser-table-cursor" rowKey="id" scroll={{ y: scrollHeight + "px" }}
+                dataSource={dataSource} loading={loading} pagination={pagination} columns={columns}
+                onRowClick={this.save}/>
+    </WeaDialog>);
+  }
+}
+
+export default CreatePushRecordDialog;
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
new file mode 100644
index 00000000..08287119
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
@@ -0,0 +1,88 @@
+/*
+  *  数据推送
+  * 推送记录
+  * @Author:    黎永顺
+  * @Date:      2025/4/1
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaTable } from "ecCom";
+import * as API from "../../../../apis/datapush";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class Index extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      columns: [], dataSource: [], loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
+      selectedRowKeys: []
+    };
+  }
+
+  componentDidMount() {
+    this.getPushRecordList();
+  }
+
+  componentWillUnmount() {
+    this.setState({ selectedRowKeys: [] }, () => this.props.onChange("rowKey", []));
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.isQuery !== this.props.isQuery) this.setState({
+      pageInfo: { ...this.state.pageInfo, current: 1 }
+    }, () => this.getPushRecordList(nextProps));
+  }
+
+  getPushRecordList = (props) => {
+    const { pageInfo } = this.state, { query } = props || this.props;
+    const payload = { ...pageInfo, ...query };
+    this.setState({ loading: true });
+    API.getPushRecordList(payload).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+        this.setState({
+          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
+          columns: [...columns, {
+            title: getLabel(111, "操作"), dataIndex: "opts", width: 140, render: (__, record) => (<React.Fragment>
+              <a href="javascript: void(0);" style={{ marginRight: 10 }}
+                 onClick={_.debounce(() => this.props.onChange("push", record), 300)}>{getLabel(111, "推送")}</a>
+              <a href="javascript: void(0);" style={{ marginRight: 10 }}
+                 onClick={_.debounce(() => this.props.onChange("withdraw", record), 300)}>{getLabel(111, "撤回")}</a>
+              <a href="javascript: void(0);"
+                 onClick={() => this.props.onChange("view", record)}>{getLabel(111, "查看详情")}</a>
+            </React.Fragment>)
+          }]
+        });
+      }
+    });
+  };
+
+  render() {
+    const { columns, dataSource, loading, pageInfo, selectedRowKeys } = this.state;
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+      showQuickJumper: true,
+      showSizeChanger: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => this.getPushRecordList());
+      },
+      onChange: current => {
+        this.setState({ pageInfo: { ...pageInfo, current } }, () => this.getPushRecordList());
+      }
+    };
+    const rowSelection = {
+      selectedRowKeys,
+      onChange: v => this.setState({ selectedRowKeys: v }, () => this.props.onChange("rowKey", v))
+    };
+    return (<WeaTable rowKey="id" loading={loading} dataSource={dataSource} columns={columns} pagination={pagination}
+                      rowSelection={rowSelection} scroll={{ y: `calc(100vh - 182px)` }}/>);
+  }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/pushDetailDialog.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/pushDetailDialog.js
new file mode 100644
index 00000000..554cfc70
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/pushDetailDialog.js
@@ -0,0 +1,77 @@
+/*
+  * 推送记录
+  * 查看详情
+  * @Author:    黎永顺
+  * @Date:      2025/4/2
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTable, WeaTop } from "ecCom";
+import { getPushRecordDetail } from "../../../../apis/datapush";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class PushDetailDialog extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      query: { name: "" }, dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, loading: false
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) this.getPushRecordDetail(nextProps);
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
+      query: { name: "" }, pageInfo: { current: 1, pageSize: 10, total: 0 }
+    });
+  }
+
+  getPushRecordDetail = (props) => {
+    const { recordId } = props || this.props, { pageInfo, query } = this.state;
+    const payload = { ...query, ...pageInfo, recordId };
+    this.setState({ loading: true });
+    getPushRecordDetail(payload).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+        this.setState({ columns, dataSource, pageInfo: { current, pageSize, total } });
+      }
+    });
+  };
+
+  render() {
+    const { query, loading, dataSource, columns, pageInfo } = this.state;
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+      showQuickJumper: true,
+      showSizeChanger: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => this.getPushRecordDetail());
+      },
+      onChange: current => {
+        this.setState({ pageInfo: { ...pageInfo, current } }, () => this.getPushRecordDetail());
+      }
+    };
+    return (<WeaSlideModal
+      {...this.props} className="pushDetailDialog"
+      title={<WeaTop title={getLabel(111, "推送详情")} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
+                     buttons={[<WeaInputSearch value={query.name} onSearch={() => this.setState({
+                       pageInfo: { ...pageInfo, current: 1 }
+                     }, () => this.getPushRecordDetail())}
+                                               onChange={v => this.setState({ query: { ...query, name: v } })}/>]}/>
+      }
+      direction="right" top={0} width={800} height={100}
+      measureT="%" measureX="px" measureY="%"
+      content={<div className="pushDetail_content">
+        <WeaTable loading={loading} dataSource={dataSource} columns={columns} pagination={pagination}
+                  scroll={{ y: `calc(100vh - 182px)` }}/>
+      </div>}
+    />);
+  }
+}
+
+export default PushDetailDialog;
diff --git a/pc4mobx/hrmSalary/pages/datapush/conditions.js b/pc4mobx/hrmSalary/pages/datapush/conditions.js
new file mode 100644
index 00000000..c4f12a09
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/conditions.js
@@ -0,0 +1,187 @@
+// 推送配置表单
+export const conditions = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["name"],
+        fieldcol: 14,
+        label: "任务名称",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        conditionType: "SWITCH",
+        domkey: ["able"],
+        fieldcol: 14,
+        label: "是否启用",
+        lanId: 111,
+        labelcol: 6,
+        value: "0",
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        conditionType: "SELECT",
+        domkey: ["salarySobIds"],
+        fieldcol: 14,
+        label: "薪资账套",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        multiple: true,
+        options: [],
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        browserConditionParam: {
+          completeURL: "/api/bs/hrmsalary/push/mode/list",
+          dataParams: {},
+          filterByName: true,
+          tableProps: {},
+          isSingle: true,
+          searchParamsKey: "name",
+          replaceDatas: [{}]
+        },
+        tags: true,
+        conditionType: "INPUT",
+        domkey: ["modeName"],
+        fieldcol: 14,
+        label: "建模名称",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["tableName"],
+        fieldcol: 14,
+        label: "数据表名",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["modeId"],
+        fieldcol: 14,
+        label: "建模ID",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      }
+    ],
+    title: "基础信息",
+    lanId: 111,
+    col: 2,
+    defaultshow: true
+  }
+];// 推送配置表单
+export const PDConditions = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["item"],
+        fieldcol: 14,
+        label: "薪资项目",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["itemName"],
+        fieldcol: 14,
+        label: "薪资名称",
+        lanId: 111,
+        labelcol: 6,
+        viewAttr: 2,
+        hide: true
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["source"],
+        fieldcol: 14,
+        label: "薪资资源",
+        lanId: 111,
+        labelcol: 6,
+        viewAttr: 2,
+        hide: true
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["fieldName"],
+        fieldcol: 14,
+        label: "字段名称",
+        lanId: 111,
+        labelcol: 6,
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        conditionType: "SELECT",
+        domkey: ["fieldType"],
+        fieldcol: 14,
+        label: "字段类型",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        options: [],
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];// 推送详细配置表单
+
+
+export const RQconditions = [
+  {
+    items: [
+      {
+        conditionType: "MONTHPICKER",
+        domkey: ["startMonthStr"],
+        fieldcol: 14,
+        label: "薪资所属月",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "MONTHPICKER",
+        domkey: ["endMonthStr"],
+        fieldcol: 14,
+        label: "薪资所属月",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["name"],
+        fieldcol: 14,
+        label: "薪资账套",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];// 推送记录查询表单
diff --git a/pc4mobx/hrmSalary/pages/datapush/formRender.js b/pc4mobx/hrmSalary/pages/datapush/formRender.js
new file mode 100644
index 00000000..6c8035ae
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/formRender.js
@@ -0,0 +1,51 @@
+import React from "react";
+import { WeaFormItem, WeaSearchGroup, WeaTools } from "ecCom";
+import { WeaSwitch } from "comsMobx";
+import CustomTreeSelect from "./components/PDDialog/customTreeSelect";
+import CustomBrowser from "../../components/CustomBrowser";
+
+const getKey = WeaTools.getKey;
+export const formRender = (form, conditions, params) => {
+  const { isFormInit } = form;
+  const formParams = form.getFormParams();
+  let group = [];
+  isFormInit && conditions && conditions.map(c => {
+    let items = [];
+    c.items.map(fields => {
+      items.push({
+        com: (
+          <WeaFormItem label={fields.label} labelCol={{ span: `${fields.labelcol}` }}
+                       wrapperCol={{ span: `${fields.fieldcol}` }} error={form.getError(fields)}
+                       tipPosition="bottom">
+            {
+              getKey(fields) === "item" ?
+                <React.Fragment>
+                  <CustomTreeSelect
+                    detail={params} fieldConfig={fields} form={form} formParams={formParams}/>
+                  {
+                    _.isEmpty(formParams.item) &&
+                    <span className="wea-required-e9" style={{ verticalAlign: "middle" }}>
+                        <img src="/images/BacoError_wev9.png" alt=""/>
+                      </span>
+                  }
+                </React.Fragment>
+                :
+                getKey(fields) === "modeName" ?
+                  <CustomBrowser fieldConfig={fields} form={form} formParams={formParams}
+                                 onCustomChange={(v) => !!_.values(v)[0] && form.updateFields({
+                                   tableName: _.values(v)[0].subname,
+                                   modeId: _.values(v)[0].domid
+                                 })}/>
+                  : <WeaSwitch fieldConfig={fields} form={form} formParams={formParams}/>
+            }
+          </WeaFormItem>),
+        colSpan: 1,
+        hide: fields.hide
+      });
+    });
+    !_.isEmpty(items) && group.push(
+      <WeaSearchGroup col={c.col || 1} needTigger={true} showGroup={c.defaultshow} items={items} center={false}
+                      title={c.title}/>);
+  });
+  return group;
+};
diff --git a/pc4mobx/hrmSalary/pages/datapush/index.js b/pc4mobx/hrmSalary/pages/datapush/index.js
new file mode 100644
index 00000000..e3da4cb4
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/index.js
@@ -0,0 +1,175 @@
+/*
+  *  数据推送
+  *
+  * @Author:    黎永顺
+  * @Date:      2024/11/19
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaInputSearch, WeaLocaleProvider, WeaReqTop } from "ecCom";
+import * as API from "../../apis/datapush";
+import DatapushList from "./components/datapushList";
+import PushRecord from "./components/pushRecord";
+import DatapushDialog from "./components/DPDialog";
+import PushDetailDialog from "./components/pushRecord/pushDetailDialog";
+import { Button, message, Modal } from "antd";
+import cs from "classnames";
+import "./index.less";
+import CreatePushRecordDialog from "./components/pushRecord/createPushRecordDialog";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore", "baseFormStore")
+@observer
+class Index extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      selectedKey: "pushRecord", isQuery: false, query: { name: "" }, selectedRowKeys: [],
+      loading: { push: false, withdraw: false }, visible: false,
+      DPDialog: { visible: false, title: "", detail: {} }, //数据推送弹框
+      pushDetailDialog: { visible: false, recordId: "" } //数据推送记录查看推送详情弹框
+    };
+  }
+
+  handleAdvanceSearch = () => this.setState({ isQuery: !this.state.isQuery });
+  handleOperate = (type, detail = {}) => {
+    switch (type) {
+      case "create":
+      case "edit":
+        const title = type === "create" ? getLabel(111, "新建") : getLabel(111, "编辑");
+        this.setState({ DPDialog: { visible: true, title, detail } });
+        break;
+      case "del":
+        Modal.confirm({
+          title: getLabel(111, "信息确认"),
+          content: getLabel(111, "确认要删除吗?"),
+          onOk: () => {
+            API.deletePushSetting({ id: detail }).then(({ status, errormsg }) => {
+              if (status) {
+                message.success(getLabel(111, "删除成功"));
+                this.handleAdvanceSearch();
+              } else {
+                message.error(errormsg);
+              }
+            });
+          }
+        });
+        break;
+      case "view":
+        this.setState({ pushDetailDialog: { visible: true, recordId: detail.id } });
+        break;
+      case "rowKey":
+        this.setState({ selectedRowKeys: detail });
+        break;
+      case "addRecord":
+        this.setState({ visible: true });
+        break;
+      case "push":
+      case "batchpush":
+        if (type === "batchpush" && _.isEmpty(this.state.selectedRowKeys)) {
+          message.warning(getLabel(111, "请选择数据"));
+          return;
+        }
+        this.pushRecords(type === "push" ? [detail.id] : this.state.selectedRowKeys);
+        break;
+      case "withdraw":
+      case "batchwithdraw":
+        if (type === "batchwithdraw" && _.isEmpty(this.state.selectedRowKeys)) {
+          message.warning(getLabel(111, "请选择数据"));
+          return;
+        }
+        this.withdrawRecords(type === "withdraw" ? [detail.id] : this.state.selectedRowKeys);
+        break;
+      default:
+        break;
+    }
+  };
+  pushRecords = (ids) => {
+    this.setState({ loading: { ...this.state.loading, push: true } });
+    API.pushRecords({ ids }).then(({ status, errormsg }) => {
+      this.setState({ loading: { ...this.state.loading, push: false } });
+      if (status) {
+        this.handleAdvanceSearch();
+        message.success(getLabel(111, "推送成功！"));
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
+  withdrawRecords = (ids) => {
+    this.setState({ loading: { ...this.state.loading, withdraw: true } });
+    API.withdrawRecords({ ids }).then(({ status, errormsg }) => {
+      this.setState({ loading: { ...this.state.loading, withdraw: false } });
+      if (status) {
+        this.handleAdvanceSearch();
+        message.success(getLabel(111, "撤回成功！"));
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
+
+  render() {
+    const { selectedKey, DPDialog, isQuery, query, pushDetailDialog, loading, visible } = this.state;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
+    const tabs = [
+      {
+        title: getLabel(111, "推送记录"), key: "pushRecord", showDropIcon: false, dropMenuDatas: [],
+        buttons: showOperateBtn ? [
+          <Button type="primary" onClick={() => this.handleOperate("addRecord")}
+                  loading={loading.add}>{getLabel(111, "创建")}</Button>,
+          <Button type="primary" onClick={() => this.handleOperate("batchpush")}
+                  loading={loading.push}>{getLabel(111, "批量推送")}</Button>,
+          <Button type="ghost" loading={loading.withdraw}
+                  onClick={() => this.handleOperate("batchwithdraw")}>{getLabel(111, "批量撤回")}</Button>,
+          <WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
+                          onChange={v => this.setState({ query: { ...query, name: v } })}/>
+        ] : [<WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
+                             onChange={v => this.setState({ query: { ...query, name: v } })}/>],
+        children: <PushRecord isQuery={isQuery} query={query} onChange={this.handleOperate}/>
+      },
+      {
+        title: getLabel(111, "数据推送"), key: "datapush", showDropIcon: false, dropMenuDatas: [],
+        buttons: showOperateBtn ? [
+          <Button type="primary" onClick={() => this.handleOperate("create")}>{getLabel(111, "新建")}</Button>,
+          <WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
+                          onChange={v => this.setState({ query: { ...query, name: v } })}/>
+        ] : [<WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
+                             onChange={v => this.setState({ query: { ...query, name: v } })}/>],
+        children: <DatapushList isQuery={isQuery} query={query} onChange={this.handleOperate}/>
+      }
+    ];
+    return (
+      <WeaReqTop
+        title={getLabel(111, "数据推送")} icon={<i className="icon-coms-fa"/>} selectedKey={selectedKey}
+        iconBgcolor="#F14A2D" tabDatas={tabs}
+        className={cs("datapush_wrapper", { "reqZindex0": pushDetailDialog.visible })}
+        buttonSpace={10} buttons={_.find(tabs, o => selectedKey === o.key).buttons}
+        onChange={selectedKey => this.setState({
+          selectedKey, pushDetailDialog: { ...pushDetailDialog, visible: false },
+          DPDialog: { ...DPDialog, visible: false }
+        })}
+        showDropIcon={_.find(tabs, o => selectedKey === o.key).showDropIcon} onDropMenuClick={this.handleOperate}
+        dropMenuDatas={_.find(tabs, o => selectedKey === o.key).dropMenuDatas}
+      >
+        {_.find(tabs, o => selectedKey === o.key).children}
+        {/*数据推送框*/}
+        <DatapushDialog {...DPDialog} onClose={() => this.setState({ DPDialog: { ...DPDialog, visible: false } })}
+                        onSearch={this.handleAdvanceSearch}/>
+        {/*推送记录查看详情*/}
+        <PushDetailDialog {...pushDetailDialog} onClose={() => this.setState({
+          pushDetailDialog: { ...pushDetailDialog, visible: false }
+        })}/>
+        <CreatePushRecordDialog visible={visible} onSuccess={this.handleAdvanceSearch}
+                                onCancel={(callback) => this.setState({ visible: false }, () => callback && callback())}/>
+      </WeaReqTop>
+    );
+  }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/datapush/index.less b/pc4mobx/hrmSalary/pages/datapush/index.less
new file mode 100644
index 00000000..71919160
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/index.less
@@ -0,0 +1,194 @@
+.datapush_wrapper {
+  .wea-new-top-req-title > div:last-child {
+    right: 16px !important;
+  }
+
+  .wea-new-top-req-content {
+    padding: 8px 16px 0 16px;
+
+    .wea-new-table {
+      background: #FFF;
+    }
+
+    .ant-spin-nested-loading, .ant-spin-container {
+      height: 100% !important;
+    }
+
+    .pushdata_create_dialog {
+      .scroller {
+        background: #f6f6f6;
+      }
+
+      .pushdata_detail {
+        .opts {
+          width: 100%;
+          display: flex;
+          justify-content: flex-end;
+          align-items: center;
+          padding: 8px;
+        }
+      }
+
+      .wea-slide-modal-title {
+        border-bottom: 1px solid #ebebeb;
+      }
+
+      .titleDialog {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 46px 0 16px;
+
+        .titleCol {
+          flex: 1;
+          display: flex;
+          align-items: center;
+        }
+
+        .titleLeftBox {
+          .titleIcon {
+            color: #fff;
+            margin: 0;
+            width: 40px;
+            height: 40px;
+            line-height: 40px;
+            font-size: 22px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background: #F14A2D;
+            border-radius: 50%;
+          }
+
+          .title {
+            font-size: 14px;
+            color: #333;
+            padding-left: 6px;
+          }
+        }
+
+        .titleRightBox {
+          justify-content: flex-end;
+
+          button:last-child {
+            margin-left: 10px;
+          }
+        }
+      }
+    }
+  }
+
+  .pushDetailDialog {
+    .wea-slide-modal-content {
+      height: 100%;
+
+      .wea-new-table {
+        background: #FFF;
+      }
+
+      .pushDetail_content {
+        height: 100%;
+        background: #F6F6F6;
+        padding: 8px 16px;
+      }
+    }
+
+    .wea-slide-modal-title {
+      background: #FFF;
+      text-align: left;
+      height: 44px;
+    }
+
+    .wea-new-top {
+      background: #FFF;
+
+      .ant-col-10 {
+        padding-right: 50px !important;
+      }
+    }
+  }
+}
+
+.reqZindex0 {
+  .wea-new-top-req {
+    z-index: 0 !important;
+  }
+}
+
+.custom_item_treeselect {
+  .weapp-excel-code-action-list-variable-tip {
+    display: none;
+  }
+}
+
+.no-child-item {
+  .ant-select-tree-switcher {
+    display: none !important;
+  }
+
+  .ant-select-tree-node-content-wrapper {
+    width: 100%;
+  }
+
+  .weapp-excel-code-action-list-variable {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .weapp-excel-code-action-list-variable-name {
+      height: 20px;
+      line-height: 18px;
+      -webkit-flex: 1 1;
+      flex: 1 1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      word-break: keep-all;
+      white-space: nowrap;
+      cursor: pointer;
+    }
+
+    .danger {
+      color: rgb(255, 102, 106) !important;
+      border: 1px solid rgb(255, 193, 195) !important;
+      background-color: rgb(255, 223, 224) !important;
+    }
+
+    .weapp-excel-code-action-list-variable-tip {
+      width: 40px;
+      height: 20px;
+      line-height: 18px;
+      text-align: center;
+      vertical-align: middle;
+      color: rgb(255, 205, 80);
+      border: 1px solid rgb(255, 222, 138);
+      background-color: rgb(255, 245, 219);
+      border-radius: 2px;
+    }
+  }
+}
+
+.record-dialog {
+  .wea-dialog-body {
+    background: #f6f6f6;
+    padding: 8px 16px;
+
+    .record-form {
+      background: #FFF;
+      margin-bottom: 8px;
+
+      .wea-search-group, .wea-content {
+        padding: 0;
+      }
+
+      .rangePickerBox {
+        display: flex;
+        align-items: center;
+      }
+    }
+
+    .wea-new-table {
+      background: #FFF;
+    }
+  }
+}
diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
index 28bda271..c697bcfb 100644
--- a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
@@ -9,9 +9,10 @@ import { inject, observer } from "mobx-react";
 import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
 import { Button, message } from "antd";
 import { getSearchs } from "../../../../util";
-import { getTaxAgentSelectListAsAdmin } from "../../../../apis/taxAgent";
 import { saveDeclare } from "../../../../apis/declare";
 import { declareConditions } from "./condition";
+import { postFetch } from "../../../../util/request";
+import * as API from "../../../../apis/ruleconfig";
 
 const getKey = WeaTools.getKey;
 const getLabel = WeaLocaleProvider.getLabel;
@@ -31,26 +32,34 @@ class Index extends Component {
     if (nextProps.visible !== this.props.visible && !nextProps.visible) this.props.declareStore.initDeclareForm();
   }
 
-  getTaxAgentSelectListAsAdmin = (props) => {
+  getTaxAgentSelectListAsAdmin = async (props) => {
+    const { data: sysinfo } = await API.sysinfo();
     const { declareStore: { declareForm } } = props;
-    getTaxAgentSelectListAsAdmin().then(({ status, data }) => {
-      if (status) {
-        this.setState({
-          conditions: _.map(declareConditions, item => ({
-            ...item,
-            items: _.map(item.items, o => {
-              if (getKey(o) === "taxAgentId") {
-                return {
-                  ...o, options: _.map(data, g => ({ key: g.id, showname: g.content }))
-                  // helpfulTitle: getLabel(563420, "提示：可选择单个个税扣缴义务人进行申报，若不选择，则批量对管理下的所有个税扣缴义务人进行申报；")
-                };
-              }
-              return { ...o };
-            })
-          }))
-        }, () => declareForm.initFormFields(this.state.conditions));
-      }
-    });
+    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" })
+      .then(({ status, data }) => {
+        if (status) {
+          this.setState({
+            conditions: _.map(declareConditions, item => ({
+              ...item,
+              items: _.map(item.items, o => {
+                if (getKey(o) === "taxAgentId") {
+                  return {
+                    ...o, label: getLabel(o.lanId, o.label),
+                    options: _.map(data, g => ({ key: String(g.id), showname: g.name }))
+                    // helpfulTitle: getLabel(563420, "提示：可选择单个个税扣缴义务人进行申报，若不选择，则批量对管理下的所有个税扣缴义务人进行申报；")
+                  };
+                } else if (getKey(o) === "salaryMonthStr") {
+                  return {
+                    ...o,
+                    label: sysinfo["TAX_DECLARATION_DATE_TYPE"] === "1" ? getLabel(111, "税款所属期") : getLabel(111, "薪资所属月")
+                  };
+                }
+                return { ...o, label: getLabel(o.lanId, o.label) };
+              })
+            }))
+          }, () => declareForm.initFormFields(this.state.conditions));
+        }
+      });
   };
   save = () => {
     const { declareStore: { declareForm } } = this.props;
@@ -58,7 +67,9 @@ class Index extends Component {
       if (f.isValid) {
         const payload = declareForm.getFormParams();
         this.setState({ loading: true });
-        saveDeclare({ ...payload }).then(({ status, errormsg }) => {
+        saveDeclare({
+          ...payload, taxCycle: `${payload.salaryMonthStr}-01`, salaryDate: `${payload.salaryMonthStr}-01`
+        }).then(({ status, errormsg }) => {
           this.setState({ loading: false });
           if (status) {
             message.success(getLabel(30700, "操作成功"));
diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js
index f5627a0c..e85383ca 100644
--- a/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js
@@ -17,7 +17,7 @@ class Index extends Component {
     return (
       <div className="salary-btn-flex">
         <div className="mounth-range">
-          <span className="label">{getLabel(543549, "薪资所属月：")}</span>
+          <span className="label">{getLabel(111, "税款所属期：")}</span>
           <MonthRangePicker dateRange={dateRange} viewAttr={2}
                             onChange={v => this.props.onChange({ dateRange: v })}/>
         </div>
diff --git a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
index b2cab8ff..831c33cb 100644
--- a/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
@@ -8,7 +8,7 @@ import React, { Component } from "react";
 import { WeaLocaleProvider, WeaTable } from "ecCom";
 import { Dropdown, Menu, message, Modal } from "antd";
 import { getDeclareList, withDrawTaxDeclaration } from "../../../../apis/declare";
-import { sysConfCodeRule } from "../../../../apis/ruleconfig";
+import { sysConfCodeRule, sysinfo } from "../../../../apis/ruleconfig";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -35,18 +35,19 @@ class Index extends Component {
       if (status && data === "1") this.setState({ showWithDrawBtn: data === "1" });
     });
   };
-  getDeclareList = (props) => {
-    const { pageInfo } = this.state;
-    const { queryParams } = props;
+  getDeclareList = async (props) => {
+    const { data: sysData } = await sysinfo();
+    const { pageInfo } = this.state, { queryParams } = props;
     const { dateRange, ...extra } = queryParams;
-    const [fromSalaryMonthStr, endSalaryMonthStr] = dateRange || [];
-    const params = { fromSalaryMonthStr, endSalaryMonthStr, ...extra };
+    const [fromSalaryMonth, endSalaryMonth] = dateRange || [];
+    const params = { fromSalaryMonth: fromSalaryMonth + "-01", endSalaryMonth: endSalaryMonth + "-01", ...extra };
     const payload = { ...pageInfo, ...params };
     this.setState({ loading: true });
     getDeclareList(payload).then(({ status, data }) => {
       this.setState({ loading: false });
       if (status) {
-        const { columns, list: dataSource, pageNum, pageSize, total } = data;
+        let { columns, list: dataSource, pageNum, pageSize, total } = data;
+        sysData["TAX_DECLARATION_DATE_TYPE"] === "1" && (columns = _.filter(columns, o => o.dataIndex !== "salaryMonth"));
         this.setState({
           dataSource, pageInfo: { ...pageInfo, pageNum, pageSize, total },
           columns: _.map(columns, o => {
@@ -109,7 +110,7 @@ class Index extends Component {
         {
           dataIndex: "operate", title: getLabel(30585, "操作"),
           width: 170, render: (__, record) => {
-            const { id } = record;
+            const { id, opts = [] } = record;
             return <React.Fragment>
               <a
                 href={`${window.ecologyContentPath || ""}/spa/hrmSalary/static/index.html#/main/hrmSalary/generateDeclarationDetail?id=${id}`}
@@ -122,7 +123,7 @@ class Index extends Component {
                                        onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
               }
               {
-                showWithDrawBtn &&
+                showWithDrawBtn && opts.includes("admin") &&
                 <a
                   href="javascript:void(0);" style={{ marginLeft: 10 }}
                   onClick={() => {
diff --git a/pc4mobx/hrmSalary/pages/declare/declare.js b/pc4mobx/hrmSalary/pages/declare/declare.js
index dfdc681e..45f918f7 100644
--- a/pc4mobx/hrmSalary/pages/declare/declare.js
+++ b/pc4mobx/hrmSalary/pages/declare/declare.js
@@ -37,7 +37,8 @@ class Calculate extends Component {
   }
 
   renderCalculateOpts = () => {
-    const { taxAgentStore: { showOperateBtn } } = this.props;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const { queryParams, isRefresh } = this.state;
     let calculateOpts = [
       <Button type="primary" onClick={() => this.setState({
diff --git a/pc4mobx/hrmSalary/pages/employeeView/index.js b/pc4mobx/hrmSalary/pages/employeeView/index.js
index f56c3854..6386aba9 100644
--- a/pc4mobx/hrmSalary/pages/employeeView/index.js
+++ b/pc4mobx/hrmSalary/pages/employeeView/index.js
@@ -12,6 +12,7 @@ import { Spin } from "antd";
 import { inject, observer } from "mobx-react";
 import { MonthRangePicker } from "../reportView/components/statisticalMicroSettingsSlide";
 import { optionAddWhole } from "../../util/options";
+import { postFetch } from "../../util/request";
 import moment from "moment";
 import "./index.less";
 
@@ -24,11 +25,8 @@ class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      loading: false,
-      taxAgentId: "",
-      countResult: {},
+      loading: false, taxAgentId: "", countResult: {}, dataSource: [], taxAgentOption: [],
       salaryMonth: [moment().startOf("year").format("YYYY-MM"), moment().format("YYYY-MM")],
-      dataSource: [],
       pageInfo: {
         current: 1,
         pageSize: 10,
@@ -38,8 +36,10 @@ class Index extends Component {
   }
 
   componentWillMount() {
-    const { taxAgentStore: { fetchTaxAgentOption } } = this.props;
-    fetchTaxAgentOption();
+    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" })
+      .then(({ status, data }) => {
+        if (status) this.setState({ taxAgentOption: _.map(data, o => ({ key: String(o.id), showname: o.name })) });
+      });
   }
 
   componentDidMount() {
@@ -76,7 +76,6 @@ class Index extends Component {
       dataSource, columns, showSum, pageInfo, countResult
     }), "*");
   };
-
   statisticsEmployeeDetailList = () => {
     const { params: { employeeId }, payrollFilesStore: { statisticsEmployeeDetailList } } = this.props;
     const { taxAgentId, salaryMonth, pageInfo } = this.state;
@@ -104,7 +103,6 @@ class Index extends Component {
       }
     }).catch(() => this.setState({ loading: false }));
   };
-
   getColumns = () => {
     const { dataSource, pageInfo, countResult } = this.state;
     const { payrollFilesStore: { employeeTableStore } } = this.props;
@@ -121,13 +119,10 @@ class Index extends Component {
   };
 
   render() {
-    const {
-      location,
-      taxAgentStore: { showOperateBtn, taxAgentOption },
-      payrollFilesStore: { employeeTableStore }
-    } = this.props;
-    const { salaryMonth, taxAgentId, loading } = this.state;
+    const { location, taxAgentStore: { PageAndOptAuth }, payrollFilesStore: { employeeTableStore } } = this.props;
+    const { salaryMonth, taxAgentId, loading, taxAgentOption } = this.state;
     const { query: { dept, name } } = location;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const btns = [
       <MonthRangePicker viewAttr={2} dateRange={salaryMonth}
                         onChange={v => this.setState({ salaryMonth: v }, () => this.statisticsEmployeeDetailList())}/>,
diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
index 8a6533ee..047ced9c 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
@@ -22,6 +22,7 @@ import SlideModalTitle from "../../../components/slideModalTitle";
 import { getSalaryFieldForm, saveSalaryField } from "../../../apis/fieldManage";
 import { commonEnumList } from "../../../apis/payrollFiles";
 import { dataTypeOptions, patternOptions, roundingModeOptions } from "../../salaryItem/options";
+import { postFetch } from "../../../util/request";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -44,15 +45,17 @@ class FieldSlide extends Component {
       pattern: "2",
       sortedIndex: "",
       width: "",
-      description: ""
+      description: "",
+      taxAgentOption: []
     };
   }
 
   componentDidMount() {
-    const { taxAgentStore } = this.props;
     this.commonEnumList();
-    const { fetchTaxAgentOption } = taxAgentStore;
-    fetchTaxAgentOption();
+    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" })
+      .then(({ status, data }) => {
+        if (status) this.setState({ taxAgentOption: _.map(data, o => ({ key: String(o.id), showname: o.name })) });
+      });
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
@@ -203,13 +206,8 @@ class FieldSlide extends Component {
   };
 
   render() {
-    const {
-      title,
-      visible,
-      record: { id: editId },
-      taxAgentStore: { taxAgentOption, showSalaryItemBtn, showOperateBtn },
-      onCancel
-    } = this.props;
+    const { title, visible, record: { id: editId }, onCancel, taxAgentStore: { PageAndOptAuth } } = this.props;
+    const admin = PageAndOptAuth.opts.includes("admin");
     const {
       loading,
       name,
@@ -224,7 +222,8 @@ class FieldSlide extends Component {
       pattern,
       sortedIndex,
       width,
-      description
+      description,
+      taxAgentOption
     } = this.state;
     return (
       <WeaSlideModal
@@ -241,7 +240,7 @@ class FieldSlide extends Component {
             tabs={[]}
             loading={loading}
             showOperateBtn={true}
-            editable={(showSalaryItemBtn || showOperateBtn)}
+            editable={admin}
             onSave={this.saveFieldInfo}
           />
         }
diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
index 840da963..d470705b 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
@@ -57,7 +57,8 @@ class FieldTable extends Component {
   getColumns = () => {
     const { columns } = this.state;
     const { taxAgentStore, onEditLedger, onDeleteLedger } = this.props;
-    const { showSalaryItemBtn, showOperateBtn } = taxAgentStore;
+    const { PageAndOptAuth } = taxAgentStore;
+    const admin = PageAndOptAuth.opts.includes("admin");
     return _.map([...columns, {
       dataIndex: "operate",
       display: true,
@@ -72,9 +73,9 @@ class FieldTable extends Component {
         item.render = (text, record) => {
           return <div className="optWrapper">
             <a href="javascript:void(0);" className="mr10"
-               onClick={() => onEditLedger(record)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"}</a>
+               onClick={() => onEditLedger(record)}>{admin ? "编辑" : "查看"}</a>
             {
-              record.canDelete && (showSalaryItemBtn || showOperateBtn) &&
+              record.canDelete && admin &&
               <a href="javascript:void(0);" className="mr10" onClick={() => onDeleteLedger(record)}>删除</a>
             }
             <Dropdown
diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.js b/pc4mobx/hrmSalary/pages/fieldManagement/index.js
index b0d483c9..38672e44 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/index.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.js
@@ -85,7 +85,8 @@ class FieldManagement extends Component {
   render() {
     const { searchVal, doSearch, slideparams, logDialogVisible, filterConditions } = this.state;
     const { taxAgentStore } = this.props;
-    const { showSalaryItemBtn, showOperateBtn } = taxAgentStore;
+    const { PageAndOptAuth } = taxAgentStore;
+    const admin = PageAndOptAuth.opts.includes("admin");
     const btns = [
       <Button
         type="primary"
@@ -100,7 +101,7 @@ class FieldManagement extends Component {
     return (
       <WeaTop
         title="字段管理" icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D" className="fieldManageWrapper"
-        buttons={(showSalaryItemBtn || showOperateBtn) ? btns : btns.slice(-1)}
+        buttons={admin ? btns : btns.slice(-1)}
         showDropIcon onDropMenuClick={this.onDropMenuClick}
         dropMenuDatas={[
           {
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/LedgerBackCalculatedSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/LedgerBackCalculatedSalaryItemTable.js
index 3788b5f9..b2cb8a73 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/LedgerBackCalculatedSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/LedgerBackCalculatedSalaryItemTable.js
@@ -6,11 +6,8 @@
  */
 import React, { Component } from "react";
 import { WeaTable } from "ecCom";
-import { inject, observer } from "mobx-react";
 import LedgerBackCalcEditSlide from "./ledgerBackCalcEditSlide";
 
-@inject("taxAgentStore")
-@observer
 class LedgerBackCalculatedSalaryItemTable extends Component {
   constructor(props) {
     super(props);
@@ -56,7 +53,8 @@ class LedgerBackCalculatedSalaryItemTable extends Component {
 
   render() {
     const { backCalcEditSlide } = this.state;
-    const { taxAgentStore: { showOperateBtn }, dataSource, editId, saveSalarySobId, key } = this.props;
+    const { record, dataSource, editId, saveSalarySobId, key } = this.props;
+    const showOperateBtn = editId ? record.opts.includes("admin") : true;
     const columns = [
       {
         dataIndex: "name",
@@ -78,7 +76,7 @@ class LedgerBackCalculatedSalaryItemTable extends Component {
         width: 80,
         render: (text, record, index) => {
           const { canEdit } = record;
-          return (showOperateBtn && canEdit) ?
+          return showOperateBtn ?
             <a href="javascript: void(0);" onClick={() => this.handleEditBackCalc(record)}>编辑</a> :
             <span></span>;
         }
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js
index a3fd96e5..80884056 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js
@@ -11,9 +11,10 @@ import { duplicateLedger } from "../../../apis/ledger";
 import { WeaDialog } from "ecCom";
 import { Button, message } from "antd";
 import { getSearchs } from "../../../util";
+import { postFetch } from "../../../util/request";
 import "./index.less";
 
-@inject("ledgerStore", "taxAgentStore")
+@inject("ledgerStore")
 @observer
 class CopyLedgerModal extends Component {
   constructor(props) {
@@ -31,42 +32,39 @@ class CopyLedgerModal extends Component {
     if (nextProps.visible !== this.props.visible && nextProps.visible) {
       const { ledgerStore, name, taxAgentId } = nextProps;
       const { copyForm: form } = ledgerStore;
-      form.updateFields({
-        name: { value: name },
-        taxAgentId: { value: taxAgentId.toString() }
-      });
+      form.updateFields({ name: { value: name }, taxAgentId: { value: taxAgentId } });
     }
   }
 
   getTaxAgentSelectListAsAdmin = () => {
-    const { taxAgentStore, ledgerStore } = this.props;
+    const { ledgerStore } = this.props;
     const { copyForm: form } = ledgerStore;
-    const { getTaxAgentSelectListAsAdmin } = taxAgentStore;
-    getTaxAgentSelectListAsAdmin().then(({ status, data }) => {
-      if (status) {
-        const conditions = _.map(copyConditions, it => {
-          it.items = _.map(it.items, child => {
-            if (child.domkey[0] === "taxAgentId") {
-              return {
-                ...child,
-                options: _.map(data, it => ({ key: it.id, showname: it.content }))
-              };
-            } else {
-              return { ...child };
-            }
+    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" })
+      .then(({ status, data }) => {
+        if (status) {
+          const conditions = _.map(copyConditions, it => {
+            it.items = _.map(it.items, child => {
+              if (child.domkey[0] === "taxAgentId") {
+                return {
+                  ...child, options: _.map(data, it => ({ key: String(it.id), showname: it.name }))
+                };
+              } else {
+                return { ...child };
+              }
+            });
+            return { ...it };
           });
-          return { ...it };
-        });
-        form.initFormFields(conditions);
-      }
-    });
+          form.initFormFields(conditions);
+        }
+      });
   };
   handleSubmit = () => {
     const { ledgerStore, id, onRefreshList, onCancel } = this.props;
     const { copyForm: form } = ledgerStore;
     form.validateForm().then(f => {
       if (f.isValid) {
-        const payload = { id, ...form.getFormParams() };
+        const { taxAgentId, ...formParams } = form.getFormParams();
+        const payload = { id, ...formParams, taxAgentIds: taxAgentId.split(",") };
         this.setState({ loading: true });
         duplicateLedger(payload).then(({ status, errormsg }) => {
           this.setState({ loading: false });
@@ -84,7 +82,6 @@ class CopyLedgerModal extends Component {
     });
   };
 
-
   render() {
     const { onCancel, ledgerStore, ...extra } = this.props;
     const { loading } = this.state;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
index 96d0463d..724b344a 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
@@ -41,6 +41,10 @@
 .baseSettingWrapper {
   padding: 12px 12px 12px 20px;
 
+  .wea-form-item-wrapper {
+    display: inline-block !important;
+  }
+
   .baseSettingLeft {
     border: 1px solid #ebedf0;
     padding: 0 !important;
@@ -91,39 +95,14 @@
 
 //调薪计薪规则弹框
 .adjustRuleModalWrapper {
-  .titleTipWrapper {
-    display: flex;
-    align-items: center;
+  .calcRules .cust {
+    line-height: 30px;
 
-    .title {
-      margin-right: 4px;
-    }
-  }
-
-  .adjustRuleDetailWrapper {
-    display: flex;
-    flex-direction: column;
-
-    .adjustSalaryFlex {
+    .child {
       display: flex;
       align-items: center;
-      margin-bottom: 10px;
     }
   }
-
-  .wea-select, .ant-select-selection, .ant-select {
-    width: 100%;
-  }
-
-  .wea-select {
-    display: inline-block;
-    position: relative;
-  }
-
-  .ant-select-selection {
-    height: 30px;
-    border-radius: 0;
-  }
 }
 
 // 回算薪资项目
@@ -172,6 +151,10 @@
     display: flex;
     align-items: center;
 
+    .wea-ignore-node i {
+      display: none;
+    }
+
     .wea-sortable-grid-item {
       display: inline-block;
       border: none;
@@ -215,6 +198,10 @@
         }
       }
     }
+
+    .wea-new-table.wea-new-table-draggable table {
+      table-layout: fixed
+    }
   }
 
   .titleWrapper {
@@ -249,7 +236,7 @@
   padding: 0;
   background: transparent;
   border: none;
-  font-size: 20px!important;
+  font-size: 20px !important;
   line-height: 20px;
 }
 
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js
index 1a19b304..3cdb2983 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js
@@ -61,10 +61,11 @@ class LedgerAccountApprRule extends Component {
   }
 
   renderForm = (form, conditions) => {
-    const { saveSalarySobId, editId } = this.props;
+    const { saveSalarySobId, editId, record } = this.props;
     const { approvalItemGroup } = this.state;
     const { isFormInit } = form;
     const formParams = form.getFormParams();
+    const showOperateBtn = editId ? record.opts.includes("admin") : true;
     let group = [];
     isFormInit && conditions && conditions.map(c => {
       let items = [];
@@ -76,8 +77,8 @@ class LedgerAccountApprRule extends Component {
                            wrapperCol={{ span: `${fields.fieldcol}` }} error={form.getError(fields)}
                            tipPosition="bottom"
               >
-                <WeaSwitch fieldConfig={fields} form={form} formParams={formParams}
-                           onChange={this.handleFormItemChange}/>
+                <WeaSwitch fieldConfig={{ ...fields, viewAttr: showOperateBtn ? fields.viewAttr : 1 }} form={form}
+                           formParams={formParams} onChange={this.handleFormItemChange}/>
               </WeaFormItem>),
             hide: fields.hide
           });
@@ -89,6 +90,7 @@ class LedgerAccountApprRule extends Component {
                            tipPosition="bottom"
               >
                 <LedgerAccountSalaryItemsSet datas={approvalItemGroup} salarySobId={editId || saveSalarySobId}
+                                             showOperateBtn={showOperateBtn}
                                              onAddItems={(groupId, items) => this.setState({
                                                approvalItemGroup: _.map(approvalItemGroup, o => ({
                                                  ...o,
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js
index 1f53c37b..7a4ee3cc 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js
@@ -55,26 +55,29 @@ class LedgerAccountSalaryItemsSet extends Component {
 
   render() {
     const { editDialog, salaryItemDialog } = this.state;
-    const { datas } = this.props;
+    const { datas, showOperateBtn = true } = this.props;
     return (
       <div>
         <div style={{ textAlign: "right", padding: "10px 0" }}>
-          <WeaButtonIcon buttonType="add" type="primary"
-                         onClick={() => this.setState({
-                           editDialog: { visible: true, title: getLabel(111, "添加分类") }
-                         })}/>
-
+          {
+            showOperateBtn && <WeaButtonIcon buttonType="add" type="primary"
+                                             onClick={() => this.setState({
+                                               editDialog: { visible: true, title: getLabel(111, "添加分类") }
+                                             })}/>
+          }
         </div>
         <div className={cs("salaryItemSettingWrapper", { required: _.isEmpty(datas) })}>
           <WeaSortable
-            datas={datas}
+            datas={_.map(datas, o => ({ ...o, filter: !showOperateBtn }))}
             onChange={list => this.props.onChange(list)}
             renderNodeItem={(item) => {
               return <div className="salaryItemWrapper">
                 <div className="salaryItemHeader">
                 <span className="titleWrapper">
                   <span className="salaryClassTitle">{item.groupName}</span>
-                  <span className="iconWrapper">
+                  {
+                    showOperateBtn &&
+                    <span className="iconWrapper">
                     <i className="icon-coms-edit" onClick={() => this.setState({
                       editDialog: {
                         visible: true, groupName: item.groupName, groupId: item.id, title: getLabel(111, "分类名称编辑")
@@ -82,14 +85,17 @@ class LedgerAccountSalaryItemsSet extends Component {
                     })}/>
                     <i className="icon-coms-Delete" onClick={() => this.handleDeleteClick(item)}/>
                   </span>
+                  }
                 </span>
-                  <i className="icon-coms-Add-to" onClick={() => this.handleAddSalaryItems(item)}/>
+                  {
+                    showOperateBtn && <i className="icon-coms-Add-to" onClick={() => this.handleAddSalaryItems(item)}/>
+                  }
                 </div>
                 <div className="salaryItemContent">
                   {
                     !_.isEmpty(item.approvalItems) ?
                       <WeaSortable
-                        datas={item.approvalItems}
+                        datas={_.map(item.approvalItems, o => ({ ...o, filter: !showOperateBtn }))}
                         onChange={(items) => this.props.onChange(
                           _.map(datas, child => {
                             if (child.id === item.id) {
@@ -102,7 +108,10 @@ class LedgerAccountSalaryItemsSet extends Component {
                           return <div className="salaryItemList">
                             <div className="salaryItem" title={filed.salaryItemName}>
                               <div className="salaryItemName">{filed.salaryItemName}</div>
-                              <Icon type="cross" onClick={() => this.handleDeleteClick(item, filed)}/>
+                              {
+                                showOperateBtn &&
+                                <Icon type="cross" onClick={() => this.handleDeleteClick(item, filed)}/>
+                              }
                             </div>
                           </div>;
                         }}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js
index b81b506e..0956eb81 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js
@@ -5,170 +5,139 @@
  * Date: 2022/12/12
  */
 import React, { Component } from "react";
-import { WeaDialog, WeaFormItem, WeaHelpfulTip, WeaSearchGroup, WeaSelect } from "ecCom";
-import { Button, Modal, Radio } from "antd";
-import { monthDays } from "../config";
+import { inject, observer } from "mobx-react";
+import { WeaDialog, WeaFormItem, WeaHelpfulTip, WeaLocaleProvider, WeaSelect, WeaTools } from "ecCom";
+import FormInfo from "../../../components/FormInfo";
+import { WeaSwitch } from "comsMobx";
+import { Button } from "antd";
 import { listSalarySobItem } from "../../../apis/ledger";
+import { monthDays, ruleConditions } from "../config";
 import "./index.less";
 
+const { getLabel } = WeaLocaleProvider;
+const getKey = WeaTools.getKey;
+
+@inject("ledgerStore")
+@observer
 class LedgerAdjustRuleAddModal extends Component {
   constructor(props) {
     super(props);
-    this.state = {
-      beforeAdjustmentType: 2,
-      afterAdjustmentType: 1,
-      salaryItemId: "",
-      salaryItemName: "",
-      dayOfMonth: "1",
-      salaryItemOptions: []
-    };
+    this.state = { conditions: [] };
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.visible !== this.props.visible && nextProps.salarySobId) this.listSalarySobItem(nextProps.salarySobId);
+    if (nextProps.visible !== this.props.visible && nextProps.visible) this.listSalarySobItem(nextProps.salarySobId);
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.props.ledgerStore.initRuleForm();
   }
 
   listSalarySobItem = (salarySobId) => {
     const { salaryRuleItemsList } = this.props;
     const payload = {
-      excludeSalaryItemIds: _.map(salaryRuleItemsList, item => item.salaryItemId),
-      salarySobId
+      excludeSalaryItemIds: _.map(salaryRuleItemsList, item => item.salaryItemId), salarySobId
     };
     listSalarySobItem(payload).then(({ status, data }) => {
       if (status) {
         this.setState({
-          salaryItemOptions: _.map(data, it => ({ key: it.salaryItemId.toString(), showname: it.salaryItemName }))
-        });
+          conditions: _.map(ruleConditions, item => ({
+            ...item, items: _.map(item.items, o => {
+              o = { ...o, label: getLabel(o.lanId, o.label) };
+              if (getKey(o) === "salaryItemId") {
+                return {
+                  ...o, options: _.map(data, it => ({ key: it.salaryItemId.toString(), showname: it.salaryItemName }))
+                };
+              } else if (getKey(o) === "dayOfMonth") {
+                return { ...o, options: monthDays };
+              } else if (getKey(o) === "beforeAdjustmentType" || getKey(o) === "afterAdjustmentType") {
+                return {
+                  ...o,
+                  options: _.map(o.options, k => ({
+                    ...k,
+                    showname: !k.helpfultip ? getLabel(k.lanId, k.showname) : <span>
+                      <span style={{ marginRight: 4 }}>{getLabel(k.lanId, k.showname)}</span>
+                      <WeaHelpfulTip title={`=${getLabel(k.helpfultiplanId, k.helpfultip)}`}/>
+                    </span>
+                  }))
+                };
+              }
+              return o;
+            })
+          }))
+        }, () => this.props.ledgerStore.ruleForm.initFormFields(this.state.conditions));
       }
     });
   };
   handleSave = () => {
-    const { salaryRuleItemsList, onSave } = this.props;
-    const { salaryItemOptions, ...extraItems } = this.state;
-    if (_.isEmpty(extraItems.salaryItemId)) {
-      Modal.warning({
-        title: "信息确认",
-        content: "必要信息不完整，红色*为必填项！"
-      });
-      return;
-    }
-    const items = { ...extraItems, salaryItemName: this.state.salaryItemName };
-    const { salaryItemName, salaryItemId, ...extraFileds } = items;
-    const salaryItemNameFiled = salaryItemName.split(","), salaryItemIdFiled = salaryItemId.split(",");
-    const fields = _.map(salaryItemNameFiled, (item, index) => {
-      return {
-        ...extraFileds,
-        salaryItemName: item,
-        salaryItemId: salaryItemIdFiled[index]
-      };
-    });
-    this.handleReset();
-    onSave([...salaryRuleItemsList, ...fields]);
-  };
-  handleReset = () => {
-    this.setState({
-      beforeAdjustmentType: 2,
-      afterAdjustmentType: 1,
-      salaryItemId: "",
-      salaryItemName: "",
-      dayOfMonth: "1",
-      salaryItemOptions: []
-    }, () => {
-      const { onCancel } = this.props;
-      onCancel();
+    const { salaryRuleItemsList, onSave, ledgerStore: { ruleForm } } = this.props;
+    ruleForm.validateForm().then(f => {
+      if (f.isValid) {
+        const { salaryItemId } = ruleForm.getFormParams(), { fieldMap } = ruleForm;
+        const fields = _.map(salaryItemId.split(","), o => ({
+          ...ruleForm.getFormParams(),
+          salaryItemId: o,
+          salaryItemName: _.find(fieldMap["salaryItemId"]["options"], k => k.key === o).showname
+        }));
+        this.props.onCancel(onSave([...salaryRuleItemsList, ...fields]));
+      } else {
+        f.showErrors();
+      }
     });
   };
 
 
   render() {
-    const {
-      salaryItemId,
-      salaryItemOptions,
-      dayOfMonth,
-      beforeAdjustmentType,
-      afterAdjustmentType
-    } = this.state;
-    const { title, visible } = this.props;
-    const buttons = [<Button type="primary" onClick={this.handleSave}>保存</Button>];
-    return (
-      <WeaDialog
-        initLoadCss
-        className="adjustRuleModalWrapper"
-        title={title}
-        visible={visible}
-        style={{ width: 750 }}
-        buttons={buttons}
-        onCancel={this.handleReset}
-      >
-        <WeaSearchGroup col={1} needTigger title="" showGroup center>
-          <WeaFormItem label="薪资项目" labelCol={{ span: 4 }} wrapperCol={{ span: 20 }}
-                       style={{ tableLayout: "fixed" }}>
-            <WeaSelect
-              multiple
-              viewAttr={3}
-              style={{ width: "350px" }}
-              options={salaryItemOptions}
-              value={salaryItemId}
-              onChange={(salaryItemId, salaryItemName) => this.setState({ salaryItemId, salaryItemName })}
-            />
-          </WeaFormItem>
-          <WeaFormItem label={<AdjustTitle/>} labelCol={{ span: 4 }} wrapperCol={{ span: 20 }} colon={false}>
-            <div className="adjustRuleDetailWrapper">
-              <div className="adjustSalaryFlex">
-                <span>如果：调薪生效日期在</span>
-                <WeaSelect
-                  viewAttr={3}
-                  style={{ width: 60, margin: "0 6px" }}
-                  value={dayOfMonth}
-                  options={monthDays}
-                  onChange={(dayOfMonth) => this.setState({ dayOfMonth })}
-                />
-                <span>（含）之前</span>
+    const { ledgerStore: { ruleForm } } = this.props, { conditions } = this.state;
+    const buttons = [<Button type="primary" onClick={this.handleSave}>{getLabel(111, "保存")}</Button>];
+    const itemRender = {
+      salaryItemId: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} form={form} formParams={formParams}/>);
+      },
+      dayOfMonth: () => null,
+      beforeAdjustmentType: () => null,
+      afterAdjustmentType: () => null
+    };
+    const childrenComponents = {
+      salaryItemId: () => {
+        const { dayOfMonth, beforeAdjustmentType, afterAdjustmentType } = ruleForm.getFormParams();
+        const coms = [], { fieldMap } = ruleForm;
+        coms.push(
+          <WeaFormItem label={<span>
+            <span className="title">{getLabel(111, "计薪规则")}</span>
+            <WeaHelpfulTip
+              title={getLabel(111, "该规则适用于一个薪资核算周期内只调整一次薪资或个税扣缴义务人的情况，其他情况默认按照分段计薪规则核算")}/>
+          </span>} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+            <div className="cust">
+              <div className="child">
+                <div className="lbl">{fieldMap["dayOfMonth"].label}</div>
+                <WeaSelect value={dayOfMonth} options={monthDays} style={{ width: 100 }}
+                           onChange={v => ruleForm.updateFields({ dayOfMonth: { value: v } })}/>
+                <div className="rbl">{getLabel(111, "（含）之前")}</div>
               </div>
-              <div className="adjustSalaryFlex">
-                <span>计薪规则为：</span>
-                <Radio.Group onChange={(e) => this.setState({ beforeAdjustmentType: e.target.value })}
-                             value={beforeAdjustmentType}>
-                  <Radio value={2}>取调整后薪资</Radio>
-                  <Radio value={4}>分段计薪<WeaHelpfulTip
-                    style={{ marginLeft: "10px" }}
-                    width={200}
-                    title="=调整前薪资/当月自然日天数*调整前自然日天数+调整后薪资/当月自然日天数*调整后自然日天数"
-                    placement="topLeft"
-                  /></Radio>
-                  <Radio value={3}>取平均<WeaHelpfulTip
-                    style={{ marginLeft: "10px" }}
-                    width={200}
-                    title="=（调整前薪资+调整后薪资）/2"
-                    placement="topLeft"
-                  />
-                  </Radio>
-                </Radio.Group>
+              <div className="child">
+                <div className="lbl">{fieldMap["beforeAdjustmentType"].label}</div>
+                <WeaSelect value={beforeAdjustmentType} detailtype={fieldMap["beforeAdjustmentType"]["detailtype"]}
+                           options={fieldMap["beforeAdjustmentType"]["options"]} style={{ flex: 1 }}
+                           onChange={v => ruleForm.updateFields({ beforeAdjustmentType: { value: v } })}/>
               </div>
-              <div style={{ marginBottom: 10 }}>否则：调薪生效日期在{dayOfMonth}号之后</div>
-              <div className="adjustSalaryFlex">
-                <span>计薪规则为：</span>
-                <Radio.Group onChange={(e) => this.setState({ afterAdjustmentType: e.target.value })}
-                             value={afterAdjustmentType}>
-                  <Radio value={1}>取调整前薪资</Radio>
-                  <Radio value={4}>分段计薪<WeaHelpfulTip
-                    style={{ marginLeft: "10px" }}
-                    width={200}
-                    title="=调整前薪资/当月自然日天数*调整前自然日天数+调整后薪资/当月自然日天数*调整后自然日天数"
-                    placement="topLeft"
-                  /></Radio>
-                  <Radio value={3}>取平均<WeaHelpfulTip
-                    style={{ marginLeft: "10px" }}
-                    width={200}
-                    title="=（调整前薪资+调整后薪资）/2"
-                    placement="topLeft"
-                  />
-                  </Radio>
-                </Radio.Group>
+              <div className="child">
+                <div className="lbl">{getLabel(111, "否则：调薪生效日期在10号之后")}</div>
+              </div>
+              <div className="child">
+                <div className="lbl">{fieldMap["afterAdjustmentType"].label}</div>
+                <WeaSelect value={afterAdjustmentType} detailtype={fieldMap["afterAdjustmentType"]["detailtype"]}
+                           options={fieldMap["afterAdjustmentType"]["options"]} style={{ flex: 1 }}
+                           onChange={v => ruleForm.updateFields({ afterAdjustmentType: { value: v } })}/>
               </div>
             </div>
           </WeaFormItem>
-        </WeaSearchGroup>
+        );
+        return [{ com: <div className="calcRules">{coms}</div>, col: 1 }];
+      }
+    };
+    return (
+      <WeaDialog {...this.props} initLoadCss style={{ width: 750, height: 236 }} buttons={buttons}
+                 className="adjustRuleModalWrapper">
+        <FormInfo className="form-dialog-layout" center={false} itemRender={itemRender}
+                  childrenComponents={childrenComponents} form={ruleForm} formFields={conditions}/>
       </WeaDialog>
     );
   }
@@ -176,14 +145,3 @@ class LedgerAdjustRuleAddModal extends Component {
 
 export default LedgerAdjustRuleAddModal;
 
-const AdjustTitle = () => {
-  return <div className="titleTipWrapper">
-    <span className="title">计薪规则</span>
-    <WeaHelpfulTip
-      width={200}
-      title="该规则适用于一个薪资核算周期内只调整一次薪资或个税扣缴义务人的情况，其他情况默认按照分段计薪规则核算"
-      placement="topLeft"
-    />
-    <span className="title">:</span>
-  </div>;
-};
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
index 905c2f3b..5889b792 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
@@ -5,7 +5,6 @@
  * Date: 2022/12/12
  */
 import React, { Component } from "react";
-import { inject, observer } from "mobx-react";
 import { Button, message, Modal } from "antd";
 import { WeaButtonIcon, WeaInputSearch, WeaTab } from "ecCom";
 import PersonalScopeTable from "../../../components/PersonalScopeTable";
@@ -37,8 +36,6 @@ const APISaveFox = {
   edit: editLedgerPersonRange
 };
 
-@inject("taxAgentStore")
-@observer
 class LedgerAssociatedPersonnel extends Component {
   constructor(props) {
     super(props);
@@ -224,7 +221,8 @@ class LedgerAssociatedPersonnel extends Component {
       externalPersonModalVisible,
       loading, extEmpsWitch
     } = this.state;
-    const { taxAgentStore: { showOperateBtn }, editId, saveSalarySobId } = this.props;
+    const { record, editId, saveSalarySobId } = this.props;
+    const admin = editId ? record.opts.includes("admin") : true;
     const topTab = [
       {
         title: "关联人员范围",
@@ -239,7 +237,7 @@ class LedgerAssociatedPersonnel extends Component {
         viewcondition: "externalList"
       }
     ];
-    const btns = showOperateBtn ? [
+    const btns = admin ? [
       <Button
         className="icon-coms-leading-in-btn"
         type="primary"
@@ -280,7 +278,7 @@ class LedgerAssociatedPersonnel extends Component {
           datas={(extEmpsWitch === "0" || !extEmpsWitch) ? _.dropRight(topTab) : topTab}
           keyParam="viewcondition" //主键
           selectedKey={selectedKey}
-          buttons={showOperateBtn && selectedKey === "listInclude" ? btns : btns.slice(1)}
+          buttons={admin && selectedKey === "listInclude" ? btns : btns.slice(1)}
           onChange={selectedKey => this.setState({ selectedKey })}
         />
         <PersonalScopeTable
@@ -289,7 +287,7 @@ class LedgerAssociatedPersonnel extends Component {
           APIFox={APIFox}
           tabActive={selectedKey}
           searchValue={searchValue}
-          showOperateBtn={showOperateBtn}
+          showOperateBtn={admin}
           onChangeSelectKey={rowKeys => this.setState({ rowKeys })}
           onEditScope={this.handleAddPersonal}
         />
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBackCalculatedSalaryItem.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBackCalculatedSalaryItem.js
index 80764a70..b0b4ee9b 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBackCalculatedSalaryItem.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBackCalculatedSalaryItem.js
@@ -67,14 +67,8 @@ class LedgerBackCalculatedSalaryItem extends Component {
           _.map(backCalcItems, item => {
             const { key, label, helpContent, dataSource } = item;
             return (
-              <WeaSearchGroup
-                key={key}
-                needTigger
-                title={
-                  <TitleComp title={label} helpContent={helpContent}/>
-                }
-                showGroup
-              >
+              <WeaSearchGroup key={key} needTigger showGroup
+                              title={<TitleComp title={label} helpContent={helpContent}/>}>
                 <LedgerBackCalculatedSalaryItemTable
                   {...this.props} dataSource={dataSource}
                   key={key} onRefresh={this.getAggregate}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
index cc89cd8a..dea5364c 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
@@ -7,7 +7,6 @@
 import React, { Component } from "react";
 import { WeaCheckbox, WeaFormItem, WeaHelpfulTip, WeaInput, WeaSelect, WeaTextarea } from "ecCom";
 import { Col, Row } from "antd";
-import { inject, observer } from "mobx-react";
 import { baseSettingFormItem } from "../config";
 import { getLedgerBasicForm } from "../../../apis/ledger";
 import {
@@ -19,11 +18,10 @@ import {
   prefixAddZero
 } from "../../../util/date";
 import { commonEnumList } from "../../../apis/ruleconfig";
+import { postFetch } from "../../../util/request";
 import moment from "moment";
 import "./index.less";
 
-@inject("taxAgentStore")
-@observer
 class LedgerBaseSetting extends Component {
   constructor(props) {
     super(props);
@@ -90,7 +88,11 @@ class LedgerBaseSetting extends Component {
         const { settingBaseInfo } = this.state;
         let tmpV = {};
         _.map(Object.keys(settingBaseInfo), key => {
-          tmpV[key] = !_.isNil(basicForm[key]) ? basicForm[key].toString() : "";
+          if (key === "taxAgentId") {
+            tmpV[key] = _.map(basicForm["taxAgentIds"], it => it.toString()).join(",");
+          } else {
+            tmpV[key] = !_.isNil(basicForm[key]) ? basicForm[key].toString() : "";
+          }
         });
         this.setState({
           settingBaseInfo: {
@@ -104,23 +106,21 @@ class LedgerBaseSetting extends Component {
     });
   };
   getTaxAgentSelectListAsAdmin = () => {
-    const { taxAgentStore } = this.props;
-    const { getTaxAgentSelectListAsAdmin } = taxAgentStore;
-    getTaxAgentSelectListAsAdmin().then(({ status, data }) => {
-      if (status) {
-        this.setState({
-          baseForm: _.map(baseSettingFormItem, it => {
-            if (it.key === "taxAgentId") {
-              return {
-                ...it,
-                options: _.map(data, it => ({ key: it.id, showname: it.content }))
-              };
-            }
-            return { ...it };
-          })
-        }, () => this.commonEenumList());
-      }
-    });
+    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" })
+      .then(({ status, data }) => {
+        if (status) {
+          this.setState({
+            baseForm: _.map(baseSettingFormItem, it => {
+              if (it.key === "taxAgentId") {
+                return {
+                  ...it, options: _.map(data, o => ({ key: String(o.id), showname: o.name }))
+                };
+              }
+              return { ...it };
+            })
+          }, () => this.commonEenumList());
+        }
+      });
   };
   commonEenumList = () => {
     const payload = {
@@ -157,18 +157,19 @@ class LedgerBaseSetting extends Component {
   };
 
   render() {
-    const { editId, taxAgentStore: { taxAgentOption } } = this.props;
+    const { editId, record, PageAndOptAuth } = this.props;
     const { baseForm, settingBaseInfo } = this.state;
     const { canEdit, taxAgentId } = settingBaseInfo;
     let taxAgentIdDisabled = false, taxableItemsDisabled = false;
+    const admin = editId ? record.opts.includes("admin") : true;
     return (
       <div className="baseSettingWrapper">
         <Row gutter={20}>
           <Col span={18} className="baseSettingLeft">
             {
               _.map(baseForm, item => {
-                const { key, label, type, options = [], children = [] } = item;
-                taxAgentIdDisabled = key === "taxAgentId" && editId && taxAgentId;
+                const { key, label, type, options = [], children = [], multiple = false } = item;
+                taxAgentIdDisabled = key === "taxAgentId" && editId && !PageAndOptAuth.isChief;
                 taxableItemsDisabled = key === "taxableItems" && editId;
                 return <WeaFormItem
                   key={key} label={label}
@@ -176,10 +177,10 @@ class LedgerBaseSetting extends Component {
                 >
                   {
                     type === "INPUT" ?
-                      <WeaInput value={settingBaseInfo[key]} viewAttr={3} disabled={canEdit !== "true"}
+                      <WeaInput value={settingBaseInfo[key]} viewAttr={3} disabled={!admin}
                                 onChange={(v) => this.handleChangeField(key, v)}/> :
                       type === "TEXTAREA" ?
-                        <WeaTextarea value={settingBaseInfo[key]} disabled={canEdit !== "true"}
+                        <WeaTextarea value={settingBaseInfo[key]} disabled={!admin}
                                      onChange={(v) => this.handleChangeField(key, v)}/> :
                         type === "CHECKBOX" ?
                           <React.Fragment>
@@ -189,12 +190,11 @@ class LedgerBaseSetting extends Component {
                           </React.Fragment> :
                           type === "SELECT" ?
                             <WeaSelect value={settingBaseInfo[key]}
-                                       options={((canEdit !== "true" || taxAgentIdDisabled || taxableItemsDisabled) && key === "taxAgentId") ? taxAgentOption : options}
-                                       viewAttr={3}
-                                       disabled={canEdit !== "true" || taxAgentIdDisabled || taxableItemsDisabled}
+                                       options={options} viewAttr={taxAgentIdDisabled ? 1 : 3} multiple={multiple}
+                                       disabled={!admin || taxableItemsDisabled}
                                        onChange={(v) => this.handleChangeField(key, v)}/> :
                             type === "CUSTOM" ?
-                              <CustomSelect list={children} baseInfo={settingBaseInfo} inputStr={key}
+                              <CustomSelect list={children} baseInfo={settingBaseInfo} inputStr={key} admin={admin}
                                             onChange={(key, v) => this.handleChangeField(key, v)}/> : null
                   }
                 </WeaFormItem>;
@@ -211,8 +211,7 @@ class LedgerBaseSetting extends Component {
 export default LedgerBaseSetting;
 
 const CustomSelect = (props) => {
-  const { list, baseInfo, onChange, inputStr } = props;
-  const { canEdit } = baseInfo;
+  const { list, baseInfo, onChange, inputStr, admin } = props;
   const selectInfo = buildEditBasicInfo(baseInfo);
   return <Row gutter={10} key={inputStr}>
     {
@@ -220,8 +219,7 @@ const CustomSelect = (props) => {
         const { key, options = [] } = item;
         return <Col span={6}>
           <WeaSelect value={baseInfo[key]} options={options} viewAttr={3}
-                     disabled={canEdit !== "true"}
-                     onChange={(v) => onChange(key, v)}/>
+                     disabled={!admin} onChange={(v) => onChange(key, v)}/>
         </Col>;
       })
     }
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js
index e4d4c00d..90196173 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js
@@ -5,14 +5,11 @@
  * Date: 2022/12/12
  */
 import React, { Component } from "react";
-import { inject, observer } from "mobx-react";
 import { WeaButtonIcon, WeaTab, WeaTable } from "ecCom";
 import { Modal } from "antd";
 import LedgerAdjustRuleAddModal from "./ledgerAdjustRuleAddModal";
 import { listAdjustmentRule } from "../../../apis/ledger";
 
-@inject("taxAgentStore")
-@observer
 class LedgerSalaryAdjustmentRules extends Component {
   constructor(props) {
     super(props);
@@ -92,9 +89,10 @@ class LedgerSalaryAdjustmentRules extends Component {
   };
 
   render() {
-    const { taxAgentStore: { showOperateBtn }, editId, onSaveParams } = this.props;
+    const { record, editId, onSaveParams } = this.props;
     const { adjustRuleAddModal } = this.state;
     const { dataSource } = this.state;
+    const showOperateBtn = editId ? record.opts.includes("admin") : true;
     const btns = showOperateBtn ? [
       <WeaButtonIcon buttonType="add" type="primary" onClick={this.handleAddAdjustRule}/>
     ] : [];
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
index e2b191ae..a192c791 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
@@ -46,11 +46,12 @@ class LedgerSalaryItemBaseInfo extends Component {
   };
   handleDeleteEmplist = (item) => {
     const { dataSource, onChangeSortableList } = this.props;
-    onChangeSortableList(_.xorWith(dataSource, [item], _.isEqual));
+    onChangeSortableList(_.filter(dataSource, o => o.id !== item.id));
   };
 
   render() {
-    const { dataSource, onChangeSortableList, onPreview } = this.props;
+    const { dataSource, onChangeSortableList, onPreview, editId, record } = this.props;
+    const admin = editId ? record.opts.includes("admin") : true;
     const { empFieldListOptions } = this.state;
     const options = _.map(empFieldListOptions, o => ({
       ...o, disabled: _.map(dataSource, g => g.fieldId).includes(o.key)
@@ -60,7 +61,7 @@ class LedgerSalaryItemBaseInfo extends Component {
       <WeaSearchGroup needTigger={false} showGroup title={<TitleComp onPreview={onPreview}/>}>
         <div className="userInfoWrapper">
           <WeaSortable
-            datas={dataSource}
+            datas={_.map(dataSource, o => ({ ...o, filter: !admin }))}
             draggableType="icon"
             onChange={onChangeSortableList}
             renderNodeItem={(item) => {
@@ -80,6 +81,7 @@ class LedgerSalaryItemBaseInfo extends Component {
             className="wea-sortable-grid-item"
           />
           <WeaSelect
+            disabled={!admin}
             showSearch
             options={options}
             style={{ width: 150 }}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
index 4b9b42ec..5e61b475 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
@@ -140,9 +140,9 @@ class LedgerSalaryItemNormal extends Component {
       onChangeSelectedRowKeys,
       onAddSalaryItems,
       incomeCategoriesTitleName,
-      taxAgentStore
+      record
     } = this.props;
-    const { showOperateBtn } = taxAgentStore;
+    const showOperateBtn = editId ? record.opts.includes("admin") : true;
     const { categoryModal, addCategoryItemsVisible, moveModalPayload, salaryItemKeywords } = this.state;
     const newDateSource = _.map(dataSource, item => {
       return {
@@ -182,7 +182,8 @@ class LedgerSalaryItemNormal extends Component {
               >
                 <LedgerSalaryItemTable
                   tableData={items}
-                  dataSource={_.find(newDateSource, childItem => childItem.uuid === uuid).items}
+                  showOperateBtn={showOperateBtn}
+                  dataSource={_.find(dataSource, childItem => childItem.uuid === uuid).items}
                   salarySobId={editId || saveSalarySobId}
                   selectedRowKeys={field.selectedRowKeys || []}
                   onDropCategoryItem={(data) => onDropCategoryItem(field, data)}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 4f126ef9..76808a84 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -231,7 +231,7 @@ class LedgerSalaryItemTable extends Component {
 
   render() {
     const { salaryItemPayload, editFormulModal, originRecord } = this.state;
-    const { onHandleItemhide } = this.props;
+    const { onHandleItemhide, showOperateBtn } = this.props;
     const {
       tableData, dataSource, onDropCategoryItem,
       onChangeSelectedRowKeys, selectedRowKeys, onMoveTo
@@ -315,16 +315,16 @@ class LedgerSalaryItemTable extends Component {
       <React.Fragment>
         <WeaTable
           rowKey={record => record.id || record.key}
-          rowSelection={rowSelection}
+          rowSelection={showOperateBtn ? rowSelection : null}
           dataSource={tableData}
-          columns={columns}
+          columns={showOperateBtn ? columns : _.filter(columns, o => (o.dataIndex !== "operate" && o.dataIndex !== "itemHide"))}
           onRow={(record, index) => ({
             index,
             moveRow: record
           })}
           pagination={false}
           onDrop={onDropCategoryItem}
-          draggable={dataSource.length === tableData.length}
+          draggable={dataSource.length === tableData.length && showOperateBtn}
         />
         <LedgerSalaryItemEditSlide
           {...salaryItemPayload}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
index 821ba416..7233f9b2 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
@@ -10,12 +10,13 @@ import { Button } from "antd";
 import { WeaSwitch } from "comsMobx";
 import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
 import { searchConditions } from "../config";
-import { getTaxAgentSelectList } from "../../../apis/taxAgent";
+import { postFetch } from "../../../util/request";
 
 const getKey = WeaTools.getKey;
 const getLabel = WeaLocaleProvider.getLabel;
 
-@inject("ledgerStore") @observer
+@inject("ledgerStore")
+@observer
 class LedgerSearchComp extends Component {
   constructor(props) {
     super(props);
@@ -30,26 +31,28 @@ class LedgerSearchComp extends Component {
 
   getTaxAgentSelectList = () => {
     const { ledgerStore: { searchForm } } = this.props;
-    getTaxAgentSelectList().then(({ status, data }) => {
-      if (status) {
-        this.setState({
-          conditions: _.map(searchConditions, o => {
-            return {
-              ...o, items: _.map(o.items, j => {
-                if (getKey(j) === "taxAgentId") {
-                  return {
-                    ...j, options: [{ key: "", showname: getLabel(332, "全部") }, ..._.map(data, g => ({
-                      key: g.id, showname: g.content
-                    }))]
-                  };
-                }
-                return { ...j };
-              })
-            };
-          })
-        }, () => searchForm.initFormFields(this.state.conditions));
-      }
-    });
+    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" })
+      .then(({ status, data }) => {
+        if (status) {
+          this.setState({
+            conditions: _.map(searchConditions, o => {
+              return {
+                ...o,
+                items: _.map(o.items, j => {
+                  if (getKey(j) === "taxAgentId") {
+                    return {
+                      ...j, options: [{ key: "", showname: getLabel(332, "全部") }, ..._.map(data, g => ({
+                        key: String(g.id), showname: g.name
+                      }))]
+                    };
+                  }
+                  return { ...j };
+                })
+              };
+            })
+          }, () => searchForm.initFormFields(this.state.conditions));
+        }
+      });
   };
   formRender = (form, condition) => {
     const { isFormInit } = form, formParams = form.getFormParams();
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index c5ead666..0e07cd7e 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -23,7 +23,7 @@ import "./index.less";
 const { getLabel } = WeaLocaleProvider;
 const Step = WeaSteps.Step;
 
-@inject("taxAgentStore", "ledgerStore")
+@inject("ledgerStore")
 @observer
 class LedgerSlide extends Component {
   constructor(props) {
@@ -67,17 +67,18 @@ class LedgerSlide extends Component {
       return false;
     }
     this.setState({ loading: true });
-    saveLedgerBasic({ ...extra, description, id: editId }).then(({ status, data, errormsg }) => {
-      this.setState({ loading: false });
-      if (status) {
-        const { onRefreshList } = this.props;
-        message.success("保存成功");
-        onRefreshList();
-        !editId && this.setState({ current: current + 1, saveSalarySobId: data });
-      } else {
-        message.error(errormsg || "保存失败");
-      }
-    }).catch(() => this.setState({ loading: false }));
+    saveLedgerBasic({ ...extra, description, id: editId, taxAgentIds: extra.taxAgentId.split(",") })
+      .then(({ status, data, errormsg }) => {
+        this.setState({ loading: false });
+        if (status) {
+          const { onRefreshList } = this.props;
+          message.success("保存成功");
+          onRefreshList();
+          !editId && this.setState({ current: current + 1, saveSalarySobId: data });
+        } else {
+          message.error(errormsg || "保存失败");
+        }
+      }).catch(() => this.setState({ loading: false }));
   };
   /*
    * Author: 黎永顺
@@ -198,7 +199,7 @@ class LedgerSlide extends Component {
   };
 
   render() {
-    const { visible, editId, taxAgentStore: { showOperateBtn } } = this.props;
+    const { visible, editId, record } = this.props;
     const { current, saveSalarySobId, loading, salaryApprovalStatus } = this.state;
     let tabs = [
       {
@@ -296,7 +297,7 @@ class LedgerSlide extends Component {
         measure="%"
         title={
           !editId ? <WeaTopTitle buttons={_.find(tabs, o => current === o.key).createBtns}/> :
-            <WeaReqTitle buttons={showOperateBtn ? _.find(tabs, o => current === o.key).editBtns : []}
+            <WeaReqTitle buttons={record.opts.includes("admin") ? _.find(tabs, o => current === o.key).editBtns : []}
                          tabDatas={tabs} selectedKey={String(current)}
                          onChange={cur => this.setState({ current: parseInt(cur) })}/>
         }
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
index 68f24fde..e77ea617 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
@@ -71,7 +71,7 @@ class LedgerTable extends Component {
           return <WeaCheckbox
             value={text === 0 ? "1" : "0"}
             display="switch"
-            disabled={!showOperateBtn}
+            disabled={!record.opts.includes("admin")}
             onChange={(disable) => this.changeLedgerStatus({ id: record.id, disable: disable === "0" ? 1 : 0 })}
           />;
         };
@@ -80,14 +80,14 @@ class LedgerTable extends Component {
         item.render = (text, record) => {
           return <div className="optWrapper">
             <a href="javascript:void(0);" className="mr10"
-               onClick={() => onEditLedger(record)}>{showOperateBtn ? "编辑" : "查看"}</a>
+               onClick={() => onEditLedger(record)}>{record.opts.includes("admin") ? "编辑" : "查看"}</a>
             {
-              showOperateBtn &&
+              record.opts.includes("admin") &&
               <a href="javascript:void(0);" className="mr10"
                  onClick={() => this.handleMenuClick({ key: "copy" }, record)}>复制</a>
             }
             {
-              showOperateBtn &&
+              record.opts.includes("admin") &&
               <Popover
                 overlayClassName="moreIconWrapper"
                 placement="bottomRight"
@@ -148,11 +148,15 @@ class LedgerTable extends Component {
   };
   handleMenuClick = ({ key }, record) => {
     const { copyLedgerModal } = this.state;
-    const { id, name, taxAgentId } = record;
+    const { id, name, taxAgentIds } = record;
     switch (key) {
       case "copy":
         this.setState({
-          copyLedgerModal: { ...copyLedgerModal, visible: true, id, name, taxAgentId }
+          copyLedgerModal: {
+            ...copyLedgerModal,
+            visible: true, id, name,
+            taxAgentId: _.map(taxAgentIds, o => String(o)).join(",")
+          }
         });
         break;
       case "delete":
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/config.js b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
index 435e4793..a1085635 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/config.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
@@ -19,6 +19,7 @@ export const copyConditions = [
         fieldcol: 14,
         rules: "required|string",
         label: "个税扣缴义务人",
+        multiple: true,
         labelcol: 6,
         value: "",
         viewAttr: 3
@@ -86,6 +87,7 @@ export const baseSettingFormItem = [
     key: "taxAgentId",
     label: "个税扣缴义务人",
     type: "SELECT",
+    multiple: true,
     options: []
   },
   {
@@ -857,3 +859,76 @@ export const classifyConditions = [
     defaultshow: true
   }
 ];
+export const ruleConditions = [//调薪计薪规则项表单
+  {
+    items: [
+      {
+        conditionType: "SELECT",
+        domkey: ["salaryItemId"],
+        fieldcol: 8,
+        rules: "required|string",
+        label: "薪资项目",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        multiple: true,
+        viewAttr: 3
+      },
+      {
+        conditionType: "SELECT",
+        domkey: ["dayOfMonth"],
+        fieldcol: 6,
+        label: "如果：调薪生效日期在",
+        lanId: 111,
+        labelcol: 0,
+        value: "1",
+        viewAttr: 2
+      },
+      {
+        conditionType: "SELECT",
+        domkey: ["beforeAdjustmentType"],
+        fieldcol: 6,
+        label: "计薪规则为：",
+        lanId: 111,
+        labelcol: 0,
+        value: "2",
+        options: [
+          { key: "2", showname: "取调整后薪资", lanId: 111 },
+          {
+            key: "4", showname: "分段计薪", lanId: 111, helpfultiplanId: 111,
+            helpfultip: "调整前薪资/当月自然日天数*调整前自然日天数+调整后薪资/当月自然日天数*调整后自然日天数"
+          },
+          {
+            key: "3", showname: "取平均", lanId: 111,
+            helpfultip: "（调整前薪资+调整后薪资）/2", helpfultiplanId: 111
+          }
+        ],
+        detailtype: 3,
+        viewAttr: 2
+      },
+      {
+        conditionType: "SELECT",
+        domkey: ["afterAdjustmentType"],
+        fieldcol: 6,
+        label: "计薪规则为：",
+        lanId: 111,
+        labelcol: 0,
+        value: "1",
+        options: [
+          { key: "1", showname: "取调整前薪资", lanId: 111 },
+          {
+            key: "4", showname: "分段计薪", lanId: 111, helpfultiplanId: 111,
+            helpfultip: "调整前薪资/当月自然日天数*调整前自然日天数+调整后薪资/当月自然日天数*调整后自然日天数"
+          },
+          {
+            key: "3", showname: "取平均", lanId: 111,
+            helpfultip: "（调整前薪资+调整后薪资）/2", helpfultiplanId: 111
+          }
+        ],
+        detailtype: 3,
+        viewAttr: 2
+      }
+    ],
+    defaultshow: true
+  }
+];
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.js b/pc4mobx/hrmSalary/pages/ledgerPage/index.js
index ebd64818..8c8947f2 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/index.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.js
@@ -7,7 +7,7 @@
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { WeaLocaleProvider, WeaTop } from "ecCom";
-import { Button } from "antd";
+import { Button, Modal } from "antd";
 import LedgerTable from "./components/ledgerTable";
 import LedgerSlide from "./components/ledgerSlide";
 import LedgerSearchComp from "./components/ledgerSearchComp";
@@ -23,34 +23,19 @@ class Index extends Component {
     super(props);
     this.state = {
       searchVal: "", doSearch: false, logDialogVisible: false, filterConditions: "[]",
-      slideparams: {
-        visible: false,
-        title: "新建账套",
-        editId: ""
-      }
+      slideparams: { visible: false, title: "新建账套", editId: "", record: {} }
     };
   }
 
-  componentDidMount() {
-    const { taxAgentStore } = this.props;
-    const { fetchTaxAgentOption } = taxAgentStore;
-    fetchTaxAgentOption();
-  }
-
   handleEditLedger = (record) => {
     const { slideparams } = this.state;
     const { id } = record;
-    this.setState({ slideparams: { ...slideparams, visible: true, title: "编辑账套", editId: id } });
+    this.setState({ slideparams: { ...slideparams, visible: true, title: "编辑账套", editId: id, record } });
   };
   handleResetLedger = () => {
     const { slideparams } = this.state;
     this.setState({
-      slideparams: {
-        ...slideparams,
-        visible: false,
-        title: "新建账套",
-        editId: ""
-      }
+      slideparams: { ...slideparams, visible: false, title: "新建账套", editId: "", record: {} }
     });
   };
   onDropMenuClick = (key, targetid = "") => {
@@ -65,21 +50,33 @@ class Index extends Component {
         break;
     }
   };
+  handleNewBuild = () => {
+    const { taxAgentStore } = this.props;
+    const { PageAndOptAuth } = taxAgentStore;
+    if (!PageAndOptAuth.isAdminEnable && !PageAndOptAuth.isChief) {
+      Modal.info({
+        title: getLabel(111, "提示"),
+        content: getLabel(111, "业务线人员新建账套后，需联系总管理员，将该账套加入所属业务线。"),
+        onOk: () => this.setState({ slideparams: { ...this.state.slideparams, visible: true } })
+      });
+    } else {
+      this.setState({ slideparams: { ...this.state.slideparams, visible: true } });
+    }
+  };
 
   render() {
     const { logDialogVisible, filterConditions, doSearch, slideparams } = this.state;
     const { taxAgentStore } = this.props;
-    const { showOperateBtn } = taxAgentStore;
+    const { PageAndOptAuth } = taxAgentStore;
+    const admin = PageAndOptAuth.opts.includes("admin");
     const btns = [
-      <Button type="primary" onClick={() => this.setState({ slideparams: { ...slideparams, visible: true } })}>
-        {getLabel(111, "新建")}
-      </Button>,
+      <Button type="primary" onClick={this.handleNewBuild}>{getLabel(111, "新建")}</Button>,
       <LedgerSearchComp onSearch={() => this.setState({ doSearch: !doSearch })}/>
     ];
     return (
       <WeaTop
         title="薪资账套" className="ledgerOuter" icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
-        buttons={showOperateBtn ? btns : btns.slice(-1)}
+        buttons={admin ? btns : btns.slice(-1)}
         showDropIcon onDropMenuClick={this.onDropMenuClick}
         dropMenuDatas={[
           {
@@ -92,7 +89,7 @@ class Index extends Component {
           <LedgerTable doSearch={doSearch} onEditLedger={this.handleEditLedger}
                        onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
           <LedgerSlide
-            {...slideparams}
+            {...slideparams} PageAndOptAuth={PageAndOptAuth}
             onCancel={this.handleResetLedger}
             onRefreshList={() => this.setState({ doSearch: !doSearch })}
           />
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js b/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js
new file mode 100644
index 00000000..3462cb08
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js
@@ -0,0 +1,87 @@
+export const secondaryVerifyConditions = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["authCode"],
+        fieldcol: 14,
+        label: "二次验证密码",
+        labelcol: 10,
+        value: "",
+        otherParams: {
+          type: "password"
+        },
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];
+export const loginCondition = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["password"],
+        fieldcol: 14,
+        label: "登录密码",
+        labelcol: 10,
+        value: "",
+        otherParams: {
+          type: "password"
+        },
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];
+export const secondarypwdCondition = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["secondaryPwd1"],
+        fieldcol: 14,
+        label: "密码",
+        labelcol: 10,
+        value: "",
+        otherParams: {
+          type: "password",
+          passwordStrength: true
+        },
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["secondaryPwd2"],
+        fieldcol: 14,
+        label: "确认密码",
+        labelcol: 10,
+        value: "",
+        otherParams: {
+          type: "password"
+        },
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["validatecode"],
+        fieldcol: 14,
+        label: "验证码",
+        labelcol: 10,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 1b598371..372ede86 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -2,37 +2,31 @@ import React from "react";
 import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
 import { getQueryString } from "../../util/url";
-import { WeaDialog, WeaError, WeaInput, WeaLocaleProvider } from "ecCom";
-import { Button, message, Modal } from "antd";
+import { WeaLocaleProvider } from "ecCom";
+import { message, Modal } from "antd";
 import Authority from "../mySalary/authority";
 import "../payroll/templatePreview/index.less";
 import * as API from "../../apis/mySalaryBenefits";
 import { salaryBillGetToken } from "../../apis/mySalaryBenefits";
 import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../apis/payroll";
 import CaptchaModal from "../../components/captchaModal";
-import PassSetDialog from "./passSetDialog";
 import { ConfirmBtns } from "../mySalary/mySalaryView";
 import Content from "../../components/pcTemplate/content";
 import MobileTemplate from "../../components/mobileTemplate";
+import SecondaryVerify from "./secondaryVerify";
+import LoginVerify from "./loginVerify";
+import SecondarypwdVerify from "./secondarypwdVerify";
 import "../mySalary/index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
-@inject("mySalaryStore")
-@observer
+@inject("mySalaryStore") @observer
 export default class MobilePayroll extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      pwdSetVisible: false,
-      visible: false,
-      captchaVisible: false,
-      authCode: "",
-      notSetting: false,
-      mySalaryBillData: {
-        employeeInformation: {},
-        salaryTemplate: []
-      },
+      visible: false, captchaVisible: false, loginVisible: false, pwdSetVisible: false,
+      mySalaryBillData: { employeeInformation: {}, salaryTemplate: [] },
       salaryBillToken: {}
     };
     this.id = "";
@@ -43,15 +37,12 @@ export default class MobilePayroll extends React.Component {
     this.id = getQueryString("id");
     const { mySalaryStore: { init, setMySalaryBill } } = this.props;
     setMySalaryBill({});
-    if (type !== "phone") {
-      const { data, status } = await payrollCheckType();
-      if (status && data === "PWD") {
-        init(false, () => this.getMySalaryBill(this.id));
-      } else {
-        this.setState({ captchaVisible: true });
-      }
+    const { data, status } = await payrollCheckType();
+    if (status && data === "PWD") {
+      type !== "phone" ? init(false, () => this.getMySalaryBill(this.id)) : await this.initMobile();
+    } else {
+      this.setState({ captchaVisible: true });
     }
-    type === "phone" && await this.initMobile();
   }
 
   initMobile = async () => {
@@ -60,12 +51,7 @@ export default class MobilePayroll extends React.Component {
       API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
         .then(({ status, isNeedSecondAuth }) => {
           if (status && isNeedSecondAuth) {
-            this.setState({ visible: true }, () => {
-              API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
-                .then(({ status, notSetting }) => {
-                  this.setState({ notSetting });
-                });
-            });
+            this.setState({ visible: true });
           } else {
             this.getMySalaryBill(getQueryString("id"));
             setInitEmVerify();
@@ -82,12 +68,7 @@ export default class MobilePayroll extends React.Component {
         API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
           .then(({ status, isNeedSecondAuth }) => {
             if (status && isNeedSecondAuth) {
-              this.setState({ visible: true }, () => {
-                API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
-                  .then(({ status, notSetting }) => {
-                    this.setState({ notSetting });
-                  });
-              });
+              this.setState({ visible: true });
             } else {
               this.getMySalaryBill(getQueryString("id"));
               setInitEmVerify();
@@ -96,33 +77,12 @@ export default class MobilePayroll extends React.Component {
       });
     }
   };
-  doSecondAuth = () => {
-    const { salaryBillToken } = this.state;
-    const { mySalaryStore: { setInitEmVerify } } = this.props;
-    if (!this.state.authCode) {
-      this.refs.weaError.showError();
-      return;
-    }
-    API.doSecondAuth({
-      authCode: this.state.authCode, mouldCode: "HRM", itemCode: "SALARY"
-    }, salaryBillToken).then(({ status, checkStatus, checkMsg }) => {
-      if (status && checkStatus === "1") {
-        message.success(checkMsg);
-        setInitEmVerify();
-        this.setState({ visible: false });
-        this.getMySalaryBill(getQueryString("id"));
-      } else {
-        message.error(checkMsg);
-      }
-    });
-  };
   getMySalaryBill = (salaryInfoId) => {
     const { salaryBillToken } = this.state;
     const { mySalaryStore: { getMySalaryBill } } = this.props;
     const params = this.getUrlkey();
     const payload = {
-      salaryInfoId, header: salaryBillToken,
-      ..._.pick(params, ["recipient"])
+      salaryInfoId, header: salaryBillToken, ..._.pick(params, ["recipient"])
     };
     getMySalaryBill(payload).then(result => {
       this.setState({
@@ -132,10 +92,8 @@ export default class MobilePayroll extends React.Component {
   };
   getUrlkey = () => {
     let url = window.location.href;
-    let params = {},
-      arr = url.split("?");
-    if (arr.length <= 1)
-      return params;
+    let params = {}, arr = url.split("?");
+    if (arr.length <= 1) return params;
     arr = arr[1].split("&");
     for (var i = 0, l = arr.length; i < l; i++) {
       var a = arr[i].split("=");
@@ -144,19 +102,21 @@ export default class MobilePayroll extends React.Component {
     return params;
   };
   confirmSalaryBill = () => {
-    confirmSalaryBill({ salaryInfoId: getQueryString("id") }).then(({ status, errormsg }) => {
-      if (status) {
-        message.success(getLabel(30700, "操作成功"));
-        this.getMySalaryBill(getQueryString("id"));
-      } else {
-        message.error(errormsg || getLabel(30651, "操作失败"));
-      }
-    });
+    const { salaryBillToken } = this.state;
+    confirmSalaryBill({ salaryInfoId: getQueryString("id"), header: salaryBillToken })
+      .then(({ status, errormsg }) => {
+        if (status) {
+          message.success(getLabel(30700, "操作成功"));
+          this.getMySalaryBill(getQueryString("id"));
+        } else {
+          message.error(errormsg || getLabel(30651, "操作失败"));
+        }
+      });
   };
   handleGoFeedback = () => {
     Modal.confirm({
       title: getLabel(131329, "信息确认"),
-      content: getLabel(111, "请确认薪资信息是有误，进行反馈并发起反馈流程。"),
+      content: getLabel(111, "确认是否发起反馈流程？"),
       onOk: () => {
         const { salaryBillToken } = this.state;
         feedBackSalaryBill({ salaryInfoId: getQueryString("id"), header: salaryBillToken })
@@ -177,76 +137,67 @@ export default class MobilePayroll extends React.Component {
   };
 
   render() {
-    const { mySalaryStore: { clearLoading, pwdForm } } = this.props;
-    const { mySalaryBillData, visible, captchaVisible, notSetting, pwdSetVisible } = this.state;
+    const { mySalaryStore: { setInitEmVerify } } = this.props, {
+      captchaVisible, visible, loginVisible, pwdSetVisible
+    } = this.state;
     const type = getQueryString("type");
-    if (_.isEmpty(toJS(this.props.mySalaryStore.mySalaryBill))) return <div>
-      <WeaDialog
-        onCancel={() => this.setState({ visible: false }, () => clearLoading())}
-        title="请输入二次验证密码" visible={visible} initLoadCss
-        className="verifyWrapper"
-        hasScroll buttons={[
-        <Button type="primary" size="small" onClick={this.doSecondAuth}>确定</Button>
-      ]}
-      >
-        <WeaError tipPosition="bottom" ref="weaError" error="此项必填">
-          <WeaInput value={this.state.authCode} type="password" viewAttr={3}
-                    onChange={authCode => this.setState({ authCode })}/>
-        </WeaError>
-        {
-          notSetting &&
-          <div style={{ clear: "both", paddingTop: 10 }}>
-            {getLabel("514970", "您还未设置二次验证密码，点击")}
-            <a href="javascript:void(0);"
-               onClick={() => this.setState({ pwdSetVisible: true })}>{getLabel("30747", "设置")}</a>
-          </div>
-        }
-      </WeaDialog>
-      <PassSetDialog form={pwdForm} visible={pwdSetVisible} onCancel={() => this.setState({ pwdSetVisible: false })}/>
-    </div>;
-    const {
-      salaryTemplate, salaryGroups, employeeInformation,
-      sendTime, confirmStatus, showAck, showFeedback
-    } = toJS(this.props.mySalaryStore.mySalaryBill);
-    const salaryProps = {
-      theme: salaryTemplate.theme, tip: salaryTemplate.textContent, sendTime,
-      background: salaryTemplate.background, tipPosi: salaryTemplate.textContentPosition || "",
-      itemTypeList: [employeeInformation, ...salaryGroups]
-    };
-    return (
-      <React.Fragment>
-        {
-          type === "phone" ?
-            <Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
-                       store={this.props.mySalaryStore}>
-              <MobileTemplate {...salaryProps} title={getLabel(111, "工资单查看")}>
-                <ConfirmBtns
-                  showAck={showAck} showFeedback={showFeedback}
-                  confirmSalaryBill={this.confirmSalaryBill}
-                  goFeedback={this.handleGoFeedback}
-                />
-              </MobileTemplate>
-            </Authority>
-            :
-            <Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
-                       store={this.props.mySalaryStore}>
-              <div className="weapp-salary-my-salary-view-payroll">
-                <Content {...salaryProps}>
-                  <ConfirmBtns
-                    showAck={showAck} showFeedback={showFeedback}
-                    confirmSalaryBill={this.confirmSalaryBill}
-                    goFeedback={this.handleGoFeedback}
-                  />
-                </Content>
-              </div>
-            </Authority>
-        }
+    if (_.isEmpty(toJS(this.props.mySalaryStore.mySalaryBill))) return <React.Fragment>
+      {visible && <SecondaryVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
+                                   onSetLogin={() => this.setState({ visible: false, loginVisible: true })}
+                                   onSuccess={() => {
+                                     setInitEmVerify();
+                                     this.getMySalaryBill(getQueryString("id"));
+                                   }}/>}
+      {loginVisible && <LoginVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
+                                    onSetPwdSet={() => this.setState({ loginVisible: false, pwdSetVisible: true })}/>}
+      {pwdSetVisible && <SecondarypwdVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
+                                            onSuccess={() => this.setState({ pwdSetVisible: false }, () => this.initMobile())}/>}
+      {/*发送验证码*/}
+      {
+        captchaVisible &&
         <CaptchaModal
           visible={captchaVisible} id={getQueryString("id")}
           onCancel={() => this.setState({ captchaVisible: false })}
-          onConfirm={() => this.props.mySalaryStore.setInitEmVerify()}
+          onConfirm={() => {
+            setInitEmVerify();
+            this.getMySalaryBill(getQueryString("id"));
+          }}
         />
-      </React.Fragment>
-    );
+      }
+    </React.Fragment>;
+    const {
+      salaryTemplate, salaryGroups, employeeInformation, sendTime, confirmStatus, showAck, showFeedback
+    } = toJS(this.props.mySalaryStore.mySalaryBill);
+    const salaryProps = {
+      theme: salaryTemplate.theme,
+      tip: salaryTemplate.textContent,
+      sendTime,
+      background: salaryTemplate.background,
+      tipPosi: salaryTemplate.textContentPosition || "",
+      itemTypeList: [employeeInformation, ...salaryGroups]
+    };
+    return (<React.Fragment>
+      {type === "phone" ? <Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
+                                     store={this.props.mySalaryStore}>
+        <MobileTemplate {...salaryProps} title={getLabel(111, "工资单查看")}>
+          <ConfirmBtns
+            showAck={showAck} showFeedback={showFeedback}
+            confirmSalaryBill={this.confirmSalaryBill}
+            goFeedback={this.handleGoFeedback}
+          />
+        </MobileTemplate>
+      </Authority> : <Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
+                                store={this.props.mySalaryStore}>
+        <div className="weapp-salary-my-salary-view-payroll">
+          <Content {...salaryProps}>
+            <ConfirmBtns
+              showAck={showAck} showFeedback={showFeedback}
+              confirmSalaryBill={this.confirmSalaryBill}
+              goFeedback={this.handleGoFeedback}
+            />
+          </Content>
+        </div>
+      </Authority>}
+    </React.Fragment>);
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.less b/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
index 923d3d82..9fd7d4d6 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
@@ -39,3 +39,132 @@
     }
   }
 }
+
+.am-modal-mask {
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  height: 100%;
+  z-index: 999;
+  background-color: rgba(0, 0, 0, .4);
+}
+
+.am-modal-transparent {
+  width: 80%;
+}
+
+.am-modal-transparent .am-modal-content {
+  border-radius: 7px;
+  padding-top: 15px;
+}
+
+.am-modal-content {
+  position: relative;
+  background-color: #fff;
+  border: 0;
+  background-clip: padding-box;
+  text-align: center;
+  height: 100%;
+  overflow: hidden;
+}
+
+.am-modal-header {
+  padding: 15px;
+}
+
+.am-modal-title {
+  margin: 0;
+  letter-spacing: -.1px;
+  color: #333;
+  font-size: 14px;
+  line-height: 20px;
+  text-align: center;
+  height: auto;
+  max-height: 150px;
+  overflow-y: auto;
+}
+
+.am-modal-body {
+  font-size: 14px;
+  color: #868686;
+  height: 100%;
+  line-height: 1.5;
+  overflow: auto;
+  padding: 0 15px 30px;
+
+  .wea-search-group, .wea-content, .wea-form-cell {
+    padding: 0;
+  }
+
+  .secondarypwd-form {
+    .wea-form-cell-wrapper {
+      & > div:last-child {
+        .ant-col-16 {
+          width: 37.5% !important;
+        }
+      }
+    }
+  }
+}
+
+.am-modal-wrap {
+  position: fixed;
+  overflow: auto;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  height: 100%;
+  z-index: 999;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  -webkit-transform: translateZ(1px);
+  transform: translateZ(1px);
+}
+
+.am-modal-button-group-h {
+  position: relative;
+  border-top: 1px solid #ddd;
+  display: flex;
+}
+
+.am-modal-button-group-h .am-modal-button {
+  -webkit-touch-callout: none;
+  flex: 1 1;
+  box-sizing: border-box;
+  text-align: center;
+  text-decoration: none;
+  outline: none;
+  color: #55b1f9;
+  height: 50px;
+  line-height: 50px;
+  display: block;
+  width: auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 14px;
+}
+
+.am-modal-button-group-h .am-modal-button:first-child {
+  color: #333;
+}
+
+.am-modal-button-group-h .am-modal-button:last-child {
+  position: relative;
+  border-left: 1px solid #ddd;
+}
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
new file mode 100644
index 00000000..90d231ca
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
@@ -0,0 +1,59 @@
+/*
+  * 登录密码验证
+  *
+  * @Author:    黎永顺
+  * @Date:      2025/4/17
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import { WeaForm } from "comsMobx";
+import FormInfo from "../../components/FormInfo";
+import { loginCondition } from "./conditions";
+import MobileModal from "./mobileModal";
+import * as API from "../../apis/mySalaryBenefits";
+import { RSAEcrypt } from "../../util/RSAUtil";
+
+const form = new WeaForm();
+const getLabel = WeaLocaleProvider.getLabel;
+
+class LoginVerify extends Component {
+
+  componentDidMount() {
+    form.initFormFields(loginCondition);
+  }
+
+  componentWillUnmount() {
+    form.resetForm();
+  }
+
+  save = async () => {
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        RSAEcrypt("1", { ...form.getFormParams() }, this.props.salaryBillToken)
+          .then(RSAParam => {
+            API.checkPassword({ ...RSAParam }).then(({ result }) => {
+              if (result) {
+                this.props.onSetPwdSet();
+              } else {
+                form.showError("password", getLabel(504343, "登录密码错误"));
+              }
+            });
+          });
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+
+  render() {
+    const itemRender = {};
+    return (<MobileModal title={getLabel(111, "请先输入登录密码")} onConfirm={this.save}>
+      <FormInfo center={false} itemRender={itemRender} form={form} formFields={loginCondition}/>
+    </MobileModal>);
+  }
+}
+
+export default LoginVerify;
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js b/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js
new file mode 100644
index 00000000..b6f388db
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js
@@ -0,0 +1,65 @@
+/*
+  *  自定义移动端弹框组件
+  *
+  * @Author:    黎永顺
+  * @Date:      2025/4/16
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import { removeElementById } from "../../util";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class MobileModal extends Component {
+  componentDidMount() {
+    this.setMetaViewport();
+  }
+
+  setMetaViewport = () => {
+    // 检查是否已存在 viewport meta 标签
+    let viewportMeta = document.querySelector("meta[name=\"viewport\"]");
+    if (!viewportMeta) {
+      // 如果不存在，创建一个新的 meta 标签
+      viewportMeta = document.createElement("meta");
+      viewportMeta.setAttribute("name", "viewport");
+      document.head.appendChild(viewportMeta);
+    }
+    // 设置或更新 viewport 的 content 属性
+    const content = "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover";
+    viewportMeta.setAttribute("content", content);
+  };
+
+  render() {
+    return (
+      <div id="am-modal-container">
+        <div>
+          <div className="am-modal-mask"></div>
+          <div className="am-modal-wrap">
+            <div className="am-modal am-modal-transparent">
+              <div className="am-modal-content">
+                <div className="am-modal-header">
+                  <div className="am-modal-title">{this.props.title}</div>
+                </div>
+                <div className="am-modal-body">{this.props.children}</div>
+                <div className="am-modal-footer">
+                  <div className="am-modal-button-group-h">
+                    <a href="javascript:void(0);" className="am-modal-button"
+                       onClick={() => removeElementById("am-modal-container")}>{getLabel(111, "取消")}</a>
+                    <a href="javascript:void(0);" className="am-modal-button"
+                       onClick={this.props.onConfirm}>{getLabel(111, "确定")}</a>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default MobileModal;
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
index 5cb571e6..159807e0 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/pwdCondtion.js
@@ -1,6 +1,25 @@
 import { WeaLocaleProvider } from "ecCom";
 
 const { getLabel } = WeaLocaleProvider;
+export const captchaCondition = [
+  {
+    items: [
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["mobileCode"],
+        fieldcol: 18,
+        label: getLabel(111, "验证码"),
+        labelcol: 6,
+        detailtype: 1,
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];
 export const loginCondition = [
   {
     items: [
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
new file mode 100644
index 00000000..b5310466
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
@@ -0,0 +1,82 @@
+/*
+  * 二次验证密码
+  *
+  * @Author:    黎永顺
+  * @Date:      2025/4/16
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import { message } from "antd";
+import FormInfo from "../../components/FormInfo";
+import { secondaryVerifyConditions } from "./conditions";
+import * as API from "../../apis/mySalaryBenefits";
+import MobileModal from "./mobileModal";
+
+const form = new WeaForm();
+const getLabel = WeaLocaleProvider.getLabel;
+
+class SecondaryVerify extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { notSetting: false };
+  }
+
+  componentDidMount() {
+    API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.props.salaryBillToken)
+      .then(({ notSetting }) => {
+        this.setState({ notSetting });
+      });
+    form.initFormFields(secondaryVerifyConditions);
+  }
+
+  componentWillUnmount() {
+    this.setState({ notSetting: false }, () => form.resetForm());
+  }
+
+  doSecondAuth = () => {
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        const { salaryBillToken } = this.props;
+        API.doSecondAuth({ mouldCode: "HRM", itemCode: "SALARY", ...form.getFormParams() }, salaryBillToken)
+          .then(({ status, checkStatus, checkMsg }) => {
+            if (status && checkStatus === "1") {
+              message.success(checkMsg);
+              this.props.onSuccess();
+            } else {
+              form.showError("authCode", checkMsg);
+            }
+          });
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+
+  render() {
+    const { notSetting } = this.state;
+    const itemRender = {
+      authCode: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} form={form} formParams={formParams}/>
+          {
+            notSetting &&
+            <div style={{ clear: "both", paddingTop: 10 }}>
+              {getLabel(111, "您还未设置二次验证密码，点击")}
+              <a href="javascript:void(0);" onClick={this.props.onSetLogin}>{getLabel(111, "设置")}</a>
+            </div>
+          }
+        </React.Fragment>);
+      }
+    };
+    return (<MobileModal title={getLabel(111, "身份验证")} onConfirm={this.doSecondAuth}>
+      <FormInfo center={false} custLabelCol={9} itemRender={itemRender} form={form}
+                formFields={secondaryVerifyConditions}/>
+    </MobileModal>);
+  }
+}
+
+export default SecondaryVerify;
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
new file mode 100644
index 00000000..a8f84027
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
@@ -0,0 +1,91 @@
+/*
+  *  二次验证密码设置
+  *
+  * @Author:    黎永顺
+  * @Date:      2025/4/17
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import { message } from "antd";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import FormInfo from "../../components/FormInfo";
+import { secondarypwdCondition } from "./conditions";
+import * as API from "../../apis/mySalaryBenefits";
+import MobileModal from "./mobileModal";
+import { RSAEcrypt } from "../../util/RSAUtil";
+
+const form = new WeaForm();
+const getLabel = WeaLocaleProvider.getLabel;
+
+class SecondarypwdVerify extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      src: (window.ecologyContentPath || "") + "/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4",
+      num: 0
+    };
+  }
+
+  componentDidMount() {
+    form.initFormFields(secondarypwdCondition);
+  }
+
+  componentWillUnmount() {
+    form.resetForm();
+  }
+
+  save = async () => {
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        const { secondaryPwd1, secondaryPwd2, validatecode } = form.getFormParams();
+        if (secondaryPwd1 !== secondaryPwd2) {
+          form.showError("secondaryPwd2", getLabel(504376, "密码确认不正确！"));
+          return;
+        }
+        RSAEcrypt("1", { secondaryPwd1, secondaryPwd2 }).then(RSAParam => {
+          API.saveSecondaryPwd({ ...RSAParam, validatecode }, this.props.salaryBillToken)
+            .then(({ sign, message: msg }) => {
+              if (sign === "1") {
+                message.success(msg);
+                this.props.onSuccess();
+              } else {
+                form.showError("validatecode", msg);
+                this.setState({ num: this.state.num + 1 }, () => {
+                  this.setState({ src: `${window.ecologyContentPath || ""}/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4&seriesnum_=${this.state.num}` });
+                });
+              }
+            });
+        });
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+
+  render() {
+    const itemRender = {
+      validatecode: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} form={form} formParams={formParams}/>
+          <img
+            style={{ height: 30, cursor: "pointer", position: "absolute", left: "118%" }}
+            src={this.state.src}
+            onClick={() => {
+              this.setState({ num: this.state.num + 1 }, () => {
+                this.setState({ src: `${window.ecologyContentPath || ""}/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4&seriesnum_=${this.state.num}` });
+              });
+            }} alt=""/>
+        </React.Fragment>);
+      }
+    };
+    return (<MobileModal title={getLabel(111, "二次验证密码设置")} onConfirm={this.save}>
+      <FormInfo className="secondarypwd-form" center={false} itemRender={itemRender} form={form}
+                formFields={secondarypwdCondition}/>
+    </MobileModal>);
+  }
+}
+
+export default SecondarypwdVerify;
diff --git a/pc4mobx/hrmSalary/pages/mySalary/authority.js b/pc4mobx/hrmSalary/pages/mySalary/authority.js
index 00a74712..ec098fc2 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/authority.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/authority.js
@@ -9,7 +9,6 @@ export default class Authority extends React.Component {
   render() {
     const { store } = this.props;
     const { loading, hasRight } = store;
-
     const style = {
       position: "absolute",
       top: "50%",
diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
index 5fa76f93..5a334965 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
@@ -14,6 +14,8 @@ import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../a
 import CaptchaModal from "../../components/captchaModal";
 import "./index.less";
 
+const isIPhone = new RegExp("\\biPhone\\b|\\biPod\\b", "i").test(window.navigator.userAgent);
+const isEm = window.navigator.userAgent.indexOf("E-Mobile7") >= 0;
 const { getLabel } = WeaLocaleProvider;
 
 @inject("mySalaryStore")
@@ -57,7 +59,7 @@ class MySalaryView extends Component {
   handleGoFeedback = () => {
     Modal.confirm({
       title: getLabel(131329, "信息确认"),
-      content: getLabel(544271, "请确认薪资信息是有误，进行反馈并发起反馈流程。"),
+      content: getLabel(544271, "确认是否发起反馈流程？"),
       onOk: () => {
         const { params: { salaryInfoId }, mySalaryStore: { getMySalaryBill } } = this.props;
         feedBackSalaryBill({ salaryInfoId }).then(({ status, errorMsg }) => {
@@ -123,7 +125,7 @@ export const ConfirmBtns = (props) => {
       <Button type="primary" onClick={props.confirmSalaryBill}>{getLabel(111, "确认")}</Button>
     }
     {
-      props.showFeedback === "1" &&
+      ((props.showFeedback === "1" && !isIPhone) || (props.showFeedback === "1" && isIPhone && isEm)) &&
       <Button type="ghost" onClick={props.goFeedback}>{getLabel(111, "反馈")}</Button>
     }
   </div>;
diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
index a955b423..4a5bf0a4 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
@@ -31,6 +31,7 @@ class Index extends Component {
   }
 
   async componentDidMount() {
+    this.setState({ store: { ...this.state.store, loading: true } });
     const { data: sysinfo } = await API.sysinfo();
     const { adjustShowStatus, salaryShowStatus } = sysinfo;
     let tabs = [
@@ -39,7 +40,7 @@ class Index extends Component {
     ];
     salaryShowStatus === "0" && (tabs = _.filter(tabs, o => o.key !== "1"));
     adjustShowStatus === "0" && (tabs = _.filter(tabs, o => o.key !== "2"));
-    this.setState({ sysinfo, tabs }, () => {
+    this.setState({ sysinfo, tabs, store: { ...this.state.store, loading: false } }, () => {
       const { tabs, store } = this.state;
       this.setState({
         selectedKey: !_.isEmpty(tabs) ? _.head(tabs).key : "0",
diff --git a/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js b/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js
index 927e1fbd..cc58acc7 100644
--- a/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js
+++ b/pc4mobx/hrmSalary/pages/payroll/components/waterMarkSetModal.js
@@ -90,7 +90,7 @@ class WaterMarkSetModal extends Component {
   };
 
   render() {
-    const { wmClassify, wmNoTransparent, wmRotate, wmImg, wmcontSet } = this.state;
+    const { wmClassify, wmNoTransparent, wmRotate, wmImg, wmcontSet } = this.state, { showOperateBtn } = this.props;
     return (
       <WeaSlideModal
         {...this.props} className="waterMarkSetWrapper"
@@ -103,7 +103,7 @@ class WaterMarkSetModal extends Component {
               <WeaFormItem label={getLabel(111, "水印类型")} labelCol={{ span: 5 }} wrapperCol={{ span: 10 }}>
                 <div style={{ display: "flex", alignItems: "center" }}>
                   <WeaSelect
-                    value={wmClassify} detailtype={3}
+                    value={wmClassify} detailtype={3} viewAttr={showOperateBtn ? 2 : 1}
                     options={[
                       { key: "text", showname: getLabel(111, "文本") },
                       { key: "image", showname: getLabel(111, "图片") }
@@ -119,8 +119,11 @@ class WaterMarkSetModal extends Component {
                   wmClassify === "text" ?
                     <WeaError tipPosition="bottom" ref="watermarkContError" error={getLabel(385869, "此项必填")}>
                       <div className="textSetting">
-                        <i className="icon-coms-Flow-setting"
-                           onClick={() => this.setState({ wmcontSet: { ...wmcontSet, visible: true } })}/>
+                        {
+                          showOperateBtn &&
+                          <i className="icon-coms-Flow-setting"
+                             onClick={() => this.setState({ wmcontSet: { ...wmcontSet, visible: true } })}/>
+                        }
                         {
                           _.isEmpty(wmcontSet.textSet) ? <img src="/images/BacoError_wev9.png" alt=""/> :
                             <span className="previewBtn txtPrew"
@@ -159,21 +162,24 @@ class WaterMarkSetModal extends Component {
               </WeaFormItem>
               <WeaFormItem label={getLabel(111, "不透明（百分比）")} labelCol={{ span: 5 }} wrapperCol={{ span: 10 }}>
                 <WeaInputNumber
-                  min={0} max={80} precision={2} value={wmNoTransparent}
+                  min={0} max={80} precision={2} value={wmNoTransparent} disabled={!showOperateBtn}
                   onChange={wmNoTransparent => this.setState({ wmNoTransparent })}
                 />
               </WeaFormItem>
               <WeaFormItem label={getLabel(111, "旋转角度（逆时针）")} labelCol={{ span: 5 }} wrapperCol={{ span: 10 }}>
                 <WeaInputNumber
-                  min={0} max={360} precision={2} value={wmRotate}
+                  min={0} max={360} precision={2} value={wmRotate} disabled={!showOperateBtn}
                   onChange={wmRotate => this.setState({ wmRotate })}
                 />
               </WeaFormItem>
             </WeaSearchGroup>
-            <div className="slideBottom">
-              <Button type="primary" onClick={this.handleCustomSave}>{getLabel(111, "确定")}</Button>
-              <Button type="ghost" onClick={this.props.onClose}>{getLabel(111, "取消")}</Button>
-            </div>
+            {
+              showOperateBtn &&
+              <div className="slideBottom">
+                <Button type="primary" onClick={this.handleCustomSave}>{getLabel(111, "确定")}</Button>
+                <Button type="ghost" onClick={this.props.onClose}>{getLabel(111, "取消")}</Button>
+              </div>
+            }
             {/*  水印内容设置弹框*/}
             <WmContentSetModal {...wmcontSet}
                                onClose={textSet => this.setState({
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js
index 552a7122..df034794 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js
@@ -32,10 +32,10 @@ class PayrollPartTable extends Component {
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.visible !== this.props.visible) {
-      nextProps.visible && this.sendRangeList(nextProps);
-      this.setState({ selectedRowKeys: [] });
-    }
+    if (nextProps.visible !== this.props.visible && nextProps.visible) this.sendRangeList(nextProps);
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
+      selectedRowKeys: [], pageInfo: { current: 1, pageSize: 10, total: 0 }
+    });
   }
 
   sendRangeList = (props) => {
@@ -52,9 +52,9 @@ class PayrollPartTable extends Component {
     sendRangeList(payload).then(({ status, data }) => {
       this.setState({ loading: { ...loading, query: false } });
       if (status) {
-        const { pageNum: current, pageSize, total, columns, list: dataSource } = data;
+        const { pageNum: current, total, columns, list: dataSource } = data;
         this.setState({
-          pageInfo: { ...pageInfo, current, pageSize, total },
+          pageInfo: { ...pageInfo, current, total },
           dataSource: _.map(dataSource, it => ({
             ...it,
             includeObj: _.map(it.includeObj, child => child.targetName || child.targetTypeName).join(","),
@@ -125,8 +125,7 @@ class PayrollPartTable extends Component {
       onChange: current => {
         this.setState({
           pageInfo: { ...pageInfo, current }
-        }, () => {
-        });
+        }, () => this.sendRangeList({ grantType, salarySendId }));
       }
     };
     const rowSelection = {
diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
index 7d2edc9c..55f518cd 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
@@ -104,6 +104,7 @@ class TemplateBaseSettings extends Component {
   };
 
   render() {
+    const { showOperateBtn } = this.props;
     const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state;
     const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
     const { monthType = "SALARY_DATE", limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting;
@@ -111,14 +112,14 @@ class TemplateBaseSettings extends Component {
       <React.Fragment>
         <WeaSearchGroup title={getLabel(111, "水印设置")} showGroup needTigger className="waterMarkWrapper">
           <WeaFormItem label={getLabel(111, "启用水印")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
-            <WeaCheckbox value={watermarkStatus} display="switch"
+            <WeaCheckbox value={watermarkStatus} display="switch" viewAttr={showOperateBtn ? 2 : 1}
                          onChange={watermarkStatus => this.setState({ watermarkStatus, watermark: "DEFAULT" })}/>
           </WeaFormItem>
           {
             watermarkStatus === "1" &&
             <WeaFormItem label={getLabel(111, "水印类型")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
               <WeaSelect
-                value={watermark}
+                value={watermark} viewAttr={showOperateBtn ? 2 : 1}
                 options={[
                   { key: "DEFAULT", showname: getLabel(111, "系统默认水印") },
                   { key: "CUSTOM", showname: getLabel(111, "自定义水印") }
@@ -134,7 +135,7 @@ class TemplateBaseSettings extends Component {
                   }
                 })}>{getLabel(111, "水印设置")}</span>
               }
-              <WaterMarkSetModal {...watermarkSet}
+              <WaterMarkSetModal {...watermarkSet} showOperateBtn={showOperateBtn}
                                  onClose={() => this.setState({ watermarkSet: { ...watermarkSet, visible: false } })}
                                  onChange={wmSetting => this.setState({ wmSetting })}
               />
@@ -143,7 +144,7 @@ class TemplateBaseSettings extends Component {
         </WeaSearchGroup>
         <WeaSearchGroup title={getLabel(111, "工资单确认反馈设置")} showGroup needTigger className="waterMarkWrapper">
           <WeaFormItem label={getLabel(111, "启用工资单确认")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
-            <WeaCheckbox value={ackStatus} display="switch"
+            <WeaCheckbox value={ackStatus} display="switch" viewAttr={showOperateBtn ? 2 : 1}
                          onChange={ackStatus => this.setState({
                            ackFeedbackSetting: {
                              ...ackFeedbackSetting, ackStatus, autoAckDays: 7
@@ -155,7 +156,7 @@ class TemplateBaseSettings extends Component {
             <React.Fragment>
               <WeaFormItem label={getLabel(111, "自动确认超时天数")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
                 <WeaInputNumber
-                  min={1} value={autoAckDays} viewAttr={3}
+                  min={1} value={autoAckDays} viewAttr={3} disabled={!showOperateBtn}
                   style={{ width: "90%" }}
                   onChange={autoAckDays => this.setState({
                     ackFeedbackSetting: {
@@ -170,7 +171,7 @@ class TemplateBaseSettings extends Component {
             </React.Fragment>
           }
           <WeaFormItem label={getLabel(111, "启用工资单反馈")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
-            <WeaCheckbox value={feedbackStatus} display="switch"
+            <WeaCheckbox value={feedbackStatus} display="switch" viewAttr={showOperateBtn ? 2 : 1}
                          onChange={feedbackStatus => this.setState({
                            ackFeedbackSetting: {
                              ...ackFeedbackSetting, feedbackStatus
@@ -182,7 +183,7 @@ class TemplateBaseSettings extends Component {
             <React.Fragment>
               <WeaFormItem label={getLabel(111, "PC端反馈流程地址")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
                 <WeaInput
-                  value={feedBackUrl} viewAttr={3}
+                  value={feedBackUrl} viewAttr={3} disabled={!showOperateBtn}
                   onChange={feedBackUrl => this.setState({
                     ackFeedbackSetting: {
                       ...ackFeedbackSetting, feedBackUrl
@@ -191,7 +192,7 @@ class TemplateBaseSettings extends Component {
               </WeaFormItem>
               <WeaFormItem label={getLabel(111, "移动端反馈流程地址")} labelCol={{ span: 2 }} wrapperCol={{ span: 4 }}>
                 <WeaInput
-                  value={mobileFeedbackUrl} viewAttr={3}
+                  value={mobileFeedbackUrl} viewAttr={3} disabled={!showOperateBtn}
                   onChange={mobileFeedbackUrl => this.setState({
                     ackFeedbackSetting: {
                       ...ackFeedbackSetting, mobileFeedbackUrl
@@ -207,12 +208,12 @@ class TemplateBaseSettings extends Component {
             <WeaSelect
               value={monthType} onChange={monthType => this.setState({
               salaryBillViewingLimitSetting: { ...salaryBillViewingLimitSetting, monthType }
-            })}
+            })} viewAttr={2} disabled={!showOperateBtn}
               options={[
                 { key: "SALARY_DATE", showname: getLabel(111, "薪资所属月"), selected: true },
                 { key: "SEND_DATE", showname: getLabel(111, "发放日期") }
               ]}/>
-            <WeaInputNumber min={0} value={limitMonth}
+            <WeaInputNumber min={0} value={limitMonth} viewAttr={2} disabled={!showOperateBtn}
                             onChange={limitMonth => this.setState({
                               salaryBillViewingLimitSetting: {
                                 ...salaryBillViewingLimitSetting, limitMonth
@@ -226,7 +227,7 @@ class TemplateBaseSettings extends Component {
           </div>
           <div className="agingBox">
             <span>{getLabel(111, "首次查看")}</span>
-            <WeaInputNumber min={0} value={burningAfterReadingMin}
+            <WeaInputNumber min={0} value={burningAfterReadingMin} viewAttr={2} disabled={!showOperateBtn}
                             onChange={burningAfterReadingMin => this.setState({
                               salaryBillViewingLimitSetting: {
                                 ...salaryBillViewingLimitSetting, burningAfterReadingMin
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
index 7eae1948..9a7c033c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
@@ -173,8 +173,8 @@
 
     .ph-switch {
       height: 100%;
-      margin: 0 auto;
-      text-align: center;
+      display: flex;
+      justify-content: center;
 
       .active, .phs-btn:hover {
         background-color: rgba(0, 0, 0, .15);
@@ -184,8 +184,9 @@
       .phs-btn {
         height: 50px;
         min-width: 88px;
-        line-height: 50px;
-        display: inline-block;
+        display: flex;
+        justify-content: center;
+        align-items: center;
         color: #fff;
         padding: 0 15px;
         cursor: pointer;
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileAdvanceSearchPannel/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileAdvanceSearchPannel/index.js
index 3f164873..bf066c7f 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileAdvanceSearchPannel/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileAdvanceSearchPannel/index.js
@@ -11,7 +11,7 @@ import { inject, observer } from "mobx-react";
 import { getSearchs } from "../../../../util";
 import * as API from "../../../../apis/payrollFiles";
 import { salaryFileSearchConditions } from "../../config";
-import { getTaxAgentSelectList } from "../../../../apis/taxAgent";
+import { postFetch } from "../../../../util/request";
 
 const getLabel = WeaLocaleProvider.getLabel;
 const getKey = WeaTools.getKey;
@@ -29,7 +29,7 @@ class salaryFileAdvanceSearchPannel extends Component {
   async componentDidMount() {
     const [{ data: userStatusList }, { data: taxAgentList }] = await Promise.all([
       API.commonEnumList({ enumClass: "com.engine.salary.enums.UserStatusEnum" }),
-      getTaxAgentSelectList()
+      postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" })
     ]);
     this.setState({
       searchConditions: _.map(salaryFileSearchConditions, item => {
@@ -44,7 +44,7 @@ class salaryFileAdvanceSearchPannel extends Component {
             } else if (getKey(child) === "taxAgentIds") {
               return {
                 ...child,
-                options: _.map(taxAgentList, o => ({ key: o.id, showname: o.content }))
+                options: _.map(taxAgentList, o => ({ key: String(o.id), showname: o.name }))
               };
             }
             return { ...child };
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
index 24f3cd63..f687683a 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
@@ -31,7 +31,7 @@ const APILIST = {
   cancelSalarySuspension: API.cancelStop //取消停薪
 };
 
-@inject("payrollFilesStore", "taxAgentStore")
+@inject("payrollFilesStore")
 @observer
 class Index extends Component {
   constructor(props) {
@@ -100,12 +100,12 @@ class Index extends Component {
         case "CHANGE-SALARY":
         case "VIEW":
         case "EDIT":
-          const { taxAgentStore: { showOperateBtn }, selectedKey: runStatuses } = this.props;
-          const { record: { id: salaryArchiveId } } = params;
+          const { selectedKey: runStatuses } = this.props;
+          const { record: { id: salaryArchiveId, opts } } = params;
           this.setState({
             salaryFilesEditSlide: {
               ...this.state.salaryFilesEditSlide, visible: true, salaryArchiveId,
-              runStatuses, showOperateBtn
+              runStatuses, showOperateBtn: opts.includes("admin")
             }
           });
           break;
@@ -172,7 +172,7 @@ class Index extends Component {
     }).catch(() => this.setState({ loading: false }));
   };
   getColumns = () => {
-    const { payrollFilesStore: { tableStore }, taxAgentStore: { showOperateBtn } } = this.props;
+    const { payrollFilesStore: { tableStore } } = this.props;
     const columns = _.map(_.filter(toJS(tableStore.columns), (item) => item.display === "true"), (it, idx) => ({
       dataIndex: it.dataIndex, title: it.title, align: "left",
       width: (it.dataIndex === "taxAgentName" || it.dataIndex === "operate") ? 185 : 150,
@@ -181,7 +181,7 @@ class Index extends Component {
     }));
     if (!_.isEmpty(columns)) {
       this.postMessageToChild({
-        columns, showOperateBtn, selectedKey: this.props.selectedKey,
+        columns, selectedKey: this.props.selectedKey,
         showDelSalaryFileBtn: this.props.showDelSalaryFileBtn,
         dataSource: this.state.dataSource, selectedRowKeys: this.state.selectedRowKeys,
         showSum: false, pageInfo: this.state.pageInfo
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
index ce378ee6..6616f55f 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
@@ -209,7 +209,7 @@ export const renderDropMenuDatas = (selectedKey, showOperateBtn) => {
     default:
       break;
   }
-  return showOperateBtn ? menus : _.filter(menus, o => o.key === "custom_cols");
+  return showOperateBtn ? menus : _.filter(menus, o => (o.key === "custom_cols" || o.key === "log"));
 };
 
 export const salaryFileSearchConditions = [
@@ -407,7 +407,7 @@ export const salaryFilesConditions = [
         domkey: ["position"],
         fieldcol: 14,
         label: "岗位",
-        lanId: 6086,
+        lanId: 111,
         labelcol: 10,
         value: "",
         viewAttr: 1
@@ -449,7 +449,7 @@ export const salaryFilesConditions = [
   },
   {
     defaultshow: true, title: getLabel(543329, "发薪设置"),
-    col: 1,lanId: 543329,
+    col: 1, lanId: 543329,
     items: [
       {
         colSpan: 1,
@@ -480,7 +480,7 @@ export const salaryFilesConditions = [
     defaultshow: true, title: getLabel(538004, "薪资档案"),
     titleHelpful: getLabel(543330, "提示：显示已生效的最新数据"),
     titleHelpfulLanId: 543330,
-    col: 2, salaryFile: true,lanId: 538004,
+    col: 2, salaryFile: true, lanId: 538004,
     items: []
   }
 ];
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js
index 344a3284..8cc9b781 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js
@@ -247,15 +247,16 @@ class SalaryFiles extends Component {
       selectedKey, topTabCount, showSearchAd, isQuery, showDelSalaryFileBtn, showExtEmpsWitch,
       salaryFileImpDialog, salaryImportTypes, logDialogVisible, filterConditions
     } = this.state;
-    const { taxAgentStore: { showOperateBtn } } = this.props;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
     const tabs = _.map(tabList, o => ({ ...o, title: getLabel(o.lanId, o.title) }));
+    const admin = PageAndOptAuth.opts.includes("admin");
     return (
       <div className="salary-files-wrapper">
         <WeaReqTop
           title={getLabel(538004, "薪资档案")} buttonSpace={10} icon={<i className="icon-coms-fa"/>}
-          iconBgcolor="#F14A2D" showDropIcon dropMenuDatas={renderDropMenuDatas(selectedKey, showOperateBtn)}
-          onDropMenuClick={this.onDropMenuClick}
-          buttons={renderReqBtns(selectedKey, salaryImportTypes, this.handleReqBtnsCLick, showOperateBtn)}
+          iconBgcolor="#F14A2D" showDropIcon onDropMenuClick={this.onDropMenuClick}
+          dropMenuDatas={renderDropMenuDatas(selectedKey, admin)}
+          buttons={renderReqBtns(selectedKey, salaryImportTypes, this.handleReqBtnsCLick, admin)}
           replaceTab={
             <WeaTab
               datas={!showExtEmpsWitch ? _.dropRight(tabs) : tabs} autoCalculateWidth
@@ -274,7 +275,7 @@ class SalaryFiles extends Component {
             </div>
             {/*列表*/}
             <SalaryFileList isQuery={isQuery} ref={dom => this.salaryFileListRef = dom}
-                            selectedKey={selectedKey} showOperateBtn={showOperateBtn}
+                            selectedKey={selectedKey} showOperateBtn={admin}
                             showDelSalaryFileBtn={showDelSalaryFileBtn}
                             onChangeTopTabCount={this.queryInsuranceTabTotal}
                             onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js
index 64e91b27..4bdb7293 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js
@@ -5,7 +5,6 @@
  * Date: 2023/10/12
  */
 import React, { Component } from "react";
-import { inject, observer } from "mobx-react";
 import { WeaLocaleProvider, WeaTable } from "ecCom";
 import { Dropdown, Menu, message, Tag } from "antd";
 import { getPayrollList } from "../../../../apis/payroll";
@@ -13,8 +12,6 @@ import moment from "moment";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
-@inject("taxAgentStore")
-@observer
 class Index extends Component {
   constructor(props) {
     super(props);
@@ -100,7 +97,6 @@ class Index extends Component {
 
   render() {
     const { loading, dataSource, columns, pageInfo } = this.state;
-    const { taxAgentStore: { showOperateBtn } } = this.props;
     const pagination = {
       ...pageInfo,
       showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
@@ -132,7 +128,7 @@ class Index extends Component {
               const showGrant = haveBackCalc === 1 && salaryAcctType === 0;
               return <React.Fragment>
                 {
-                  showOperateBtn &&
+                  record.opts.includes("admin") &&
                   <a
                     href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/payrollGrant?id=${id}&ackFeedbackStatus=${ackFeedbackStatus}`}
                     style={{ marginRight: 10 }} target="_blank">{getLabel(542702, "发放")}</a>
@@ -144,7 +140,7 @@ class Index extends Component {
                   >{getLabel(83110, "查看详情")}</a>
                 }
                 {
-                  sendNum === sendTotal && !showGrant &&
+                  (!record.opts.includes("admin") || (sendNum === sendTotal && !showGrant)) &&
                   <Dropdown
                     overlay={<Menu onClick={e => this.handleOpts(e, record)}>
                       <Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
@@ -155,7 +151,7 @@ class Index extends Component {
                   </Dropdown>
                 }
                 {
-                  sendNum !== sendTotal && !showGrant &&
+                  sendNum !== sendTotal && !showGrant && record.opts.includes("admin") &&
                   <Dropdown
                     overlay={<Menu onClick={e => this.handleOpts(e, record)}>
                       <Menu.Item key="template">{getLabel(543603, "更新模板")}</Menu.Item>
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollCopyDialog/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollCopyDialog/index.js
index 904c84d2..611513d5 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollCopyDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollCopyDialog/index.js
@@ -8,9 +8,10 @@ import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
 import { Button, message } from "antd";
+import { postFetch } from "../../../../util/request";
 import { getSearchs } from "../../../../util";
 import { copyConditions } from "../conditions";
-import { duplicatePayroll, getPayrollTemplateLedgerList } from "../../../../apis/payroll";
+import { duplicatePayroll } from "../../../../apis/payroll";
 
 const getLabel = WeaLocaleProvider.getLabel;
 const getKey = WeaTools.getKey;
@@ -31,29 +32,30 @@ class Index extends Component {
   }
 
   getPayrollTemplateLedgerList = (props) => {
-    getPayrollTemplateLedgerList().then(({ status, data }) => {
-      if (status) {
-        this.setState({
-          conditions: _.map(copyConditions, item => {
-            return {
-              ...item, items: _.map(item.items, o => {
-                if (getKey(o) === "salarySobId") {
-                  return {
-                    ...o, label: getLabel(o.lanId, o.label),
-                    options: _.map(data, d => ({ key: d.id, showname: d.content }))
-                  };
-                } else {
-                  return { ...o, label: getLabel(o.lanId, o.label) };
-                }
-              })
-            };
-          })
-        }, () => {
-          props.payrollStore.payrollCopyForm.initFormFields(this.state.conditions);
-          props.payrollStore.payrollCopyForm.updateFields({ salarySobId: { value: props.salarySobId } });
-        });
-      }
-    });
+    postFetch("/api/bs/hrmsalary/salarysob/listAuth", { filterType: "ADMIN_DATA" })
+      .then(({ status, data }) => {
+        if (status) {
+          this.setState({
+            conditions: _.map(copyConditions, item => {
+              return {
+                ...item, items: _.map(item.items, o => {
+                  if (getKey(o) === "salarySobId") {
+                    return {
+                      ...o, label: getLabel(o.lanId, o.label),
+                      options: _.map(data, d => ({ key: String(d.id), showname: d.name }))
+                    };
+                  } else {
+                    return { ...o, label: getLabel(o.lanId, o.label) };
+                  }
+                })
+              };
+            })
+          }, () => {
+            props.payrollStore.payrollCopyForm.initFormFields(this.state.conditions);
+            props.payrollStore.payrollCopyForm.updateFields({ salarySobId: { value: props.salarySobId } });
+          });
+        }
+      });
   };
 
   save = () => {
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js
index 31f8c5e7..01a66e2b 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js
@@ -5,7 +5,6 @@
  * Date: 2023/10/13
  */
 import React, { Component } from "react";
-import { inject, observer } from "mobx-react";
 import { WeaLocaleProvider, WeaSelect, WeaTable } from "ecCom";
 import { Dropdown, Menu, message, Modal } from "antd";
 import { changePayrollDefaultUse, deletePayroll, getPayrollTemplateList } from "../../../../apis/payroll";
@@ -14,8 +13,6 @@ import UpdatePayrollTemplateSlide from "../updatePayrollTemplateSlide";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
-@inject("taxAgentStore")
-@observer
 class Index extends Component {
   constructor(props) {
     super(props);
@@ -126,7 +123,7 @@ class Index extends Component {
 
   render() {
     const { loading, dataSource, columns, pageInfo, copyDialog, tmplSlide, selectedRowKeys } = this.state;
-    const { taxAgentStore: { showOperateBtn }, forceUpdate } = this.props;
+    const { forceUpdate } = this.props;
     const pagination = {
       ...pageInfo,
       showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
@@ -160,23 +157,23 @@ class Index extends Component {
               render: (__, record) => {
                 const {} = record;
                 //显示更新模板
-                return showOperateBtn ? <React.Fragment>
-                    <a href="javascript:void(0);" onClick={() => this.handleOpts({ key: "edit" }, record)}
-                       style={{ marginRight: 10 }}>{getLabel(501169, "编辑")}</a>
-                    <a href="javascript:void(0);" style={{ marginRight: 10 }}
-                       onClick={() => this.handleOpts({ key: "copy" }, record)}
-                    >{getLabel(77, "复制")}</a>
-                    <Dropdown
-                      overlay={<Menu onClick={e => this.handleOpts(e, record)}>
-                        <Menu.Item key="del">{getLabel(535052, "删除")}</Menu.Item>
-                        <Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
-                      </Menu>
-                      }>
-                      <a href="javascript:void(0);"><i className="icon-coms-more"/></a>
-                    </Dropdown>
-                  </React.Fragment> :
-                  <a href="javascript:void(0);"
-                     onClick={() => this.handleOpts({ key: "view" }, record)}>{getLabel(83110, "查看详情")}</a>;
+                return record.opts.includes("admin") ? <React.Fragment>
+                  <a href="javascript:void(0);" onClick={() => this.handleOpts({ key: "edit" }, record)}
+                     style={{ marginRight: 10 }}>{getLabel(501169, "编辑")}</a>
+                  <a href="javascript:void(0);" style={{ marginRight: 10 }}
+                     onClick={() => this.handleOpts({ key: "copy" }, record)}
+                  >{getLabel(77, "复制")}</a>
+                  <Dropdown
+                    overlay={<Menu onClick={e => this.handleOpts(e, record)}>
+                      <Menu.Item key="del">{getLabel(535052, "删除")}</Menu.Item>
+                      <Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
+                    </Menu>
+                    }
+                  >
+                    <a href="javascript:void(0);"><i className="icon-coms-more"/></a>
+                  </Dropdown>
+                </React.Fragment> : <a href="javascript:void(0);"
+                                       onClick={() => this.handleOpts({ key: "view" }, record)}>{getLabel(83110, "查看详情")}</a>;
               }
             }
           ]}
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
index 1ebc0216..37381a6f 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
@@ -53,6 +53,10 @@ class Index extends Component {
         } = payrollTempForm.getFormParams(),
         { ackFeedbackStatus, feedbackStatus, autoAckDays, ...extraFb } = payrollTempFeedbackForm.getFormParams(),
         { formData, smsSettingDialog } = this.tmpBaseSetRef.state;
+      if (autoSendStatus !== "1" && emailStatus !== "1" && msgStatus !== "1" && smsStatus !== "1") {
+        message.warning(getLabel(111, "工资单模板至少开启一个发送通道"));
+        return;
+      }
       const payload = {
         ...toJS(tmplDataSource), ...extraFb, ...formData, ...extraBs,
         ackFeedbackStatus: ackFeedbackStatus === "1",
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/index.js
index ebc36b4e..cad4fc94 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.js
@@ -39,8 +39,9 @@ class Index extends Component {
   }
 
   renderReqBtns = () => {
-    const { taxAgentStore: { showOperateBtn } } = this.props;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
     const { selectedKey, isRefresh, queryParams } = this.state;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     let reqBtns = [];
     switch (selectedKey) {
       case "grant":
@@ -53,14 +54,14 @@ class Index extends Component {
         ];
         break;
       case "template":
-        const loading = this.templateRef ? this.templateRef.wrappedInstance.state.delLoading : false;
-        const delDisabled = !this.templateRef || _.isEmpty(this.templateRef.wrappedInstance.state.selectedRowKeys);
+        const loading = this.templateRef ? this.templateRef.state.delLoading : false;
+        const delDisabled = !this.templateRef || _.isEmpty(this.templateRef.state.selectedRowKeys);
         const btns = [
           <Button type="primary" onClick={() => {
-            this.templateRef.wrappedInstance.handleOpts({ key: "edit" }, {});
+            this.templateRef.handleOpts({ key: "edit" }, {});
           }}>{getLabel(365, "新建")}</Button>,
           <Button type="ghost" loading={loading} disabled={delDisabled} onClick={() => {
-            this.templateRef.wrappedInstance.handleOpts({ key: "del" }, {});
+            this.templateRef.handleOpts({ key: "del" }, {});
           }}>{getLabel(32136, "批量删除")}</Button>
         ];
         const queryBtns = [
@@ -74,10 +75,10 @@ class Index extends Component {
         break;
       case "watermark":
         const { baseSetSaveLoading } = this.state;
-        reqBtns = [
+        reqBtns = showOperateBtn ? [
           <Button type="primary" loading={baseSetSaveLoading}
                   onClick={() => this.baseSetRef.salaryBillBaseSetSave()}>{getLabel(537558, "保存")}</Button>
-        ];
+        ] : [];
         break;
       default:
         break;
@@ -85,13 +86,15 @@ class Index extends Component {
     return reqBtns;
   };
   renderContent = () => {
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
     const { selectedKey, queryParams, isRefresh } = this.state;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     let dom = null;
     switch (selectedKey) {
       case "grant":
         dom = <GrantTableList queryParams={queryParams} isRefresh={isRefresh}
                               onUpdateTemp={(id) => this.setState({ selectedKey: "template" }, () => {
-                                this.templateRef.wrappedInstance.handleOpts({ key: "edit" }, { id });
+                                this.templateRef.handleOpts({ key: "edit" }, { id });
                               })}
                               onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
         />;
@@ -103,7 +106,7 @@ class Index extends Component {
         break;
       case "watermark":
         dom = <TemplateBaseSettings
-          ref={dom => this.baseSetRef = dom}
+          ref={dom => this.baseSetRef = dom} showOperateBtn={showOperateBtn}
           onChangeLoading={loading => this.setState({ baseSetSaveLoading: loading })}
         />;
         break;
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.less b/pc4mobx/hrmSalary/pages/payrollRelease/index.less
index 634a44e4..50edacb5 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/index.less
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.less
@@ -20,6 +20,10 @@
     }
   }
 
+  .wea-new-top-req {
+    //z-index: 0 !important;
+  }
+
   .wea-new-top-req-wapper .wea-new-top-req-title > div:last-child {
     right: 16px;
   }
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js b/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
index a94d2a07..f9955249 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/customStatisticsItemsModal.js
@@ -7,7 +7,6 @@
 import React, { Component } from "react";
 import { Button, message, Modal } from "antd";
 import {
-  WeaBrowser,
   WeaCheckbox,
   WeaDialog,
   WeaError,
@@ -19,6 +18,7 @@ import {
   WeaTable
 } from "ecCom";
 import { reportStatisticsItemSave, statisticsItemChangetab, statisticsItemGetform } from "../../../apis/statistics";
+import CustomBrowser from "../../../components/CustomBrowser";
 import "../index.less";
 
 const { getLabel } = WeaLocaleProvider;
@@ -263,23 +263,22 @@ class CustomStatisticsItemsModal extends Component {
       })
     });
   };
-  handleChangeStatisticalItems = (itemValue, _names, datas) => {
+  handleChangeStatisticalItems = (data) => {
+    const itemValue = _.keys(data)[0], datas = _.values(data);
     const { formData } = this.state;
     this.setState({
       formData: {
         ...formData,
         itemValue,
         itemValueSpan: _.map(datas, it => it.name).join(","),
-        itemName: datas.length === 1 ? _.map(datas, it => it.names).join(",") : ""
+        itemName: datas.length === 1 ? _.map(datas, it => it.name).join(",") : ""
       }
     }, () => {
       statisticsItemChangetab({ itemId: itemValue }).then(({ status, data }) => {
         if (status) {
           const { ruleData } = data;
           const { columns, data: dataSource } = ruleData;
-          this.setState({
-            columns, dataSource
-          });
+          this.setState({ columns, dataSource });
         }
       });
     });
@@ -368,52 +367,37 @@ class CustomStatisticsItemsModal extends Component {
         className="statisticItemsWrapper"
       >
         <div className="statisticItemsBox">
-          <WeaFormItem label={getLabel(111, "统计项目")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
-            <WeaError tipPosition="bottom" ref="proError" error={getLabel(111, "此项必填")}>
-              <WeaBrowser
-                title={getLabel(111, "统计项目")} type={162} viewAttr={!isShare ? 3 : 1} isSingle
-                value={itemValue}
-                replaceDatas={itemValue ? _.map(itemValue.split(","), (it, idx) => ({
-                  id: it,
-                  name: itemValueSpan.split(",")[idx]
-                })) : []}
-                completeParams={{
-                  type: 162,
-                  fielddbtype: "browser.salaryItemBrowser",
-                  f_weaver_belongto_usertype: "0"
-                }}
-                conditionDataParams={{
-                  type: "browser.salaryItemBrowser",
-                  fielddbtype: "browser.salaryItemBrowser",
-                  f_weaver_belongto_usertype: "0"
-                }}
-                dataParams={{
-                  type: "browser.salaryItemBrowser",
-                  f_weaver_belongto_usertype: "0"
-                }}
-                destDataParams={{
-                  type: "browser.salaryItemBrowser",
-                  f_weaver_belongto_usertype: "0"
-                }}
-                // isMultCheckbox
-                inputStyle={{ width: "100%" }}
-                onChange={this.handleChangeStatisticalItems}
-              />
-            </WeaError>
-          </WeaFormItem>
-          <WeaFormItem label={getLabel(111, "统计项名称")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
-            <WeaError tipPosition="bottom" ref="nameError" error={getLabel(111, "此项必填")}>
-              <WeaInput value={itemName} viewAttr={!isShare ? 3 : 1}
-                        onChange={itemName => this.setState({ formData: { ...formData, itemName } })}/>
-            </WeaError>
-          </WeaFormItem>
-          <div className="customRuleTableWrapper">
-            <WeaTable
-              dataSource={dataSource}
-              columns={cols}
-              pagination={false}
-            />
-          </div>
+          {
+            !_.isEmpty(columns) && <React.Fragment>
+              <WeaFormItem label={getLabel(111, "统计项目")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+                <WeaError tipPosition="bottom" ref="proError" error={getLabel(111, "此项必填")}>
+                  <CustomBrowser
+                    fieldConfig={{
+                      viewAttr: !isShare ? 3 : 1,
+                      browserConditionParam: {
+                        isSingle: true, completeURL: "/api/bs/hrmsalary/salaryitem/listAuth", tableProps: {},
+                        replaceDatas: itemValue ? _.map(itemValue.split(","), (it, idx) => ({
+                          id: it, name: itemValueSpan.split(",")[idx]
+                        })) : [], dataParams: { filterType: "QUERY_DATA" }, searchParamsKey: "", filterByName: true
+                      }
+                    }} value={itemValue} onCustomChange={this.handleChangeStatisticalItems}/>
+                </WeaError>
+              </WeaFormItem>
+              <WeaFormItem label={getLabel(111, "统计项名称")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+                <WeaError tipPosition="bottom" ref="nameError" error={getLabel(111, "此项必填")}>
+                  <WeaInput value={itemName} viewAttr={!isShare ? 3 : 1}
+                            onChange={itemName => this.setState({ formData: { ...formData, itemName } })}/>
+                </WeaError>
+              </WeaFormItem>
+              <div className="customRuleTableWrapper">
+                <WeaTable
+                  dataSource={dataSource}
+                  columns={cols}
+                  pagination={false}
+                />
+              </div>
+            </React.Fragment>
+          }
         </div>
       </WeaDialog>
     );
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 45ee98bb..9d1f5d7c 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -30,8 +30,7 @@ import {
   statisticsItemList
 } from "../../../apis/statistics";
 import { commonEnumList } from "../../../apis/ruleconfig";
-import { getTaxAgentSelectList } from "../../../apis/taxAgent";
-import { getSalarysobListAll } from "../../../apis";
+import { postFetch } from "../../../util/request";
 import { condition } from "./condition";
 import cs from "classnames";
 import "../index.less";
@@ -70,40 +69,44 @@ class StatisticalMicroSettingsSlide extends Component {
   }
 
   getTaxAgentSelectList = async (props) => {
-    const [salarySobList, empStatusList] = await Promise.all([getSalarysobListAll(), commonEnumList({ enumClass: "com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum" })]);
-    getTaxAgentSelectList(props.isShare).then(({ status, data }) => {
-      if (status) {
-        const conditions = _.map(condition, item => {
-          return {
-            ...item,
-            items: _.map(item.items, child => {
-              if (getKey(child) === "taxAgent") {
-                return {
-                  ...child, viewAttr: props.isShare ? 1 : child.viewAttr,
-                  options: _.map(data, o => ({ key: o.id, showname: o.content }))
-                };
-              } else if (getKey(child) === "salarySob") {
-                return {
-                  ...child, viewAttr: props.isShare ? 1 : child.viewAttr,
-                  options: _.map(salarySobList.data, o => ({ key: String(o.id), showname: o.name }))
-                };
-              } else if (getKey(child) === "status") {
-                return {
-                  ...child, viewAttr: props.isShare ? 1 : child.viewAttr,
-                  options: _.map(empStatusList.data, o => ({ key: o.value.toString(), showname: o.defaultLabel }))
-                };
-              }
-              return { ...child, viewAttr: props.isShare ? 1 : child.viewAttr };
-            })
-          };
-        });
-        this.setState({ conditions }, () => {
-          props.form.initFormFields(this.state.conditions);
-          props.id && this.reportStatisticsGetSearchCondition(props.id);
-        });
+    const [salarySobList, empStatusList] = await Promise.all([
+      postFetch("/api/bs/hrmsalary/salarysob/listAuth", { filterType: "QUERY_DATA" }),
+      commonEnumList({ enumClass: "com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum" })
+    ]);
+    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" })
+      .then(({ status, data }) => {
+        if (status) {
+          const conditions = _.map(condition, item => {
+            return {
+              ...item,
+              items: _.map(item.items, child => {
+                if (getKey(child) === "taxAgent") {
+                  return {
+                    ...child, viewAttr: props.isShare ? 1 : child.viewAttr,
+                    options: _.map(data, o => ({ key: String(o.id), showname: o.name }))
+                  };
+                } else if (getKey(child) === "salarySob") {
+                  return {
+                    ...child, viewAttr: props.isShare ? 1 : child.viewAttr,
+                    options: _.map(salarySobList.data, o => ({ key: String(o.id), showname: o.name }))
+                  };
+                } else if (getKey(child) === "status") {
+                  return {
+                    ...child, viewAttr: props.isShare ? 1 : child.viewAttr,
+                    options: _.map(empStatusList.data, o => ({ key: o.value.toString(), showname: o.defaultLabel }))
+                  };
+                }
+                return { ...child, viewAttr: props.isShare ? 1 : child.viewAttr };
+              })
+            };
+          });
+          this.setState({ conditions }, () => {
+            props.form.initFormFields(this.state.conditions);
+            props.id && this.reportStatisticsGetSearchCondition(props.id);
+          });
 
-      }
-    });
+        }
+      });
   };
   reportStatisticsGetSearchCondition = (id) => {
     const { conditions } = this.state;
diff --git a/pc4mobx/hrmSalary/pages/reportView/index.js b/pc4mobx/hrmSalary/pages/reportView/index.js
index 4d01e7c0..5756ae21 100644
--- a/pc4mobx/hrmSalary/pages/reportView/index.js
+++ b/pc4mobx/hrmSalary/pages/reportView/index.js
@@ -109,7 +109,8 @@ class Index extends Component {
   render() {
     const { report, dimensionList, statisticalPayload } = this.state;
     const { isShare } = report;
-    const { attendanceStore: { settingForm }, taxAgentStore: { taxAgentOption, showOperateBtn } } = this.props;
+    const { attendanceStore: { settingForm }, taxAgentStore: { PageAndOptAuth } } = this.props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     return (
       <WeaTop
         title={getLabel(111, "报表查看")} icon={<i className="icon-coms-fa"/>}
@@ -158,8 +159,7 @@ class Index extends Component {
                     </div>
                     {/*统计数据范围及规则设置弹框*/}
                     <StatisticalMicroSettingsSlide
-                      {...statisticalPayload} form={settingForm}
-                      taxAgentAdminOption={taxAgentOption} isShare={isShare}
+                      {...statisticalPayload} form={settingForm} isShare={isShare}
                       onClose={(isRefresh) => this.setState({
                         statisticalPayload: { visible: false, id: "", dimension: "" }
                       }, () => isRefresh && this.leftTabRef.reportStatisticsReportList())}
diff --git a/pc4mobx/hrmSalary/pages/reportView/index.less b/pc4mobx/hrmSalary/pages/reportView/index.less
index e1e94313..4fc5e700 100644
--- a/pc4mobx/hrmSalary/pages/reportView/index.less
+++ b/pc4mobx/hrmSalary/pages/reportView/index.less
@@ -214,6 +214,7 @@
 
   .wea-form-item .wea-form-item-wrapper .wea-field-readonly {
     white-space: pre-wrap !important;
+    line-height: 28px;
   }
 
   .wea-slide-modal-title {
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js
new file mode 100644
index 00000000..83c24cd1
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js
@@ -0,0 +1,91 @@
+/*
+  *  角色新增
+  *
+  * @Author:    黎永顺
+  * @Date:      2024/8/5
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaDialog, WeaLocaleProvider } from "ecCom";
+import { Button, message } from "antd";
+import { getSearchs } from "../../../../util";
+import { roleConditions } from "../conditions";
+import * as API from "../../../../apis/taxAgent";
+import "../index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore")
+@observer
+class Index extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      conditions: [], loading: false, formData: { taxAgentIds: [], sobIds: [] }
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) {
+      this.setState({
+        conditions: _.map(roleConditions, item => ({
+          ...item, items: _.map(item.items, o => ({ ...o, label: getLabel(o.lanId, o.label) }))
+        }))
+      }, () => nextProps.taxAgentStore.roleForm.initFormFields(this.state.conditions));
+    }
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) nextProps.taxAgentStore.initRoleForm();
+  }
+
+  save = (isSetting) => {
+    const { taxAgentStore: { roleForm } } = this.props;
+    const { formData } = this.state;
+    roleForm.validateForm().then(f => {
+      if (f.isValid) {
+        const payload = roleForm.getFormParams();
+        this.setState({ loading: true });
+        API.saveAuthRole({ ...payload, ...formData }).then(({ status, data, errormsg }) => {
+          this.setState({ loading: false });
+          if (status) {
+            message.success(getLabel(111, "操作成功！"));
+            this.props.onCancel(() => this.props.onSearch());
+            isSetting && this.props.showRoleSetDialog({
+              id: data, name: payload.name, selectedKey: "auth.MemberTargetTypeEnum"
+            });
+          } else {
+            message.error(errormsg);
+          }
+        });
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+  handleFormChange = (val) => {
+    const key = _.keys(val)[0];
+    if (key === "taxAgentIds" || key === "sobIds") {
+      this.setState({ formData: { ...this.state.formData, ...val } });
+    }
+  };
+
+  render() {
+    const { conditions, loading, roleSetDialog } = this.state;
+    const { taxAgentStore: { roleForm } } = this.props;
+    return (
+      <WeaDialog
+        {...this.props} style={{ width: 520 }} initLoadCss title={getLabel(111, "添加业务线")} className="role-dialog"
+        buttons={[
+          <Button type="primary" loading={loading} onClick={() => this.save()}>{getLabel(111, "保存")}</Button>,
+          <Button type="primary" loading={loading}
+                  onClick={() => this.save(true)}>{getLabel(111, "保存并进入详细设置")}</Button>
+        ]}
+      >
+        <div className="form-dialog-layout">{getSearchs(roleForm, conditions, 1, false, this.handleFormChange)}</div>
+      </WeaDialog>
+    );
+  }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.js
new file mode 100644
index 00000000..77d46acc
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.js
@@ -0,0 +1,36 @@
+/*
+  *  业务线管理
+  * 高级搜索
+  * @Author:    黎永顺
+  * @Date:      2024/9/24
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { Button } from "antd";
+import { WeaInputSearch, WeaLocaleProvider } from "ecCom";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore")
+@observer
+class Index extends Component {
+  render() {
+    const { taxAgentStore: { advanceForm } } = this.props;
+    return (
+      <div className="role-advance-search">
+        <WeaInputSearch value={advanceForm.getFormParams().name}
+                        onChange={v => advanceForm.updateFields({ name: v })}
+                        onSearch={this.props.onAdvanceSearch}
+        />
+        <Button type="ghost" className="wea-advanced-search text-elli"
+                onClick={this.props.onOpenAdvanceSearch}>{getLabel(545754, "高级搜索")}</Button>
+      </div>
+    );
+  }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.less b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.less
new file mode 100644
index 00000000..556cfd69
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.less
@@ -0,0 +1,27 @@
+.role-advance-search {
+  display: flex;
+  align-items: center;
+  position: relative;
+
+  .wea-advanced-search {
+    top: 0;
+    left: -1px;
+    height: 28px;
+    line-height: 1;
+    border-radius: 0;
+    position: relative;
+    color: #474747;
+    padding: 4px 15px;
+  }
+
+  .wea-advanced-search:hover {
+    border: 1px solid #dadada;
+    color: #474747;
+  }
+
+  .text-elli {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+}
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/advanceSearchPannel/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceSearchPannel/index.js
new file mode 100644
index 00000000..72f0970d
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceSearchPannel/index.js
@@ -0,0 +1,115 @@
+/*
+  * 业务线管理
+  * 高级搜索面板
+  * @Author:    黎永顺
+  * @Date:      2024/9/24
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaLocaleProvider, WeaTools } from "ecCom";
+import { roleSearchConditions } from "../conditions";
+import { getAuthOptTree } from "../../../../apis/taxAgent";
+import { getSearchs } from "../../../../util";
+import { Button } from "antd";
+
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore")
+@observer
+class AdvanceSearchPannel extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { conditions: [] };
+  }
+
+  async componentDidMount() {
+    const { taxAgentStore: { advanceForm } } = this.props;
+    const { data } = await getAuthOptTree();
+    this.setState({
+      conditions: _.map(roleSearchConditions, item => ({
+        ...item, title: getLabel(item.lanId, item.title),
+        items: _.map(item.items, o => {
+          if (getKey(o) === "opts") {
+            return {
+              ...o, label: getLabel(o.lanId, o.label),
+              options: _.map(o.options, k => ({ ...k, showname: getLabel(k.lanId, k.showname) }))
+            };
+          } else if (getKey(o) === "pages") {
+            return {
+              ...o, label: getLabel(o.lanId, o.label),
+              treeData: [{
+                label: data.name, value: data.key, key: data.key, id: data.key, name: data.name,
+                children: _.map(data.modules, i => ({
+                  label: i.name, value: `${data.key}-${i.key}`, key: `${data.key}-${i.key}`,
+                  id: `${data.key}-${i.key}`, name: i.name,
+                  children: _.map(i.pages, k => ({
+                    label: k.name, value: k.key, key: k.key, selectable: true,
+                    id: k.key, name: k.name
+                  }))
+                }))
+              }]
+            };
+          }
+          return { ...o, label: getLabel(o.lanId, o.label) };
+        })
+      }))
+    }, () => advanceForm.initFormFields(this.state.conditions));
+  }
+
+  handleReset = () => {
+    const { taxAgentStore: { advanceForm } } = this.props;
+    this.setState({
+      conditions: _.map(this.state.conditions, item => ({
+        ...item, items: _.map(item.items, o => ({ ...o, value: "" }))
+      }))
+    }, () => advanceForm.resetForm());
+  };
+  handleFormChange = (val) => {
+    const key = _.keys(val)[0];
+    const { taxAgentStore: { advanceForm } } = this.props;
+    if (key === "taxAgentIds" || key === "sobIds" || key === "pages") {
+      this.setState({
+        conditions: _.map(this.state.conditions, item => ({
+          ...item, items: _.map(item.items, o => {
+            if (key === getKey(o)) {
+              return { ...o, value: _.map(val[key], o => o.id).join(",") };
+            }
+            return { ...o, value: advanceForm.getFormParams()[getKey(o)] };
+          })
+        }))
+      });
+    }
+  };
+
+  render() {
+    const { taxAgentStore: { advanceForm } } = this.props;
+    const { conditions } = this.state;
+    return (
+      <React.Fragment>
+        <div className="wea-advanced-searchsAd">
+          {getSearchs(advanceForm, conditions, 2, false, this.handleFormChange)}
+        </div>
+        <div className="wea-search-buttons">
+          <div style={{ textAlign: "center" }}>
+            <span style={{ marginLeft: 15 }}>
+              <Button type="primary" onClick={this.props.onAdSearch}>{getLabel(388113, "搜索")}</Button>
+            </span>
+            <span style={{ marginLeft: 15 }}>
+              <Button type="ghost" onClick={this.handleReset}>{getLabel(2022, "重置")}</Button>
+            </span>
+            <span style={{ marginLeft: 15 }}>
+              <Button type="ghost" onClick={this.props.onCancel}>{getLabel(31129, "取消")}</Button>
+            </span>
+          </div>
+        </div>
+      </React.Fragment>
+    );
+  }
+}
+
+export default AdvanceSearchPannel;
+
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/conditions.js b/pc4mobx/hrmSalary/pages/roleManagement/components/conditions.js
new file mode 100644
index 00000000..6a32be00
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/conditions.js
@@ -0,0 +1,261 @@
+export const roleConditions = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["name"],
+        fieldcol: 16,
+        label: "名称",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        browserConditionParam: {
+          completeURL: "/api/bs/hrmsalary/taxAgent/listAuth",
+          dataParams: { filterType: "QUERY_DATA" },
+          filterByName: true,
+          tableProps: {},
+          isSingle: false,
+          searchParamsKey: "name"
+        },
+        conditionType: "CUSTOMBROWSER",
+        domkey: ["taxAgentIds"],
+        fieldcol: 16,
+        label: "个税扣缴义务人",
+        lanId: 111,
+        labelcol: 6,
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        browserConditionParam: {
+          completeURL: "/api/bs/hrmsalary/salarysob/listAuth",
+          dataParams: { filterType: "QUERY_DATA" },
+          filterByName: true,
+          tableProps: {},
+          isSingle: false,
+          searchParamsKey: "name"
+        },
+        conditionType: "CUSTOMBROWSER",
+        domkey: ["sobIds"],
+        fieldcol: 16,
+        label: "薪资账套",
+        lanId: 111,
+        labelcol: 6,
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        conditionType: "TEXTAREA",
+        domkey: ["description"],
+        fieldcol: 16,
+        label: "描述",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      }
+    ],
+    defaultshow: true,
+    title: ""
+  }
+];
+export const roleOperatorConditions = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["targetTypeName"],
+        fieldcol: 18,
+        label: "对象类型",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        conditionType: "BROWSER",
+        domkey: ["targetName"],
+        fieldcol: 18,
+        label: "对象",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        rules: "required",
+        viewAttr: 3
+      },
+      {
+        conditionType: "SELECT",
+        domkey: ["link"],
+        fieldcol: 18,
+        label: "连接符",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        conditionType: "INPUTNUMBER",
+        domkey: ["sortedIndex"],
+        fieldcol: 18,
+        label: "批次",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        rules: "required",
+        viewAttr: 3
+      }
+    ],
+    defaultshow: true,
+    title: ""
+  }
+];
+export const roleSearchConditions = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["name"],
+        fieldcol: 16,
+        label: "名称",
+        lanId: 111,
+        labelcol: 8,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        browserConditionParam: {
+          completeURL: "/api/bs/hrmsalary/taxAgent/listAuth",
+          dataParams: { filterType: "QUERY_DATA" },
+          filterByName: true,
+          tableProps: {},
+          isSingle: false,
+          searchParamsKey: "name"
+        },
+        conditionType: "CUSTOMBROWSER",
+        domkey: ["taxAgentIds"],
+        fieldcol: 16,
+        label: "个税扣缴义务人",
+        lanId: 111,
+        labelcol: 8,
+        viewAttr: 2
+      },
+      {
+        browserConditionParam: {
+          completeParams: {},
+          conditionDataParams: {},
+          dataParams: {},
+          destDataParams: {},
+          hasAddBtn: false,
+          hasAdvanceSerach: true,
+          idSeparator: ",",
+          isAutoComplete: 1,
+          isDetail: 0,
+          isMultCheckbox: false,
+          isSingle: false,
+          linkUrl: "",
+          pageSize: 10,
+          quickSearchName: "",
+          replaceDatas: [],
+          type: "17"
+        },
+        conditionType: "BROWSER",
+        domkey: ["roleEmpIds"],
+        fieldcol: 16,
+        isQuickSearch: false,
+        label: "成员",
+        lanId: 111,
+        labelcol: 8,
+        viewAttr: 2
+      },
+      {
+        browserConditionParam: {
+          completeURL: "/api/bs/hrmsalary/salarysob/listAuth",
+          dataParams: { filterType: "QUERY_DATA" },
+          filterByName: true,
+          tableProps: {},
+          isSingle: false,
+          searchParamsKey: "name"
+        },
+        conditionType: "CUSTOMBROWSER",
+        domkey: ["sobIds"],
+        fieldcol: 16,
+        label: "薪资账套",
+        lanId: 111,
+        labelcol: 8,
+        viewAttr: 2
+      },
+      {
+        browserConditionParam: {
+          completeParams: {},
+          conditionDataParams: {},
+          dataParams: {},
+          destDataParams: {},
+          hasAddBtn: false,
+          hasAdvanceSerach: true,
+          idSeparator: ",",
+          isAutoComplete: 1,
+          isDetail: 0,
+          isMultCheckbox: false,
+          isSingle: false,
+          linkUrl: "",
+          pageSize: 10,
+          quickSearchName: "",
+          replaceDatas: [],
+          type: "17"
+        },
+        conditionType: "BROWSER",
+        domkey: ["employeeIds"],
+        fieldcol: 16,
+        isQuickSearch: false,
+        label: "数据",
+        lanId: 111,
+        labelcol: 8,
+        viewAttr: 2
+      },
+      {
+        conditionType: "SELECT",
+        domkey: ["opts"],
+        fieldcol: 16,
+        label: "权限项",
+        lanId: 111,
+        labelcol: 8,
+        multiple: true,
+        options: [
+          { key: "query", showname: "查询", lanId: 111 },
+          { key: "admin", showname: "管理", lanId: 111 }
+        ],
+        value: "",
+        viewAttr: 2
+      },
+      {
+        browserConditionParam: {
+          completeURL: "",
+          dataParams: { filterType: "" },
+          filterByName: true,
+          tableProps: {},
+          isSingle: false,
+          treeSelect: true,
+          searchParamsKey: "name"
+        },
+        conditionType: "CUSTOMBROWSER",
+        domkey: ["pages"],
+        fieldcol: 16,
+        label: "页面",
+        lanId: 111,
+        labelcol: 8,
+        treeData: [],
+        value: "",
+        viewAttr: 2
+      }
+    ],
+    defaultshow: true,
+    title: "基本信息",
+    lanId: 111,
+    col: 2
+  }
+];
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/index.less b/pc4mobx/hrmSalary/pages/roleManagement/components/index.less
new file mode 100644
index 00000000..e471d7e0
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/index.less
@@ -0,0 +1,120 @@
+.tax_role_setting_browser {
+  width: 100%;
+  display: inline-block !important;
+
+  .wea-field-readonly.border {
+    cursor: default !important;
+  }
+
+  .wea-field-readonly.border .child-item {
+    margin-bottom: 4px;
+  }
+
+  .only-operate {
+    position: relative;
+
+    & > a {
+      white-space: normal !important;
+      display: inline !important;
+      color: #2db7f5;
+    }
+
+  }
+
+  .only-operate:hover {
+    .ant-select-selection__choice__remove {
+      visibility: visible;
+    }
+  }
+
+  .ant-select-selection__choice__remove:before {
+    content: "\E62D";
+    font-family: anticon !important;
+  }
+
+  .ant-select-selection__choice__remove {
+    visibility: hidden;
+    right: -3px;
+    font-size: 12px !important;
+    top: 50%;
+    margin-top: -6px;
+    text-decoration: none;
+    position: static;
+    padding: 0;
+    cursor: pointer;
+    transform: scale(.66666667) rotate(0deg);
+  }
+}
+
+.tax_role_set_dialog {
+  .tax_role_set_container {
+    padding: 10px 25px;
+
+    .tax_role_form_item {
+      min-height: 190px;
+      border: 1px solid rgb(217, 217, 217);
+
+      & > .wea-select {
+        margin: 10px 10px 0 20px;
+        line-height: 25px;
+      }
+
+      .tax_role_operator_setting {
+        border-top: 1px solid rgb(217, 217, 217);
+        padding: 8px;
+        display: table;
+        width: 100%;
+
+        & > div:last-child {
+          text-align: right;
+        }
+      }
+
+      .tax_role_browser_form_item {
+        margin: 12px 14px;
+      }
+
+      .tax_role_auth_tree {
+        padding: 10px 20px;
+      }
+    }
+
+    .tax_role_operator_setting_table {
+      .setting_table_title {
+        & > .operator {
+          line-height: 45px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+        }
+      }
+    }
+  }
+}
+
+.role-dialog {
+  .form-dialog-layout {
+    .ant-select-selection {
+      height: auto !important;
+    }
+  }
+}
+
+.authDetail_dialog {
+  .authDetail-dialog-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .authDetail-table {
+    background: #f6f6f6;
+    padding: 8px 16px;
+    height: 100%;
+
+    .wea-new-table {
+      background: #FFF;
+    }
+  }
+
+}
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/authTree.js b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/authTree.js
new file mode 100644
index 00000000..d9d972ac
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/authTree.js
@@ -0,0 +1,90 @@
+/*
+  *  角色权限设置
+  *
+  * @Author:    黎永顺
+  * @Date:      2024/8/21
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import * as API from "../../../../apis/taxAgent";
+import { Row } from "antd";
+import { WeaLocaleProvider, WeaTree } from "ecCom";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class AuthTree extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      checkedKeys: [], expandedKeys: [], datas: {}
+    };
+  }
+
+  componentDidMount() {
+    const { roleId } = this.props;
+    API.getAuthOptTree({ roleId }).then(({ status, data }) => {
+      if (status) {
+        this.setState({
+          datas: {
+            canClick: true, id: data.key, nodeid: data.key, isParent: true, name: data.name,
+            subs: _.map(data.modules, item => ({
+              ...item, canClick: true, id: item.key, nodeid: item.key, pid: data.key, isParent: !_.isEmpty(item.pages),
+              subs: _.map(item.pages, o => ({
+                ...o, canClick: true, id: `${item.key}-${o.key}`, nodeid: `${item.key}-${o.key}`,
+                pid: item.key, isParent: !_.isEmpty(o.opts),
+                subs: _.map(o.opts, k => ({
+                  canClick: true, id: `${o.key}-${k.key}`, name: k.name, nodeid: `${o.key}-${k.key}`,
+                  pid: `${item.key}-${o.key}`, isParent: false, able: k.able
+                }))
+              }))
+            }))
+          }
+        }, () => this.setState({ expandedKeys: this.initExpandKeys(), checkedKeys: this.initCheckedKeys() }));
+      }
+    });
+  }
+
+  initExpandKeys = () => {
+    const { datas } = this.state;
+    const parentIds = [];
+    const findParent = (node) => {
+      if (node.subs && node.subs.length > 0) {
+        parentIds.push(node.id);
+        node.subs.forEach(child => findParent(child));
+      }
+    };
+    findParent(datas);
+    return parentIds;
+  };
+  initCheckedKeys = () => {
+    const { datas } = this.state;
+    const checkedIds = [];
+    const findCheckedId = (node) => {
+      if (node.subs && node.subs.length > 0) {
+        node.subs.forEach(child => {
+          if (!!child.able) checkedIds.push(child.id);
+          findCheckedId(child);
+        });
+      }
+    };
+    findCheckedId(datas);
+    return checkedIds;
+  };
+
+  render() {
+    const { checkedKeys, expandedKeys, datas } = this.state;
+    return (
+      <Row className="tax_role_auth_tree">
+        <WeaTree
+          checkable onCheck={checkedKeys => this.setState({ checkedKeys })} checkedKeys={checkedKeys}
+          expandedKeys={expandedKeys} onExpand={expandedKeys => this.setState({ expandedKeys })}
+          datas={datas}
+        />
+      </Row>
+    );
+  }
+}
+
+export default AuthTree;
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/detailDialog.js b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/detailDialog.js
new file mode 100644
index 00000000..dc70c5a3
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/detailDialog.js
@@ -0,0 +1,97 @@
+/*
+  *  角色详情设置弹窗
+  *   成员、数据明细查询
+  * @Author:    黎永顺
+  * @Date:      2024/9/27
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaDialog, WeaInputSearch, WeaLocaleProvider, WeaTable } from "ecCom";
+import * as API from "../../../../apis/taxAgent";
+import "../index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+const APIFOX = {
+  "auth.MemberTargetTypeEnum": API.authMemberDetail,
+  "auth.DataTargetTypeEnum": API.authDataDetail
+};
+
+class DetailDialog extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
+      query: { username: "" }, dataSource: [], columns: []
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) this.getData(nextProps);
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
+      query: { username: "" }, pageInfo: { current: 1, pageSize: 10, total: 0 }
+    });
+  }
+
+  getData = (props) => {
+    const { pageInfo, query } = this.state, { roleId, selectedKey } = props || this.props;
+    let payload = { ...pageInfo, ...query, roleId };
+    this.setState({ loading: true });
+    APIFOX[selectedKey](payload).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+        this.setState({
+          columns, dataSource, pageInfo: { ...pageInfo, current, pageSize, total }
+        });
+      }
+    });
+  };
+  renderTitle = () => {
+    const { selectedKey } = this.props, { query } = this.state;
+    const title = selectedKey === "auth.MemberTargetTypeEnum" ? getLabel(111, "成员明细") : getLabel(111, "数据明细");
+    return (<div className="authDetail-dialog-title">
+      <span>{title}</span>
+      <WeaInputSearch value={query.username} onChange={v => this.setState({ query: { username: v } })}
+                      onSearch={v => this.setState({ pageInfo: { current: 1 } }, () => this.getData())}/>
+    </div>);
+  };
+
+  render() {
+    const { loading, dataSource, pageInfo, columns } = this.state;
+    const sheight = this.dialog ? this.dialog.state.height - 120 : 260;
+
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+      showQuickJumper: true,
+      showSizeChanger: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({
+          pageInfo: { ...pageInfo, current, pageSize }
+        }, () => this.getData());
+      },
+      onChange: current => {
+        this.setState({ pageInfo: { ...pageInfo, current } }, () => this.getData());
+      }
+    };
+
+    return (
+      <WeaDialog
+        {...this.props} initLoadCss ref={dom => this.dialog = dom} title={this.renderTitle()}
+        className="authDetail_dialog" style={{
+        width: 784, height: 460, minHeight: 200, minWidth: 380,
+        maxHeight: "90%", maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
+      }} buttons={[]}>
+        <div className="authDetail-table">
+          <WeaTable dataSource={dataSource} loading={loading} pagination={pagination} scroll={{ y: sheight }}
+                    rowKey="id" columns={columns}/>
+        </div>
+      </WeaDialog>
+    );
+  }
+}
+
+export default DetailDialog;
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/editRoleDialog.js b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/editRoleDialog.js
new file mode 100644
index 00000000..d8fe3e0e
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/editRoleDialog.js
@@ -0,0 +1,155 @@
+/*
+  *  编辑角色操作者
+  *
+  * @Author:    黎永顺
+  * @Date:      2024/8/20
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
+import { Button } from "antd";
+import { roleOperatorConditions } from "../conditions";
+import { getSearchs } from "../../../../util";
+
+const getLabel = WeaLocaleProvider.getLabel;
+const getKey = WeaTools.getKey;
+
+@inject("taxAgentStore")
+@observer
+class EditRoleDialog extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      conditions: [], loading: false, targetSob: {}
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) {
+      this.setState({
+        conditions: _.map(roleOperatorConditions, item => ({
+          ...item, items: _.map(item.items, o => {
+            o = { ...o, label: getLabel(o.lanId, o.label), value: String(nextProps.record[getKey(o)]) };
+            switch (getKey(o)) {
+              case "link":
+                o = { ...o, options: nextProps.linkOptions, hide: _.isEmpty(nextProps.linkOptions) };
+                break;
+              case "sortedIndex":
+                o = { ...o, hide: _.isEmpty(nextProps.linkOptions) };
+                break;
+              case "targetName":
+                o = ["EMP", "DEPARTMENT", "JOB", "SUB_COMPANY", "ROLE"].includes(nextProps.record.targetType) ?
+                  {
+                    ...o, value: "", browserConditionParam: {
+                      ...this.renderBrowserType(nextProps.record.targetType),
+                      replaceDatas: [{ id: nextProps.record["target"], name: nextProps.record[getKey(o)] }]
+                    }
+                  } :
+                  nextProps.record.targetType === "SQL" ? {
+                    ...o, conditionType: "TEXTAREA", otherParams: { minRows: 3 }
+                  } : nextProps.record.targetType === "LEVEL" ?
+                    {
+                      ...o, startValue: nextProps.record[getKey(o)].split("-")[0],
+                      endValue: nextProps.record[getKey(o)].split("-")[1],
+                      conditionType: "SCOPE", precision: 0
+                    } : (nextProps.record.targetType === "SOB" ||
+                      nextProps.record.targetType === "TAX") ? {
+                      ...o, value: nextProps.record["target"],
+                      conditionType: "CUSTOMBROWSER", browserConditionParam: {
+                        completeURL: nextProps.record.targetType === "SOB" ?
+                          "/api/bs/hrmsalary/salarysob/listAuth" : "/api/bs/hrmsalary/taxAgent/listAuth",
+                        dataParams: { filterType: "QUERY_DATA" },
+                        filterByName: true, isSingle: true,
+                        tableProps: {}, searchParamsKey: "name",
+                        replaceDatas: [{ id: nextProps.record["target"], name: nextProps.record["targetName"] }]
+                      }
+                    } : { ...o };
+                break;
+              default:
+                break;
+            }
+            return o;
+          })
+        })),
+        targetSob: { id: nextProps.record["target"], name: nextProps.record["targetName"] }
+      }, () => nextProps.taxAgentStore.roleOperatorForm.initFormFields(this.state.conditions));
+    }
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) {
+      this.setState({ targetSob: {} });
+      nextProps.taxAgentStore.initRoleOperatorForm();
+    }
+    if (nextProps.loading !== this.props.loading && !nextProps.loading) this.props.onCancel();
+  }
+
+  renderBrowserType = (enumType) => {
+    let browserType = {};
+    switch (enumType) {
+      case "EMP":
+        browserType = { ...browserType, type: 17, isSingle: true, title: getLabel(82246, "人员选择") };
+        break;
+      case "DEPARTMENT":
+        browserType = { ...browserType, type: 57, isSingle: true, title: getLabel(111, "部门选择") };
+        break;
+      case "JOB":
+        browserType = { ...browserType, type: 278, isSingle: true, title: getLabel(111, "岗位选择") };
+        break;
+      case "SUB_COMPANY":
+        browserType = { ...browserType, type: 164, isSingle: true, title: getLabel(111, "分部选择") };
+        break;
+      case "ROLE":
+        browserType = { ...browserType, type: 65, isSingle: true, title: getLabel(111, "角色选择") };
+        break;
+      default:
+        break;
+    }
+    return browserType;
+  };
+  save = () => {
+    const { targetSob } = this.state;
+    const { taxAgentStore: { roleOperatorForm }, record, onChange } = this.props;
+    roleOperatorForm.validateForm().then(f => {
+      if (f.isValid) {
+        const { targetName: __, link, sortedIndex } = roleOperatorForm.getFormParams();
+        const targetName = roleOperatorForm.getFormDatas().targetName;
+        onChange([_.assign(record, {
+          editId: record.id, sortedIndex,
+          id: record.targetType === "LEVEL" ? targetName.value.join("-") : targetName.value,
+          name: record.targetType === "SQL" ? __ :
+            record.targetType === "LEVEL" ? __.join("-") : (targetName.valueSpan || targetSob.name),
+          link: link === "undefined" ? "OR" : link
+        })]);
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+  handleFormChange = (val) => {
+    const { record } = this.props;
+    const key = _.keys(val)[0];
+    if (key === "targetName" && (record.targetType === "SOB" || record.targetType === "TAX"))
+      this.setState({ targetSob: _.head(val[key]) });
+  };
+
+  render() {
+    const { conditions } = this.state;
+    const { taxAgentStore: { roleOperatorForm }, linkOptions, loading } = this.props;
+    return (
+      <WeaDialog
+        {...this.props} style={{ width: 480, height: _.isEmpty(linkOptions) ? 129 : 223 }}
+        initLoadCss title={getLabel(111, "编辑操作者")}
+        buttons={[
+          <Button type="primary" loading={loading} onClick={this.save}>{getLabel(111, "保存")}</Button>
+        ]}
+      >
+        <div className="form-dialog-layout">
+          {getSearchs(roleOperatorForm, conditions, 1, false, this.handleFormChange)}
+        </div>
+      </WeaDialog>
+    );
+  }
+}
+
+export default EditRoleDialog;
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js
new file mode 100644
index 00000000..4dc8d2c2
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js
@@ -0,0 +1,495 @@
+/*
+  *  角色详情设置弹窗
+  *
+  * @Author:    黎永顺
+  * @Date:      2024/8/5
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import {
+  WeaBrowser,
+  WeaDialog,
+  WeaFormItem,
+  WeaInputNumber,
+  WeaLocaleProvider,
+  WeaScope,
+  WeaSelect,
+  WeaTab,
+  WeaTable,
+  WeaTextarea,
+  WeaTools
+} from "ecCom";
+import { commonEnumList } from "../../../../apis/archive";
+import EditRoleDialog from "./editRoleDialog";
+import DetailDialog from "./detailDialog";
+import AuthTree from "./authTree";
+import * as API from "../../../../apis/taxAgent";
+import { Button, Col, message, Modal, Row } from "antd";
+import "../index.less";
+import CustomBrowser from "../../../../components/CustomBrowser";
+import { roleConditions } from "../conditions";
+import { getSearchs } from "../../../../util";
+
+const getLabel = WeaLocaleProvider.getLabel;
+const getKey = WeaTools.getKey;
+const APIFOX = {
+  "auth.MemberTargetTypeEnum": API.authMemberList,
+  "save.auth.MemberTargetTypeEnum": API.saveAuthMember,
+  "delete.auth.MemberTargetTypeEnum": API.deleteAuthMember,
+  "sync.auth.MemberTargetTypeEnum": API.syncAuthMember,
+  "auth.DataTargetTypeEnum": API.authDataList,
+  "save.auth.DataTargetTypeEnum": API.saveAuthData,
+  "delete.auth.DataTargetTypeEnum": API.deleteAuthData,
+  "sync.auth.DataTargetTypeEnum": API.syncAuthData
+};
+
+@inject("taxAgentStore")
+@observer
+class Index extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      selectedKey: "baseinfo", name: "", options: [], enumType: "", selectedRowKeys: [],
+      replaceDatas: [], loading: { set: false, query: false, async: false, delete: false },
+      columns: [], dataSource: [], pageInfo: { current: 1, pageSize: 10, total: 0 },
+      editOperatorDialog: { visible: false, linkOptions: [], record: {} },
+      detailDialog: { visible: false, roleId: "", selectedKey: "" },
+      dataTargetSettings: { link: "OR", sortedIndex: null }, conditions: [],
+      formData: { taxAgentIds: [], sobIds: [] }
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) {
+      this.setState({
+        name: nextProps.name, selectedKey: nextProps.selectedKey || "baseinfo",
+        detailDialog: {
+          ...this.state.detailDialog, roleId: nextProps.roleId,
+          selectedKey: nextProps.selectedKey || "baseinfo"
+        }
+      }, () => {
+        !["auth.AuthTargetTypeEnum", "baseinfo"].includes(this.state.selectedKey) && this.getEnumList();
+        !["auth.AuthTargetTypeEnum", "baseinfo"].includes(this.state.selectedKey) && this.getSettingRoler(nextProps.roleId);
+        this.state.selectedKey === "baseinfo" && this.getRole(nextProps.roleId);
+        this.state.selectedKey === "auth.DataTargetTypeEnum" && this.getConnectSymbol();
+      });
+    } else {
+      this.setState({
+        selectedRowKeys: [], replaceDatas: [], pageInfo: { current: 1, pageSize: 10, total: 0 },
+        dataTargetSettings: { link: "OR", sortedIndex: "" }
+      });
+    }
+  }
+
+  getRole = (id) => {
+    API.getRole({ id }).then(({ status, data }) => {
+      if (status) {
+        this.setState({
+          conditions: _.map(roleConditions, item => ({
+            ...item, items: _.map(item.items, o => {
+              if (getKey(o) === "taxAgentIds" || getKey(o) === "sobIds") {
+                return {
+                  ...o, label: getLabel(o.lanId, o.label),
+                  value: _.map(data[getKey(o)], i => String(i.id)).join(","),
+                  browserConditionParam: {
+                    ...o.browserConditionParam,
+                    replaceDatas: _.map(data[getKey(o)], i => ({ id: String(i.id), name: i.name }))
+                  }
+                };
+              }
+              return { ...o, label: getLabel(o.lanId, o.label) };
+            })
+          })),
+          formData: {
+            taxAgentIds: _.map(data["taxAgentIds"], i => ({ id: String(i.id), name: i.name })),
+            sobIds: _.map(data["sobIds"], i => ({ id: String(i.id), name: i.name }))
+          }
+        }, () => {
+          this.props.taxAgentStore.roleForm.initFormFields(this.state.conditions);
+          this.props.taxAgentStore.roleForm.updateFields({
+            name: { value: data.name },
+            description: { value: data.description }
+          });
+        });
+      }
+    });
+  };
+  getEnumList = () => {
+    const payload = { enumClass: `com.engine.salary.enums.${this.state.selectedKey}` };
+    commonEnumList(payload).then(({ status, data }) => {
+      if (status) this.setState({
+        options: _.map(data, o => ({ key: o.enum, showname: o.defaultLabel })),
+        enumType: _.head(data).enum || ""
+      });
+      if (!status) this.setState({ options: [], enumType: "" });
+    });
+  };
+  getSettingRoler = (roleId) => {
+    const { selectedKey, pageInfo } = this.state;
+    this.setState({ loading: { ...this.state.loading, query: true } });
+    APIFOX[selectedKey]({ roleId, ...pageInfo }).then(({ status, data }) => {
+      this.setState({ loading: { ...this.state.loading, query: false } });
+      if (status) {
+        const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+        this.setState({
+          dataSource, pageInfo: { ...pageInfo, current, pageSize, total },
+          columns: [
+            ...columns, {
+              dataIndex: "opt", title: getLabel(111, "操作"), width: 120,
+              render: (__, record) => (<a href="javascript:void(0);"
+                                          onClick={() => this.handleEditOperator(record)}>{getLabel(111, "编辑")}</a>)
+            }
+          ]
+        });
+      }
+    });
+  };
+  handleEditOperator = (record) => {
+    this.setState({ editOperatorDialog: { ...this.state.editOperatorDialog, visible: true, record } });
+  };
+  getConnectSymbol = async () => {
+    const payload = { enumClass: `com.engine.salary.enums.auth.DataLinkEnum` };
+    const { data } = await commonEnumList(payload);
+    const linkOptions = _.map(data, o => ({ key: o.enum, showname: o.defaultLabel }));
+    this.setState({ editOperatorDialog: { ...this.state.editOperatorDialog, linkOptions } });
+  };
+  addOperatorSettings = () => {
+    const { roleId } = this.props;
+    const { selectedKey, enumType: targetType, replaceDatas, dataTargetSettings } = this.state;
+    if (_.isEmpty(replaceDatas)) {
+      Modal.warning({
+        title: getLabel(111, "系统提示"),
+        content: getLabel(111, "请先选择操作对象的值！")
+      });
+      return;
+    }
+    const payload = _.map(replaceDatas, o => ({
+      roleId, target: o.id || "", id: o.editId || "",
+      targetType: o.targetType || targetType,
+      targetName: o.name || "",
+      link: o.link || dataTargetSettings.link,
+      sortedIndex: o.sortedIndex || dataTargetSettings.sortedIndex
+    }));
+    this.setState({ loading: { ...this.state.loading, set: true } });
+    APIFOX[`save.${selectedKey}`](payload).then(({ status, errormsg }) => {
+      this.setState({ loading: { ...this.state.loading, set: false } });
+      if (status) {
+        message.success(getLabel(111, "操作成功！"));
+        this.setState({ replaceDatas: [] }, () => this.getSettingRoler(roleId));
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
+  deleteOperatorSettings = () => {
+    const { roleId } = this.props;
+    const { selectedKey, selectedRowKeys } = this.state;
+    if (_.isEmpty(selectedRowKeys)) {
+      Modal.warning({
+        title: getLabel(111, "信息确认"),
+        content: getLabel(111, "确定要删除所选批次吗？")
+      });
+      return;
+    }
+    this.setState({ loading: { ...this.state.loading, delete: true } });
+    APIFOX[`delete.${selectedKey}`](selectedRowKeys).then(({ status, errormsg }) => {
+      this.setState({ loading: { ...this.state.loading, delete: false } });
+      if (status) {
+        message.success(getLabel(111, "操作成功！"));
+        this.setState({ selectedRowKeys: [] }, () => this.getSettingRoler(roleId));
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
+  saveAuthOpt = () => {
+    const { roleId } = this.props, { selectedKey } = this.state;
+    if (selectedKey === "baseinfo") {
+      this.saveBaseInfo();
+      return;
+    }
+    const { state: { checkedKeys } } = this.authTreeRef;
+    const payload = {
+      roleId, opts: _.reduce(checkedKeys, (pre, cur) => {
+        if (cur.indexOf("query") !== -1 || cur.indexOf("admin") !== -1) {
+          const [page, opt] = cur.split("-");
+          return [...pre, { page, opt }];
+        }
+        return pre;
+      }, [])
+    };
+    this.setState({ loading: { ...this.state.loading, set: true } });
+    API.saveAuthOpt(payload).then(({ status, errormsg }) => {
+      this.setState({ loading: { ...this.state.loading, set: false } });
+      if (status) {
+        message.success(getLabel(111, "操作成功！"));
+        this.props.onSearch && this.props.onSearch();
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
+  saveBaseInfo = () => {
+    const { taxAgentStore: { roleForm }, roleId } = this.props;
+    const { formData } = this.state;
+    roleForm.validateForm().then(f => {
+      if (f.isValid) {
+        const payload = roleForm.getFormParams();
+        this.setState({ loading: { ...this.state.loading, set: true } });
+        API.saveAuthRole({ id: roleId, ...payload, ...formData }).then(({ status, errormsg }) => {
+          this.setState({ loading: { ...this.state.loading, set: false } });
+          if (status) {
+            message.success(getLabel(111, "操作成功！"));
+            this.props.onSearch && this.props.onSearch();
+          } else {
+            message.error(errormsg);
+          }
+        });
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+  syncAuthData = () => {
+    const { roleId } = this.props, { selectedKey } = this.state;
+    this.setState({ async: true });
+    APIFOX[`sync.${selectedKey}`]({ roleId }).then(({ status, errormsg }) => {
+      this.setState({ async: false });
+      if (status) {
+        message.success(getLabel(111, "操作成功！"));
+        this.props.onSearch && this.props.onSearch();
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
+  getOperatorSetting = () => {
+    const { roleId, taxAgentStore: { roleForm } } = this.props;
+    const { selectedKey, enumType, replaceDatas, conditions } = this.state;
+    if (!["auth.AuthTargetTypeEnum", "baseinfo"].includes(selectedKey)) {
+      let browserType = {};
+      switch (enumType) {
+        case "EMP":
+          browserType = { ...browserType, type: 17, title: getLabel(82246, "人员选择") };
+          break;
+        case "DEPARTMENT":
+          browserType = { ...browserType, type: 57, title: getLabel(111, "部门选择") };
+          break;
+        case "JOB":
+          browserType = { ...browserType, type: 278, title: getLabel(111, "岗位选择") };
+          break;
+        case "SUB_COMPANY":
+          browserType = { ...browserType, type: 164, title: getLabel(111, "分部选择") };
+          break;
+        case "ROLE":
+          browserType = { ...browserType, type: 65, title: getLabel(111, "角色选择") };
+          break;
+        case "SQL":
+          return (<Row className="tax_role_browser_form_item">
+            <WeaTextarea style={{ width: "100%" }} minRows={3}
+                         value={_.head(replaceDatas) ? _.head(replaceDatas).name : ""}
+                         onChange={v => this.setState({ replaceDatas: [{ id: v, name: v }] })}/>
+          </Row>);
+        case "LEVEL":
+          return (<WeaFormItem label={getLabel(111, "安全级别")} labelCol={{ span: 2 }} wrapperCol={{ span: 5 }}
+                               className="tax_role_browser_form_item">
+            <WeaScope isMobx value={_.reduce(replaceDatas, (pre, cur) => cur.id.split("-"), [])}
+                      onChange={v => this.setState({ replaceDatas: [{ id: v.join("-"), name: v.join("-") }] })}/>
+          </WeaFormItem>);
+        case "SOB":
+          return (<WeaFormItem label={getLabel(111, "薪资账套")} labelCol={{ span: 2 }} wrapperCol={{ span: 5 }}
+                               className="tax_role_browser_form_item">
+            <CustomBrowser
+              fieldConfig={{
+                viewAttr: 2,
+                browserConditionParam: {
+                  completeURL: "/api/bs/hrmsalary/salarysob/listAuth", dataParams: { filterType: "QUERY_DATA" },
+                  filterByName: true, tableProps: {}, isSingle: false, searchParamsKey: "name", replaceDatas
+                }
+              }}
+              value={_.map(replaceDatas, o => (o.id))}
+              onCustomChange={replaceDatas => this.setState({
+                replaceDatas: _.map(_.values(replaceDatas), o => ({ id: o.id, name: o.name }))
+              })}
+            />
+          </WeaFormItem>);
+        case "TAX":
+          return (<WeaFormItem label={getLabel(111, "扣缴义务人")} labelCol={{ span: 4 }} wrapperCol={{ span: 6 }}
+                               className="tax_role_browser_form_item">
+            <CustomBrowser
+              fieldConfig={{
+                viewAttr: 2,
+                browserConditionParam: {
+                  completeURL: "/api/bs/hrmsalary/taxAgent/listAuth", dataParams: { filterType: "QUERY_DATA" },
+                  filterByName: true, tableProps: {}, isSingle: false, searchParamsKey: "name", replaceDatas
+                }
+              }}
+              value={_.map(replaceDatas, o => (o.id))}
+              onCustomChange={replaceDatas => this.setState({
+                replaceDatas: _.map(_.values(replaceDatas), o => ({ id: o.id, name: o.name }))
+              })}
+            />
+          </WeaFormItem>);
+        default:
+          return (<Row className="tax_role_browser_form_item"></Row>);
+      }
+      return (<Row className="tax_role_browser_form_item">
+        <WeaBrowser {...browserType} isSingle={false} inputStyle={{ width: 150 }} replaceDatas={replaceDatas}
+                    onChange={(__, ___, replaceDatas) => this.setState({ replaceDatas })}/>
+      </Row>);
+    } else if (selectedKey === "auth.AuthTargetTypeEnum") {
+      return (<AuthTree roleId={roleId} ref={dom => this.authTreeRef = dom}/>);
+    }
+    return getSearchs(roleForm, conditions, 1, false, this.handleFormChange);
+  };
+  handleFormChange = (val) => {
+    const key = _.keys(val)[0];
+    if (key === "taxAgentIds" || key === "sobIds") {
+      this.setState({ formData: { ...this.state.formData, ...val } });
+    }
+  };
+
+  render() {
+    const { roleId, taxAgentStore, counts } = this.props;
+    const {
+      selectedKey, name, options, enumType, pageInfo, columns, dataSource, loading, selectedRowKeys, editOperatorDialog,
+      dataTargetSettings, detailDialog
+    } = this.state;
+    const { linkOptions } = editOperatorDialog;
+    const tabs = [
+      { title: getLabel(111, "基础信息"), viewcondition: "baseinfo", showcount: true, count: "resources" },
+      {
+        title: getLabel(111, "成员设置"), viewcondition: "auth.MemberTargetTypeEnum", showcount: true, count: "members"
+      },
+      { title: getLabel(111, "功能权限"), viewcondition: "auth.AuthTargetTypeEnum", showcount: true, count: "opts" },
+      { title: getLabel(111, "数据范围"), viewcondition: "auth.DataTargetTypeEnum", showcount: true, count: "datas" }
+    ];
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+      showQuickJumper: true,
+      showSizeChanger: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({
+          pageInfo: { ...pageInfo, current, pageSize }
+        }, () => this.getSettingRoler(roleId));
+      },
+      onChange: current => {
+        this.setState({
+          pageInfo: { ...pageInfo, current }
+        }, () => this.getSettingRoler(roleId));
+      }
+    };
+    const rowSelection = {
+      selectedRowKeys, onChange: (selectedRowKeys) => this.setState({ selectedRowKeys })
+    };
+    const buttons = [
+      <Button type="primary" onClick={this.syncAuthData} loading={loading.async}>{getLabel(111, "同步")}</Button>,
+      <Button type="primary" loading={loading.set} onClick={this.saveAuthOpt}>{getLabel(111, "保存")}</Button>
+    ];
+    ["auth.AuthTargetTypeEnum", "baseinfo"].includes(selectedKey) && buttons.shift();
+    !["auth.AuthTargetTypeEnum", "baseinfo"].includes(selectedKey) && buttons.pop();
+    !["auth.AuthTargetTypeEnum", "baseinfo"].includes(selectedKey) && buttons.unshift(
+      <Button type="primary" onClick={() => this.setState({
+        detailDialog: { ...detailDialog, visible: true }
+      })}>{selectedKey === "auth.MemberTargetTypeEnum" ? getLabel(111, "成员明细") : getLabel(111, "数据明细")}</Button>
+    );
+    return (
+      <WeaDialog
+        {...this.props} hasScroll className="tax_role_set_dialog" initLoadCss
+        title={`${getLabel(111, "编辑业务线")}-(${name})`}
+        buttons={buttons} style={{
+        width: 960, height: 606.6, minHeight: 200, minWidth: 380,
+        maxHeight: "90%", maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
+      }}
+      >
+        <div className="tax_role_set_container">
+          <Row>
+            <div className="tax_role_form_item">
+              <WeaTab datas={tabs} keyParam="viewcondition" selectedKey={selectedKey} countParam="count" counts={counts}
+                      onChange={v => this.setState({
+                        selectedKey: v, replaceDatas: [], selectedRowKeys: [],
+                        detailDialog: { ...detailDialog, selectedKey: v }
+                      }, () => {
+                        taxAgentStore.roleForm.resetForm();
+                        const { selectedKey } = this.state;
+                        !["auth.AuthTargetTypeEnum", "baseinfo"].includes(selectedKey) && this.getEnumList();
+                        !["auth.AuthTargetTypeEnum", "baseinfo"].includes(selectedKey) && this.getSettingRoler(roleId);
+                        selectedKey === "auth.DataTargetTypeEnum" && this.getConnectSymbol();
+                        selectedKey === "baseinfo" && this.getRole(roleId);
+                      })}/>
+              {
+                !["auth.AuthTargetTypeEnum", "baseinfo"].includes(selectedKey) &&
+                <WeaSelect options={options} detailtype={3} value={enumType}
+                           onChange={v => this.setState({ enumType: v, replaceDatas: [] })}/>
+              }
+              {this.getOperatorSetting()}
+              {
+                !["auth.AuthTargetTypeEnum", "baseinfo"].includes(selectedKey) &&
+                <Row className="tax_role_operator_setting">
+                  {
+                    this.state.selectedKey === "auth.DataTargetTypeEnum" &&
+                    <Col span={16}>
+                      <Row>
+                        <Col span={12}>
+                          <WeaFormItem label={getLabel(111, "连接符")} labelCol={{ span: 8 }} wrapperCol={{ span: 14 }}>
+                            <WeaSelect value={dataTargetSettings.link} options={linkOptions}
+                                       onChange={link => this.setState({
+                                         dataTargetSettings: { ...dataTargetSettings, link }
+                                       })}/>
+                          </WeaFormItem>
+                        </Col>
+                        <Col span={12}>
+                          <WeaFormItem label={getLabel(111, "批次")} labelCol={{ span: 8 }} wrapperCol={{ span: 14 }}>
+                            <WeaInputNumber value={dataTargetSettings.sortedIndex}
+                                            onChange={sortedIndex => this.setState({
+                                              dataTargetSettings: { ...dataTargetSettings, sortedIndex }
+                                            })}/>
+                          </WeaFormItem>
+                        </Col>
+                      </Row>
+                    </Col>
+                  }
+                  <Col span={8} offset={this.state.selectedKey === "auth.DataTargetTypeEnum" ? 0 : 16}>
+                    <Button type="primary" loading={loading.set}
+                            onClick={this.addOperatorSettings}>{getLabel(111, "添加操作者设置")}</Button>
+                  </Col>
+                </Row>
+              }
+            </div>
+          </Row>
+          {/*表格*/}
+          {
+            !["auth.AuthTargetTypeEnum", "baseinfo"].includes(selectedKey) &&
+            <Row className="tax_role_operator_setting_table">
+              <Col span={24} className="setting_table_title">
+                <div className="wea-f12 text-elli operator">
+                  <span>{getLabel(111, "已设操作者")}</span>
+                  <Button type="ghost" disabled={_.isEmpty(selectedRowKeys)} loading={loading.delete}
+                          onClick={this.deleteOperatorSettings}>{getLabel(111, "批量删除")}</Button>
+                </div>
+                <WeaTable rowKey="id" columns={columns} dataSource={dataSource} bordered loading={loading.query}
+                          pagination={pagination} rowSelection={rowSelection}/>
+                {/* 编辑操作者*/}
+                <EditRoleDialog {...editOperatorDialog} loading={loading.set}
+                                onChange={replaceDatas => this.setState({ replaceDatas }, () => this.addOperatorSettings())}
+                                onCancel={callback => this.setState({
+                                  editOperatorDialog: { ...editOperatorDialog, visible: false, record: {} }
+                                }, () => callback && callback())}/>
+                {/*成员、数据明细查看*/}
+                <DetailDialog {...detailDialog}
+                              onCancel={() => this.setState({ detailDialog: { ...detailDialog, visible: false } })}/>
+              </Col>
+            </Row>
+          }
+        </div>
+      </WeaDialog>
+    );
+  }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/roleSetting/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/roleSetting/index.js
new file mode 100644
index 00000000..31e392d8
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/roleSetting/index.js
@@ -0,0 +1,81 @@
+/*
+  *  个税扣缴义务人-角色设置
+  *
+  * @Author:    黎永顺
+  * @Date:      2024/8/5
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaBrowser, WeaLocaleProvider } from "ecCom";
+import { message, Modal } from "antd";
+import AddRoleDialog from "../addRoleDialog";
+import RoleDetailSetDialog from "../roleDetailSetDialog";
+import * as API from "../../../../apis/taxAgent";
+import "../index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class Index extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      addRoleDialog: { visible: false, taxAgentId: "" },
+      roleSetDialog: { visible: false, roleId: "", name: "" }
+    };
+  }
+
+  showRoleSetDialog = (role) => this.setState({ roleSetDialog: { visible: true, roleId: role.id, name: role.name } });
+  deleteAuthRole = (role) => {
+    Modal.confirm({
+      title: getLabel(111, "信息确认"),
+      content: getLabel(111, "确认要删除吗?"),
+      onOk: () => {
+        API.deleteAuthRole([role.id]).then(({ status, errormsg }) => {
+          if (status) {
+            message.success(getLabel(111, "操作成功！"));
+            this.props.onSearch();
+          } else {
+            message.error(errormsg);
+          }
+        });
+      }
+    });
+
+  };
+
+  render() {
+    const { addRoleDialog, roleSetDialog } = this.state;
+    const { taxAgent, onSearch } = this.props;
+    const { role } = taxAgent;
+    return (
+      <React.Fragment>
+        <WeaBrowser type={-99991} isSingle={false} hasAddBtn hasBorder whiteBackground viewAttr={1}
+                    className="tax_role_setting_browser"
+                    addOnClick={() => this.setState({ addRoleDialog: { taxAgentId: taxAgent.id, visible: true } })}
+                    replaceDatas={_.map(role, o => ({
+                      id: o.id,
+                      name: <span className="only-operate">
+                        <a href="javascript:void(0);" onClick={() => this.showRoleSetDialog(o)}>{o.name}</a>
+                        <span className="ant-select-selection__choice__remove"
+                              onClick={() => this.deleteAuthRole(o)}/>
+                      </span>
+                    }))}/>
+        {/*添加角色*/}
+        <AddRoleDialog {...addRoleDialog} onSearch={onSearch}
+                       showRoleSetDialog={this.showRoleSetDialog}
+                       onCancel={callback => this.setState({
+                         addRoleDialog: { ...addRoleDialog, visible: false }
+                       }, () => callback && callback())}/>
+        {/*角色详情设置*/}
+        <RoleDetailSetDialog {...roleSetDialog} onSearch={onSearch}
+                             onCancel={callback => this.setState({
+                               roleSetDialog: { ...roleSetDialog, visible: false }
+                             }, () => callback && callback())}/>
+      </React.Fragment>
+    );
+  }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/index.js b/pc4mobx/hrmSalary/pages/roleManagement/index.js
new file mode 100644
index 00000000..3b419943
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/index.js
@@ -0,0 +1,242 @@
+/*
+  *  角色管理
+  *
+  * @Author:    黎永顺
+  * @Date:      2024/9/6
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaLocaleProvider, WeaTable, WeaTop } from "ecCom";
+import { Button, Dropdown, Menu, message, Modal } from "antd";
+import * as API from "../../apis/taxAgent";
+import AddRoleDialog from "./components/addRoleDialog";
+import RoleDetailSetDialog from "./components/roleDetailSetDialog";
+import AdvanceInputBtn from "./components/advanceInputBtn";
+import AdvanceSearchPannel from "./components/advanceSearchPannel";
+import LogDialog from "../../components/logViewModal";
+import cs from "classnames";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore")
+@observer
+class Index extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 },
+      loading: false, selectedRowKeys: [], addRoleDialog: { taxAgentId: "", visible: false },
+      logDialogVisible: false, filterConditions: "", showSearchAd: false, syncLoading: false,
+      roleSetDialog: {
+        visible: false, roleId: "", name: "", selectedKey: "",
+        counts: { datas: 0, members: 0, resources: 0, opts: 0 }
+      }
+    };
+  }
+
+  componentDidMount() {
+    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 = {
+      ...pageInfo, ...advanceForm.getFormParams(),
+      employeeIds: !_.isEmpty(advanceForm.getFormParams()["employeeIds"]) ? advanceForm.getFormParams()["employeeIds"].split(",") : [],
+      opts: !_.isEmpty(advanceForm.getFormParams()["opts"]) ? advanceForm.getFormParams()["opts"].split(",") : [],
+      roleEmpIds: !_.isEmpty(advanceForm.getFormParams()["roleEmpIds"]) ? advanceForm.getFormParams()["roleEmpIds"].split(",") : [],
+      sobIds: !_.isEmpty(advanceForm.getFormParams()["sobIds"]) ? advanceForm.getFormParams()["sobIds"].split(",") : [],
+      taxAgentIds: !_.isEmpty(advanceForm.getFormParams()["taxAgentIds"]) ? advanceForm.getFormParams()["taxAgentIds"].split(",") : [],
+      pages: !_.isEmpty(advanceForm.getFormParams()["pages"]) ? advanceForm.getFormParams()["pages"].split(",") : []
+    };
+    this.setState({ loading: true });
+    API.getRoleList(paylaod).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { list: dataSource, columns, pageNum: current, pageSize, total } = data;
+        this.setState({
+          dataSource, pageInfo: { ...pageInfo, current, pageSize, total },
+          columns: [..._.map(columns, o => {
+            if (
+              o.dataIndex === "resources" || o.dataIndex === "members" ||
+              o.dataIndex === "opts" || o.dataIndex === "datas"
+            ) {
+              const tabsKey = {
+                resources: "baseinfo",
+                members: "auth.MemberTargetTypeEnum",
+                opts: "auth.AuthTargetTypeEnum",
+                datas: "auth.DataTargetTypeEnum"
+              };
+              return {
+                ...o, render: (text, record) => (
+                  <a href="javascript:void(0)" style={{ marginRight: 10 }} onClick={() => this.showRoleSetDialog({
+                    ...record, selectedKey: tabsKey[o.dataIndex]
+                  })}>{text}</a>)
+              };
+            }
+            return { ...o };
+          }), {
+            title: getLabel(111, "操作"), width: 150, dataIndex: "action",
+            render: (__, record) => (
+              <React.Fragment>
+                <a href="javascript:void(0)" style={{ marginRight: 10 }}
+                   onClick={() => this.showRoleSetDialog(record)}>{getLabel(111, "编辑")}</a>
+                <a href="javascript:void(0)" style={{ marginRight: 10 }}
+                   onClick={() => this.deleteAuthRole([record.id])}>{getLabel(111, "删除")}</a>
+                <Dropdown overlay={
+                  <Menu onClick={e => this.handleDropMenuClick(e.key, record.id)}>
+                    <Menu.Item key="log">{getLabel(545781, "操作日志")}</Menu.Item>
+                  </Menu>
+                }>
+                  <a href="javascript:void(0);"><i className="icon-coms-more"/></a>
+                </Dropdown>
+              </React.Fragment>
+            )
+          }]
+        }, () => {
+          const { roleSetDialog, dataSource } = this.state;
+          roleSetDialog.roleId && this.setState({
+            roleSetDialog: {
+              ...roleSetDialog, counts: {
+                ...roleSetDialog.counts, ..._.reduce(_.keys(roleSetDialog.counts), (pre, cur) => ({
+                  ...pre, [cur]: _.find(dataSource, o => o.id === roleSetDialog.roleId)[cur] || 0
+                }), {})
+              }
+            }
+          });
+        });
+      }
+    });
+  };
+  showRoleSetDialog = (role) => this.setState({
+    roleSetDialog: {
+      visible: true, roleId: role.id, name: role.name, selectedKey: role.selectedKey,
+      counts: {
+        ...this.state.roleSetDialog.counts, ..._.reduce(_.keys(this.state.roleSetDialog.counts), (pre, cur) => ({
+          ...pre, [cur]: role[cur] || 0
+        }), {})
+      }
+    }
+  });
+  deleteAuthRole = (payload) => {
+    Modal.confirm({
+      title: getLabel(111, "信息确认"),
+      content: getLabel(111, "确认要删除吗?"),
+      onOk: () => {
+        API.deleteAuthRole(payload).then(({ status, errormsg }) => {
+          if (status) {
+            message.success(getLabel(111, "操作成功！"));
+            this.setState({ selectedRowKeys: [] }, () => this.getRoleList());
+          } else {
+            message.error(errormsg);
+          }
+        });
+      }
+    });
+  };
+  handleDropMenuClick = (key, targetid = "") => {
+    switch (key) {
+      case "log":
+        this.setState({
+          logDialogVisible: true,
+          filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
+        });
+        break;
+      default:
+        break;
+    }
+  };
+
+  render() {
+    const {
+      dataSource, columns, pageInfo, loading, selectedRowKeys, addRoleDialog, roleSetDialog,
+      logDialogVisible, filterConditions, showSearchAd, syncLoading
+    } = this.state;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const admin = PageAndOptAuth.opts.includes("admin");
+    const dropMenuDatas = [{
+      key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
+      content: getLabel(545781, "操作日志")
+    }];
+    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 })}
+                       onAdvanceSearch={() => this.setState({ pageInfo: { ...pageInfo, current: 1 } },
+                         () => this.getRoleList())}/>
+    ];
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+      showQuickJumper: true,
+      showSizeChanger: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => this.getRoleList());
+      },
+      onChange: current => {
+        this.setState({ pageInfo: { ...pageInfo, current } }, () => this.getRoleList());
+      }
+    };
+    const rowSelection = {
+      selectedRowKeys, onChange: (selectedRowKeys) => this.setState({ selectedRowKeys })
+    };
+    !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}
+              onDropMenuClick={this.handleDropMenuClick}>
+        <div className="rolemanagement-content">
+          <div
+            className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
+            <AdvanceSearchPannel onCancel={() => this.setState({ showSearchAd: false })}
+                                 onAdSearch={() => this.setState({
+                                   showSearchAd: false, pageInfo: { ...pageInfo, current: 1 }
+                                 }, () => this.getRoleList())}/>
+          </div>
+          <WeaTable dataSource={dataSource} columns={columns} pagination={pagination} loading={loading}
+                    rowSelection={rowSelection} scroll={{ y: `calc(100vh - 173px)` }} rowKey="id"/>
+          {/*添加角色*/}
+          <AddRoleDialog {...addRoleDialog} onSearch={this.getRoleList}
+                         showRoleSetDialog={this.showRoleSetDialog}
+                         onCancel={callback => this.setState({
+                           addRoleDialog: { ...addRoleDialog, visible: false }
+                         }, () => callback && callback())}/>
+          {/*角色详情设置*/}
+          <RoleDetailSetDialog {...roleSetDialog} onSearch={this.getRoleList}
+                               onCancel={callback => this.setState({
+                                 roleSetDialog: { ...roleSetDialog, visible: false, roleId: "" }
+                               }, () => {
+                                 this.props.taxAgentStore.initRoleForm();
+                                 callback && callback();
+                               })}/>
+        </div>
+        {/*操作日志*/}
+        <LogDialog visible={logDialogVisible} logFunction="authlink" filterConditions={filterConditions}
+                   onCancel={() => this.setState({ logDialogVisible: false })}/>
+      </WeaTop>
+    );
+  }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/index.less b/pc4mobx/hrmSalary/pages/roleManagement/index.less
new file mode 100644
index 00000000..8de15ad5
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/index.less
@@ -0,0 +1,60 @@
+.rolemanagement-index {
+  .rolemanagement-content {
+    height: 100%;
+    overflow-y: auto;
+    padding: 8px 16px 0;
+    background: rgb(246, 246, 246);
+
+    .wea-new-table {
+      background: #FFF;
+    }
+
+    .searchAdvanced-condition-hide {
+      display: none;
+    }
+
+    .searchAdvanced-condition-container {
+      background: #FFF;
+      margin-bottom: 10px;
+      border: 1px solid #e5e5e5;
+
+      .wea-search-buttons {
+        border-top: 1px solid #dadada;
+        padding: 15px 0;
+      }
+
+      .wea-advanced-searchsAd {
+        height: 247px;
+        overflow: hidden auto;
+
+        .formItem-delete {
+          position: absolute;
+          top: 0;
+          right: -40px;
+        }
+
+        .searchAdvanced-commonSelect {
+          border-top: 1px solid #ebebeb;
+          margin: 0 25px;
+          padding: 10px 0;
+        }
+
+        .custom-advance-largeSpacing {
+          padding-left: 26px;
+
+          .link {
+            border: none;
+            border-radius: 0;
+            padding: 12px 10px 12px 26px;
+            color: #2db7f5
+          }
+        }
+
+      }
+    }
+  }
+
+  .wea-input-focus .ant-input {
+    vertical-align: baseline;
+  }
+}
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
index c5701013..43fd37fa 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
@@ -188,6 +188,24 @@ export const conditions = [
         lanId: 111,
         labelcol: 8,
         viewAttr: 2
+      },
+      {
+        conditionType: "SWITCH",
+        domkey: ["SHOT_EMP_BTN"],
+        fieldcol: 10,
+        label: "启用人事信息快照",
+        lanId: 111,
+        labelcol: 8,
+        viewAttr: 2
+      },
+      {
+        conditionType: "SWITCH",
+        domkey: ["SALARY_ACCT_SYNC_TYPE"],
+        fieldcol: 10,
+        label: "是否采用线程池",
+        lanId: 111,
+        labelcol: 8,
+        viewAttr: 2
       }
     ],
     title: "薪资核算",
@@ -213,6 +231,16 @@ export const conditions = [
         lanId: 111,
         labelcol: 8,
         viewAttr: 2
+      },
+      {
+        conditionType: "SELECT",
+        domkey: ["TAX_DECLARATION_DATE_TYPE"],
+        fieldcol: 10,
+        label: "申报日期类型",
+        lanId: 111,
+        labelcol: 8,
+        options: [],
+        viewAttr: 2
       }
     ],
     title: "算税规则",
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/form.js b/pc4mobx/hrmSalary/pages/ruleConfig/form.js
index 09a946f8..29b4d01b 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/form.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/form.js
@@ -25,8 +25,8 @@ export const renderRuleForm = (form, condition, onChange) => {
             tipPosition="bottom">
             <WeaSwitch
               fieldConfig={fields} form={form} formParams={formParams}
-              onChange={v => getKey(fields) !== "salaryAcctFixedColumns" && onChange(v)}
-              onBlur={(v) => getKey(fields) === "salaryAcctFixedColumns" && onChange({ salaryAcctFixedColumns: { value: v } })}
+              onChange={v => !["INPUT", "INPUTNUMBER", "TEXTAREA"].includes(fields.conditionType) && onChange(v)}
+              onBlur={v => ["INPUT", "INPUTNUMBER", "TEXTAREA"].includes(fields.conditionType) && onChange({ [getKey(fields)]: { value: v } })}
             />
           </WeaFormItem>),
         colSpan: 1,
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
index 573bc864..2608bb44 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
@@ -73,6 +73,13 @@ class RuleConfig extends Component {
               ...o,
               hide: sysinfo["SALARY_APPROVAL_STATUS"] === "0" || _.isNil(sysinfo["SALARY_APPROVAL_STATUS"])
             };
+          } else if (getKey(o) === "TAX_DECLARATION_DATE_TYPE") {
+            return {
+              ...o, options: [
+                { key: "0", showname: getLabel(111, "薪资所属月"), selected: true },
+                { key: "1", showname: getLabel(111, "税款所属期"), selected: false }
+              ]
+            };
           }
           return { ...o };
         })
@@ -97,7 +104,7 @@ class RuleConfig extends Component {
         form.updateFields({ [item]: { value: sysinfo[item] === "0" ? "0" : (sysinfo[item] || "0") } });
       } else if (item === "taxAgentShowStatus" || item === "salaryShowStatus" || item === "adjustShowStatus") {
         form.updateFields({ [item]: { value: sysinfo[item] || "1" } });
-      } else if (item === "OPEN_APPLICATION_ENCRYPT") {
+      } else if (item === "OPEN_APPLICATION_ENCRYPT" || item === "SALARY_ACCT_SYNC_TYPE") {
         form.updateFields({ [item]: { value: _.isNil(sysinfo[item]) ? "1" : (sysinfo[item] || "") } });
       } else if (
         item === "APPROVAL_CAN_MANUAL_FILE_STATUS" || item === "APPROVAL_CAN_RE_CALC_STATUS" || item === "APPROVAL_CAN_EDIT_RESULT_STATUS"
@@ -154,6 +161,9 @@ class RuleConfig extends Component {
           case "APPROVAL_CAN_RE_CALC_STATUS":
           case "APPROVAL_CAN_EDIT_RESULT_STATUS":
           case "ATTENDANCE_SERIAL_COLLECTION_BTN":
+          case "TAX_DECLARATION_DATE_TYPE":
+          case "SHOT_EMP_BTN":
+          case "SALARY_ACCT_SYNC_TYPE":
             if (!this.handleDebounce) {
               this.handleDebounce = _.debounce(() => {
                 const confTitle = {
@@ -171,7 +181,10 @@ class RuleConfig extends Component {
                   APPROVAL_CAN_MANUAL_FILE_STATUS: getLabel(111, "开启审批的核算记录允许手动归档"),
                   APPROVAL_CAN_RE_CALC_STATUS: getLabel(111, "开启审批的核算记录允许重新核算"),
                   APPROVAL_CAN_EDIT_RESULT_STATUS: getLabel(111, "审批流程发起后允许修改核算数据"),
-                  ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据")
+                  ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据"),
+                  TAX_DECLARATION_DATE_TYPE: getLabel(111, "申报日期类型"),
+                  SHOT_EMP_BTN: getLabel(111, "启用组织快照"),
+                  SALARY_ACCT_SYNC_TYPE: getLabel(111, "是否采用线程池")
                 };
                 this.unifiedSettings(key, confTitle[key]);
                 this.handleDebounce = null;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/baseSettings.js b/pc4mobx/hrmSalary/pages/salary/components/baseSettings.js
new file mode 100644
index 00000000..a534feb0
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/baseSettings.js
@@ -0,0 +1,48 @@
+/*
+ * Author: 黎永顺
+ * name: 基础设置
+ * Description:
+ * Date: 2022/11/29
+ */
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { decentralizationConditions, editConditions } from "../../taxAgent/editConditions";
+import { getSearchs } from "../../../util";
+
+@inject("taxAgentStore")
+@observer
+class BaseSettings extends Component {
+
+  componentDidMount() {
+
+  }
+
+  render() {
+    const { taxAgentStore: { salarytaxAgentForm }, decentralization, isChief } = this.props;
+    return (
+      <div className="form-dialog-layout">
+        {
+          decentralization === "0" ?
+            getSearchs(salarytaxAgentForm, convertConditon(decentralizationConditions, !isChief), 1, false) :
+            getSearchs(salarytaxAgentForm, convertConditon(editConditions, !isChief), 1, false)
+        }
+      </div>
+    );
+  }
+}
+
+export default BaseSettings;
+
+export const convertConditon = (condition, bool) => {
+  return _.map(condition, item => {
+    return {
+      ...item,
+      items: _.map(item.items, child => {
+        return {
+          ...child,
+          viewAttr: bool ? 1 : child.viewAttr
+        };
+      })
+    };
+  });
+};
diff --git a/pc4mobx/hrmSalary/pages/salary/components/comHint.js b/pc4mobx/hrmSalary/pages/salary/components/comHint.js
new file mode 100644
index 00000000..aea13257
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/comHint.js
@@ -0,0 +1,46 @@
+/*
+ * Author: 黎永顺
+ * name: 个税扣缴义务人小提示组件
+ * Description:
+ * Date: 2022/11/22
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import "./index.less";
+
+const { getLabel } = WeaLocaleProvider;
+
+class ComHint extends Component {
+  /*
+   * Author: 黎永顺
+   * Description: 提示语注释
+   * Params: isChief=总管理员
+   * Date: 2022/11/22
+   */
+  renderTips = () => {
+    const { isChief = true } = this.props;
+    if (isChief) {
+      return [
+        <p>{getLabel(111, "1、个税扣缴义务人与档案中的个税扣缴义务人匹配，修改个税扣缴义务人名称，薪资档案的个税扣缴义务人数据同步更新；")}</p>,
+        <p>{getLabel(111, "2、删除个税扣缴义务人需先确认档案里无人员使用该个税扣缴义务人，否则不予删除；")}</p>,
+        <p>{getLabel(111, "3、只有薪酬总管理员能够操作个税扣缴义务人的增减和开启/关闭分权；")}</p>,
+        <p>{getLabel(111, "4、开启分权，需维护个税扣缴义务人的管理员；当前总管理员默认有管理员的权限；")}</p>
+      ];
+    } else {
+      return [];
+    }
+  };
+
+  render() {
+    return (
+      <div className="comHint">
+        <div className="hintHeader">{getLabel(111, "小提示")}</div>
+        <div className="hintTips">
+          {this.renderTips()}
+        </div>
+      </div>
+    );
+  }
+}
+
+export default ComHint;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/constants.js b/pc4mobx/hrmSalary/pages/salary/components/constants.js
new file mode 100644
index 00000000..7d6ad232
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/constants.js
@@ -0,0 +1,440 @@
+export const fieldList = [
+  {
+    key: "name",
+    label: "名称",
+    lanId: 33439,
+    type: "TEXT",
+    viewAttr: 1
+  },
+  {
+    key: "taxCode",
+    label: "税号",
+    lanId: 111,
+    type: "TEXT",
+    viewAttr: 3
+  },
+  {
+    key: "city",
+    label: "报税所属区域",
+    lanId: 111,
+    type: "SELECT",
+    viewAttr: 3
+  },
+  {
+    key: "areaCode",
+    label: "行政区划代码",
+    lanId: 111,
+    type: "TEXT",
+    viewAttr: 3
+  },
+  {
+    key: "passwordType",
+    label: "密码校验类型",
+    lanId: 111,
+    type: "RADIO",
+    viewAttr: 3,
+    options: [
+      {
+        key: "TAX_NET_PASSWORD",
+        showname: "个税网报密码",
+        lanId: 111
+      },
+      {
+        key: "REAL_NAME_PASSWORD",
+        showname: "实名账号密码",
+        lanId: 111
+      }
+    ]
+  },
+  {
+    key: "account",
+    label: "实名账号",
+    lanId: 111,
+    type: "TEXT",
+    viewAttr: 3
+  },
+  {
+    key: "realNamePassword",
+    label: "实名账号密码",
+    lanId: 111,
+    type: "PASSWORD",
+    viewAttr: 3
+  },
+  {
+    key: "netPassword",
+    label: "个税网报密码",
+    lanId: 111,
+    type: "PASSWORD",
+    viewAttr: 3
+  },
+  {
+    key: "taxRegistrationNumber",
+    label: "登记序号",
+    type: "TEXT",
+    lanId: 111,
+    viewAttr: 1
+  },
+  {
+    key: "departmentCode",
+    label: "部门编码",
+    lanId: 111,
+    type: "TEXT",
+    viewAttr: 1
+  },
+  {
+    key: "checkStatus",
+    label: "报税信息验证状态",
+    lanId: 111,
+    type: "TEXT",
+    viewAttr: 1
+  }
+];
+
+export const taxFillCondition = [
+  {
+    items: [
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["taxAgentName"],
+        fieldcol: 14,
+        label: "个税扣缴义务人",
+        lanId: 537996,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["taxRegistrationNumber"],
+        fieldcol: 14,
+        label: "登记序号",
+        lanId: 545138,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["taxpayerStatus"],
+        fieldcol: 14,
+        label: "纳税人状态",
+        lanId: 545139,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["legalPersonName"],
+        fieldcol: 14,
+        label: "法人姓名",
+        lanId: 545140,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["mobile"],
+        fieldcol: 14,
+        label: "联系电话",
+        lanId: 545141,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["businessAddress"],
+        fieldcol: 14,
+        label: "生产经营地址",
+        lanId: 545142,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["industryName"],
+        fieldcol: 14,
+        label: "行业名称",
+        lanId: 545143,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["taxAuthorities"],
+        fieldcol: 14,
+        label: "主管税务机关",
+        lanId: 545144,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["taxBranch"],
+        fieldcol: 14,
+        label: "主管税务科所",
+        lanId: 545145,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["divideFiling"],
+        fieldcol: 14,
+        label: "是否分部门备案",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      }
+    ],
+    defaultshow: true
+  }
+];
+export const deptFillCondition = [
+  {
+    items: [
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["departmentName"],
+        fieldcol: 14,
+        label: "部门名称",
+        lanId: 536641,
+        labelcol: 6,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["departmentCode"],
+        fieldcol: 14,
+        label: "部门编码",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    defaultshow: true
+  }
+];
+export const taxFillColumns = [
+  {
+    dataIndex: "taxCode",
+    title: "税号",
+    titleId: "",
+    fixed: "left"
+  },
+  {
+    dataIndex: "taxAgentName",
+    title: "个税扣缴义务人",
+    titleId: "537996"
+  },
+  {
+    dataIndex: "taxRegistrationNumber",
+    title: "登记序号",
+    titleId: "545138"
+  },
+  {
+    dataIndex: "taxpayerStatus",
+    title: "纳税人状态",
+    titleId: "545139"
+  },
+  {
+    dataIndex: "taxAuthorities",
+    title: "主管税务机关",
+    titleId: "545144"
+  },
+  {
+    dataIndex: "taxBranch",
+    title: "主管税务科所",
+    titleId: "545145"
+  },
+  {
+    dataIndex: "businessAddress",
+    title: "生产经营地址",
+    titleId: "545142"
+  },
+  {
+    dataIndex: "industryName",
+    title: "行业名称",
+    titleId: "545143"
+  },
+  {
+    dataIndex: "legalPersonName",
+    title: "法人姓名",
+    titleId: "545140"
+  },
+  {
+    dataIndex: "mobile",
+    title: "联系电话",
+    titleId: "545141"
+  }
+];
+export const personScopeConditions = [
+  {
+    items: [
+      {
+        conditionType: "SELECT_LINKAGE",
+        domkey: ["targetType"],
+        fieldcol: 16,
+        label: "对象类型",
+        lanId: 111,
+        labelcol: 6,
+        options: [],
+        viewAttr: 3,
+        rules: "selectLinkageRequired",
+        selectLinkageDatas: {}
+      },
+      {
+        conditionType: "SELECT",
+        domkey: ["employeeStatus"],
+        fieldcol: 18,
+        label: "选择员工状态",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        detailtype: "2",
+        rules: "required",
+        viewAttr: 3
+      },
+    ],
+    defaultshow: true
+  }
+];
+export const scopeSelectLinkageDatas = {
+  EMPLOYEE:{
+    browserConditionParam: {
+      completeParams: {},
+      dataParams: {},
+      hasAddBtn: false,
+      hasAdvanceSerach: true,
+      isAutoComplete: 1,
+      isDetail: 0,
+      isMultCheckbox: false,
+      isSingle: false,
+      pageSize: 10,
+      linkUrl: "",
+      type: "17",
+      viewAttr: 3,
+      rules:'required',
+      title: ""
+    },
+    conditionType: "BROWSER",
+    domkey: ["target"],
+    fieldcol: 24,
+    label: "",
+    labelcol: 0,
+    value: "",
+    rules: "required",
+    viewAttr: 3
+  },
+  DEPT:{
+    browserConditionParam: {
+      completeParams: {},
+      dataParams: {},
+      hasAddBtn: false,
+      hasAdvanceSerach: true,
+      isAutoComplete: 1,
+      isDetail: 0,
+      isMultCheckbox: false,
+      isSingle: false,
+      pageSize: 10,
+      linkUrl: "",
+      type: "57",
+      viewAttr: 3,
+      rules:'required',
+      title: ""
+    },
+    conditionType: "BROWSER",
+    domkey: ["target"],
+    fieldcol: 24,
+    label: "",
+    labelcol: 0,
+    value: "",
+    rules: "required",
+    viewAttr: 3
+  },
+  SUBCOMPANY:{
+    browserConditionParam: {
+      completeParams: {},
+      dataParams: {},
+      hasAddBtn: false,
+      hasAdvanceSerach: true,
+      isAutoComplete: 1,
+      isDetail: 0,
+      isMultCheckbox: false,
+      isSingle: false,
+      pageSize: 10,
+      linkUrl: "",
+      type: "164",
+      viewAttr: 3,
+      rules:'required',
+      title: ""
+    },
+    conditionType: "BROWSER",
+    domkey: ["target"],
+    fieldcol: 24,
+    label: "",
+    labelcol: 0,
+    value: "",
+    rules: "required",
+    viewAttr: 3
+  },
+  POSITION:{
+    browserConditionParam: {
+      completeParams: {},
+      dataParams: {},
+      hasAddBtn: false,
+      hasAdvanceSerach: true,
+      isAutoComplete: 1,
+      isDetail: 0,
+      isMultCheckbox: false,
+      isSingle: false,
+      pageSize: 10,
+      linkUrl: "",
+      type: "278",
+      viewAttr: 3,
+      rules:'required',
+      title: ""
+    },
+    conditionType: "BROWSER",
+    domkey: ["target"],
+    fieldcol: 24,
+    label: "",
+    labelcol: 0,
+    value: "",
+    rules: "required",
+    viewAttr: 3
+  },
+  SQL: {
+    conditionType: "TEXTAREA",
+    domkey: ["target"],
+    fieldcol: 24,
+    label: "",
+    labelcol: 0,
+    value: "",
+    rules: "required",
+    viewAttr: 3
+  }
+};
diff --git a/pc4mobx/hrmSalary/pages/salary/components/index.less b/pc4mobx/hrmSalary/pages/salary/components/index.less
new file mode 100644
index 00000000..9eed4669
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/index.less
@@ -0,0 +1,165 @@
+.taxAgentSlideContent {
+  height: 100%;
+  background: #F6F6F6;
+
+  .ant-steps {
+    margin: 0 0 20px 0 !important;
+    padding-top: 20px;
+  }
+
+  .personal-scope {
+    padding: 8px 16px;
+    height: 100%;
+
+    .wea-tab, .wea-new-table {
+      background: #FFF;
+    }
+
+    .icon-refresh {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 20px;
+      height: 20px;
+      color: #fff;
+      background: #55a1f8;
+      cursor: pointer;
+      border-radius: 3px;
+    }
+  }
+
+  .baseSettingWrapper, .taxDeclarationInfoWrapper {
+    padding: 12px 12px 12px 20px;
+
+    .wea-search-group {
+      padding: 0;
+      border: 1px solid #e5e5e5;
+      border-bottom: none;
+
+      .wea-content {
+        padding: 0;
+
+        .wea-form-cell, .wea-form-item {
+          border-bottom: 1px solid #e5e5e5;
+          padding: 5px 10px 5px 30px;
+
+          .wea-form-item {
+            padding: 0 !important;
+            border-bottom: none !important;
+          }
+        }
+      }
+    }
+  }
+}
+
+.comHint {
+  width: 100%;
+  margin: 16px 0;
+  border: 1px solid #e5e5e5;
+  background: #FFF;
+
+  .hintHeader {
+    background: #f6f6f6;
+    height: 40px;
+    border-bottom: 1px solid #e5e5e5;
+    padding-left: 16px;
+    line-height: 40px;
+  }
+
+  .hintTips {
+    width: 100%;
+    color: #999;
+    line-height: 20px;
+    padding: 0 16px;
+    display: inline-block;
+
+    p {
+      margin: 1rem 0;
+    }
+  }
+}
+
+.slideOuterWrapper {
+  .wea-slide-modal-title {
+    height: initial;
+    line-height: initial;
+    text-align: left;
+  }
+
+  .rodal-close {
+    z-index: 99;
+    top: 10px !important;
+  }
+
+}
+
+@media (min-width: 1260px) {
+  .slideOuterWrapper {
+    .reqTopWrapper .wea-new-top-req-title > div:first-child > div {
+      max-width: 100% !important;
+    }
+  }
+}
+
+@media screen and (min-width: 1060px) and (max-width: 1260px) {
+  .slideOuterWrapper {
+    .reqTopWrapper .wea-new-top-req-title > div:first-child > div {
+      max-width: calc(100% - 96px) !important;
+    }
+  }
+}
+
+//添加关联人员弹框中的下拉框样式
+.personalScopeModalWrapper {
+  .wea-select, .ant-select-selection, .ant-select {
+    width: 100%;
+  }
+
+  .wea-select {
+    display: inline-block;
+    position: relative;
+  }
+
+  .ant-select-selection {
+    height: 30px;
+    border-radius: 0;
+  }
+}
+
+.taxfillingDialog {
+  .ant-modal-title {
+    .text-elli {
+      color: #111;
+      font-weight: 700;
+    }
+  }
+
+  .taxfillingDialogContent {
+    height: 100%;
+    padding: 16px;
+    background: #f6f6f6;
+    overflow-y: auto;
+
+    .wea-search-group {
+      padding: 0;
+      background: #FFF;
+      border: 1px solid #e5e5e5;
+      border-bottom: 0;
+
+      .ant-row, .wea-form-cell {
+        padding: 0;
+      }
+
+      .wea-form-item {
+        padding: 5px 16px;
+        border-bottom: 1px solid #e5e5e5;
+      }
+    }
+
+    .wea-new-table {
+      background: #FFF;
+    }
+
+  }
+}
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScope.js b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
new file mode 100644
index 00000000..b051642f
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScope.js
@@ -0,0 +1,234 @@
+/*
+ * Author: 黎永顺
+ * name: 人员范围
+ * Description:
+ * Date: 2022/11/30
+ */
+import React, { Component } from "react";
+import { message, Modal } from "antd";
+import { inject, observer } from "mobx-react";
+import { WeaButtonIcon, WeaInputSearch, WeaLocaleProvider, WeaTab } from "ecCom";
+import {
+  taxAgentRangeDelete,
+  taxAgentRangeExtDelete,
+  taxAgentRangeExtSave,
+  taxAgentRangeImportData
+} from "../../../apis/taxAgent";
+import { sysinfo } from "../../../apis/ruleconfig";
+import PersonalScopeTable from "./personalScopeTable";
+import PersonalScopeModal from "./personalScopeModal";
+import ImportDialog from "../../../components/importDialog";
+import ExternalPersonModal from "../../../components/externalPersonModal";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore")
+@observer
+class PersonalScope extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      searchValue: "", selectedKey: "listInclude", rowKeys: [], loading: false,
+      extEmpsWitch: "1", //非系统人员开关， 1： 开启， 0：关闭
+      personalAddModal: {
+        visible: false, externalVisible: false, title: getLabel(111, "关联人员"), includeType: "", record: {}
+      },
+      importParams: {
+        visible: false, title: getLabel(111, "数据导入"), nextloading: false, importResult: {}, imageId: "",
+        link: `/api/bs/hrmsalary/taxAgent/range/downloadTemplate?taxAgentId=${props.taxAgentId}`,
+        previewUrl: "/api/bs/hrmsalary/taxAgent/range/preview"
+      }
+    };
+    this.personalScopeTableRef = null;
+  }
+
+  componentDidMount() {
+    const { taxAgentStore: { hasIconInTax } } = this.props;
+    hasIconInTax();
+    this.getSysinfo();
+  }
+
+  /*
+   * Author: 黎永顺
+   * Description:非系统人员开关查询
+   * Params:
+   * Date: 2023/11/9
+   */
+  getSysinfo = () => {
+    sysinfo().then(({ status, data }) => {
+      if (status) this.setState({ extEmpsWitch: data.extEmpsWitch });
+    });
+  };
+  /*
+   * Author: 黎永顺
+   * Description: 删除人员范围
+   * Params:
+   * Date: 2022/11/30
+   */
+  taxAgentRangeDelete = () => {
+    Modal.confirm({
+      title: "信息确认",
+      content: "确认要删除吗?",
+      onOk: () => {
+        const { selectedKey } = this.state;
+        const API = selectedKey === "listExt" ? taxAgentRangeExtDelete : taxAgentRangeDelete;
+        API(this.state.rowKeys).then(({ status, errormsg }) => {
+          if (status) {
+            message.success("删除成功");
+            this.setState({ rowKeys: [] }, () => {
+              this.personalScopeTableRef.clearRowkeys();
+            });
+          } else {
+            message.error(errormsg || "删除失败");
+          }
+        });
+      }
+    });
+  };
+  /*
+   * Author: 黎永顺
+   * Description:新增人员范围
+   * Params:
+   * Date: 2022/11/30
+   */
+  handleAddPersonal = (record = {}) => {
+    const { personalAddModal, selectedKey } = this.state;
+    this.setState({
+      personalAddModal: {
+        ...personalAddModal, record,
+        visible: selectedKey !== "listExt",
+        externalVisible: selectedKey === "listExt",
+        includeType: selectedKey === "listInclude" ? 1 : 0
+      }
+    });
+  };
+  handleImportFile = (params) => {
+    const { taxAgentId } = this.props, { importParams } = this.state;
+    this.setState({ importParams: { ...importParams, nextloading: true } });
+    taxAgentRangeImportData({ ...params, taxAgentId }).then(({ status, errormsg, data }) => {
+      this.setState({ importParams: { ...importParams, nextloading: false } });
+      if (status) {
+        this.setState({ importParams: { ...importParams, importResult: data } });
+      } else {
+        message.warning(errormsg);
+      }
+    });
+  };
+  /*
+   * Author: 黎永顺
+   * Description: 保存非系统人员
+   * Params:
+   * Date: 2023/11/9
+   */
+  handleSaveExtPersons = (payload = {}) => {
+    const { taxAgentId } = this.props;
+    const { personalAddModal } = this.state;
+    this.setState({ loading: false });
+    taxAgentRangeExtSave({ taxAgentId, ...payload }).then(({ status, errormsg }) => {
+      this.setState({ loading: false });
+      if (status) {
+        message.success("新增成功");
+        this.setState({
+          personalAddModal: {
+            ...personalAddModal,
+            externalVisible: false
+          }
+        }, () => this.personalScopeTableRef.getPersonalScopeList());
+      } else {
+        message.error(errormsg);
+      }
+    }).catch(() => this.setState({ loading: false }));
+  };
+
+  render() {
+    const { selectedKey, searchValue, rowKeys, personalAddModal, importParams, extEmpsWitch, loading } = this.state;
+    const { taxAgentStore: { PageAndOptAuth }, taxAgentId } = this.props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
+    const topTab = [
+      {
+        title: "管理范围",
+        viewcondition: "listInclude"
+      },
+      {
+        title: "从范围中排除",
+        viewcondition: "listExclude"
+      },
+      {
+        title: "非系统人员范围",
+        viewcondition: "listExt"
+      }
+    ];
+    const btns = showOperateBtn ? [
+      <span className="icon-refresh" title={getLabel(111, "导入")} onClick={() => {
+        this.setState({ importParams: { ...importParams, visible: true } });
+      }}><i className="icon-coms-leading-in"/></span>,
+      <WeaButtonIcon
+        buttonType="del"
+        type="primary"
+        disabled={_.isEmpty(rowKeys)}
+        onClick={this.taxAgentRangeDelete}
+      />,
+      <WeaButtonIcon buttonType="add" type="primary" onClick={() => this.handleAddPersonal()}/>,
+      <WeaInputSearch
+        style={{ width: 220 }}
+        value={searchValue}
+        onChange={searchValue => this.setState({ searchValue })}
+        placeholder="请输入对象"
+        onSearch={() => this.personalScopeTableRef.getPersonalScopeList(selectedKey, 1)}
+      />
+    ] : [<WeaInputSearch
+      style={{ width: 220 }}
+      value={searchValue}
+      onChange={searchValue => this.setState({ searchValue })}
+      placeholder="请输入对象"
+      onSearch={() => this.personalScopeTableRef.getPersonalScopeList(selectedKey, 1)}
+    />];
+    (selectedKey === "listExclude" || selectedKey === "listExt") && btns.shift();
+    return (
+      <div className="personal-scope">
+        <WeaTab
+          datas={(extEmpsWitch === "0" || !extEmpsWitch) ? topTab.slice(0, -1) : topTab}
+          keyParam="viewcondition" //主键
+          selectedKey={selectedKey}
+          buttons={btns}
+          onChange={selectedKey => this.setState({ selectedKey })}
+        />
+        <PersonalScopeTable
+          ref={dom => this.personalScopeTableRef = dom}
+          taxAgentId={taxAgentId}
+          tabActive={selectedKey}
+          searchValue={searchValue}
+          onChangeSelectKey={rowKeys => this.setState({ rowKeys })}
+          onEditScope={this.handleAddPersonal}
+        />
+        {/*非系统人员添加*/}
+        <ExternalPersonModal
+          visible={personalAddModal.externalVisible} loading={loading}
+          onCancel={() => this.setState({ personalAddModal: { ...personalAddModal, externalVisible: false } })}
+          onExternalPersonSave={this.handleSaveExtPersons}
+        />
+        <PersonalScopeModal
+          {...personalAddModal}
+          taxAgentId={taxAgentId}
+          onSuccess={() => this.personalScopeTableRef.getPersonalScopeList()}
+          onCancel={(callback) =>
+            this.setState({
+              personalAddModal: { ...personalAddModal, visible: false, includeType: "", record: {} }
+            }, () => callback && callback())
+          }
+        />
+        <ImportDialog {...importParams}
+                      nextCallback={imageId => this.setState({ importParams: { ...importParams, imageId } })}
+                      nextUplaodCallback={imageId => this.handleImportFile({ imageId })}
+                      onResetImportResult={() => this.setState(({
+                        importParams: { ...importParams, importResult: {}, imageId: "" }
+                      }))}
+                      onCancel={(callback) => this.setState({
+                        importParams: { ...importParams, visible: false }
+                      }, () => callback && this.personalScopeTableRef.getPersonalScopeList(selectedKey, 1))}/>
+      </div>
+    );
+  }
+}
+
+export default PersonalScope;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
new file mode 100644
index 00000000..d33be5f4
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
@@ -0,0 +1,167 @@
+/*
+ * Author: 黎永顺
+ * name: 新增人员范围弹框
+ * Description:
+ * Date: 2022/11/30
+ */
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaSwitch } from "comsMobx";
+import { WeaCheckbox, WeaDialog, WeaFormItem, WeaHelpfulTip, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
+import { Button, message } from "antd";
+import { getTaxAgentRangeForm, taxAgentRangeEdit, taxAgentRangeSave } from "../../../apis/taxAgent";
+import { personScopeConditions, scopeSelectLinkageDatas } from "./constants";
+
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore")
+@observer
+class PersonalScopeModal extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: false, conditions: [], employeeStatus: []
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) this.getTaxAgentRangeForm(nextProps);
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.props.taxAgentStore.initPersonScopeForm();
+  }
+
+  getTaxAgentRangeForm = (props) => {
+    const { record } = props;
+    getTaxAgentRangeForm().then(({ status, data }) => {
+      if (status) {
+        const { employeeStatus, targetTypeList } = data;
+        this.setState({
+          employeeStatus, conditions: _.map(personScopeConditions, item => ({
+            ...item, items: _.map(item.items, o => {
+              if (getKey(o) === "employeeStatus") {
+                return {
+                  ...o, label: getLabel(o.lanId, o.label), value: !_.isEmpty(record) ? record.status : "",
+                  options: _.map(employeeStatus, it => ({ key: it.id, showname: it.name }))
+                };
+              }
+              return {
+                ...o, label: getLabel(o.lanId, o.label), viewAttr: !_.isEmpty(record) ? 1 : 3,
+                options: _.map(targetTypeList, it => ({
+                  key: it.id, showname: it.name,
+                  selected: !_.isEmpty(record) ? it.id === record.targetType : it.id === "EMPLOYEE"
+                })),
+                selectLinkageDatas: {
+                  ..._.reduce(_.keys(scopeSelectLinkageDatas), (pre, cur) => {
+                    if (cur !== "SQL") {
+                      return {
+                        ...pre,
+                        [cur]: {
+                          ...scopeSelectLinkageDatas[cur],
+                          browserConditionParam: {
+                            ...scopeSelectLinkageDatas[cur].browserConditionParam,
+                            replaceDatas: !_.isEmpty(record) ? [{
+                              id: String(record.targetId),
+                              name: record.targetName
+                            }] : []
+                          }
+                        }
+                      };
+                    }
+                    return {
+                      ...pre, [cur]: { ...scopeSelectLinkageDatas[cur], value: !_.isEmpty(record) ? record.target : "" }
+                    };
+                  }, {})
+                }
+              };
+            })
+          }))
+        }, () => this.props.taxAgentStore.personScopeForm.initFormFields(this.state.conditions));
+      }
+    });
+  };
+  taxAgentRangeSave = () => {
+    const { taxAgentStore: { personScopeForm }, record = {} } = this.props;
+    personScopeForm.validateForm().then(f => {
+      if (f.isValid) {
+        const { employeeStatus, targetType, target } = personScopeForm.getFormParams();
+        const { includeType, taxAgentId } = this.props;
+        const payload = {
+          includeType, taxAgentId, employeeStatus: employeeStatus.split(","), id: record.id,
+          targetParams: _.map(target.split(","), it => ({
+            targetType, targetId: targetType === "SQL" ? "0" : it,
+            target: targetType === "SQL" ? target : ""
+          }))
+        };
+        this.setState({ loading: true });
+        const API = !_.isEmpty(record) ? taxAgentRangeEdit : taxAgentRangeSave;
+        API(payload).then(({ status, errormsg }) => {
+          this.setState({ loading: false });
+          if (status) {
+            message.success(getLabel(111, "操作成功！"));
+            this.props.onCancel(this.props.onSuccess);
+          } else {
+            message.error(errormsg);
+          }
+        }).catch(() => this.setState({ loading: true }));
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+  renderForm = () => {
+    const { taxAgentStore: { personScopeForm } } = this.props;
+    const { conditions, employeeStatus } = this.state, { isFormInit } = personScopeForm,
+      formParams = personScopeForm.getFormParams();
+    const checked = formParams.employeeStatus && _.every(_.map(employeeStatus, o => o.id), k => formParams.employeeStatus.indexOf(k) !== -1);
+    let group = [];
+    isFormInit && conditions.map(c => {
+      let items = [];
+      c.items.map(fields => {
+        items.push({
+          com: (
+            <WeaFormItem label={`${fields.label}`} labelCol={{ span: `${fields.labelcol}` }}
+                         wrapperCol={{ span: `${fields.fieldcol}` }} error={personScopeForm.getError(fields)}
+                         tipPosition="bottom">
+              {
+                getKey(fields) === "employeeStatus" &&
+                <WeaCheckbox value={checked ? "1" : "0"} content={getLabel(111, "全选")}
+                             onChange={this.handleChangeAll}/>
+              }
+              <WeaSwitch fieldConfig={fields} form={personScopeForm} formParams={formParams}/>
+              {
+                personScopeForm.getFormParams().targetType === "SQL" && getKey(fields) === "targetType" &&
+                <WeaHelpfulTip placement="topLeft" style={{ position: "absolute", top: "50%", right: "-35px" }}
+                               width={200} title={
+                  <span
+                    dangerouslySetInnerHTML={{ __html: getLabel(111, "注意事项：<br>1、sql需返回人员id<br>2、sql结尾不需要 ; go /等符号<br>使用例子：定义获取岗位是开发的人员<br>select id from hrmresource where JOBTITLE = 17") }}/>
+                }/>
+              }
+            </WeaFormItem>),
+          hide: fields.hide
+        });
+      });
+      group.push(<WeaSearchGroup col={1} needTigger showGroup={c.defaultshow} items={items}/>);
+    });
+    return group;
+  };
+  handleChangeAll = (val) => {
+    const { taxAgentStore: { personScopeForm } } = this.props, { employeeStatus } = this.state;
+    val === "1" ? personScopeForm.updateFields({ employeeStatus: { value: _.map(employeeStatus, o => o.id).join(",") } }) :
+      personScopeForm.updateFields({ employeeStatus: { value: "" } });
+  };
+
+  render() {
+    const { title, taxAgentStore: { personScopeForm } } = this.props, { loading } = this.state;
+    const buttons = [
+      <Button type="primary" onClick={this.taxAgentRangeSave} loading={loading}>{getLabel(111, "确定")}</Button>,
+      <Button type="ghost" onClick={() => personScopeForm.resetForm()}>{getLabel(111, "重置")}</Button>
+    ];
+    return (
+      <WeaDialog {...this.props} initLoadCss title={title} style={{ width: 600, height: 159 }} buttons={buttons}>
+        <div className="form-dialog-layout">{this.renderForm()}</div>
+      </WeaDialog>
+    );
+  }
+}
+
+export default PersonalScopeModal;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/personalScopeTable.js b/pc4mobx/hrmSalary/pages/salary/components/personalScopeTable.js
new file mode 100644
index 00000000..e09e2ea9
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScopeTable.js
@@ -0,0 +1,139 @@
+/*
+ * Author: 黎永顺
+ * name: 人员范围列表数据
+ * Description:
+ * Date: 2022/11/30
+ */
+import React, { Component } from "react";
+import { WeaTable } from "ecCom";
+import { getTaxAgentRangeListExclude, getTaxAgentRangeListInclude, taxAgentRangelistExt } from "../../../apis/taxAgent";
+import "./index.less";
+import { calcPageNo } from "../../../util";
+
+const APIFox = {
+  listInclude: getTaxAgentRangeListInclude,
+  listExclude: getTaxAgentRangeListExclude,
+  listExt: taxAgentRangelistExt
+};
+
+class PersonalScopeTable extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: {
+        query: false
+      },
+      dataSource: [],
+      columns: [],
+      selectedRowKeys: [],
+      pageInfo: {
+        current: 1,
+        pageSize: 10,
+        total: 0
+      }
+    };
+  }
+
+  componentDidMount() {
+    this.getPersonalScopeList();
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.tabActive !== this.props.tabActive) {
+      this.setState({ selectedRowKeys: [] }, () => {
+        this.getPersonalScopeList(nextProps.tabActive);
+        nextProps.onChangeSelectKey([]);
+      });
+    }
+  }
+
+  getPersonalScopeList = (tabActive = this.props.tabActive, current) => {
+    const { searchValue, taxAgentId } = this.props;
+    const { pageInfo, loading } = this.state;
+    const payload = {
+      taxAgentId, targetName: searchValue, ...pageInfo, current: current || pageInfo.current
+    };
+    this.setState({ loading: { ...loading, query: true } });
+    APIFox[tabActive](payload).then(({ status, data }) => {
+      this.setState({ loading: { ...loading, query: false } });
+      if (status) {
+        const { pageNum: current, pageSize, total, columns, list: dataSource } = data;
+        this.setState({
+          pageInfo: { ...pageInfo, current, pageSize, total },
+          dataSource,
+          columns: _.map(columns, item => {
+            return {
+              ...item,
+              render: (text, record) => {
+                if (item.dataIndex === "targetName") {
+                  return <a href="javascript:void(0);" onClick={() => this.props.onEditScope(record)}>{text}</a>;
+                }
+                return <span className="tdEllipsis" title={text}>{text}</span>;
+              }
+            };
+          })
+        });
+      }
+    }).catch(() => {
+      this.setState({ loading: { ...loading, query: false } });
+    });
+  };
+
+  /*
+   * Author: 黎永顺
+   * Description: 清空选中项
+   * Params:
+   * Date: 2022/11/30
+   */
+  clearRowkeys = () => {
+    const { pageInfo, selectedRowKeys } = this.state;
+    this.setState({
+      selectedRowKeys: [],
+      pageInfo: {
+        ...pageInfo,
+        current: calcPageNo(pageInfo.total, pageInfo.current, 10, selectedRowKeys.length)
+      }
+    }, () => {
+      this.getPersonalScopeList();
+    });
+  };
+
+  render() {
+    const { dataSource, columns, pageInfo, loading, selectedRowKeys } = this.state;
+    const { onChangeSelectKey } = this.props;
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `共 ${total} 条`,
+      showQuickJumper: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onChange: current => {
+        this.setState({
+          pageInfo: { ...pageInfo, current }
+        }, () => {
+          this.getPersonalScopeList();
+        });
+      }
+    };
+    const rowSelection = {
+      selectedRowKeys,
+      onChange: (selectedRowKeys) => {
+        this.setState({ selectedRowKeys }, () => {
+          onChangeSelectKey(this.state.selectedRowKeys);
+        });
+      }
+    };
+    return (
+      <WeaTable
+        rowKey="id"
+        rowSelection={rowSelection}
+        dataSource={dataSource}
+        pagination={pagination}
+        loading={loading.query}
+        columns={columns}
+        scroll={{ y: `calc(100vh - 230px)` }}
+      />
+    );
+  }
+}
+
+export default PersonalScopeTable;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
new file mode 100644
index 00000000..28085d47
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
@@ -0,0 +1,303 @@
+/*
+ * Author: 黎永顺
+ * name: 新增/编辑个税扣缴义务人
+ * Description:
+ * Date: 2022/11/29
+ */
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { Button, message, Modal } from "antd";
+import { WeaLocaleProvider, WeaSlideModal, WeaSteps } from "ecCom";
+import { decentralizationConditions, editConditions } from "../../taxAgent/editConditions";
+import BaseSettings, { convertConditon } from "./baseSettings";
+import PersonalScope from "./personalScope";
+import TaxDeclarationInfo from "./taxDeclarationInfo";
+import TaxFilingInfoDialofg from "./taxFillingInfoDialog";
+import WeaTopTitle from "../../../components/custom-title/weaTopTitle";
+import WeaReqTitle from "../../../components/custom-title/weaReqTitle";
+import * as API from "../../../apis/taxAgent";
+import { registrationCheck } from "../../../apis/taxAgent";
+import "./index.less";
+
+const { getLabel } = WeaLocaleProvider;
+const Step = WeaSteps.Step;
+
+@inject("taxAgentStore")
+@observer
+class TaxAgentSlide extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      current: 0, loading: false, verifyLoading: false, taxAgentId: "",
+      taxFilingInfoDialofg: {
+        visible: false, title: "", checkPayload: {},
+        isEdit: false, jumpAll: false, loading: false,
+        taxAgentTaxReturnCheckFormDTO: null
+      }
+    };
+    this.taxInfoRef = null;
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible || nextProps.decentralization !== this.props.decentralization) {
+      const { taxAgentStore: { salarytaxAgentForm }, decentralization, isChief } = nextProps;
+      decentralization === "0" ?
+        salarytaxAgentForm.setCondition(convertConditon(decentralizationConditions, !isChief), true) :
+        salarytaxAgentForm.setCondition(convertConditon(editConditions, !isChief), true);
+      this.setState({ current: nextProps.current, taxAgentId: nextProps.taxAgentId }, () => {
+        if (this.state.taxAgentId) this.getTaxAgentForm();
+      });
+    }
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.props.taxAgentStore.setSalarytaxAgentForm();
+  }
+
+  getTaxAgentForm = () => {
+    const { taxAgentId } = this.state;
+    const { taxAgentStore: { salarytaxAgentForm } } = this.props;
+    API.getTaxAgentForm({ id: taxAgentId }).then(({ status, data }) => {
+      if (status) {
+        const { name, description, adminUserIds, sortedIndex } = data;
+        salarytaxAgentForm.updateFields({
+          name: { value: name },
+          adminUserIds: {
+            value: _.map(adminUserIds, it => it.id.toString()).join(","),
+            valueSpan: _.map(adminUserIds, it => it.content).join(",")
+          },
+          sortedIndex: { value: sortedIndex },
+          description: { value: description }
+        });
+      }
+    });
+  };
+  /*
+   * Author: 黎永顺
+   * Description: 保存个税扣缴义务人
+   * Params:
+   * Date: 2022/12/1
+   */
+  saveTaxAgent = (payload) => {
+    const { onOk, salaryOn } = this.props;
+    const { current } = this.state;
+    this.setState({ loading: true });
+    API.saveTaxAgent(payload).then(({ status, data, errormsg }) => {
+      this.setState({ loading: false });
+      if (status) {
+        message.success(getLabel(22619, "保存成功"));
+        this.setState({
+          current: !salaryOn ? current + 2 : current + 1,
+          taxAgentId: data
+        }, () => onOk());
+      } else {
+        message.error(errormsg || getLabel(22620, "保存失败"));
+      }
+    }).catch(() => this.setState({ loading: false }));
+  };
+  /*
+   * Author: 黎永顺
+   * Description: 编辑个税扣缴义务人
+   * Params:
+   * Date: 2022/12/1
+   */
+  updateTaxAgent = (payload) => {
+    const { onCancel } = this.props;
+    this.setState({ loading: true });
+    API.updateTaxAgent(payload).then(({ status, data, errormsg }) => {
+      this.setState({ loading: false });
+      if (status) {
+        message.success(getLabel(31439, "更新成功"));
+        onCancel(true);
+      } else {
+        message.error(errormsg || getLabel(31825, "更新失败"));
+      }
+    }).catch(() => this.setState({ loading: false }));
+  };
+  handleSave = () => {
+    const { taxAgentStore: { salarytaxAgentForm } } = this.props;
+    const { taxAgentId } = this.state;
+    salarytaxAgentForm.validateForm().then((f) => {
+      if (f.isValid) {
+        const formData = salarytaxAgentForm.getFormParams();
+        const payload = {
+          ...formData,
+          adminUserIds: formData.adminUserIds ? formData.adminUserIds.split(",") : []
+        };
+        taxAgentId ? this.updateTaxAgent({ ...payload, id: taxAgentId }) : this.saveTaxAgent(payload);
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+  handleSaveAndVerify = (jumpAll = false) => {
+    const { isEdit } = this.props, { taxAgentId, taxFilingInfoDialofg } = this.state;
+    const { fieldForm, fieldItem } = this.taxInfoRef.state;
+    const { city: cityStr, cityVal = [], netPassword, realNamePassword, ...extra } = fieldForm;
+    const boolean = _.every(_.filter(fieldItem, item => item.viewAttr === 3), it => fieldForm[it.key]);
+    if (!boolean) {
+      Modal.warning({
+        title: getLabel(131329, "信息确认"),
+        content: getLabel(518702, "必要信息不完整，红色*为必填项！")
+      });
+      return;
+    }
+    const [nation, province, city] = cityStr ? cityStr.split("-") : [];
+    const proBool = _.every(cityStr ? cityStr.split("-") : [], it => it !== "undefined");
+    if (!proBool) {
+      Modal.warning({
+        title: getLabel(131329, "信息确认"),
+        content: getLabel(111, "请展开选择报税所属区域！")
+      });
+      return;
+    }
+    // requestType: 1:保存并验证 2：保存
+    const payload = {
+      ...extra, nation, province, city,
+      taxAgentId, requestType: 1, password: netPassword || realNamePassword,
+      cityname: !_.isEmpty(cityVal) ? _.head(cityVal).name : ""
+    };
+    this.setState({ verifyLoading: true });
+    API.saveAndCheck(_.omitBy(payload, val => _.isNil(val))).then(({ status, data, errormsg }) => {
+      this.setState({ verifyLoading: false });
+      if (status) {
+        message.success(getLabel(22619, "保存成功！"));
+        this.setState({
+          taxFilingInfoDialofg: {
+            ...taxFilingInfoDialofg, visible: true,
+            isEdit, jumpAll, title: fieldForm.name, checkPayload: payload,
+            taxAgentTaxReturnCheckFormDTO: data.TaxAgentTaxReturnCheckFormDTO || data.table.list
+          }
+        });
+      } else {
+        message.error(errormsg || getLabel(22620, "保存失败！"));
+      }
+    }).catch(() => this.setState({ verifyLoading: false }));
+  };
+  handleSubmit = (selectKey) => {
+    const { taxFilingInfoDialofg, taxAgentId } = this.state;
+    const { fieldForm } = this.taxInfoRef.state;
+    const { city: cityStr, cityVal = [], netPassword, realNamePassword, ...extra } = fieldForm;
+    const [nation, province, city] = cityStr ? cityStr.split("-") : [];
+    const { taxAgentTaxReturnCheckFormDTO } = taxFilingInfoDialofg;
+    this.setState({
+      taxFilingInfoDialofg: { ...taxFilingInfoDialofg, loading: true }
+    });
+    registrationCheck({
+      ...extra, nation, province, city,
+      taxAgentId, password: netPassword || realNamePassword,
+      cityname: !_.isEmpty(cityVal) ? _.head(cityVal).name : "",
+      ..._.find(taxAgentTaxReturnCheckFormDTO, it => it.index === selectKey)
+    }).then(({ status, data, errormsg }) => {
+      this.setState({
+        taxFilingInfoDialofg: { ...taxFilingInfoDialofg, loading: false }
+      });
+      if (status) {
+        message.success(getLabel(22619, "保存成功！"));
+        this.setState({
+          taxFilingInfoDialofg: {
+            ...taxFilingInfoDialofg,
+            taxAgentTaxReturnCheckFormDTO: data.TaxAgentTaxReturnCheckFormDTO
+          }
+        });
+      } else {
+        message.error(errormsg || getLabel(22620, "保存失败！"));
+      }
+    }).catch(() => {
+      this.setState({
+        taxFilingInfoDialofg: { ...taxFilingInfoDialofg, loading: false }
+      });
+    });
+  };
+
+  render() {
+    const {
+      isEdit, title, visible, onCancel, salaryOn, decentralization, isChief, taxAgentStore: { PageAndOptAuth }
+    } = this.props;
+    const { current, taxAgentId, taxFilingInfoDialofg, loading, verifyLoading } = this.state;
+    let tabs = [
+      {
+        key: 0, title: getLabel(82751, "基础设置"),
+        createBtns: [
+          <Button type="primary" onClick={this.handleSave}
+                  loading={loading}>{getLabel(33199, "保存并进入下一步")}</Button>
+        ],
+        editBtns: [
+          <Button type="primary" onClick={this.handleSave}
+                  loading={loading}>{getLabel(537558, "保存")}</Button>
+        ],
+        children: <BaseSettings decentralization={decentralization} isChief={isChief}/>
+      },
+      {
+        key: 1, title: getLabel(544342, "报税信息"),
+        createBtns: [
+          <Button type="ghost" loading={verifyLoading}
+                  onClick={() => this.handleSaveAndVerify(true)}>{getLabel(543470, "完成，跳过所有步骤")}</Button>,
+          <Button type="ghost"
+                  onClick={() => this.setState({ current: current + 1 })}>{getLabel(1402, "下一步")}</Button>
+        ],
+        editBtns: [
+          <Button type="primary" loading={verifyLoading}
+                  onClick={() => this.handleSaveAndVerify(false)}>{getLabel(544343, "保存并验证")}</Button>
+        ],
+        children: <TaxDeclarationInfo ref={dom => this.taxInfoRef = dom} taxAgentId={taxAgentId} isChief={isChief}/>
+      },
+      {
+        key: 2, title: getLabel(124810, "人员范围"),
+        createBtns: [
+          <Button type="ghost"
+                  onClick={() => this.setState({ current: !salaryOn ? current - 2 : current - 1 })}>{getLabel(1876, "上一步")}</Button>
+        ],
+        editBtns: [],
+        children: <PersonalScope taxAgentId={taxAgentId}/>
+      }
+    ];
+    tabs = !salaryOn ? _.filter(tabs, it => it.key !== 1) : tabs;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
+    return (
+      <WeaSlideModal
+        className="taxAgentSlide" visible={visible} top={0} width={65} height={100} measure="%" direction="right"
+        title={
+          !this.props.taxAgentId ?
+            <WeaTopTitle title={title} buttons={_.find(tabs, o => current === o.key).createBtns}/> :
+            <WeaReqTitle buttons={showOperateBtn ? _.find(tabs, o => current === o.key).editBtns : []}
+                         tabDatas={tabs} selectedKey={String(current)} title={title}
+                         onChange={cur => this.setState({ current: parseInt(cur) })}/>
+        }
+        content={
+          <div className="taxAgentSlideContent">
+            {
+              !isEdit &&
+              <WeaSteps current={current} style={{ margin: "20px 0" }}>
+                {
+                  _.map(tabs, item => {
+                    const { key, title } = item;
+                    return <Step description={title} key={key}/>;
+                  })
+                }
+              </WeaSteps>
+            }
+            {_.find(tabs, o => current === o.key).children}
+            <TaxFilingInfoDialofg
+              {...taxFilingInfoDialofg}
+              onSubmit={this.handleSubmit}
+              onCancel={(isRefresh) => {
+                const { jumpAll } = taxFilingInfoDialofg;
+                this.setState({
+                  current: jumpAll ? this.state.current + 1 : this.state.current,
+                  taxFilingInfoDialofg: {
+                    ...taxFilingInfoDialofg, visible: false,
+                    taxAgentTaxReturnCheckFormDTO: null
+                  }
+                }, () => {
+                  isRefresh && this.taxInfoRef.taxReturnGetForm();
+                  jumpAll && this.props.onCancel(true);
+                });
+              }}
+            />
+          </div>
+        }
+        onClose={() => onCancel()}
+      />
+    );
+  }
+}
+
+export default TaxAgentSlide;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js b/pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js
new file mode 100644
index 00000000..5658e479
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js
@@ -0,0 +1,137 @@
+/*
+ * Author: 黎永顺
+ * name: 个税扣缴义务人列表
+ * Description:
+ * Date: 2022/11/29
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaTable } from "ecCom";
+import { Dropdown, Menu } from "antd";
+import * as API from "../../../apis/taxAgent";
+import "./index.less";
+
+const { getLabel } = WeaLocaleProvider;
+
+class TaxAgentTable extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: {
+        query: false
+      },
+      dataSource: [],
+      columns: [],
+      pageInfo: {
+        current: 1,
+        pageSize: 10,
+        total: 0
+      }
+    };
+  }
+
+  componentDidMount() {
+    this.getTaxAgentList();
+  }
+
+  getTaxAgentList = () => {
+    const { pageInfo, loading } = this.state;
+    const { searchValue, onOperate } = this.props;
+    const payload = {
+      name: searchValue,
+      ...pageInfo
+    };
+    this.setState({ loading: { ...loading, query: true } });
+    API.getTaxAgentList(payload).then(({ status, data }) => {
+      this.setState({ loading: { ...loading, query: false } });
+      if (status) {
+        const { pageNum: current, pageSize, total, columns, list: dataSource } = data;
+        this.setState({
+          pageInfo: { ...pageInfo, current, pageSize, total },
+          dataSource,
+          columns: _.map(columns, item => {
+            if (item.dataIndex === "employeeRange") {
+              return {
+                ...item,
+                render: (text, record) => {
+                  return <a href="javaScript:void(0);" onClick={() => onOperate("edit", record.id, 2)}>{text}</a>;
+                }
+              };
+            }
+            return {
+              ...item,
+              render: (text) => {
+                return <span className="tdEllipsis" title={text}>{text}</span>;
+              }
+            };
+          })
+        });
+      }
+    }).catch(() => {
+      this.setState({ loading: { ...loading, query: false } });
+    });
+  };
+
+  render() {
+    const { dataSource, columns, pageInfo, loading } = this.state;
+    const { onOperate, isChief } = this.props;
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+      showSizeChanger: true,
+      showQuickJumper: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({
+          pageInfo: { ...pageInfo, current, pageSize }
+        }, () => {
+          this.getTaxAgentList();
+        });
+      },
+      onChange: current => {
+        this.setState({
+          pageInfo: { ...pageInfo, current }
+        }, () => {
+          this.getTaxAgentList();
+        });
+      }
+    };
+    return (
+      <WeaTable
+        dataSource={dataSource}
+        pagination={pagination}
+        loading={loading.query}
+        columns={[
+          ...columns,
+          {
+            title: getLabel(30585, "操作"),
+            key: "operation",
+            width: 120,
+            render: (text, record) =>
+              <div className="operationWapper">
+                <a href="javaScript:void(0);" style={{ marginRight: 10 }}
+                   onClick={() => onOperate("edit", record.id)}>{getLabel(501169, "编辑")}</a>
+                {
+                  isChief &&
+                  <a href="javaScript:void(0);" style={{ marginRight: 10 }}
+                     onClick={() => onOperate("delete", record.id)}>{getLabel(535052, "删除")}</a>
+                }
+                <Dropdown
+                  overlay={
+                    <Menu>
+                      <Menu.Item>
+                        <a href="javascript:void(0)"
+                           onClick={() => onOperate("log", record.id)}>{getLabel(545781, "操作日志")}</a>
+                      </Menu.Item>
+                    </Menu>
+                  }>
+                  <a href="javascript:void(0)"><i className="icon-coms-more"/></a>
+                </Dropdown>
+              </div>
+          }
+        ]}
+      />
+    );
+  }
+}
+
+export default TaxAgentTable;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
new file mode 100644
index 00000000..11f5e4d3
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
@@ -0,0 +1,146 @@
+/*
+ * Author: 黎永顺
+ * name: 报税信息
+ * Description:
+ * Date: 2022/12/1
+ */
+import React, { Component } from "react";
+import { WeaBrowser, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaSelect } from "ecCom";
+import { fieldList } from "./constants";
+import { taxReturnGetForm } from "../../../apis/taxAgent";
+
+const { getLabel } = WeaLocaleProvider;
+
+class TaxDeclarationInfo extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      fieldForm: {
+        name: "",
+        taxCode: "",
+        city: "",
+        cityVal: [],
+        areaCode: null,
+        passwordType: "TAX_NET_PASSWORD",
+        account: "",
+        realNamePassword: "",
+        netPassword: null,
+        taxRegistrationNumber: "",
+        departmentCode: "",
+        checkStatus: ""
+      },
+      fieldItem: []
+    };
+  }
+
+  componentDidMount() {
+    this.setState({
+      fieldItem: _.filter(_.map(fieldList, item => ({
+        ...item,
+        label: getLabel(item.lanId, item.label),
+        viewAttr: this.props.isChief ? item.viewAttr : 1
+      })), it => it.key !== "account" && it.key !== "realNamePassword")
+    }, () => {
+      this.taxReturnGetForm();
+    });
+  }
+
+  taxReturnGetForm = () => {
+    const { taxAgentId } = this.props;
+    taxReturnGetForm({ taxAgentId }).then(({ status, data }) => {
+      if (status) {
+        const { fieldForm } = this.state;
+        this.setState({
+          fieldForm: {
+            ...fieldForm,
+            ..._.reduce(_.keys(fieldForm), (pre, cur) => {
+              if (cur !== "city") {
+                if (cur === "checkStatus") {
+                  const checkStatusMap = {
+                    "NOT_COMMIT": getLabel(111, "未验证"),
+                    "SUCCESS": getLabel(111, "成功"),
+                    "FAIL": getLabel(111, "失败")
+                  };
+                  return { ...pre, [cur]: checkStatusMap[data[cur]] };
+                }
+                return { ...pre, [cur]: data[cur] };
+              }
+              return {
+                ...pre,
+                [cur]: `${data["nation"]}-${data["province"]}-${data[cur]}`
+              };
+            }, {}),
+            cityVal: (data["city"] && data["cityName"]) ? [{ id: data["city"], name: data["cityName"] }] : []
+          }
+        });
+      }
+    });
+  };
+  handleChangeValue = (key, value, cityVal = []) => {
+    const { fieldForm } = this.state;
+    this.setState({
+      fieldForm: !_.isEmpty(cityVal) ? {
+        ...fieldForm, [key]: value, cityVal
+      } : { ...fieldForm, [key]: value }
+    }, () => {
+      if (key === "passwordType" && this.state.fieldForm.passwordType === "REAL_NAME_PASSWORD") {
+        this.setState({
+          fieldItem: _.filter(fieldList, it => it.key !== "netPassword"),
+          fieldForm: { ...this.state.fieldForm, account: null, realNamePassword: null, netPassword: null }
+        });
+      } else if (key === "passwordType" && this.state.fieldForm.passwordType === "TAX_NET_PASSWORD") {
+        this.setState({
+          fieldItem: _.filter(fieldList, it => it.key !== "account" && it.key !== "realNamePassword"),
+          fieldForm: { ...this.state.fieldForm, netPassword: null, account: null, realNamePassword: null }
+        });
+      }
+    });
+  };
+
+  render() {
+    const { fieldItem, fieldForm } = this.state;
+    return (
+      <div className="taxDeclarationInfoWrapper">
+        <WeaSearchGroup col={1} needTigger showGroup>
+          {
+            _.map(fieldItem, item => {
+              const { key, label, type, viewAttr, options = [] } = item;
+              return <WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 14 }} key={key}>
+                {
+                  (type === "TEXT" || type === "PASSWORD") &&
+                  <WeaInput autocomplete="off" value={fieldForm[key]} type={_.lowerCase(type)} viewAttr={viewAttr}
+                            onChange={(v) => this.handleChangeValue(key, v)}/>
+                }
+                {
+                  type === "SELECT" &&
+                  <WeaBrowser replaceDatas={fieldForm["cityVal"]} type={58} viewAttr={viewAttr}
+                              helpfulTip={getLabel(111, "请展开选择报税所属区域")}
+                              onChange={(__, ___, datas) => {
+                                if (!_.isEmpty(datas)) {
+                                  this.handleChangeValue(key, `1-${datas[0].pid}-${datas[0].id}`, _.map(datas, it => ({
+                                    id: it.id,
+                                    name: it.name
+                                  })));
+                                } else {
+                                  this.handleChangeValue(key, "", []);
+                                }
+                              }}
+                  />
+                }
+                {
+                  type === "RADIO" &&
+                  <WeaSelect detailtype={3} value={fieldForm[key]}
+                             options={_.map(options, it => ({ ...it, showname: getLabel(it.lanId, it.showname) }))}
+                             viewAttr={viewAttr}
+                             onChange={(v) => this.handleChangeValue(key, v)}/>
+                }
+              </WeaFormItem>;
+            })
+          }
+        </WeaSearchGroup>
+      </div>
+    );
+  }
+}
+
+export default TaxDeclarationInfo;
diff --git a/pc4mobx/hrmSalary/pages/salary/components/taxFillingInfoDialog.js b/pc4mobx/hrmSalary/pages/salary/components/taxFillingInfoDialog.js
new file mode 100644
index 00000000..3a02b4b7
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/components/taxFillingInfoDialog.js
@@ -0,0 +1,132 @@
+/*
+ * Author: 黎永顺
+ * name: 个税申报-异常、失败详情
+ * Description:
+ * Date: 2023/8/18
+ */
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaDialog, WeaLocaleProvider, WeaTable } from "ecCom";
+import { Button, message } from "antd";
+import { deptFillCondition, taxFillColumns, taxFillCondition } from "./constants";
+import { getSearchs } from "../../../util";
+import { saveDepartmentCodeAndCheck } from "../../../apis/taxAgent";
+
+const { getLabel } = WeaLocaleProvider;
+
+@inject("taxAgentStore")
+@observer
+class TaxFilingInfoDialofg extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      selectedRowKeys: [], checkLoading: false
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (!_.isEmpty(nextProps.taxAgentTaxReturnCheckFormDTO) &&
+      Object.prototype.toString.call(nextProps.taxAgentTaxReturnCheckFormDTO) === "[object Object]"
+    ) {
+      const { taxAgentTaxReturnCheckFormDTO, taxAgentStore: { taxfillInfoForm, deptfillInfoForm } } = nextProps;
+      taxfillInfoForm.initFormFields(taxFillCondition);
+      deptfillInfoForm.initFormFields(deptFillCondition);
+      const fields = _.map(taxFillCondition[0].items, it => {
+        return it.domkey[0];
+      });
+      fields.map(item => {
+        taxfillInfoForm.updateFields({
+          [item]: item !== "divideFiling" ? (taxAgentTaxReturnCheckFormDTO[item] || "") : (taxAgentTaxReturnCheckFormDTO[item] === "ON" ? getLabel(538048, "是") : getLabel(30587, "否"))
+        });
+      });
+    }
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) {
+      const { taxAgentStore: { setTaxfillInfoForm, initDeptfillInfoForm } } = nextProps;
+      setTaxfillInfoForm();
+      initDeptfillInfoForm();
+    }
+  }
+
+  handleSaveOrKnow = () => {
+    const { taxAgentStore: { taxfillInfoForm, deptfillInfoForm }, checkPayload } = this.props;
+    if (taxfillInfoForm.getFormParams().divideFiling === getLabel(538048, "是")) {
+      deptfillInfoForm.validateForm().then(f => {
+        if (f.isValid) {
+          this.setState({ checkLoading: true });
+          saveDepartmentCodeAndCheck(_.omitBy({ ...checkPayload, ...deptfillInfoForm.getFormParams() }, val => _.isNil(val)))
+            .then(({ status, errormsg }) => {
+              this.setState({ checkLoading: false });
+              if (status) {
+                message.success(getLabel(30700, "操作成功！"));
+                this.props.onCancel(true);
+              } else {
+                message.error(errormsg);
+              }
+            }).catch(() => this.setState({ checkLoading: false }));
+        } else {
+          f.showErrors();
+        }
+      });
+    } else {
+      this.props.onCancel();
+    }
+  };
+
+  render() {
+    const { selectedRowKeys, checkLoading } = this.state;
+    const { taxAgentStore: { taxfillInfoForm, deptfillInfoForm }, taxAgentTaxReturnCheckFormDTO, loading } = this.props;
+    const rowSelection = {
+      type: "radio",
+      selectedRowKeys,
+      onChange: selectedRowKeys => this.setState({ selectedRowKeys })
+    };
+    return (
+      <WeaDialog
+        {...this.props}
+        hasScroll className="taxfillingDialog" initLoadCss
+        buttons={
+          Object.prototype.toString.call(taxAgentTaxReturnCheckFormDTO) === "[object Object]" ?
+            [
+              <Button type="primary" onClick={this.handleSaveOrKnow} loading={checkLoading}>
+                {taxfillInfoForm.getFormParams().divideFiling === getLabel(538048, "是") ? getLabel(537558, "保存") : getLabel(545147, "知道了")}
+              </Button>
+            ] : [
+              <Button loading={loading} type="primary"
+                      onClick={() => !_.isEmpty(selectedRowKeys) && this.props.onSubmit(selectedRowKeys[0])}>{getLabel(725, "提交")}</Button>
+            ]
+        }
+        style={{
+          width: 850,
+          height: 480,
+          minHeight: 200,
+          minWidth: 380,
+          maxHeight: "50%",
+          maxWidth: "50%",
+          overflow: "hidden",
+          transform: "translate(0px, 0px)"
+        }}
+      >
+        <div className="taxfillingDialogContent">
+          {
+            Object.prototype.toString.call(taxAgentTaxReturnCheckFormDTO) === "[object Object]" ?
+              <React.Fragment>
+                {getSearchs(taxfillInfoForm, taxFillCondition, 1)}
+                {taxfillInfoForm.getFormParams().divideFiling === getLabel(538048, "是") && getSearchs(deptfillInfoForm, deptFillCondition, 1)}
+              </React.Fragment> :
+              <WeaTable
+                rowKey="index" dataSource={taxAgentTaxReturnCheckFormDTO}
+                columns={_.map(taxFillColumns, o => ({
+                  dataIndex: o.dataIndex,
+                  width: 200,
+                  title: getLabel(o.titleId, o.title)
+                }))}
+                scroll={{ x: 1200 }} rowSelection={rowSelection}
+              />
+          }
+        </div>
+      </WeaDialog>
+    );
+  }
+}
+
+export default TaxFilingInfoDialofg;
diff --git a/pc4mobx/hrmSalary/pages/salary/index.less b/pc4mobx/hrmSalary/pages/salary/index.less
new file mode 100644
index 00000000..e6dacf00
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/index.less
@@ -0,0 +1,101 @@
+.salaryAgentWrapper {
+  .wea-new-top-content {
+    background: #f6f6f6;
+    padding: 8px 16px 0;
+  }
+
+  .wea-new-top {
+    .wea-input-focus {
+      height: 31.36px;
+      line-height: 0;
+    }
+  }
+
+  .comContent {
+    .wea-search-group:first-child {
+      margin-bottom: 16px;
+    }
+
+    .wea-search-group {
+      padding: 0;
+      background: #fff;
+
+      .wea-title {
+        padding: 0 10px;
+      }
+
+      .wea-content {
+        padding: 0;
+
+        .wea-form-item {
+          padding-left: 18px;
+        }
+      }
+    }
+
+    .customTitleWrapper {
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .ant-btn {
+        margin-left: 10px;
+        border-radius: 0;
+        padding: 0;
+        background: transparent;
+        border: none;
+        font-size: 20px;
+        line-height: 20px;
+      }
+
+      .ant-btn.ant-btn-primary[disabled] {
+        color: #d8d8d8;
+      }
+
+      .ant-btn.ant-btn-primary {
+        color: #55a1f8;
+      }
+    }
+
+    .tdEllipsis {
+      display: inline-block;
+      width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+
+  .ant-col-10 {
+    span:nth-child(2) {
+      //margin-top: -6px;
+    }
+  }
+
+  .taxAgentSlide {
+    .wea-slide-modal-title {
+      height: auto;
+      line-height: normal;
+      text-align: left;
+      background: #FFF;
+
+      .wea-new-top .ant-col-10 {
+        padding-right: 45px !important;
+      }
+    }
+
+    .rodal-close {
+      z-index: 99;
+      top: 10px !important;
+    }
+
+    .wea-new-top-req-wapper .wea-new-top-req-title > div:last-child {
+      right: 45px !important;
+    }
+
+    .wea-slide-modal-content {
+      height: 100%;
+    }
+  }
+}
diff --git a/pc4mobx/hrmSalary/pages/salary/taxAgent.js b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
new file mode 100644
index 00000000..300037c3
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/salary/taxAgent.js
@@ -0,0 +1,236 @@
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { Button, message, Modal } from "antd";
+import { WeaCheckbox, WeaFormItem, WeaInputSearch, WeaLocaleProvider, WeaSearchGroup, WeaTop } from "ecCom";
+import ComHint from "./components/comHint";
+import TaxAgentTable from "./components/taxAgentTable";
+import TaxAgentSlide from "./components/taxAgentSlide";
+import LogDialog from "../../components/logViewModal";
+import * as API from "../../apis/taxAgent";
+import "./index.less";
+
+const { getLabel } = WeaLocaleProvider;
+
+@inject("taxAgentStore")
+@observer
+class TaxAgent extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      syncLoading: false, //同步人员范围loading
+      searchValue: "",
+      decentralization: "0", //启用分权
+      taxAgentSlideProps: {
+        isEdit: false, visible: false, title: getLabel(543629, "新增个税扣缴义务人"),
+        taxAgentId: "", current: 0, salaryOn: false
+      },
+      logDialogVisible: false,
+      filterConditions: "[]"
+    };
+    this.taxAgentTableRef = null;
+  }
+
+  componentDidMount() {
+    this.getTaxAgentBaseForm();
+  }
+
+  getTaxAgentBaseForm = () => {
+    API.getTaxAgentBaseForm().then(({ status, data }) => {
+      if (status) {
+        const { devolutionStatus } = data;
+        this.setState({ decentralization: String(devolutionStatus || 0) });
+      }
+    });
+  };
+  /*
+   * Author: 黎永顺
+   * Description:开启关闭个税扣缴义务人开关
+   * Params:
+   * Date: 2022/11/29
+   */
+  taxAgentBaseSave = devolutionStatus => {
+    this.setState({ decentralization: this.state.decentralization }, () => {
+      Modal.confirm({
+        title: getLabel(131329, "信息确认"),
+        content: `${getLabel(33703, "确认")}${devolutionStatus === "0" ? getLabel(26471, "停用") : getLabel(26472, "启用")}${getLabel(524044, "分权")}?`,
+        onOk: () => {
+          const paylaod = { devolutionStatus };
+          const { taxAgentStore } = this.props;
+          const { taxAgentBaseSave, setSalarytaxAgentForm } = taxAgentStore;
+          taxAgentBaseSave(paylaod).then(({ status, errormsg }) => {
+            if (status) {
+              message.success(`${devolutionStatus === "0" ? "停用" : "启用"}分权成功`);
+              this.getTaxAgentBaseForm();
+              this.taxAgentTableRef.getTaxAgentList();
+              setSalarytaxAgentForm();
+            } else {
+              message.error(errormsg || `${devolutionStatus === "0" ? "停用" : "启用"}分权失败`);
+            }
+          });
+        }
+      });
+    });
+  };
+  /*
+   * Author: 黎永顺
+   * Description:
+   * Params:添加个税扣缴义务人
+   * Date: 2022/11/29
+   */
+  handleAddTaxAgent = () => {
+    this.setState({
+      taxAgentSlideProps: {
+        ...this.state.taxAgentSlideProps,
+        visible: true, current: 0
+      }
+    });
+  };
+  /*
+   * Author: 黎永顺
+   * Description:启用分权
+   * Params:
+   * Date: 2022/12/1
+   */
+  taxAgentRangeSync = () => {
+    const { taxAgentStore } = this.props;
+    const { taxAgentRangeSync } = taxAgentStore;
+    this.setState({ syncLoading: true });
+    taxAgentRangeSync({}).then(({ status, data, errormsg }) => {
+      this.setState({ syncLoading: false });
+      if (status) {
+        message.success(data || getLabel(30700, "操作成功"));
+        this.taxAgentTableRef.getTaxAgentList();
+      } else {
+        message.error(data || errormsg || getLabel(30651, "操作失败"));
+      }
+    });
+  };
+  handelResetSlide = (isUpdate = false) => {
+    const { taxAgentStore } = this.props;
+    const { salarytaxAgentForm } = taxAgentStore;
+    this.setState({
+      taxAgentSlideProps: {
+        ...this.state.taxAgentSlideProps,
+        isEdit: false,
+        visible: false,
+        title: getLabel(543629, "新增个税扣缴义务人"),
+        taxAgentId: "",
+        current: 0
+      }
+    }, () => {
+      isUpdate && this.taxAgentTableRef.getTaxAgentList();
+      salarytaxAgentForm.resetForm();
+    });
+  };
+  handleOperate = (type, itemId, current = 0) => {
+    switch (type) {
+      case "edit":
+        this.setState({
+          taxAgentSlideProps: {
+            ...this.state.taxAgentSlideProps,
+            visible: true, title: getLabel(543632, "编辑个税扣缴义务人"),
+            taxAgentId: itemId, current, isEdit: true
+          }
+        });
+        break;
+      case "delete":
+        Modal.confirm({
+          title: getLabel(131329, "信息确认"),
+          content: getLabel(388758, "确认要删除吗?"),
+          onOk: () => {
+            API.deleteTaxAgent([itemId]).then(({ status, errormsg }) => {
+              if (status) {
+                message.success(getLabel(502230, "删除成功"));
+                this.taxAgentTableRef.getTaxAgentList();
+              } else {
+                message.error(errormsg || getLabel(20462, "删除失败"));
+              }
+            });
+          }
+        });
+        break;
+      case "log":
+        this.setState({
+          logDialogVisible: true,
+          filterConditions: itemId ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${itemId}\"}]` : "[]"
+        });
+        break;
+      default:
+        break;
+    }
+  };
+
+  render() {
+    const { taxAgentStore: { PageAndOptAuth: permission } } = this.props;
+    const {
+      searchValue, decentralization, taxAgentSlideProps, syncLoading, logDialogVisible, filterConditions
+    } = this.state;
+    const btns = [
+      <Button type="primary" onClick={this.taxAgentRangeSync}
+              loading={syncLoading}>{getLabel(543633, "同步人员范围")}</Button>,
+      <WeaInputSearch
+        style={{ width: 220 }}
+        value={searchValue}
+        onChange={searchValue => this.setState({ searchValue })}
+        placeholder={getLabel(543634, "请输入个税扣缴义务人名称")}
+        onSearch={() => this.taxAgentTableRef.getTaxAgentList()}
+      />
+    ];
+    const customTitle = <div className="customTitleWrapper">
+      <span>{getLabel(537996, "个税扣缴义务人")}</span>
+      {
+        permission.isChief &&
+        <Button type="primary" size="small" onClick={this.handleAddTaxAgent}>
+          <span className="icon-coms-Add-to-hot" title={getLabel(384113, "添加")}></span>
+        </Button>
+      }
+    </div>;
+    const showOperateBtn = permission.opts.includes("admin");
+    return (
+      <div className="salaryAgentWrapper">
+        <WeaTop
+          title={getLabel(537996, "个税扣缴义务人")}
+          icon={<i className="icon-coms-fa"/>}
+          iconBgcolor="#F14A2D"
+          buttons={showOperateBtn ? btns : btns.slice(1)}
+          showDropIcon onDropMenuClick={key => this.handleOperate(key)}
+          dropMenuDatas={[
+            {
+              key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
+              content: getLabel(545781, "操作日志")
+            }
+          ]}
+        >
+          <div className="comContent">
+            {
+              permission.isChief &&
+              <WeaSearchGroup title={getLabel(82743, "基础信息")} showGroup needTigger={false}>
+                <WeaFormItem label={getLabel(543639, "启用分权")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+                  <WeaCheckbox value={decentralization} display="switch" onChange={this.taxAgentBaseSave}/>
+                </WeaFormItem>
+              </WeaSearchGroup>
+            }
+            <WeaSearchGroup title={customTitle} showGroup needTigger={false}>
+              <TaxAgentTable searchValue={searchValue} onOperate={this.handleOperate}
+                             isChief={permission.isChief} //isChief- 是否是总管理员
+                             ref={dom => this.taxAgentTableRef = dom}/>
+            </WeaSearchGroup>
+          </div>
+          <ComHint/>
+          <TaxAgentSlide
+            {...taxAgentSlideProps}
+            isChief={permission.isChief} //isChief- 是否是总管理员
+            decentralization={decentralization} //是否开启分权 0：否 1：是 ;开启分权才有管理员的添加
+            onOk={() => this.taxAgentTableRef.getTaxAgentList()}
+            onCancel={(isUpdate = false) => this.handelResetSlide(isUpdate)}
+          />
+          {/*操作日志*/}
+          <LogDialog visible={logDialogVisible} logFunction="taxagent" filterConditions={filterConditions}
+                     onCancel={() => this.setState({ logDialogVisible: false })}/>
+        </WeaTop>
+      </div>
+    );
+  }
+}
+
+export default TaxAgent;
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
index 474eb08c..28e46ef5 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
@@ -5,9 +5,8 @@ import { WeaSwitch } from "comsMobx";
 import FormalFormModal from "./formalFormModal";
 import { salaryItemConditions } from "./columns";
 import { commonEnumList } from "../../apis/archive";
+import { postFetch } from "../../util/request";
 import { getItemForm } from "../../apis/item";
-import { getTaxAgentSelectList } from "../../apis/taxAgent";
-
 
 const getLabel = WeaLocaleProvider.getLabel;
 const getKey = WeaTools.getKey;
@@ -44,7 +43,7 @@ export default class CustomSalaryItemSlide extends React.Component {
       };
     const [{ data: sharedTypeList }, { data: taxAgentList }] = await Promise.all([
       commonEnumList({ enumClass: "com.engine.salary.enums.sicategory.SharedTypeEnum" }),
-      getTaxAgentSelectList()
+      postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" })
     ]);
     this.setState({
       conditions: _.map(salaryItemConditions, c => {
@@ -63,8 +62,8 @@ export default class CustomSalaryItemSlide extends React.Component {
                 break;
               case "taxAgentIds":
                 fields = {
-                  ...fields, options: _.map(taxAgentList, o => ({ key: o.id, showname: o.content })),
-                  hide: String(salaryItemForm["sharedType"]) === "0" || _.isNil(salaryItemForm["sharedType"])
+                  ...fields, options: _.map(taxAgentList, o => ({ key: String(o.id), showname: o.name })),
+                  hide: String(salaryItemForm["sharedType"]) === "0" || !_.isNil(salaryItemForm["sharedType"])
                 };
                 break;
               case "dataType":
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index 6a9c5f1f..f9f8dcc1 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -119,8 +119,8 @@ export default class SalaryItem extends React.Component {
         break;
       case "customAdd":
       case "edit":
-        const { taxAgentStore: { showOperateBtn } } = this.props;
-        const { loading } = this.state;
+        const { taxAgentStore: { PageAndOptAuth } } = this.props;
+        const { loading } = this.state, showOperateBtn = PageAndOptAuth.opts.includes("admin");
         const editTitle = !showOperateBtn ? getLabel(111, "查看自定义薪资项目") : getLabel(111, "修改自定义薪资项目");
         const title = key === "edit" ? editTitle : getLabel(111, "新建自定义薪资项目");
         const buttons = key === "edit" ? [
@@ -153,11 +153,12 @@ export default class SalaryItem extends React.Component {
   };
 
   render() {
-    const { taxAgentStore: { showOperateBtn } } = this.props;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
     const {
       selectedRowKeys, logDialogVisible, filterConditions, name, isQuery, customItemDialog, sysVisible,
       salaryItemImpDialog
     } = this.state;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const menu = (
       <Menu onClick={({ key }) => this.onDropMenuClick(key)}>
         <Menu.Item key="sysAdd">{getLabel(111, "新增系统薪资项")}</Menu.Item>
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.less b/pc4mobx/hrmSalary/pages/salaryItem/index.less
index cf539484..0e752b3f 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.less
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.less
@@ -187,6 +187,7 @@
       border: 1px solid #e5e5e5 !important;
       padding: 4px 8px !important;
       min-height: 70px !important;
+      word-wrap: break-word;
     }
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js
index 27409fb5..cd9dd5c7 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js
@@ -5,7 +5,6 @@
  * Date: 2024/1/23
  */
 import React, { Component } from "react";
-import { inject, observer } from "mobx-react";
 import { message, Modal, Spin } from "antd";
 import { WeaLocaleProvider } from "ecCom";
 import { getIframeParentHeight } from "../../../../util";
@@ -14,8 +13,6 @@ import { convertToUrlString } from "../../../../util/url";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
-@inject("taxAgentStore")
-@observer
 class WelfareRecordList extends Component {
   constructor(props) {
     super(props);
@@ -126,7 +123,7 @@ class WelfareRecordList extends Component {
     childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
   };
   getWelfareRecordList = () => {
-    const { queryForm, taxAgentStore: { showOperateBtn } } = this.props;
+    const { queryForm } = this.props;
     const { pageInfo } = this.state;
     const payload = { ...pageInfo, ...queryForm, taxAgents: queryForm.taxAgents ? queryForm.taxAgents.split(",") : [] };
     this.setState({ loading: true });
@@ -139,8 +136,7 @@ class WelfareRecordList extends Component {
           pageInfo: { ...pageInfo, current, pageSize, total },
           dataSource, columns
         }, () => this.postMessageToChild({
-          scrollHeight: 108, dataSource, columns, pageInfo: this.state.pageInfo, showOperateBtn,
-          unitTableType: "welfareRecord"
+          scrollHeight: 108, dataSource, columns, pageInfo: this.state.pageInfo, unitTableType: "welfareRecord"
         }));
       }
     }).catch(() => this.setState({ loading: false }));
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
index 4a702b64..6d2408aa 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
@@ -8,45 +8,51 @@ import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
 import { WeaSwitch } from "comsMobx";
-import * as API from "../../../../apis/standingBook";
 import { welfareRQConditions } from "../columns";
+import { postFetch } from "../../../../util/request";
 import { MonthRangePicker } from "../../../reportView/components/statisticalMicroSettingsSlide";
 import moment from "moment";
 
 const getLabel = WeaLocaleProvider.getLabel;
 const getKey = WeaTools.getKey;
 
-@inject("standingBookStore") @observer
+@inject("standingBookStore")
+@observer
 class WelfareRecordQuery extends Component {
   constructor(props) {
     super(props);
     this.state = {
       conditions: [],
-      dateRange: [moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"), moment(new Date()).endOf("year").format("YYYY-MM")]
+      dateRange: [
+        moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"),
+        moment(new Date()).endOf("year").format("YYYY-MM")
+      ]
     };
   }
 
   componentDidMount() {
-    API.getAdminTaxAgentList().then(({ status, data }) => {
-      if (status) {
-        this.setState({
-          conditions: _.map(welfareRQConditions, item => {
-            return {
-              ...item, items: _.map(item.items, o => {
-                if (getKey(o) === "taxAgents") {
-                  return { ...o, options: _.map(data, g => ({ key: g.id.toString(), showname: g.name })) };
-                }
-                return o;
-              })
-            };
-          })
-        }, () => {
-          const { standingBookStore: { welfareRQForm }, onPutAccountOptions } = this.props;
-          welfareRQForm.initFormFields(this.state.conditions);
-          onPutAccountOptions(_.map(data, g => ({ key: g.id.toString(), showname: g.name })));
-        });
-      }
-    });
+    postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" })
+      .then(({ status, data }) => {
+        if (status) {
+          this.setState({
+            conditions: _.map(welfareRQConditions, item => {
+              return {
+                ...item,
+                items: _.map(item.items, o => {
+                  if (getKey(o) === "taxAgents") {
+                    return { ...o, options: _.map(data, g => ({ key: String(g.id), showname: g.name })) };
+                  }
+                  return o;
+                })
+              };
+            })
+          }, () => {
+            const { standingBookStore: { welfareRQForm }, onPutAccountOptions } = this.props;
+            welfareRQForm.initFormFields(this.state.conditions);
+            onPutAccountOptions(_.map(data, g => ({ key: g.id.toString(), showname: g.name })));
+          });
+        }
+      });
   }
 
   renderForm = (form, conditions) => {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
index 30ec27a6..9736415a 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
@@ -24,7 +24,7 @@ export default class StandingBook extends React.Component {
       value: "",
       selectedKey: "0",
       tableParams: {
-        startTime: moment(new Date()).subtract(1, 'year').startOf("year").format("YYYY-MM"),
+        startTime: moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"),
         endTime: moment(new Date()).endOf("year").format("YYYY-MM"),
         paymentOrganization: ""
       },
@@ -68,49 +68,45 @@ export default class StandingBook extends React.Component {
   init = () => {
     const { current, dialogProps } = this.state;
     const {
-      taxAgentStore: { getPermission, fetchTaxAgentOption },
+      taxAgentStore: { PageAndOptAuth, fetchTaxAgentOption },
       standingBookStore: { getAdminTaxAgentList }
     } = this.props;
-    getPermission().then(({ status, data }) => {
-      if (status) {
-        this.setState({ adminData: data });
-        if (data.isOpenDevolution) {
-          getAdminTaxAgentList().then((data) => {
-            let taxAgentList = data.map(item => {
-              let result = {};
-              result.showname = item.name;
-              result.key = item.id + "";
-              result.selected = false;
-              return result;
-            });
-            this.setState({
-              dialogProps: {
-                ...dialogProps,
-                options: taxAgentList,
-                isAdmin: true
-              }
-            });
-          });
-        } else {
-          fetchTaxAgentOption().then(({ data }) => {
-            let taxAgentList = data.map(item => {
-              let result = {};
-              result.showname = item.content;
-              result.key = item.id + "";
-              result.selected = false;
-              return result;
-            });
-            this.setState({
-              dialogProps: {
-                ...dialogProps,
-                options: taxAgentList
-              }
-            });
-          });
-        }
-        this.getCommonList({ ...this.state.tableParams, current });
-      }
-    });
+    this.setState({ adminData: PageAndOptAuth });
+    if (data.isOpenDevolution) {
+      getAdminTaxAgentList().then((data) => {
+        let taxAgentList = data.map(item => {
+          let result = {};
+          result.showname = item.name;
+          result.key = item.id + "";
+          result.selected = false;
+          return result;
+        });
+        this.setState({
+          dialogProps: {
+            ...dialogProps,
+            options: taxAgentList,
+            isAdmin: true
+          }
+        });
+      });
+    } else {
+      fetchTaxAgentOption().then(({ data }) => {
+        let taxAgentList = data.map(item => {
+          let result = {};
+          result.showname = item.content;
+          result.key = item.id + "";
+          result.selected = false;
+          return result;
+        });
+        this.setState({
+          dialogProps: {
+            ...dialogProps,
+            options: taxAgentList
+          }
+        });
+      });
+    }
+    this.getCommonList({ ...this.state.tableParams, current });
   };
 
   getCommonList = (payload = {}) => {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
index 55e0bc78..394409e7 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
@@ -60,37 +60,36 @@ class StandingBook extends Component {
         progressVisible: true
       }, () => {
         this.timer = setInterval(() => {
-          getCalculateProgress(moment(billMonth).format("YYYY-MM"), payload.paymentOrganization)
-            .then(({ status, data }) => {
-              if (status) {
-                if (!data.status) {
-                  clearInterval(this.timer);
-                  this.setState({ progressVisible: false, progress: 0 });
-                  message.error(data.message);
-                  return;
-                }
-                if (this.state.progress !== 100) {
-                  this.setState({
-                    progress: (Number(data.progress).toFixed(2)) * 100
-                  });
-                } else {
-                  clearInterval(this.timer);
-                  this.setState({ progressVisible: false, progress: 0 }, () => {
-                    message.success(getLabel(543232, "核算成功"));
-                    this.setState({
-                      accountDialog: { ...this.state.accountDialog, visible: false }
-                    }, () => {
-                      this.wfListRef.wrappedInstance.getWelfareRecordList();
-                      const calcPayload = { ...payload, creator };
-                      window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/standingBookDetail?${convertToUrlString(calcPayload)}`);
-                    });
-                  });
-                }
-              } else {
+          getCalculateProgress(moment(billMonth).format("YYYY-MM"), payload.paymentOrganization).then(({ status, data }) => {
+            if (status) {
+              if (!data.status) {
                 clearInterval(this.timer);
                 this.setState({ progressVisible: false, progress: 0 });
+                message.error(data.message);
+                return;
               }
-            }).catch(() => {
+              if (this.state.progress !== 100) {
+                this.setState({
+                  progress: (Number(data.progress).toFixed(2)) * 100
+                });
+              } else {
+                clearInterval(this.timer);
+                this.setState({ progressVisible: false, progress: 0 }, () => {
+                  message.success(getLabel(543232, "核算成功"));
+                  this.setState({
+                    accountDialog: { ...this.state.accountDialog, visible: false }
+                  }, () => {
+                    this.wfListRef.getWelfareRecordList();
+                    const calcPayload = { ...payload, creator };
+                    window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/standingBookDetail?${convertToUrlString(calcPayload)}`);
+                  });
+                });
+              }
+            } else {
+              clearInterval(this.timer);
+              this.setState({ progressVisible: false, progress: 0 });
+            }
+          }).catch(() => {
             clearInterval(this.timer);
             this.setState({ progressVisible: false, progress: 0 });
           });
@@ -120,7 +119,8 @@ class StandingBook extends Component {
 
   render() {
     const { accountDialog, queryForm, logDialogVisible, filterConditions } = this.state;
-    const { taxAgentStore: { showOperateBtn } } = this.props;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const rightBtns = [<Button type="primary" onClick={() => this.setState({
       accountDialog: { ...accountDialog, visible: true, title: getLabel(538780, "核算") }
     })}>{getLabel(538780, "核算")}</Button>];
@@ -138,7 +138,7 @@ class StandingBook extends Component {
           onSearch={(payload) => {
             this.setState({
               queryForm: { ...queryForm, ...payload }
-            }, () => this.wfListRef.wrappedInstance.getWelfareRecordList());
+            }, () => this.wfListRef.getWelfareRecordList());
           }}
           onPutAccountOptions={options => this.setState({ accountDialog: { ...accountDialog, options } })}
         />
@@ -151,7 +151,7 @@ class StandingBook extends Component {
                      })} onOk={this.handleAccount}
       />
       {/*操作日志*/}
-      <LogDialog visible={logDialogVisible} logFunction="siAccount" filterConditions={filterConditions}
+      <LogDialog visible={logDialogVisible} logFunction="siaccount" filterConditions={filterConditions}
                  onCancel={() => this.setState({ logDialogVisible: false })}/>
       {/*核算进度条*/}
       {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js
index 47542d39..ede4d7c9 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js
@@ -46,7 +46,7 @@ class AdjustmentDefaultSlide extends Component {
   };
 
   render() {
-    const { visible, onCancel, taxAgentStore: { showOperateBtn }, dataSource } = this.props;
+    const { visible, onCancel, taxAgentStore: { PageAndOptAuth }, dataSource } = this.props;
     const { loading } = this.state;
     const columns = [
       {
@@ -82,6 +82,7 @@ class AdjustmentDefaultSlide extends Component {
         }
       }
     ];
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     return (
       <WeaSlideModal
         className="adjustDefSlideWrapper"
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
index 2fb3f37c..b853b734 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js
@@ -10,12 +10,10 @@ import { WeaSlideModal } from "ecCom";
 import { Button, message, Modal } from "antd";
 import SlideModalTitle from "../../../../components/slideModalTitle";
 import AdjustTable from "./adjustTable";
-import { getQueryString } from "../../../../util/url";
 import { compensationSave } from "../../../../apis/standingBook";
 import AdjustmentDefaultSlide from "./adjustmentDefaultSlide";
 import "./index.less";
 
-
 @inject("taxAgentStore")
 @observer
 class AdjustmentSlide extends Component {
@@ -35,10 +33,9 @@ class AdjustmentSlide extends Component {
 
   handleSave = () => {
     const requireKeys = ["adjustTo", "adjustmentTotal", "categoryType", "companyTotal", "countryTotal", "target", "welfareType"];
+    const { billMonth, paymentOrganization } = this.props;
     let { dataSource, targetOptions } = this.adjustTableRef.state;
     dataSource = _.filter(dataSource, it => (!it.id || !it.status));
-    const billMonth = getQueryString("billMonth");
-    const paymentOrganization = getQueryString("paymentOrganization");
     let bool = true;
     _.map(dataSource, item => {
       bool = _.every(requireKeys, child => !!item[child]);
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
index c7117046..919e4d78 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/index.less
@@ -13,7 +13,19 @@
   }
 
   .wea-search-tab, .wea-input-focus {
-    background: #f1f1f1;
+    background: #F1F1F1;
+    padding-right: 0 !important;
+
+    .wea-advanced-search {
+      background: #FFF
+    }
+
+    i {
+      font-size: 20px;
+      cursor: pointer;
+      vertical-align: middle;
+      color: #55a1f8;
+    }
   }
 
   .normalWapper {
@@ -23,6 +35,18 @@
     overflow: hidden;
     padding: 0 16px;
 
+    .wea-tab .wea-search-container .wea-advanced-search {
+      right: -1px !important;
+    }
+
+    .wea-tab .wea-search-tab {
+      padding-right: 0;
+
+      .wea-advanced-search {
+        background: #FFF;
+      }
+    }
+
     .tableWrapper {
       flex: 1;
       overflow: hidden;
@@ -60,20 +84,14 @@
     .tabOption {
       display: flex;
       align-items: center;
-      padding: 8px 20px;
+      padding: 8px 0;
       justify-content: flex-end;
 
-      i.icon-coms-Batch-delete, i.icon-coms-Add-to, button {
+      i {
+        font-size: 20px;
         cursor: pointer;
-        margin-right: 10px;
-      }
-
-      .anticon-search {
-        margin-right: 0px;
-      }
-
-      .wea-input-focus-btn {
-        margin-right: 0px;
+        vertical-align: middle;
+        color: #55a1f8;
       }
     }
 
@@ -93,7 +111,7 @@
   overflow: hidden;
   display: flex;
   flex-direction: column;
-  padding: 16px;
+  padding: 0 16px 16px 16px;
 
   .tableWrapper {
     flex: 1;
@@ -132,26 +150,6 @@
       }
     }
   }
-
-  .wea-new-top {
-    .ant-btn {
-      border-radius: 0;
-      padding: 0;
-      background: transparent;
-      border: none;
-      font-size: 18px;
-      line-height: 18px;
-    }
-
-    .ant-btn.ant-btn-primary[disabled] {
-      color: #d8d8d8;
-      background: transparent;
-    }
-
-    .ant-btn.ant-btn-primary {
-      color: #2db7f5;
-    }
-  }
 }
 
 //补差添加人员弹框
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js
index d0085fd7..c5e05729 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js
@@ -7,8 +7,6 @@
 import React, { Component } from "react";
 import RegTop from "./regTop";
 import { message, Modal } from "antd";
-import { WeaNewScroll } from "ecCom";
-import { getQueryString } from "../../../../util/url";
 import * as API from "../../../../apis/standingBook";
 import { calcPageNo } from "../../../../util";
 import RegList from "./regList";
@@ -16,6 +14,7 @@ import RegEditDetial from "./regEditDetial";
 import AddCompensationPersonnelDialog from "./addCompensationPersonnelDialog";
 import StandingBookCalcImportDialog from "./standingBookCalcImportDialog";
 import "./index.less";
+import { convertToUrlString } from "../../../../util/url";
 
 class MakeupDifference extends Component {
   constructor(props) {
@@ -43,9 +42,7 @@ class MakeupDifference extends Component {
 
   delBalance = () => {
     const { selectKey: ids } = this.state;
-    const billMonth = getQueryString("billMonth");
-    const paymentOrganization = getQueryString("paymentOrganization");
-    const payload = { ids, billMonth, paymentOrganization };
+    const payload = { ids, ..._.pick(this.props, ["billMonth", "paymentOrganization"]) };
     API.delBalance(payload).then(({ status, errormsg }) => {
       if (status) {
         message.success("删除成功");
@@ -64,8 +61,6 @@ class MakeupDifference extends Component {
     const workcode = this.regTopRef.state.workcode;
     const departmentIds = this.regTopRef.state.departmentIds ? this.regTopRef.state.departmentIds.split(",") : [];
     const subCompanyIds = this.regTopRef.state.subCompanyIds ? this.regTopRef.state.subCompanyIds.split(",") : [];
-    const billMonth = getQueryString("billMonth");
-    const paymentOrganization = getQueryString("paymentOrganization");
     switch (key) {
       case "delete":
         Modal.confirm({
@@ -78,13 +73,13 @@ class MakeupDifference extends Component {
         this.setState({
           importDiffModal: {
             ...importDiffModal, visible: true,
-            importparams: { billMonth: getQueryString("billMonth") }
+            importparams: { ..._.pick(this.props, ["billMonth"]) }
           }
         });
         break;
       case "export":
-        const url = `${window.location.origin}/api/bs/hrmsalary/welfare/balance/export?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`;
-        window.open(url, "_self");
+        const url = `/api/bs/hrmsalary/welfare/balance/export?${convertToUrlString(_.pick(this.props, ["billMonth", "paymentOrganization"]))}`;
+        window.open(url, "_blank");
         break;
       case "search":
         this.diffListRef.recessionList({ userName: name, workcode, departmentIds, subCompanyIds, current: 1 });
@@ -92,7 +87,7 @@ class MakeupDifference extends Component {
       case "add":
         this.setState({
           addPersonalDialog: {
-            ...addPersonalDialog, visible: true, paymentOrganization, billMonth
+            ...addPersonalDialog, ..._.pick(this.props, ["billMonth", "paymentOrganization"]), visible: true
           }
         });
         break;
@@ -117,42 +112,40 @@ class MakeupDifference extends Component {
   };
 
   render() {
-    const billMonth = getQueryString("billMonth");
     const { selectKey, importDiffModal, returnEditPersonSlide, addPersonalDialog } = this.state;
     return (
       <div className="differenceWrapper">
         <RegTop
-          type="difference"
+          {..._.pick(this.props, ["billMonth", "type"])}
+          regtopType="difference"
           ref={dom => this.regTopRef = dom}
-          billMonth={billMonth}
           onChange={this.handleChangeOpt}
           selectKey={selectKey}
         />
         <div className="tableWrapper">
-          <WeaNewScroll height="100%">
-            <RegList
-              type="difference"
-              ref={dom => this.diffListRef = dom}
-              onChangeRowkey={(selectKey) => this.setState({ selectKey })}
-              onEdit={this.handleEdit}
-            />
-            {/*编辑弹框*/}
-            <RegEditDetial {...returnEditPersonSlide} onCancel={this.handleCloseModal}/>
-            {/*添加补差人员*/}
-            <AddCompensationPersonnelDialog {...addPersonalDialog}
-                                            onCancel={(isRefresh) => this.setState({
-                                              addPersonalDialog: {
-                                                ...addPersonalDialog,
-                                                visible: false
-                                              }
-                                            }, () => isRefresh && this.diffListRef.recessionList())}
-            />
-            {/*导入补差*/}
-            <StandingBookCalcImportDialog {...importDiffModal}
-                                          onCancel={(isInit) => this.setState({
-                                            importDiffModal: { ...importDiffModal, visible: false }
-                                          }, () => isInit && this.diffListRef.recessionList())}/>
-          </WeaNewScroll>
+          <RegList
+            {..._.pick(this.props, ["billMonth", "paymentOrganization", "creator", "type"])}
+            regType="difference"
+            ref={dom => this.diffListRef = dom}
+            onChangeRowkey={(selectKey) => this.setState({ selectKey })}
+            onEdit={this.handleEdit}
+          />
+          {/*编辑弹框*/}
+          <RegEditDetial {...returnEditPersonSlide} onCancel={this.handleCloseModal}/>
+          {/*添加补差人员*/}
+          <AddCompensationPersonnelDialog {...addPersonalDialog}
+                                          onCancel={(isRefresh) => this.setState({
+                                            addPersonalDialog: {
+                                              ...addPersonalDialog,
+                                              visible: false
+                                            }
+                                          }, () => isRefresh && this.diffListRef.recessionList())}
+          />
+          {/*导入补差*/}
+          <StandingBookCalcImportDialog {...importDiffModal}
+                                        onCancel={(isInit) => this.setState({
+                                          importDiffModal: { ...importDiffModal, visible: false }
+                                        }, () => isInit && this.diffListRef.recessionList())}/>
         </div>
       </div>
     );
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index aa2ea15d..f6f6f010 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -6,95 +6,52 @@
  */
 import React, { Component } from "react";
 import { Button, Col, Icon, message, Modal, Row, Spin, Tooltip } from "antd";
-import { inject, observer } from "mobx-react";
-import { WeaBrowser, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
+import { WeaBrowser, WeaButtonIcon, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
+import * as API from "../../../../apis/standingBook";
+import { getCalculateProgress } from "../../../../apis/calculate";
+import { sysConfCodeRule } from "../../../../apis/ruleconfig";
 import { calcPageNo } from "../../../../util";
-import { getQueryString } from "../../../../util/url";
+import { convertToUrlString } from "../../../../util/url";
 import ProgressModal from "../../../../components/progressModal";
 import StandingBookCalcImportDialog from "./standingBookCalcImportDialog";
 import AdjustmentSlide from "./adjustmentSlide";
-import { getCalculateProgress } from "../../../../apis/calculate";
 import RegEditDetial from "./regEditDetial";
 import SupplementarySlide from "./supplementarySlide";
-import _ from "lodash";
 import "./index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
-@inject("standingBookStore")
-@observer
+
 export default class NormalIndex extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      date: "",
-      current: 1,
-      pageSize: 10,
-      selectedRowKeys: [],
-      addProps: {
-        title: "",
-        visible: false
-      },
-      adjustSlide: {
-        title: "调差",
-        visible: false
-      },
-      tableData: {
-        list: [],
-        columns: [],
-        total: 0
-      },
-      searchValue: "",
-      workcode: "",
-      departmentIds: "",
-      subCompanyIds: "",
-      progressVisible: false,
-      progress: 0,
-      fieldData: {}, //选中的表单头信息
-      importParams: { //导入信息的弹框表示
+      pageInfo: { current: 1, pageSize: 10, total: 0 }, selectedRowKeys: [], showSearchAd: false, loading: false,
+      formParams: { userName: "", workcode: "", departmentIds: [], subCompanyIds: [] },
+      addProps: { title: "", visible: false }, adjustSlide: { title: "调差", visible: false },
+      progressVisible: false, progress: 0, importParams: { //导入信息的弹框表示
         visible: false, fieldUrl: "getWelfareList", tmpUrl: "exportSiaccountWelfareImporttemplate",
         cacheUrl: "cacheWelfareListField", importUrl: "importInsuranceAcctDetail", importparams: {}
       },
-      returnEditPersonSlide: {
-        title: "",
-        editId: "",
-        visible: false
-      },
-      showSum: false,
-      siaccountSum: {},
-      showSearchAd: false
+      returnEditPersonSlide: { title: "", editId: "", visible: false },
+      columns: [], dataSource: [], sumRow: {}, normalPayer: ""
     };
     this.timer = null;
     this.timerDelete = null;
   }
 
   componentDidMount() {
-    const { selectedKey, location } = this.props;
-    const { current } = this.state;
-    const billMonth = location.query.billMonth;
-    const paymentOrganization = location.query.paymentOrganization;
-    selectedKey === "1"
-      ? this.getNormalList({ billMonth, current, paymentOrganization })
-      : this.getSupplementaryList({ billMonth, current, paymentOrganization });
     window.addEventListener("message", this.handleReceive, false);
   }
 
-  handleReceive = async ({ data }) => {
-    const { type, payload: { id, params } = {} } = data;
+  handleReceive = ({ data }) => {
+    const { type, payload: { id, params } = {} } = data, { selectedKey } = this.props;
     if (type === "init") {
-      this.postMessageToChild();
+      selectedKey === "1" ? this.getNormalList() : this.getSupplementaryList();
     } else if (type === "turn") {
       if (id === "PAGEINFO") {
         const { pageNum: current, size: pageSize } = params;
-        this.setState({ current, pageSize }, () => {
-          const { billMonth, paymentOrganization, selectedKey } = this.props;
-          const { current, pageSize } = this.state;
-          selectedKey === "1" ?
-            this.getNormalList({
-              billMonth, current, pageSize, paymentOrganization
-            }) :
-            this.getSupplementaryList({
-              billMonth, current, pageSize, paymentOrganization
-            });
+        this.setState({ pageInfo: { ...this.state.pageInfo, current, pageSize } }, () => {
+          selectedKey === "1" ? this.getNormalList(true) : this.getSupplementaryList(true);
         });
       } else if (id === "ROWSELECT") {
         const { selectedRowKeys } = params;
@@ -106,267 +63,125 @@ export default class NormalIndex extends Component {
   };
 
   componentWillUnmount() {
-    if (this.timer) {
-      clearInterval(this.timer);
-    }
-    if (this.timerDelete) {
-      clearInterval(this.timerDelete);
-    }
+    if (this.timer) clearInterval(this.timer);
+    if (this.timerDelete) clearInterval(this.timerDelete);
     window.removeEventListener("message", this.handleReceive, false);
   }
 
   componentWillReceiveProps(nextProps) {
-    if (nextProps.selectedKey != this.props.selectedKey) {
-      const { billMonth, paymentOrganization } = nextProps;
+    if (nextProps.selectedKey !== this.props.selectedKey) {
       this.setState({
-        current: 1, selectedRowKeys: []
+        pageInfo: { current: 1, pageSize: 10, total: 0 }, selectedRowKeys: [], dataSource: [], sumRow: {},
+        addProps: { title: "", visible: false }, returnEditPersonSlide: { title: "", editId: "", visible: false }
       }, () => {
-        const { current } = this.state;
-        nextProps.selectedKey === "1"
-          ? this.getNormalList({ billMonth, current, paymentOrganization })
-          : this.getSupplementaryList({ billMonth, current, paymentOrganization });
+        nextProps.selectedKey === "1" ? this.getNormalList() : this.getSupplementaryList();
       });
     }
   }
 
   postMessageToChild = () => {
-    const billMonth = getQueryString("billMonth");
-    const paymentOrganization = getQueryString("paymentOrganization");
     const childFrameObj = document.getElementById("atdTable");
-    const { current, pageSize, tableData, selectedRowKeys, showSum, siaccountSum, searchValue: userName } = this.state;
-    const { list: dataSource, total, columns } = tableData;
-    const pageInfo = { current, pageSize, total };
-    childFrameObj.contentWindow.postMessage(JSON.stringify({
-      dataSource, columns, pageInfo,
-      selectedRowKeys, selectedKey: this.props.selectedKey,
-      sumpayload: { billMonth, paymentOrganization, userName },
-      showOperates: !getQueryString("type")
+    childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
+      ..._.pick(this.state, ["dataSource", "columns", "pageInfo", "selectedRowKeys", "sumRow"]),
+      showOperates: !this.props.type
     }), "*");
   };
-
-  handleSearch = () => {
-    const { billMonth, selectedKey, paymentOrganization } = this.props;
-    selectedKey === "1"
-      ? this.getNormalList({
-        billMonth,
-        current: 1,
-        paymentOrganization,
-        userName: this.state.searchValue,
-        workcode: this.state.workcode,
-        departmentIds: this.state.departmentIds ? this.state.departmentIds.split(",") : [],
-        subCompanyIds: this.state.subCompanyIds ? this.state.subCompanyIds.split(",") : []
-      })
-      : this.getSupplementaryList({
-        billMonth,
-        current: 1,
-        paymentOrganization,
-        userName: this.state.searchValue,
-        workcode: this.state.workcode,
-        departmentIds: this.state.departmentIds ? this.state.departmentIds.split(",") : [],
-        subCompanyIds: this.state.subCompanyIds ? this.state.subCompanyIds.split(",") : []
-      });
-  };
-
-  handleSave = () => {
-    const {
-      siaccountCommonSave,
-      siaccountSupplementarySave,
-      form
-    } = this.props.standingBookStore;
-    const { billMonth, selectedKey, paymentOrganization } = this.props;
-    if (selectedKey === "1") {
-      const { includes, excludes } = form.getFormParams();
-      const payload = {
-        billMonth,
-        includes: includes.split(","),
-        excludes: _.isEmpty(excludes) ? excludes.split(",") : []
-      };
-      siaccountCommonSave(payload).then(() => {
-        message.success("添加成功");
-        this.getNormalList({
-          billMonth,
-          paymentOrganization,
-          current: this.state.current
-        });
-        this.setState({
-          addProps: {
-            ...this.state.addProps,
-            title: "",
-            visible: false
-          }
-        });
-      });
-    } else {
-      const paymentOrganization = getQueryString("paymentOrganization");
-      form.validateForm().then(f => {
-        if (f.isValid) {
-          const {
-            includes,
-            billMonth: billMonthList,
-            excludes,
-            projects
-          } = form.getFormParams();
-          const payload = {
-            billMonth,
-            billMonthList: billMonthList.split(","),
-            includes: includes.split(","),
-            // excludes: excludes.split(","),
-            projects: projects.split(","),
-            paymentOrganization
-          };
-          siaccountSupplementarySave(payload).then(() => {
-            message.success("添加成功");
-            this.getSupplementaryList({
-              billMonth,
-              current: this.state.current,
-              paymentOrganization
-            });
-            this.setState(
-              {
-                addProps: {
-                  ...this.state.addProps,
-                  title: "",
-                  visible: false
-                }
-              },
-              () => {
-                form.resetForm();
-              }
-            );
-          });
-        } else {
-          f.showErrors();
-          this.setState({ date: new Date() }); // 改变一个state的变量,强制页面刷新
-        }
-      });
-    }
-  };
-  getNormalList = async (payload = {}) => {
-    const { getNormalList } = this.props.standingBookStore;
-    getNormalList({ ...payload, pageSize: this.state.pageSize }).then(({ list, columns = [], total }) => {
-      this.setState({
-        tableData: { list, total, columns }
-      }, () => this.postMessageToChild());
+  handleSearch = () => this.props.selectedKey === "1" ? this.getNormalList() : this.getSupplementaryList();
+  getNormalList = (pageTurning = false) => {
+    const { pageInfo, formParams } = this.state;
+    const payload = { ..._.pick(this.props, ["billMonth", "paymentOrganization"]) };
+    this.setState({ loading: true });
+    API.getNormalList({ ...payload, ...pageInfo, ...formParams }).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { pageInfo: { columns, list: dataSource, pageNum: current, pageSize, total } } = data;
+        this.setState({ pageInfo: { current, pageSize, total }, columns, dataSource }, () => this.postMessageToChild());
+      }
     });
-  };
-  getSupplementaryList = async (payload = {}) => {
-    const { getSupplementaryList } = this.props.standingBookStore;
-    getSupplementaryList({
-      ...payload, pageSize: this.state.pageSize
-    }).then(({ list, columns = [], total }) => {
-      this.setState({
-        tableData: { list, columns, total }
-      }, () => this.postMessageToChild());
-    });
-  };
-  onSelectChange = selectedRowKeys => {
-    this.setState({ selectedRowKeys });
-  };
-  handleBatchDelete = () => {
-    const { siaccountCommonDelete } = this.props.standingBookStore;
-    const { list } = this.state.tableData;
-    const { selectedRowKeys } = this.state;
-    const { billMonth, selectedKey, paymentOrganization } = this.props;
-    if (_.isEmpty(selectedRowKeys)) {
-      message.warning("未勾选数据！");
-    } else {
-      const includes = _.map(
-        _.filter(list, it => selectedRowKeys.includes(it.id)),
-        item => item.employeeId
-      );
-      const ids = _.map(
-        _.filter(list, it => selectedRowKeys.includes(it.id)),
-        item => item.id
-      );
-      Modal.confirm({
-        title: "确认信息",
-        content: "确认删除勾选的数据吗？",
-        onOk: () => {
-          this.setState({
-            progressVisible: true
-          }, () => {
-            this.timerDelete = setInterval(() => {
-              if (this.state.progress !== 100) {
-                this.setState({
-                  progress: this.state.progress + 10
-                });
-              } else {
-                clearInterval(this.timerDelete);
-                this.setState({
-                  progressVisible: false,
-                  progress: 0
-                }, () => {
-                  message.success("删除成功");
-                  selectedKey === "1"
-                    ? this.getNormalList({
-                      billMonth,
-                      paymentOrganization,
-                      current: calcPageNo(this.state.tableData.total, this.state.current, 10, includes.length)
-                    })
-                    : this.getSupplementaryList({
-                      billMonth,
-                      current: calcPageNo(this.state.tableData.total, this.state.current, 10, includes.length),
-                      paymentOrganization
-                    });
-                });
-              }
-            }, 800);
+    sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" }).then(({ status, data }) => {
+      if (status && data === "1" && !pageTurning) {
+        API.getNormalListSum({ ...payload, ...pageInfo, ...formParams })
+          .then(({ status: sumStatus, data: sumData }) => {
+            if (sumStatus) this.setState({ sumRow: sumData.sumRow }, () => this.postMessageToChild());
           });
-
-          siaccountCommonDelete({
-            billMonth,
-            includes,
-            ids,
-            paymentOrganization
-          }).then(() => {
-            clearInterval(this.timerDelete);
-            message.success("删除成功");
-            this.setState({ selectedRowKeys: [], progressVisible: false, progress: 0 });
-            selectedKey === "1"
-              ? this.getNormalList({
-                billMonth,
-                paymentOrganization,
-                current: calcPageNo(this.state.tableData.total, this.state.current, 10, includes.length)
-              })
-              : this.getSupplementaryList({
-                billMonth,
-                current: calcPageNo(this.state.tableData.total, this.state.current, 10, includes.length),
-                paymentOrganization
-              });
-          });
-
-        },
-        onCancel: () => {
-        }
-      });
-    }
-  };
-  handleAdd = () => {
-    this.setState({
-      addProps: {
-        ...this.state.addProps,
-        title: "添加缴纳人员",
-        visible: true
       }
     });
   };
-
-  handleCommonAccountClick = () => {
+  getSupplementaryList = (pageTurning = false) => {
+    const { pageInfo, formParams } = this.state;
+    const payload = { ..._.pick(this.props, ["billMonth", "paymentOrganization"]) };
+    this.setState({ loading: true });
+    API.getSupplementaryList({ ...payload, ...pageInfo, ...formParams }).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { pageInfo: { columns, list: dataSource, pageNum: current, pageSize, total } } = data;
+        this.setState({ pageInfo: { current, pageSize, total }, columns, dataSource }, () => this.postMessageToChild());
+      }
+    });
+    sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" }).then(({ status, data }) => {
+      if (status && data === "1" && !pageTurning) {
+        API.getSupplementaryListSum({ ...payload, ...pageInfo, ...formParams })
+          .then(({ status: sumStatus, data: sumData }) => {
+            if (sumStatus) this.setState({ sumRow: sumData.sumRow }, () => this.postMessageToChild());
+          });
+      }
+    });
+  };
+  handleBatchDelete = () => {
+    const { selectedRowKeys, dataSource, pageInfo } = this.state;
     const { billMonth, selectedKey, paymentOrganization } = this.props;
-    const { commonAccount } = this.props.standingBookStore;
-    commonAccount({ billMonth, paymentOrganization, includes: [] });
-    this.setState({
-      progressVisible: true
-    }, () => {
+    const includes = _.map(_.filter(dataSource, it => selectedRowKeys.includes(it.id)), item => item.employeeId);
+    const ids = _.map(_.filter(dataSource, it => selectedRowKeys.includes(it.id)), item => item.id);
+    Modal.confirm({
+      title: getLabel(111, "确认信息"),
+      content: getLabel(111, "确认删除勾选的数据吗？"),
+      onOk: () => {
+        this.setState({ progressVisible: true }, () => {
+          this.timerDelete = setInterval(() => {
+            if (this.state.progress !== 100) {
+              this.setState({ progress: this.state.progress + 10 });
+            } else {
+              clearInterval(this.timerDelete);
+              this.setState({
+                progressVisible: false, progress: 0, pageInfo: {
+                  ...pageInfo, current: calcPageNo(pageInfo.total, pageInfo.current, 10, includes.length)
+                }
+              }, () => {
+                message.success(getLabel(111, "操作成功！"));
+                selectedKey === "1" ? this.getNormalList() : this.getSupplementaryList();
+              });
+            }
+          }, 800);
+        });
+        API.siaccountCommonDelete({ billMonth, includes, ids, paymentOrganization })
+          .then(() => {
+            clearInterval(this.timerDelete);
+            this.setState({
+              selectedRowKeys: [], progressVisible: false, progress: 0, pageInfo: {
+                ...pageInfo, current: calcPageNo(pageInfo.total, pageInfo.current, 10, includes.length)
+              }
+            }, () => {
+              message.success(getLabel(111, "操作成功！"));
+              selectedKey === "1" ? this.getNormalList() : this.getSupplementaryList();
+            });
+          });
+
+      }
+    });
+  };
+  handleAdd = () => this.setState({
+    addProps: { ...this.state.addProps, title: getLabel(111, "添加缴纳人员"), visible: true }
+  });
+  handleCommonAccountClick = () => {
+    const { billMonth, paymentOrganization, selectedKey } = this.props;
+    const promise = API.commonAccount({ ..._.pick(this.props, ["billMonth", "paymentOrganization"]), includes: [] });
+    this.setState({ progressVisible: true }, () => {
       this.timer = setInterval(() => {
         getCalculateProgress(billMonth, paymentOrganization).then(({ status, data }) => {
           if (status) {
             if (!data.status) {
               clearInterval(this.timer);
-              this.setState({
-                progressVisible: false,
-                progress: 0
-              });
+              this.setState({ progressVisible: false, progress: 0 });
               message.error(data.message);
             }
             if (this.state.progress !== 100) {
@@ -376,50 +191,68 @@ export default class NormalIndex extends Component {
             } else {
               clearInterval(this.timer);
               this.setState({
-                progressVisible: false,
-                progress: 0
+                progressVisible: false, progress: 0
               }, () => {
-                message.success("核算成功");
-                selectedKey === "1"
-                  ? this.getNormalList({
-                    billMonth,
-                    paymentOrganization,
-                    current: this.state.current
-                  })
-                  : this.getSupplementaryList({
-                    billMonth,
-                    paymentOrganization,
-                    current: this.state.current
-                  });
+                message.success(getLabel(111, "操作成功！"));
+                this.getNormalList();
               });
             }
           } else {
             clearInterval(this.timer);
-            this.setState({
-              progressVisible: false,
-              progress: 0
-            });
+            this.setState({ progressVisible: false, progress: 0 });
           }
         }).catch(() => {
           clearInterval(this.timer);
-          this.setState({
-            progressVisible: false,
-            progress: 0
-          });
+          this.setState({ progressVisible: false, progress: 0 });
         });
       }, 600);
     });
   };
-
+  handleAddSocialAcctEmp = () => {
+    const { normalPayer, pageInfo } = this.state, { current, pageSize, total } = pageInfo;
+    API.addSocialAcctEmp({
+      ..._.pick(this.props, ["billMonth", "paymentOrganization"]), includes: normalPayer.split(",")
+    }).then(({ status, errormsg }) => {
+      if (status) {
+        message.success(getLabel(111, "操作成功"));
+        this.setState({
+          pageInfo: { ...pageInfo, current: calcPageNo(total, current, pageSize, normalPayer.split(",").length) }
+        }, () => this.getNormalList());
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
+  handleDeleteNormalPayer = () => {
+    Modal.confirm({
+      title: getLabel(111, "确认信息"),
+      content: getLabel(111, "确认删除勾选的数据吗？"),
+      onOk: () => {
+        const { selectedRowKeys: ids, pageInfo } = this.state, { current, pageSize, total } = pageInfo;
+        API.deleteSocialAcctEmp({ ..._.pick(this.props, ["billMonth", "paymentOrganization"]), ids })
+          .then(({ status, errormsg }) => {
+            if (status) {
+              message.success(getLabel(111, "操作成功！"));
+              this.setState({
+                selectedRowKeys: [],
+                pageInfo: { ...pageInfo, current: calcPageNo(total, current, pageSize, ids.length) }
+              }, () => this.getNormalList());
+            } else {
+              message.error(errormsg);
+            }
+          });
+      }
+    });
+  };
   handleExport = () => {
-    const { billMonth, selectedKey, paymentOrganization } = this.props;
+    const { selectedKey } = this.props;
     const urlObj = {
       "1": "/api/bs/hrmsalary/welfare/common/export",
       "3": "/api/bs/hrmsalary/welfare/supplementary/export"
     };
     const url = `${window.location
-      .origin}${urlObj[selectedKey]}?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`;
-    window.open(url, "_self");
+      .origin}${urlObj[selectedKey]}?${convertToUrlString(_.pick(this.props, ["billMonth", "paymentOrganization"]))}`;
+    window.open(url, "_blank");
   };
   handleEditNormalStandingBook = (record) => {
     const { userName, id: editId } = record;
@@ -433,82 +266,76 @@ export default class NormalIndex extends Component {
     this.setState({
       returnEditPersonSlide: { ...returnEditPersonSlide, visible: false, title: "", editId: "" }
     }, () => {
-      if (refreshList) {
-        const { current } = this.state;
-        const { billMonth, selectedKey, paymentOrganization } = this.props;
-        selectedKey === "1"
-          ? this.getNormalList({
-            billMonth,
-            paymentOrganization,
-            current
-          })
-          : this.getSupplementaryList({
-            billMonth,
-            paymentOrganization,
-            current
-          });
-      }
+      if (refreshList) this.props.selectedKey === "1" ? this.getNormalList() : this.getSupplementaryList();
     });
   };
   getSearchs = () => {
-    return <WeaSearchGroup needTigger showGroup title="其他条件">
+    const { formParams } = this.state, { workcode, departmentIds, subCompanyIds } = formParams;
+    return <WeaSearchGroup needTigger showGroup title="">
       <Row>
-        <Col span={12}><WeaFormItem label="工号" labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
-          <WeaInput
-            value={this.state.workcode}
-            onChange={v => this.setState({ workcode: v })}
-          />
+        <Col span={12}><WeaFormItem label={getLabel(111, "工号")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
+          <WeaInput value={workcode} onChange={v => this.setState({ formParams: { ...formParams, workcode: v } })}/>
         </WeaFormItem></Col>
         <Col span={12}><WeaFormItem label={getLabel(27511, "部门")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
           <WeaBrowser
-            isSingle={false} value={this.state.departmentIds} type={57}
-            onChange={v => this.setState({ departmentIds: v })}/>
+            isSingle={false} value={departmentIds.join(",")} type={57}
+            onChange={v => this.setState({ formParams: { ...formParams, departmentIds: v.split(",") } })}/>
         </WeaFormItem></Col>
         <Col span={12}><WeaFormItem label={getLabel(33553, "分部")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
           <WeaBrowser
-            isSingle={false} value={this.state.subCompanyIds} type={164}
-            onChange={v => this.setState({ subCompanyIds: v })}/>
+            isSingle={false} value={subCompanyIds.join(",")} type={164}
+            onChange={v => this.setState({ formParams: { ...formParams, subCompanyIds: v.split(",") } })}/>
         </WeaFormItem></Col>
       </Row>
     </WeaSearchGroup>;
   };
 
   render() {
-    const { remarks, billMonth, selectedKey, paymentOrganization, standingBookStore } = this.props;
-    const { addProps, adjustSlide, importParams, returnEditPersonSlide, showSearchAd } = this.state;
-    const { loading } = standingBookStore;
+    const { remarks, billMonth, selectedKey, paymentOrganization, type } = this.props;
+    const {
+      formParams, addProps, adjustSlide, importParams, returnEditPersonSlide,
+      showSearchAd, selectedRowKeys, loading
+    } = this.state;
     const btn1 = [
-      <Button type="primary" onClick={this.handleBatchDelete}>批量删除</Button>,
-      <Button type="primary" onClick={this.handleAdd}>添加缴纳人员</Button>
+      <WeaButtonIcon buttonType="del" type="primary" title={getLabel(111, "删除")} disabled={_.isEmpty(selectedRowKeys)}
+                     onClick={this.handleBatchDelete}/>,
+      <WeaButtonIcon buttonType="add" type="primary" title={getLabel(111, "添加")}
+                     onClick={this.handleAdd}/>
     ];
     const btn2 = [
-      <Button type="primary" onClick={this.handleCommonAccountClick}>核算</Button>,
-      <Button type="primary"
-              onClick={() => this.setState({ adjustSlide: { ...adjustSlide, visible: true } })}>调差</Button>
+      <WeaButtonIcon buttonType="del" type="primary" title={getLabel(111, "删除")} disabled={_.isEmpty(selectedRowKeys)}
+                     onClick={this.handleDeleteNormalPayer}/>,
+      <WeaBrowser type={17} title={getLabel(383694, "添加人员")} isSingle={false} customized
+                  onChange={ids => this.setState({ normalPayer: ids }, () => this.handleAddSocialAcctEmp())}>
+        <WeaButtonIcon buttonType="add" type="primary" title={getLabel(111, "添加")}/>
+      </WeaBrowser>,
+      <Button type="primary" onClick={this.handleCommonAccountClick}>{getLabel(111, "核算")}</Button>,
+      <Button type="ghost" onClick={() => this.setState({
+        adjustSlide: { ...adjustSlide, visible: true }
+      })}>{getLabel(111, "调差")}</Button>
     ];
     const btn3 = [
-      <Button type="primary" onClick={() => {
+      <i className="iconfont icon-duibi" onClick={() => {
         window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/sbofflineComparison?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`);
-      }}>线下对比</Button>
+      }} title={getLabel(111, "线下对比")}/>
     ];
     const btn4 = [
-      <Button type="primary"
-              onClick={() => this.setState({
-                importParams: {
-                  ...importParams, visible: true,
-                  tmpUrl: selectedKey === "1" ? "exportSiaccountWelfareImporttemplate" : "exportSiaccountWelfaresupplyimporttemplatetemplate"
-                }
-              })}>导入数据</Button>
+      <i className="iconfont icon-import" onClick={() => this.setState({
+        importParams: {
+          ...importParams, visible: true,
+          tmpUrl: selectedKey === "1" ? "exportSiaccountWelfareImporttemplate" : "exportSiaccountWelfaresupplyimporttemplatetemplate"
+        }
+      })} title={getLabel(111, "导入")}/>
     ];
     const btn5 = [
-      <Button type="primary" onClick={this.handleExport}>导出全部</Button>
+      <i className="iconfont icon-export" onClick={this.handleExport} title={getLabel(111, "导出")}/>
     ];
     let btn = [];
-    (this.props.type !== "detail" && this.props.selectedKey == "3") && (btn = [...btn, ...btn1]);
-    (selectedKey === "1" && this.props.type !== "detail") && (btn = [...btn, ...btn2]);
-    selectedKey === "1" && (btn = [...btn, ...btn3]);
-    this.props.type !== "detail" && (btn = [...btn, ...btn4]);
-    btn = [...btn, ...btn5];
+    (type !== "detail" && selectedKey === "3") && (btn = [...btn, ...btn1]);
+    (selectedKey === "1" && type !== "detail") && (btn = [...btn, ...btn2]);
+    btn = [...btn5, ...btn];
+    type !== "detail" && (btn = [...btn4, ...btn]);
+    selectedKey === "1" && (btn = [...btn3, ...btn]);
     return (
       <div className="normalWapper">
         {
@@ -516,20 +343,16 @@ export default class NormalIndex extends Component {
           <div className="topContent">
             <div className="month">
               <span>
-                账单月份
-                <Tooltip placement="topLeft" title="提示：正常缴纳，账单月份即社保福利缴纳月份">
+                {getLabel(111, "账单月份")}
+                <Tooltip placement="topLeft" title={getLabel(111, "提示：正常缴纳，账单月份即社保福利缴纳月份")}>
                   <Icon type="question-circle"/>
                 </Tooltip>
               </span>
-              <span>
-                {billMonth}
-              </span>
+              <span>{billMonth}</span>
             </div>
             <div>
-              <span>备注：</span>
-              <span>
-                {remarks}
-              </span>
+              <span>{getLabel(111, "备注：")}</span>
+              <span>{remarks}</span>
             </div>
           </div>
         }
@@ -537,39 +360,26 @@ export default class NormalIndex extends Component {
           datas={[]} selectedKey="" advanceHeight={200} searchsAd={this.getSearchs()}
           searchType={["base", "advanced"]} showSearchAd={showSearchAd}
           setShowSearchAd={bool => this.setState({ showSearchAd: bool })}
-          onSearchChange={searchValue => this.setState({ searchValue })}
+          onSearchChange={userName => this.setState({ formParams: { ...formParams, userName } })}
           buttons={btn} onSearch={this.handleSearch} onAdSearch={this.handleSearch}
-          onAdReset={() => this.setState({ workcode: "" })} searchsBasePlaceHolder="请输入员工姓名"
-        />
-        <SupplementarySlide
-          {...addProps}
-          billMonth={billMonth} paymentOrganization={paymentOrganization}
-          onCancel={(isRefresh) => {
-            this.setState({
-              addProps: {
-                ...addProps,
-                visible: false
-              }
-            }, () => {
-              isRefresh && this.getSupplementaryList({
-                billMonth,
-                current: this.state.current,
-                paymentOrganization
-              });
-            });
-          }}
-        />
+          onAdReset={() => this.setState({
+            formParams: { userName: "", workcode: "", departmentIds: [], subCompanyIds: [] }
+          })}/>
+        {/*添加补缴弹框*/}
+        <SupplementarySlide {...addProps} {..._.pick(this.props, ["billMonth", "paymentOrganization"])}
+                            onCancel={(isRefresh) => {
+                              this.setState({ addProps: { ...addProps, visible: false } }, () => {
+                                isRefresh && this.getSupplementaryList();
+                              });
+                            }}/>
         {/*核算进度条*/}
         <ProgressModal
-          title={selectedKey === "3" ? "正在删除请稍后" : "正在核算请稍后"}
+          title={selectedKey === "3" ? getLabel(111, "正在删除请稍后") : getLabel(111, "正在核算请稍后")}
           visible={this.state.progressVisible}
-          onCancel={() => {
-            this.setState({ progressVisible: false, progress: 0 });
-          }}
-          progress={this.state.progress}
-        />
+          onCancel={() => this.setState({ progressVisible: false, progress: 0 })}
+          progress={this.state.progress}/>
         {/*导入弹框*/}
-        <StandingBookCalcImportDialog {...importParams}
+        <StandingBookCalcImportDialog {...importParams} {..._.pick(this.props, ["billMonth", "paymentOrganization"])}
                                       onCancel={(isInit) => this.setState({
                                         importParams: { ...importParams, visible: false }
                                       }, () => isInit && this.handleSearch())}/>
@@ -585,17 +395,9 @@ export default class NormalIndex extends Component {
           </Spin>
           {/*编辑弹框*/}
           <RegEditDetial {...returnEditPersonSlide} onCancel={this.handleCloseNormalStandingBookModal}/>
-          <AdjustmentSlide
-            {...adjustSlide}
-            onCancel={() => {
-              this.setState({
-                adjustSlide: {
-                  ...adjustSlide,
-                  visible: false
-                }
-              });
-            }}
-          />
+          {/*调差*/}
+          <AdjustmentSlide {...adjustSlide} {..._.pick(this.props, ["billMonth", "paymentOrganization"])}
+                           onCancel={() => this.setState({ adjustSlide: { ...adjustSlide, visible: false } })}/>
         </div>
       </div>
     );
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/overView.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/overView.js
index 015156ac..acb72e00 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/overView.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/overView.js
@@ -5,107 +5,69 @@
  * LastEditTime: 2022-05-09 15:07:56
  */
 import React, { Component } from "react";
-import { Button, Icon, Spin, Tooltip } from "antd";
-import { inject, observer } from "mobx-react";
-import { WeaNewScroll, WeaTable } from "ecCom";
+import { Icon, Spin, Tooltip } from "antd";
+import { WeaLocaleProvider, WeaNewScroll, WeaTable } from "ecCom";
+import { getOverViewList } from "../../../../apis/standingBook";
 import "./index.less";
+import { convertToUrlString } from "../../../../util/url";
 
-@inject("standingBookStore")
-@observer
+const getLabel = WeaLocaleProvider.getLabel;
 export default class OverViewIndex extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedRowKeys: [],
-      current: 1,
-      pageSize: 10,
-      tableData: {
-        list: [],
-        columns: [],
-        total: 0
-      }
+      dataSource: [], columns: [], pageInfo: { current: 1, pageSize: 10, total: 0 }, loading: false
     };
   }
 
   componentDidMount() {
-    const { billMonth, paymentOrganization } = this.props;
-    this.getOverViewList({ billMonth, paymentOrganization });
+    this.getOverViewList();
   }
 
-  getOverViewList = (payload = {}) => {
-    const { getOverViewList } = this.props.standingBookStore;
-    getOverViewList({ ...payload, current: 1 }).then(
-      ({ list, columns = [], total }) => {
-        columns = _.map(
-          _.filter(columns, (it) => it.dataIndex !== "id"),
-          (it) => {
-            // if (it.dataIndex === "employeeId") {
-            //   it = {
-            //     ...it,
-            //     width: 150,
-            //     fixed: 'left'
-            //   }
-            // }
-            return {
-              ...it,
-              title: (
+  getOverViewList = () => {
+    const { pageInfo } = this.state;
+    this.setState({ loading: true });
+    getOverViewList({ ..._.pick(this.props, ["billMonth", "paymentOrganization"]), ...pageInfo })
+      .then(({ status, data }) => {
+        this.setState({ loading: false });
+        if (status) {
+          const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+          this.setState({
+            dataSource, pageInfo: { current, pageSize, total },
+            columns: _.map(columns, (it) => ({
+              ...it, title: (
                 <span dangerouslySetInnerHTML={{ __html: it.title }}></span>
               )
-            };
-          }
-        );
-        this.setState({
-          tableData: {
-            list,
-            columns,
-            total
-          }
-        });
-      }
-    );
+            }))
+          });
+        }
+      });
   };
   handleExport = () => {
-    const { billMonth, paymentOrganization } = this.props;
-    const url = `${window.location
-      .origin}/api/bs/hrmsalary/welfare/overView/export?billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`;
-    window.open(url, "_self");
+    const url = `/api/bs/hrmsalary/welfare/overView/export?${convertToUrlString(_.pick(this.props, ["billMonth", "paymentOrganization"]))}`;
+    window.open(url, "_blank");
   };
 
   render() {
-    const { remarks, billMonth, selectedKey, paymentOrganization } = this.props;
-    const { selectedRowKeys } = this.state;
-    const { loading } = this.props.standingBookStore;
-    let { list, columns, total } = this.state.tableData;
+    const { pageInfo, loading, dataSource, columns } = this.state, { billMonth } = this.props;
     const pagination = {
-      total,
-      showTotal: (total) => `共 ${total} 条`,
-      showSizeChanger: true,
+      ...pageInfo,
+      showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
       showQuickJumper: true,
+      showSizeChanger: true,
       pageSizeOptions: ["10", "20", "50", "100"],
       onShowSizeChange: (current, pageSize) => {
-        this.setState({ current, pageSize });
-        this.getOverViewList({
-          billMonth, current,
-          pageSize, paymentOrganization
-        });
+        this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => this.getOverViewList());
       },
-      onChange: (current) => {
-        this.setState({ current });
-        this.getOverViewList({
-          billMonth, current,
-          pageSize: this.state.pageSize, paymentOrganization
-        });
-      }
+      onChange: current => this.setState({ pageInfo: { ...pageInfo, current } }, () => this.getOverViewList())
     };
     return (
       <div className="normalWapper">
         <div className="topContent">
           <div className="month">
             <span>
-              账单月份
-              <Tooltip
-                placement="topLeft"
-                title="提示：正常缴纳，账单月份即社保福利缴纳月份">
+              {getLabel(111, "账单月份")}
+              <Tooltip placement="topLeft" title={getLabel(111, "提示：正常缴纳，账单月份即社保福利缴纳月份")}>
                 <Icon type="question-circle"/>
               </Tooltip>
             </span>
@@ -113,20 +75,14 @@ export default class OverViewIndex extends Component {
           </div>
         </div>
         <div className="tabOption">
-          <Button type="primary" onClick={this.handleExport}>导出全部</Button>
+          <i className="iconfont icon-export" onClick={this.handleExport} title={getLabel(111, "导出")}/>
         </div>
         {/* table */}
         <div className="tableWrapper">
           <WeaNewScroll height="100%">
             <Spin spinning={loading}>
-              <WeaTable
-                rowKey="id"
-                columns={columns}
-                dataSource={list}
-                loading={loading}
-                pagination={pagination}
-                scroll={{ x: 1200 }}
-              />
+              <WeaTable rowKey="id" columns={columns} dataSource={dataSource} loading={loading} pagination={pagination}
+                        scroll={{ x: 1200 }}/>
             </Spin>
           </WeaNewScroll>
         </div>
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regAddEmployee.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regAddEmployee.js
index c311d035..793b5acc 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regAddEmployee.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regAddEmployee.js
@@ -8,7 +8,6 @@ import React, { Component } from "react";
 import { WeaDatePicker, WeaDialog, WeaFormItem, WeaSearchGroup, WeaSelect } from "ecCom";
 import { Button, Modal } from "antd";
 import RegSelect from "./regSelect";
-import * as API from "../../../../apis/standingBook";
 
 class RegAddEmployee extends Component {
   constructor(props) {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
index 979cccc9..c37db36c 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
@@ -5,10 +5,9 @@
  * Date: 2022/11/23
  */
 import React, { Component } from "react";
-import { WeaInputNumber, WeaLocaleProvider, WeaSearchGroup, WeaSlideModal, WeaTable } from "ecCom";
-import { message } from "antd";
+import { WeaInputNumber, WeaLocaleProvider, WeaSearchGroup, WeaSlideModal, WeaTable, WeaTop } from "ecCom";
+import { Button, message } from "antd";
 import * as API from "../../../../apis/standingBook";
-import SlideModalTitle from "../../../../components/slideModalTitle";
 import { regColumns } from "../constant";
 import { toDecimal_n } from "../../../../util";
 
@@ -20,37 +19,19 @@ class RegEditDetial extends Component {
     this.state = {
       loading: false,
       listMap: [
-        {
-          key: "social",
-          label: "社保",
-          dataSource: [],
-          columns: []
-        },
-        {
-          key: "fund",
-          label: "公积金",
-          dataSource: [],
-          columns: []
-        },
-        {
-          key: "other",
-          label: "企业年金及其他福利",
-          dataSource: [],
-          columns: []
-        }
+        { key: "social", label: getLabel(111, "社保"), dataSource: [], columns: [] },
+        { key: "fund", label: getLabel(111, "公积金"), dataSource: [], columns: [] },
+        { key: "other", label: getLabel(111, "企业年金及其他福利"), dataSource: [], columns: [] }
       ]
     };
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.editId !== this.props.editId && nextProps.editId) {
-      this.getPaymentById(nextProps.editId);
-    }
+    if (nextProps.editId !== this.props.editId && nextProps.editId) this.getPaymentById(nextProps.editId);
   }
 
   handleSave = () => {
-    const { editId, onCancel } = this.props;
-    const { listMap } = this.state;
+    const { editId, onCancel } = this.props, { listMap } = this.state;
     const [socialData, foundData, otherData] = listMap;
     let payload = {
       id: editId,
@@ -100,8 +81,7 @@ class RegEditDetial extends Component {
     });
   };
   handleChange = (type, dataIndex, value, record) => {
-    const { listMap } = this.state;
-    const [socialData, foundData, otherData] = listMap;
+    const { listMap } = this.state, [socialData, foundData, otherData] = listMap;
     switch (type) {
       case "social":
         const sociallist = _.map(socialData.dataSource, item => {
@@ -139,7 +119,6 @@ class RegEditDetial extends Component {
       default:
         break;
     }
-
   };
   getPaymentById = (id) => {
     const payload = { id };
@@ -257,39 +236,26 @@ class RegEditDetial extends Component {
     const { visible, title, onCancel } = this.props;
     const { listMap, loading } = this.state;
     return (
-      <WeaSlideModal
-        className="slideOuterWrapper"
-        visible={visible}
-        top={0}
-        width={48}
-        height={100}
-        direction="right"
-        measure="%"
-        title={
-          <SlideModalTitle
-            loading={loading}
-            subtitle={title}
-            showOperateBtn={true}
-            editable={true}
-            onSave={this.handleSave}
-          />
-        }
-        content={
-          <div className="regEditContentWrapper">
-            {
-              _.map(listMap, item => {
-                const { key, label, dataSource, columns } = item;
-                return <WeaSearchGroup title={label} items={[]} needTigger showGroup key={key}>
-                  <WeaTable dataSource={dataSource} columns={columns} pagination={false}/>
-                </WeaSearchGroup>;
-              })
-            }
-          </div>
-        }
-        onClose={() => onCancel()}
-        showMask={true}
-      />
-    );
+      <WeaSlideModal className="slideOuterWrapper" visible={visible} top={0} width={48}
+                     height={100} direction="right" measure="%"
+                     title={<WeaTop title={title} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
+                                    buttons={[<Button type="primary" onClick={this.handleSave}
+                                                      style={{ marginRight: 40 }}
+                                                      loading={loading}>{getLabel(111, "保存")}</Button>]}/>
+                     }
+                     content={
+                       <React.Fragment>
+                         {
+                           _.map(listMap, item => {
+                             const { key, label, dataSource, columns } = item;
+                             return <WeaSearchGroup title={label} items={[]} needTigger showGroup key={key}>
+                               <WeaTable dataSource={dataSource} columns={columns} pagination={false} bordered/>
+                             </WeaSearchGroup>;
+                           })
+                         }
+                       </React.Fragment>
+                     }
+                     onClose={() => onCancel()}/>);
   }
 }
 
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
index 849cb407..08f65301 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
@@ -6,36 +6,27 @@
  */
 import React, { Component } from "react";
 import { Spin } from "antd";
-import { getQueryString } from "../../../../util/url";
+import { sysConfCodeRule } from "../../../../apis/ruleconfig";
 import * as API from "../../../../apis/standingBook";
 import "./index.less";
 
 const APIFox = {
   "regression": API.recessionList,
-  "difference": API.balanceList
+  "regressionSum": API.recessionListSum,
+  "difference": API.balanceList,
+  "differenceSum": API.balanceListSum
 };
 
 class RegList extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      columns: [],
-      dataSource: [],
-      selectedRowKeys: [],
-      loading: {
-        query: false
-      },
-      datalistPayload: {},
-      pageInfo: {
-        current: 1,
-        pageSize: 10,
-        total: 0
-      }
+      columns: [], dataSource: [], selectedRowKeys: [], pageInfo: { current: 1, pageSize: 10, total: 0 },
+      loading: false, sumRow: {}
     };
   }
 
   componentDidMount() {
-    this.recessionList();
     window.addEventListener("message", this.handleReceive, false);
   }
 
@@ -43,11 +34,11 @@ class RegList extends Component {
     const { onEdit, onChangeRowkey } = this.props;
     const { type, payload: { id, params } = {} } = data;
     if (type === "init") {
-      this.postMessageToChild();
+      this.recessionList();
     } else if (type === "turn") {
       if (id === "PAGEINFO") {
         const { pageNum: current, size: pageSize } = params;
-        this.setState({ pageInfo: { ...this.state.pageInfo, current, pageSize } }, () => this.recessionList());
+        this.setState({ pageInfo: { ...this.state.pageInfo, current, pageSize } }, () => this.recessionList({}, true));
       } else if (id === "ROWSELECT") {
         const { selectedRowKeys } = params;
         this.setState({ selectedRowKeys });
@@ -58,24 +49,15 @@ class RegList extends Component {
     }
   };
   postMessageToChild = () => {
-    const paymentStatus = this.props.type === "difference" ? "4" : "3";
-    const creator = Number(getQueryString("creator"));
-    const billMonth = getQueryString("billMonth");
-    const paymentOrganization = getQueryString("paymentOrganization");
     const childFrameObj = document.getElementById("atdTable");
-    const { pageInfo, dataSource, columns, selectedRowKeys, datalistPayload } = this.state;
-    childFrameObj.contentWindow.postMessage(JSON.stringify({
-      dataSource, columns, pageInfo,
-      selectedRowKeys, selectedKey: this.props.type,
-      sumpayload: { billMonth, paymentOrganization, creator, paymentStatus, ...datalistPayload },
-      showOperates: !getQueryString("type")
+    childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
+      ..._.pick(this.state, ["dataSource", "columns", "pageInfo", "selectedRowKeys", "sumRow"]),
+      showOperates: !this.props.type
     }), "*");
   };
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.visible !== this.props.visible) {
-      this.recessionList();
-    }
+    if (nextProps.visible !== this.props.visible) this.recessionList();
   }
 
   componentWillUnmount() {
@@ -85,41 +67,37 @@ class RegList extends Component {
   handleResetSelectRowKeys = (selectedRowKeys) => {
     this.setState({ selectedRowKeys });
   };
-  recessionList = (module) => {
-    const { type } = this.props;
-    const { loading, pageInfo } = this.state;
-    const billMonth = getQueryString("billMonth");
-    const paymentOrganization = getQueryString("paymentOrganization");
-    const creator = Number(getQueryString("creator"));
-    const paymentStatus = type === "difference" ? "4" : "3";
+  recessionList = (module, pageTurning = false) => {
+    const { regType } = this.props, { pageInfo } = this.state;
+    const paymentStatus = regType === "difference" ? "4" : "3";
     const payload = {
-      billMonth, paymentStatus,
-      creator, paymentOrganization,
-      ...pageInfo,
-      ...module
+      ...pageInfo, ...module, paymentStatus,
+      ..._.pick(this.props, ["billMonth", "paymentOrganization", "creator"])
     };
-    this.setState({ loading: { ...loading, query: true } });
-    APIFox[type](payload).then(({ status, data }) => {
-      this.setState({ loading: { ...loading, query: false } });
+    this.setState({ loading: true });
+    APIFox[regType](payload).then(({ status, data }) => {
+      this.setState({ loading: false });
       if (status) {
         const { pageInfo: list } = data;
         const { columns, list: dataSource, pageNum: current, pageSize, total } = list;
         this.setState({
-          pageInfo: { ...pageInfo, current, pageSize, total },
-          dataSource,
-          columns,
-          datalistPayload: module
+          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, columns
         }, () => this.postMessageToChild());
       }
-    }).catch(() => {
-      this.setState({ loading: { ...loading, query: false } });
+    });
+    sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" }).then(({ status, data }) => {
+      if (status && data === "1" && !pageTurning) {
+        APIFox[`${regType}Sum`](payload).then(({ status: sumStatus, data: sumData }) => {
+          if (sumStatus) this.setState({ sumRow: sumData.sumRow }, () => this.postMessageToChild());
+        });
+      }
     });
   };
 
   render() {
     const { loading } = this.state;
     return (
-      <Spin spinning={loading.query}>
+      <Spin spinning={loading}>
         <iframe
           style={{ border: 0, width: "100%", height: "100%" }}
           // src="http://localhost:7607/#/standingbookTable"
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
index 0c6de7cc..e972210d 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
@@ -1,7 +1,15 @@
 import React, { Component } from "react";
-import { Button, Col, Row } from "antd";
-import { WeaBrowser, WeaFormItem, WeaHelpfulTip, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
-import { getQueryString } from "../../../../util/url";
+import { Col, Row } from "antd";
+import {
+  WeaBrowser,
+  WeaButtonIcon,
+  WeaFormItem,
+  WeaHelpfulTip,
+  WeaInput,
+  WeaLocaleProvider,
+  WeaSearchGroup,
+  WeaTab
+} from "ecCom";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -18,9 +26,7 @@ class RegTop extends Component {
   }
 
   renderTopBtns = () => {
-    const { name } = this.state;
-    const { onChange, selectKey, type: regtopType } = this.props;
-    const type = getQueryString("type");
+    const { onChange, selectKey, regtopType, type } = this.props;
     let dom = [
       <WeaHelpfulTip
         title={
@@ -37,21 +43,22 @@ class RegTop extends Component {
         placement="bottomRight"
         width={250}
       />,
-      <Button type="primary" onClick={() => onChange("export")}>导出全部</Button>
+      <i className="iconfont icon-export" onClick={() => onChange("export")} title={getLabel(111, "导出")}/>
     ];
     if (!type) {
       const [dom1, ...extra] = dom;
-      const domBtn = regtopType === "regression" ?
-        [<Button type="primary" onClick={() => onChange("add")}>添加</Button>] :
-        [
-          <Button type="primary" onClick={() => onChange("add")}>{getLabel(384113, "添加")}</Button>,
-          <Button type="primary" onClick={() => onChange("import")}>{getLabel(32935, "导入")}</Button>
-        ];
-      dom = [
+      const domBtn = [<WeaButtonIcon buttonType="add" type="primary" title={getLabel(111, "添加")}
+                                     onClick={() => onChange("add")}/>];
+      dom = regtopType === "regression" ? [
+        dom1, ...extra,
+        <WeaButtonIcon buttonType="del" type="primary" title={getLabel(111, "删除")} disabled={_.isEmpty(selectKey)}
+                       onClick={() => onChange("delete")}/>, ...domBtn
+      ] : [
         dom1,
-        <Button type="primary" disabled={_.isEmpty(selectKey)} onClick={() => onChange("delete")}>
-          删除
-        </Button>, ...domBtn, ...extra
+        <i className="iconfont icon-import" onClick={() => onChange("import")} title={getLabel(111, "导入")}/>,
+        ...extra,
+        <WeaButtonIcon buttonType="del" type="primary" title={getLabel(111, "删除")} disabled={_.isEmpty(selectKey)}
+                       onClick={() => onChange("delete")}/>, ...domBtn
       ];
     }
     return dom;
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
index 3b35e57e..d8c4b744 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
@@ -10,7 +10,7 @@ import RegTop from "./regTop";
 import RegList from "./regList";
 import RegAddEmployee from "./regAddEmployee";
 import RegEditDetial from "./regEditDetial";
-import { getQueryString } from "../../../../util/url";
+import { convertToUrlString } from "../../../../util/url";
 import { calcPageNo } from "../../../../util";
 import * as API from "../../../../apis/standingBook";
 import "./index.less";
@@ -52,12 +52,8 @@ class Regression extends Component {
   };
   handleSave = (params) => {
     const { loading } = this.state;
-    const billMonth = getQueryString("billMonth");
-    const paymentOrganization = getQueryString("paymentOrganization");
     const payload = {
-      ...params,
-      billMonth,
-      paymentOrganization
+      ...params, ..._.pick(this.props, ["billMonth", "paymentOrganization"])
     };
     this.setState({ loading: { ...loading, save: true } });
     API.saveRecession(payload).then(({ status, errormsg }) => {
@@ -76,9 +72,6 @@ class Regression extends Component {
     const workcode = this.regTopRef.state.workcode;
     const departmentIds = this.regTopRef.state.departmentIds ? this.regTopRef.state.departmentIds.split(",") : [];
     const subCompanyIds = this.regTopRef.state.subCompanyIds ? this.regTopRef.state.subCompanyIds.split(",") : [];
-    const billMonth = getQueryString("billMonth");
-    const creator = Number(getQueryString("creator"));
-    const paymentOrganization = getQueryString("paymentOrganization");
     switch (key) {
       case "add":
         this.setState({ returnPersonModal: { ...returnPersonModal, visible: true } });
@@ -95,8 +88,8 @@ class Regression extends Component {
         });
         break;
       case "export":
-        const url = `${window.location.origin}/api/bs/hrmsalary/welfare/recession/export?creator=${creator}&billMonth=${billMonth}&paymentOrganization=${paymentOrganization}`;
-        window.open(url, "_self");
+        const url = `/api/bs/hrmsalary/welfare/recession/export?${convertToUrlString(_.pick(this.props, ["billMonth", "paymentOrganization", "creator"]))}`;
+        window.open(url, "_blank");
         break;
       case "search":
         this.regListRef.recessionList({ userName: name, workcode, departmentIds, subCompanyIds, current: 1 });
@@ -124,21 +117,20 @@ class Regression extends Component {
   };
 
   render() {
-    const billMonth = getQueryString("billMonth");
     const { returnPersonModal, returnEditPersonSlide, selectKey, loading } = this.state;
     return (
       <div className="regressionWrapper">
         <RegTop
-          type="regression"
+          {..._.pick(this.props, ["billMonth", "type"])}
+          regtopType="regression"
           ref={dom => this.regTopRef = dom}
-          billMonth={billMonth}
           onChange={this.handleChangeOpt}
           selectKey={selectKey}
         />
         <div className="tableWrapper">
-          {/*<WeaNewScroll height="100%">*/}
           <RegList
-            type="regression"
+            {..._.pick(this.props, ["billMonth", "paymentOrganization", "creator", "type"])}
+            regType="regression"
             ref={dom => this.regListRef = dom}
             visible={returnPersonModal.visible}
             onChangeRowkey={(selectKey) => this.setState({ selectKey })}
@@ -154,7 +146,6 @@ class Regression extends Component {
             onCancel={this.handleCloseModal}
             onSave={this.handleSave}
           />
-          {/*</WeaNewScroll>*/}
         </div>
       </div>
     );
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js
index fb4a2db8..46ce5b60 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/standingBookCalcImportDialog.js
@@ -10,7 +10,6 @@ import { Badge, Button, message } from "antd";
 import ImportDialog from "../../../../components/importDialog";
 import ImportHeaderSetDialog from "./importHeaderSetDialog";
 import * as API from "../../../../apis/standingBook";
-import { getQueryString } from "../../../../util/url";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -64,17 +63,14 @@ class StandingBookCalcImportDialog extends Component {
     }
   };
   handleExportTemp = () => {
-    const { tmpUrl } = this.props;
+    const { tmpUrl, billMonth, paymentOrganization } = this.props;
     const { headerFieldsDialog: { selectItems, itemsByGroup } } = this.state;
     if (_.isEmpty(selectItems)) {
       message.error(getLabel(111, "请选择表头字段"));
     } else {
-      const billMonth = getQueryString("billMonth");
-      const paymentOrganization = getQueryString("paymentOrganization");
       const payload = {
-        billMonth,
-        welfareNames: _.map(_.filter(itemsByGroup, k => selectItems.includes(k.fieldId)), o => o.salaryItemName),
-        paymentOrganization: Number(paymentOrganization)
+        billMonth, paymentOrganization: Number(paymentOrganization),
+        welfareNames: _.map(_.filter(itemsByGroup, k => selectItems.includes(k.fieldId)), o => o.salaryItemName)
       };
       const promise = API[tmpUrl](payload);
     }
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js
index 3719461f..706ddbae 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js
@@ -6,16 +6,15 @@
  */
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
-import { message, Modal } from "antd";
-import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaSelect, WeaSlideModal } from "ecCom";
-import SlideModalTitle from "../../../../components/slideModalTitle";
+import { Button, message, Modal } from "antd";
+import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaSelect, WeaSlideModal, WeaTop } from "ecCom";
 import { Picker, SelectWithAll } from "./regAddEmployee";
 import { Browser } from "../../../dataAcquisition/addItems";
 import { getPaymentGroup, getSupplementPaymentForm, siaccountSupplementarySave } from "../../../../apis/standingBook";
-import "./index.less";
 import BusinessAccounting from "./businessAccounting";
 import InputPaymentAmount from "./inputPaymentAmount";
 import { toDecimal_n } from "../../../../util";
+import "./index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -236,7 +235,7 @@ class SupplementarySlide extends Component {
   };
 
   render() {
-    const { title, visible, onCancel, taxAgentStore: { showOperateBtn } } = this.props;
+    const { title, visible, onCancel, taxAgentStore: { PageAndOptAuth } } = this.props;
     const { baseInfo, loading, businessAccounting, inputPaymentAmount } = this.state;
     const baseItems = [
       {
@@ -366,50 +365,41 @@ class SupplementarySlide extends Component {
         })
       }
     ];
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     return (
-      <WeaSlideModal
-        className="supplementarySlideWrapper"
-        visible={visible}
-        top={0}
-        measureT="%"
-        width={800}
-        measureX="px"
-        height={100}
-        measureY="%"
-        direction="right"
-        title={
-          <SlideModalTitle
-            subtitle={title}
-            tabs={[]}
-            loading={loading}
-            showOperateBtn={showOperateBtn}
-            editable={true}
-            onSave={this.handleSaveSupplementSalary}
-          />
-        }
-        content={
-          <div>
-            <WeaSearchGroup
-              title="基础信息"
-              items={baseInfo.supplementType === "2" ? [...baseItems, ...baseExtraItems] : baseItems}
-              showGroup col={1}
-            />
-            {/* 按补缴人员的历史月份核算基数和当前档案方案核算 */}
-            {
-              baseInfo.supplementType === "2" &&
-              <BusinessAccounting {...businessAccounting} onChangeBaseItem={this.handleChangeBaseFieldItem}/>
-            }
-            {/* 动输入补缴金额 */}
-            {
-              baseInfo.supplementType === "3" &&
-              <InputPaymentAmount {...inputPaymentAmount} onChangeInputItem={this.handleChangeInputItem}/>
-            }
-          </div>
-        }
-        onClose={() => {
-          onCancel();
-          this.handleResetForm();
-        }}
+      <WeaSlideModal className="supplementarySlideWrapper" visible={visible} top={0} measureT="%" width={800}
+                     measureX="px" height={100} measureY="%" direction="right"
+                     title={
+                       <WeaTop title={title} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
+                               buttons={showOperateBtn ? [<Button type="primary"
+                                                                  onClick={this.handleSaveSupplementSalary}
+                                                                  style={{ marginRight: 40 }}
+                                                                  loading={loading}>{getLabel(111, "保存")}</Button>] : []}/>
+                     }
+                     content={
+                       <div>
+                         <WeaSearchGroup
+                           title="基础信息"
+                           items={baseInfo.supplementType === "2" ? [...baseItems, ...baseExtraItems] : baseItems}
+                           showGroup col={1}
+                         />
+                         {/* 按补缴人员的历史月份核算基数和当前档案方案核算 */}
+                         {
+                           baseInfo.supplementType === "2" &&
+                           <BusinessAccounting {...businessAccounting}
+                                               onChangeBaseItem={this.handleChangeBaseFieldItem}/>
+                         }
+                         {/* 动输入补缴金额 */}
+                         {
+                           baseInfo.supplementType === "3" &&
+                           <InputPaymentAmount {...inputPaymentAmount} onChangeInputItem={this.handleChangeInputItem}/>
+                         }
+                       </div>
+                     }
+                     onClose={() => {
+                       onCancel();
+                       this.handleResetForm();
+                     }}
       />
     );
   }
@@ -446,7 +436,7 @@ export const convertData = (dataSource) => {
         perDisabled: !_.includes(_.map(itemList, o => o.paymentScopeSign), "per"),
         perValidNum: !_.isEmpty(_.filter(itemList, i => i.paymentScopeSign === "per")) ? _.filter(itemList, i => i.paymentScopeSign === "per")[0].validNum : 2,
         comDisabled: !_.includes(_.map(itemList, o => o.paymentScopeSign), "com"),
-        comValidNum: !_.isEmpty(_.filter(itemList, i => i.paymentScopeSign === "com")) ? _.filter(itemList, i => i.paymentScopeSign === "com")[0].validNum : 2,
+        comValidNum: !_.isEmpty(_.filter(itemList, i => i.paymentScopeSign === "com")) ? _.filter(itemList, i => i.paymentScopeSign === "com")[0].validNum : 2
       });
     });
     return endList.push(data);
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js
index f58a9740..ef505512 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js
@@ -6,10 +6,10 @@
  */
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
-import { WeaLocaleProvider, WeaReqTop } from "ecCom";
+import { WeaLocaleProvider, WeaReqTop, WeaTools } from "ecCom";
+import { getTabList } from "../../../apis/standingBook";
 import NormalIndex from "./components/normal";
 import OverViewIndex from "./components/overView";
-import AbnormalListIndex from "./components/abnormalList";
 import Regression from "./components/regression";
 import MakeupDifference from "./components/makeupDifference";
 
@@ -20,65 +20,47 @@ const { getLabel } = WeaLocaleProvider;
 class StandingBookDetail extends Component {
   constructor(props) {
     super(props);
-    this.state = {
-      selectedKey: "1",
-      tabList: [],
-      remarks: "",
-      billMonth: ""
-    };
-    this.type = "";
-    this.paymentOrganization = "";
+    this.state = { selectedKey: "", tabList: [], welfareRecord: { ...WeaTools.getUrlParams() } };
   }
 
   componentDidMount() {
     this.getTabList();
   }
 
-  getTabList = (payload = {}) => {
-    const { getTabList } = this.props.standingBookStore;
-    const billMonth = this.props.location.query.billMonth;
-    this.paymentOrganization = this.props.location.query.paymentOrganization;
-    this.type = this.props.location.query.type;
-    getTabList({ billMonth, paymentOrganization: this.paymentOrganization }).then(({ data }) => {
+  getTabList = () => {
+    const order = [
+      getLabel(111, "正常缴纳"), getLabel(111, "补缴"), getLabel(111, "退差"), getLabel(111, "补差"), getLabel(111, "总览")
+    ];
+    const payload = _.pick(this.state.welfareRecord, ["billMonth", "paymentOrganization"]);
+    getTabList(payload).then(({ data }) => {
       const { tabList, remarks, billMonth } = data;
-      let newTabList = tabList.filter(item => item.id != "2");
-      newTabList.push(newTabList.splice(_.findIndex(newTabList, it => it.id === "4"), 1)[0]);
       this.setState({
-        selectedKey: newTabList[0].id,
-        tabList: _.map(newTabList, it => ({ title: it.content, key: it.id })),
-        remarks, billMonth
+        selectedKey: _.find(tabList, o => o.content === getLabel(111, "正常缴纳")).id,
+        tabList: tabList.filter(item => item.content !== getLabel(111, "异动清单")).sort((a, b) => (order.indexOf(a.content) - order.indexOf(b.content))),
+        welfareRecord: { ...this.state.welfareRecord, remarks, billMonth }
       });
     });
   };
 
   render() {
-    const { selectedKey, tabList, remarks, billMonth } = this.state;
+    const { selectedKey, tabList, welfareRecord } = this.state;
+    const tabDatas = _.map(tabList, o => ({ key: o.id, title: o.content }));
+    const params = { ...welfareRecord, selectedKey };
     return (
       <div className="standingBookDetailWapper">
         <WeaReqTop
           title={getLabel(538002, "社保福利台账")} icon={<i className="icon-coms-fa"/>}
-          iconBgcolor="#F14A2D" showDropIcon={false} tabDatas={tabList} selectedKey={selectedKey}
-          onChange={selectedKey => this.setState({ selectedKey })}
-        >
+          iconBgcolor="#F14A2D" showDropIcon={false} tabDatas={tabDatas} selectedKey={selectedKey}
+          onChange={selectedKey => this.setState({ selectedKey, welfareRecord: { ...welfareRecord, selectedKey } })}>
           {
-            (selectedKey === "1" || selectedKey === "3") &&
-            <NormalIndex selectedKey={selectedKey} remarks={remarks} billMonth={billMonth} type={this.type}
-                         paymentOrganization={this.paymentOrganization} location={this.props.location}/>
-          }
-          {
-            selectedKey === "2" &&
-            <AbnormalListIndex billMonth={billMonth} type={this.type} paymentOrganization={this.paymentOrganization}/>
-          }
-          {
-            selectedKey === "4" &&
-            <OverViewIndex billMonth={billMonth} type={this.type} paymentOrganization={this.paymentOrganization}/>
-          }
-          {
-            selectedKey === "5" && <Regression/>
-          }
-          {
-            selectedKey === "6" && <MakeupDifference/>
+            (selectedKey === "1" || selectedKey === "3") && <NormalIndex {...params} {...this.props}/>
           }
+          {/*退差*/}
+          {selectedKey === "5" && <Regression {...params} {...this.props}/>}
+          {/*补差*/}
+          {selectedKey === "6" && <MakeupDifference {...params} {...this.props}/>}
+          {/*总览*/}
+          {selectedKey === "4" && <OverViewIndex {...params} {...this.props}/>}
         </WeaReqTop>
       </div>
     );
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
index e00b4f83..8019dc11 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
@@ -8,10 +8,10 @@ import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { WeaDialog, WeaLocaleProvider, WeaSlideModal, WeaTools } from "ecCom";
 import * as API from "../../../../../apis/welfareArchive";
-import { getTaxAgentSelectList } from "../../../../../apis/taxAgent";
 import { sysinfo } from "../../../../../apis/ruleconfig";
 import { getWelfareSearchsForm, welfareConditions } from "../../config";
 import { getConditionDomkeys, toDecimal_n } from "../../../../../util";
+import { postFetch } from "../../../../../util/request";
 import { Button, message, Modal } from "antd";
 
 const getKey = WeaTools.getKey;
@@ -39,7 +39,9 @@ class Index extends Component {
   }
 
   getBaseForm = async (props) => {
-    const [taxAgentListData, sysInfoData] = await Promise.all([getTaxAgentSelectList(), sysinfo()]);
+    const [taxAgentListData, sysInfoData] = await Promise.all([
+      postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" }), sysinfo()
+    ]);
     const {
       archivesStore: { welfareProfileForm }, socialBase, fundBase, otherBase, runStatuses,
       employeeId, paymentOrganization, socialBaseData, fundBaseData, othersBaseData,
@@ -97,7 +99,7 @@ class Index extends Component {
                 items: _.map(o.items, g => {
                   return {
                     ...g, label: getLabel(g.lanId, g.label),
-                    options: _.map(taxAgentListData.data, j => ({ key: j.id, showname: j.content }))
+                    options: _.map(taxAgentListData.data, j => ({ key: String(j.id), showname: j.name }))
                   };
                 })
               };
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
index 11524d22..92a240d2 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
@@ -70,8 +70,8 @@ class Index extends Component {
     if (type === "init") {
       this.getWelfareList(this.props, true);
     } else if (type === "turn") {
-      const { record: { baseInfo, employeeId, paymentOrganization } = {}, interfaceParams = {} } = params;
-      const { runStatuses, showOperateBtn } = this.props;
+      const { record: { baseInfoId, opts, employeeId, paymentOrganization } = {}, interfaceParams = {} } = params;
+      const { runStatuses } = this.props;
       switch (id) {
         case "PAGEINFO":
           this.setState({
@@ -114,6 +114,7 @@ class Index extends Component {
               this.getPaymentForm({ ...payload, welfareTypeEnum: welfareTypeEnum["fund"], schemeId: fundSchemeId }),
               this.getPaymentForm({ ...payload, welfareTypeEnum: welfareTypeEnum["other"], schemeId: otherSchemeId })
             ]);
+            const showOperateBtn = opts.includes("admin");
             this.setState({
               welfareEditSlide: {
                 ...this.state.welfareEditSlide, visible: true, showOperateBtn,
@@ -128,18 +129,18 @@ class Index extends Component {
         case "DEL-TO-DO":
         case "DEL-TO-DO-STAY":
           const module = (id === "ADD-TO-PAY" || id === "STAY-DEL-TO-STOP" || id === "CANCEL-STOP") ?
-            [baseInfo] : { ids: [baseInfo], ...interfaceParams };
+            [baseInfoId] : { ids: [baseInfoId], ...interfaceParams };
           this.handleWelfareOpts(_.camelCase(id), module);
           break;
         case "DEL-ARCHIVE":
           Modal.confirm({
             title: getLabel(131329, "信息确认"),
             content: getLabel(388758, "确认要删除吗？"),
-            onOk: () => this.handleWelfareOpts(_.camelCase(id), [baseInfo])
+            onOk: () => this.handleWelfareOpts(_.camelCase(id), [baseInfoId])
           });
           break;
         case "log":
-          this.props.onFilterLog(id, baseInfo);
+          this.props.onFilterLog(id, baseInfoId);
           break;
         default:
           break;
@@ -156,7 +157,7 @@ class Index extends Component {
   };
   getWelfareList = (props, init = false) => {
     const { pageInfo } = this.state;
-    const { archivesStore: { welfareForm }, runStatuses, onChangeTopTabCount, showOperateBtn } = props;
+    const { archivesStore: { welfareForm }, runStatuses, onChangeTopTabCount } = props;
     const params = { ...pageInfo, ...welfareForm.getFormParams() };
     const payload = runStatuses === "ext" ? { ...params, extWelArchiveList: true } : {
       ...params,
@@ -183,10 +184,7 @@ class Index extends Component {
         }, () => {
           const { pageInfo, selectedRowKeys, columns, dataSource } = this.state;
           onChangeTopTabCount(runStatuses, total, init);
-          this.postMessageToChild({
-            dataSource, pageInfo, selectedRowKeys, runStatuses,
-            columns, showOperateBtn
-          });
+          this.postMessageToChild({ dataSource, pageInfo, selectedRowKeys, runStatuses, columns });
         });
       }
     }).catch(() => this.setState({ loading: false }));
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
index 4da87e27..8d9170df 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
@@ -151,7 +151,8 @@ class Index extends Component {
       selectedKey, topTabCount, showSearchAd, isQuery, recordDialogVisible,
       logDialogVisible, filterConditions, welfareImpDialog, showExtEmpsWitch
     } = this.state;
-    const { taxAgentStore: { showOperateBtn } } = this.props;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const tipList = _.find(welfareTipList, o => o.viewcondition === selectedKey).list;
     const tabs = _.map(tabList, o => ({ ...o, title: getLabel(o.lanId, o.title) }));
     return (
@@ -188,7 +189,7 @@ class Index extends Component {
             {/*基数调整记录*/}
             <RecordDialog visible={recordDialogVisible} onCancel={() => this.setState({ recordDialogVisible: false })}/>
             {/*操作日志*/}
-            <LogDialog visible={logDialogVisible} logFunction="siArchives" filterConditions={filterConditions}
+            <LogDialog visible={logDialogVisible} logFunction="siarchives" filterConditions={filterConditions}
                        onCancel={() => this.setState({ logDialogVisible: false })}/>
             {/*  导入*/}
             <WelfareArchivesImportDialog {...welfareImpDialog}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
index da42ac66..0fcf5898 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
@@ -10,7 +10,7 @@ import { WeaLocaleProvider, WeaSearchGroup, WeaSlideModal, WeaTab, WeaTools } fr
 import PlanSetTable from "./planSetTable";
 import { Button, message, Modal } from "antd";
 import * as API from "../../../../../apis/welfareScheme";
-import { getTaxAgentSelectListAsAdmin } from "../../../../../apis/taxAgent";
+import { postFetch } from "../../../../../util/request";
 import { getConditionDomkeys, getSearchs } from "../../../../../util";
 import BaseValidateDialog from "./baseValidateDialog";
 import { planConditons } from "../../config";
@@ -44,7 +44,7 @@ class Index extends Component {
   }
 
   getForm = async (props) => {
-    const { data: result } = await getTaxAgentSelectListAsAdmin();
+    const { data: result } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" });
     const { id, welfareTypeEnum, programmeStore: { planForm }, showOperateBtn } = props;
     API.getForm(id ? _.assign({ welfareTypeEnum }, { id }) : { welfareTypeEnum }).then(({ status, data }) => {
       if (status) {
@@ -58,12 +58,12 @@ class Index extends Component {
                 return {
                   ...o, hide: schemeBatch["sharedType"] === "0" || _.isNil(schemeBatch["sharedType"]),
                   viewAttr: (schemeBatch["sharedType"] === "1" && showOperateBtn) ? 3 : showOperateBtn ? o.viewAttr : 1,
-                  options: _.map(result, k => ({ key: k.id, showname: k.content })),
+                  options: _.map(result, k => ({ key: String(k.id), showname: k.name })),
                   label: getLabel(o.lanId, o.label)
                 };
               } else if (getKey(o) === "paymentType" || getKey(o) === "sharedType") {
                 return {
-                  ...o, label: getLabel(o.lanId, o.label),
+                  ...o, label: getLabel(o.lanId, o.label), viewAttr: showOperateBtn ? o.viewAttr : 1,
                   options: _.map(o.options, k => ({ ...k, showname: getLabel(k.lanId, k.showname) }))
                 };
               }
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js
index 1035015a..c7ee09b6 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js
@@ -60,8 +60,9 @@ class Index extends Component {
   getList = (props) => {
     const {
       programmeStore: { planSearchForm }, selectedKey: welfareTypeEnum, customQuery,
-      taxAgentStore: { showOperateBtn }
+      taxAgentStore: { PageAndOptAuth }
     } = props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const { pageInfo } = this.state;
     const originPayload = { ...pageInfo, welfareTypeEnum }, customPayload = { welfareTypeEnum: customQuery },
       welfarePayload = { ...planSearchForm.getFormParams() };
@@ -239,7 +240,8 @@ class Index extends Component {
 
   render() {
     const { dataSource, columns, pageInfo, loading, copyDialog, customDialog, welfarePlanEditSlide } = this.state;
-    const { selectedKey, taxAgentStore: { showOperateBtn } } = this.props;
+    const { selectedKey, taxAgentStore: { PageAndOptAuth } } = this.props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const pagination = {
       ...pageInfo,
       showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js
index 4f7028ad..69382697 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js
@@ -62,7 +62,8 @@ class Index extends Component {
   };
 
   render() {
-    const { taxAgentStore: { showOperateBtn } } = this.props;
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const { logDialogVisible, filterConditions, selectedKey, showSearchAd, isQuery, customQuery } = this.state;
     const tabs = _.map(tabWelfarePlanList, o => ({ ...o, title: getLabel(o.lanId, o.title) }));
     return (
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
index 0c19ca25..0f6ff199 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
@@ -103,6 +103,14 @@
 }
 
 .welfare-plan-edit-layout {
+  .ant-table-content {
+    padding-left: 208px !important;
+
+    .ant-table-fixed-left {
+      top: 1px;
+    }
+  }
+
   .flex-center {
     display: flex;
     align-items: center;
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js
index 39ceeec2..02bd0a71 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/index.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js
@@ -48,13 +48,9 @@ export default class TaxAgent extends React.Component {
   }
 
   getPermission = () => {
-    const { getPermission } = this.props.taxAgentStore;
-    getPermission().then(({ status, data }) => {
-      if (status) {
-        this.setState({ permission: data }, () => {
-          this.getTaxAgentBaseForm();
-        });
-      }
+    const { PageAndOptAuth } = this.props.taxAgentStore;
+    this.setState({ permission: PageAndOptAuth }, () => {
+      this.getTaxAgentBaseForm();
     });
   };
 
@@ -323,9 +319,9 @@ export default class TaxAgent extends React.Component {
       doInit,
       hasRight,
       getTaxAgentList,
-      showOperateBtn
+      PageAndOptAuth
     } = taxAgentStore;
-
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     if (!hasRight && !loading) {
       // 无权限处理
       return renderNoright();
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
index 8e9d740e..81075f89 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
@@ -14,11 +14,13 @@ import { Button, message } from "antd";
 import { getSearchs } from "../../../../util";
 import { salaryFileConditions } from "../../conditions";
 import * as API from "../../../../apis/variableSalary";
+import { postFetch } from "../../../../util/request";
 
 const getKey = WeaTools.getKey;
 const getLabel = WeaLocaleProvider.getLabel;
 
-@inject("baseTableStore") @observer
+@inject("baseTableStore")
+@observer
 class Index extends Component {
   constructor(props) {
     super(props);
@@ -39,29 +41,39 @@ class Index extends Component {
 
   initForm = async (props) => {
     const { baseTableStore: { VSSalaryFileForm }, detail } = props;
-    const { data: taxAgentOption } = await API.getAdminTaxAgentList();
+    const { data: taxAgentOption } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "ADMIN_DATA" });
     API.getCreateForm().then(({ data }) => {
       this.setState({
-        conditions: [..._.map(salaryFileConditions, item => ({
-          ...item, items: _.map(item.items, o => {
-            if (getKey(o) === "taxAgentIds") {
+        conditions: [
+          ..._.map(salaryFileConditions, item => ({
+            ...item, items: _.map(item.items, o => {
+              if (getKey(o) === "taxAgentIds") {
+                return {
+                  ...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
+                  options: _.map(taxAgentOption, o => ({ key: String(o.id), showname: o.name })),
+                  value: detail[getKey(o)] ? String(detail[getKey(o)]) : ""
+                };
+              }
               return {
                 ...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
-                value: detail[getKey(o)] || "",
-                options: _.map(taxAgentOption, (o, i) => ({ key: o.id, showname: o.content }))
+                value: detail[getKey(o)] || ""
               };
-            }
-            return {
-              ...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
-              value: detail[getKey(o)] || ""
-            };
-          })
-        })), {
-          items: _.map(data, o => ({
-            conditionType: "INPUT", domkey: [String(o.id)], fieldcol: 14, label: o.name, labelcol: 6,
-            value: detail[`${String(o.id)}_variableItem`] || "", viewAttr: 2, dataType: o.dataType
-          })), title: "", col: 2, defaultshow: true
-        }]
+            })
+          })),
+          {
+            items: _.map(data, o => ({
+              conditionType: "INPUT",
+              domkey: [String(o.id)],
+              fieldcol: 14,
+              label: o.name,
+              labelcol: 6,
+              value: detail[`${String(o.id)}_variableItem`] || "",
+              viewAttr: !_.isEmpty(detail) ? detail.viewAttr : 2, dataType: o.dataType
+            })),
+            title: "", col: 2,
+            defaultshow: true
+          }
+        ]
       }, () => {
         VSSalaryFileForm.initFormFields(this.state.conditions);
         if (!_.isEmpty(detail)) {
@@ -107,14 +119,17 @@ class Index extends Component {
     });
   };
   renderTitle = () => {
-    const { loading } = this.state, { title } = this.props;
+    const { loading } = this.state, { title, detail } = this.props;
     return <div className="titleDialog">
       <div className="titleCol titleLeftBox">
         <div className="titleIcon"><i className="icon-coms-fa"/></div>
         <div className="title">{title}</div>
       </div>
       <div className="titleCol titleRightBox">
-        <Button type="primary" loading={loading} onClick={this.save}>{getLabel(537558, "保存")}</Button>
+        {
+          (_.isEmpty(detail) || detail.viewAttr === 2) &&
+          <Button type="primary" loading={loading} onClick={this.save}>{getLabel(537558, "保存")}</Button>
+        }
       </div>
     </div>;
   };
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js
index 415f7e33..dfc036bf 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js
@@ -96,7 +96,9 @@ class Index extends Component {
       <ImportDialog
         {...this.props} {...importDialog}
         onResetImportResult={() => this.setState({
-          importDialog: { ...importDialog, importResult: {}, imageId: "", link: null }
+          importDialog: {
+            ...importDialog, importResult: {}, imageId: "", link: "/api/bs/hrmsalary/variableSalary/downloadTemplate"
+          }
         })}
         importParams={this.renderFormComponent()}
         exportDataDom={
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
index 9f583eee..f7309e98 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
@@ -17,6 +17,7 @@ import { getSearchs } from "../../../../util";
 import { extraConditions } from "../../conditions";
 import AdvanceInputBtn from "../advanceInputBtn";
 import SearchPannel from "../searchPannel";
+import { postFetch } from "../../../../util/request";
 import { toJS } from "mobx";
 import cs from "classnames";
 
@@ -24,32 +25,27 @@ const WeaTableComx = WeaTableNew.WeaTable;
 const getLabel = WeaLocaleProvider.getLabel;
 const getKey = WeaTools.getKey;
 
-@inject("baseTableStore") @observer
+@inject("baseTableStore")
+@observer
 class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      pageInfo: { current: 1, pageSize: 10, total: 0 },
-      loading: false,
-      dataSource: [],
-      columns: [],
-      selectedRowKeys: [],
-      condtions: [],
-      showSearchAd: false
+      pageInfo: { current: 1, pageSize: 10, total: 0 }, loading: false, dataSource: [], columns: [],
+      selectedRowKeys: [], condtions: [], showSearchAd: false
     };
   }
 
   async componentDidMount() {
-    const { data: taxAgentOption } = await API.getAdminTaxAgentList();
+    const { data: taxAgentOption } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" });
     this.setState({
       condtions: _.map(extraConditions, item => {
         return {
           ...item, items: _.map(item.items, child => {
             if (getKey(child) === "taxAgentIds") {
               return {
-                ...child,
-                label: getLabel(child.lanId, child.label),
-                options: _.map(taxAgentOption, o => ({ key: o.id, showname: o.content }))
+                ...child, label: getLabel(child.lanId, child.label),
+                options: _.map(taxAgentOption, o => ({ key: String(o.id), showname: o.name }))
               };
             }
             return { ...child, label: getLabel(child.lanId, child.label) };
@@ -73,7 +69,7 @@ class Index extends Component {
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.isQuery !== this.props.isQuery) this.setState({
       pageInfo: { ...this.state.pageInfo, current: 1 }
-    }, () => this.getVariableSalaryList());
+    }, () => this.getVariableSalaryList(nextProps));
   }
 
   handleReceive = async ({ data }) => {
@@ -95,7 +91,8 @@ class Index extends Component {
           this.handleDelete([params.id]);
           break;
         case "EDIT":
-          this.handleView(params.id);
+        case "VIEW":
+          this.handleView(params.id, id === "VIEW");
           break;
         default:
           break;
@@ -122,14 +119,16 @@ class Index extends Component {
       }
     });
   };
-  handleView = (id) => {
+  handleView = (id, view) => {
     API.getVariableSalaryDetail({ id }).then(({ status, data }) => {
-      if (status) this.props.onViewSalaryFile(data.data);
+      if (status) this.props.onViewSalaryFile({ ...data.data, viewAttr: view ? 1 : 2 });
     });
   };
   handleDelete = (ids) => {
     Modal.confirm({
-      title: getLabel(111, "信息确认"), content: getLabel(111, "确认删除吗?"), onOk: () => {
+      title: getLabel(111, "信息确认"),
+      content: getLabel(111, "确认删除吗?"),
+      onOk: () => {
         API.deleteVariableSalary({ ids }).then(({ status, errormsg }) => {
           if (status) {
             message.success(getLabel(111, "删除成功"));
@@ -144,28 +143,22 @@ class Index extends Component {
   getColumns = () => {
     const { baseTableStore: { SFTableStore }, showOperateBtn } = this.props;
     const columns = _.map(_.filter(toJS(SFTableStore.columns), (item) => item.display === "true"), (it, idx) => ({
-      dataIndex: it.dataIndex, title: it.title, align: "left", width: 150, ellipsis: true
+      dataIndex: it.dataIndex, title: it.title, align: "left",
+      width: 150, ellipsis: true
     }));
     if (!_.isEmpty(columns)) {
       this.postMessageToChild({
-        columns,
-        showOperateBtn,
-        dataSource: this.state.dataSource,
-        scrollHeight: 95,
-        pageInfo: this.state.pageInfo,
-        unitTableType: "variableSalary",
-        selectedRowKeys: this.state.selectedRowKeys
+        columns, showOperateBtn, dataSource: this.state.dataSource, scrollHeight: 95,
+        pageInfo: this.state.pageInfo, unitTableType: "variableSalary", selectedRowKeys: this.state.selectedRowKeys
       });
     }
     return columns;
   };
   postMessageToChild = (payload = {}) => {
     const i18n = {
-      "操作": getLabel(30585, "操作"),
-      "编辑": getLabel(111, "编辑"),
-      "共": getLabel(18609, "共"),
-      "条": getLabel(18256, "条"),
-      "删除": getLabel(111, "删除")
+      "操作": getLabel(30585, "操作"), "编辑": getLabel(111, "编辑"),
+      "共": getLabel(18609, "共"), "条": getLabel(18256, "条"),
+      "删除": getLabel(111, "删除"), "查看": getLabel(111, "查看")
     };
     const childFrameObj = document.getElementById("unitTable");
     childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
index bceb4585..e58ea887 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
@@ -9,7 +9,7 @@
 */
 import React, { Component } from "react";
 import { WeaLocaleProvider, WeaTable } from "ecCom";
-import { message, Modal } from "antd";
+import { message, Modal, Spin } from "antd";
 import * as API from "../../../../apis/variableSalary";
 
 const getLabel = WeaLocaleProvider.getLabel;
@@ -46,7 +46,7 @@ class Index extends Component {
             columns: [
               ..._.filter(columns, o => o.dataIndex !== "id"),
               {
-                title: getLabel(111, "操作"), dataIndex: "oprate",
+                title: getLabel(111, "操作"), dataIndex: "operate",
                 render: (__, record) => (<React.Fragment>
                   <a href="javascript: void(0)" style={{ marginRight: 10 }}
                      onClick={() => this.handleEdit(record.id)}>{getLabel(111, "编辑")}</a>
@@ -85,7 +85,7 @@ class Index extends Component {
   };
 
   render() {
-    const { columns, dataSource, loading, pageInfo } = this.state;
+    const { columns, dataSource, loading, pageInfo } = this.state, { showOperateBtn } = this.props;
     const pagination = {
       ...pageInfo,
       showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
@@ -103,9 +103,11 @@ class Index extends Component {
         }, () => this.getVariableSalaryItemList());
       }
     };
-    return (
-      <WeaTable columns={columns} dataSource={dataSource} loading={loading} bordered
-                pagination={pagination} scroll={{ y: `calc(100vh - 170px)` }}/>
+    return (<Spin spinning={loading && pageInfo.total === 0}>
+        <WeaTable columns={showOperateBtn ? columns : _.filter(columns, o => o.dataIndex !== "operate")}
+                  dataSource={dataSource} loading={loading} bordered pagination={pagination}
+                  scroll={{ y: `calc(100vh - 170px)` }}/>
+      </Spin>
     );
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/conditions.js b/pc4mobx/hrmSalary/pages/variableSalary/conditions.js
index 56ce7208..9a9301cb 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/conditions.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/conditions.js
@@ -24,6 +24,28 @@ export const conditions = [
         value: "",
         viewAttr: 2
       },
+      {
+        conditionType: "MONTHPICKER",
+        domkey: ["salaryMonth"],
+        fieldcol: 14,
+        label: "薪资所属月",
+        lanId: 111,
+        labelcol: 6,
+        value: moment(new Date()).format("YYYY-MM"),
+        viewAttr: 2
+      },
+      {
+        conditionType: "SELECT",
+        domkey: ["taxAgentIds"],
+        fieldcol: 14,
+        label: "个税扣缴义务人",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        options: [],
+        multiple: true,
+        viewAttr: 2
+      },
       {
         browserConditionParam: {
           completeParams: {},
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/index.js b/pc4mobx/hrmSalary/pages/variableSalary/index.js
index 6eb00d27..a8aaa626 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/index.js
@@ -82,7 +82,8 @@ class Index extends Component {
 
   render() {
     const { selectedKey, SIDialog, SFDialog, SFImpDialog, isQuery } = this.state;
-    const { taxAgentStore: { showOperateBtn }, baseTableStore: { VSSalaryItemForm } } = this.props;
+    const { taxAgentStore: { PageAndOptAuth }, baseTableStore: { VSSalaryItemForm } } = this.props;
+    const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const tabs = [
       {
         title: getLabel(111, "浮动数据"), key: "salaryFile", showDropIcon: true,
@@ -108,11 +109,12 @@ class Index extends Component {
           })}>{getLabel(111, "新建")}</Button>,
           <AdvanceInputBtn onAdvanceSearch={this.handleAdvanceSearch}/>
         ] : [<AdvanceInputBtn onAdvanceSearch={this.handleAdvanceSearch}/>],
-        children: <SalaryItemList {...this.props} isQuery={isQuery} onEditSalaryItem={data => this.setState({
-          SIDialog: { visible: true, id: data.id, title: getLabel(111, "编辑薪资项目") }
-        }, () => VSSalaryItemForm.updateFields({
-          name: data.name, dataType: data.dataType
-        }))}/>
+        children: <SalaryItemList {...this.props} isQuery={isQuery} showOperateBtn={showOperateBtn}
+                                  onEditSalaryItem={data => this.setState({
+                                    SIDialog: { visible: true, id: data.id, title: getLabel(111, "编辑薪资项目") }
+                                  }, () => VSSalaryItemForm.updateFields({
+                                    name: data.name, dataType: data.dataType
+                                  }))}/>
       }
     ];
     return (
diff --git a/pc4mobx/hrmSalary/single.js b/pc4mobx/hrmSalary/single.js
index 863c0a8a..059cc59f 100644
--- a/pc4mobx/hrmSalary/single.js
+++ b/pc4mobx/hrmSalary/single.js
@@ -1,14 +1,10 @@
 import React from "react";
 import ReactDOM from "react-dom";
-
 import { createHashHistory } from "History";
-
 import { IndexRedirect, Route, Router, useRouterHistory } from "react-router";
-
 import { RouterStore, syncHistoryWithStore } from "mobx-react-router";
-
+import { EXCLUDE_PAGE } from "./config";
 import { Provider } from "mobx-react";
-
 import Module from "weaHrmSalary";
 
 const routing = new RouterStore();
@@ -29,15 +25,19 @@ const Home = props => props.children;
 
 class Root extends React.Component {
   componentWillMount() {
-    const src = "/spa/hrmSalary/hrmSalaryCalculateDetail/css/iconfont/iconfont.css"
-    const link = document.createElement("link")
-    link.setAttribute('rel','stylesheet');
-    link.setAttribute('type','text/css');
-    link.setAttribute('href',src);
-    let header = document.getElementById("container")
-    header.appendChild(link)
+    const src = "/spa/hrmSalary/hrmSalaryCalculateDetail/css/iconfont/iconfont.css";
+    const link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("type", "text/css");
+    link.setAttribute("href", src);
+    let header = document.getElementById("container");
+    header.appendChild(link);
     top.$(".ant-message").remove();
-    window.location.hash.indexOf("mobilepayroll") === -1 && allStore.taxAgentStore.getPermission();
+    if (_.every(EXCLUDE_PAGE, page => window.location.hash.indexOf(page) === -1)) {
+      allStore.taxAgentStore.getPermission();
+    } else {
+      allStore.taxAgentStore.initPageAndOptAuth();
+    }
     if (window.location.hash.indexOf("payroll") !== -1) {
       window.localStorage.removeItem("template-basedata");
       window.localStorage.removeItem("salary-showset");
diff --git a/pc4mobx/hrmSalary/stores/baseForm.js b/pc4mobx/hrmSalary/stores/baseForm.js
index 3eb3a57e..c4d10349 100644
--- a/pc4mobx/hrmSalary/stores/baseForm.js
+++ b/pc4mobx/hrmSalary/stores/baseForm.js
@@ -1,64 +1,14 @@
 import { action, observable } from "mobx";
-import { message } from "antd";
-import { WeaForm, WeaLogView } from "comsMobx";
-import { WeaLocaleProvider } from "ecCom";
+import { WeaForm } from "comsMobx";
 
-import * as API from "../apis"; // 引入API接口文件
-
-const { LogStore } = WeaLogView;
-const getLabel = WeaLocaleProvider.getLabel;
 
 export class BaseFormStore {
+  // 全局设置仓库
   @observable form = new WeaForm(); // 规则渲染form
-
-  @observable logStore = new LogStore();
-  @observable condition = []; // 存储后台得到的form数据
-  @observable saveLoading = false; // 保存状态处理：保证保存的时候接口只走一次
-  @observable loading = true; // 页面初始化的loading状态：数据加载成功前后前使用
-  @observable hasRight = true; // 判断用户是有权限查看当前页面： 没有权限渲染无权限页面，有权限渲染数据
+  @action("初始化form表单") initForm = () => this.form = new WeaForm();
+  @observable formExtra = new WeaForm(); // 规则渲染form
+  @action("初始化form表单") initFormExtra = () => this.formExtra = new WeaForm();
   @observable logVisible = false; // 控制日志弹框的显影
-
-  @action // 初始化操作： 一般用来初始化获取后台数据
-  doInit = () => {
-    this.getBaseForm();
-  };
-
-  @action // 获得form配置数据
-  getBaseForm = () => {
-    API.getBaseForm().then(action(result => {
-      this.loading = false;
-      this.hasRight = result.hasRight;
-      if (result.hasRight) {
-        this.condition = result.condition;
-        this.form.initFormFields(result.condition);
-      }
-    }));
-  };
-
-  @action // 保存
-  saveForm = () => {
-    this.form.validateForm().then(action(f => { // 表单的校验: 直接使用form的validateForm方法即可
-      if (f.isValid) { // 校验听过: 走保存接口
-        this.saveLoading = true;
-        const params = this.form.getFormParams();
-        API.saveForm(params).then(action(
-          result => {
-            this.saveLoading = false;
-            if (result.api_status) { // 保存成功: 1、给出提示 2、刷新form数据
-              message.success(`${getLabel(18758, "保存成功")}`);
-              this.getBaseForm();
-            } else {
-              message.error(`${getLabel(22620, "保存失败")}`);
-            }
-          }
-        ));
-      } else {
-        f.showErrors();
-      }
-    }));
-  };
-
-  @action
+  @action("日志显隐开关")
   setLogVisible = bool => this.logVisible = bool;
-
 }
diff --git a/pc4mobx/hrmSalary/stores/ledger.js b/pc4mobx/hrmSalary/stores/ledger.js
index 0411826d..6aaff1b8 100644
--- a/pc4mobx/hrmSalary/stores/ledger.js
+++ b/pc4mobx/hrmSalary/stores/ledger.js
@@ -17,7 +17,8 @@ export class LedgerStore {
 
   @action initAARForm = (v) => this.AARForm = new WeaForm();//重置核算审批规则form
   @action initAARClassifyForm = (v) => this.AARClassifyForm = new WeaForm();//重置审批规则分类编辑form
-
+  @observable ruleForm = new WeaForm(); // 调薪计薪规则项form
+  @action initRuleForm = (v) => this.ruleForm = new WeaForm();//重置调薪计薪规则项form
 
   /*******************************************************/
   @observable tableStore = new TableStore(); // new table
diff --git a/pc4mobx/hrmSalary/stores/taxAgent.js b/pc4mobx/hrmSalary/stores/taxAgent.js
index 33b74a55..45fe8041 100644
--- a/pc4mobx/hrmSalary/stores/taxAgent.js
+++ b/pc4mobx/hrmSalary/stores/taxAgent.js
@@ -4,10 +4,18 @@ import { WeaForm, WeaTableNew } from "comsMobx";
 
 import * as API from "../apis/taxAgent"; // 引入API接口文件
 import { decentralizationConditions, editConditions } from "../pages/taxAgent/editConditions";
+import { PAGE } from "../config";
 
 const { TableStore } = WeaTableNew;
 
 export class TaxAgentStore {
+  @observable salarytaxAgentForm = new WeaForm(); //新版个税扣缴义务人表单实体
+  @observable taxfillInfoForm = new WeaForm(); //报税信息查看form
+  @action setTaxfillInfoForm = () => this.taxfillInfoForm = new WeaForm(); //报税信息form初始化
+  @observable personScopeForm = new WeaForm(); //个税扣缴义务人新增人员form
+  @action initPersonScopeForm = () => this.personScopeForm = new WeaForm(); //个税扣缴义务人新增人员form初始化
+  @observable deptfillInfoForm = new WeaForm(); //报税信息部门备案form
+  @action initDeptfillInfoForm = () => this.deptfillInfoForm = new WeaForm(); //报税信息部门备案form初始化
   @observable advanceForm = new WeaForm(); //权限-角色高级搜索form表单
   @observable roleForm = new WeaForm(); //权限-角色form表单
   @action initRoleForm = () => this.roleForm = new WeaForm();
@@ -51,6 +59,8 @@ export class TaxAgentStore {
   @action setStatisticsReportBtn = bool => (this.statisticsReportBtn = bool);//薪酬统计报表权限
   @action setPayrollPermission = bool => (this.payrollPermission = bool);// 薪资核算页面权限
 
+  @action setSalarytaxAgentForm = () => (this.salarytaxAgentForm = new WeaForm());//薪资项目权限
+
   // 初始化操作
   @action
   doInit = params => {
@@ -73,11 +83,9 @@ export class TaxAgentStore {
   // 渲染table数据
   @action
   getTaxAgentList = params => {
-    this.loading = true;
     params = params || {};
     API.getTaxAgentList(params).then(
       action(({ data, status }) => {
-        this.loading = false;
         if (status) {
           // 接口请求成功/失败处理
           const { columns, list, total, pageNum: current, pageSize } = data;
@@ -146,8 +154,13 @@ export class TaxAgentStore {
 
   @action
   getPermission = params => {
+    _.map(_.keys(PAGE), page => {
+      if (_.some(PAGE[page], k => window.location.hash.indexOf(k) !== -1)) params = { ...params, page };
+    });
+    this.loading = true;
     return new Promise((resolve, reject) => {
       API.getPermission(params).then(({ status, data }) => {
+        this.loading = false;
         if (status) {
           this.PageAndOptAuth = data;
           const { isAdminEnable, isChief, isOpenDevolution } = data;
diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less
index 6bc0127b..c28edfd8 100644
--- a/pc4mobx/hrmSalary/style/index.less
+++ b/pc4mobx/hrmSalary/style/index.less
@@ -39,6 +39,10 @@
 .form-dialog-layout {
   background: #f6f6f6;
 
+  .wea-form-item-wrapper {
+    display: block !important;
+  }
+
   .wea-form-item .wea-form-item-wrapper .wea-field-readonly {
     line-height: 28px;
   }
@@ -57,7 +61,7 @@
   }
 
   .ant-select-selection {
-    height: 30px;
+    height: 28px;
     border-radius: 0;
   }
 
diff --git a/pc4mobx/hrmSalary/util/index.js b/pc4mobx/hrmSalary/util/index.js
index a7be61b0..337096c1 100644
--- a/pc4mobx/hrmSalary/util/index.js
+++ b/pc4mobx/hrmSalary/util/index.js
@@ -1,8 +1,10 @@
 import { Spin } from "antd";
 import { WeaSwitch } from "comsMobx";
-import { WeaAlertPage, WeaFormItem, WeaHelpfulTip, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import { WeaAlertPage, WeaFormItem, WeaHelpfulTip, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
+import CustomBrowser from "../components/CustomBrowser";
 
 const getLabel = WeaLocaleProvider.getLabel;
+const getKey = WeaTools.getKey;
 
 // 获取condition的domKey值
 export const getConditionDomkeys = (condition) => {
@@ -36,14 +38,27 @@ export const getSearchs = (form, condition, col, isCenter, onChange = () => void
       items.push({
         com: (
           <WeaFormItem
-            label={`${fields.label}`} // label 标签的文本
+            label={<span>
+              <span>{`${fields.label}`}</span>
+              {
+                fields.labelExtra && <span className="wea-form-item-label-extra"
+                                           onClick={() => onChange(fields.labelType)}>{fields.labelExtra}</span>
+              }
+            </span>} // label 标签的文本
             labelCol={{ span: `${fields.labelcol}` }} // label标签占一行比例
             wrapperCol={{ span: `${fields.fieldcol}` }} // 右侧控件占一行比例
             error={form.getError(fields)} // 错误提示: 处理表单中有必填项,保存的校验
             tipPosition="bottom" // 错误提示的显示位置: top/bottom
             className={(fields.domkey[0] === "subcompanyName" || fields.domkey[0] === "departmentName") ? "hideFormItem" : classnames}
           >
-            <WeaSwitch fieldConfig={fields} form={form} formParams={formParams} onChange={onChange}/>
+            {
+              fields.conditionType === "CUSTOMBROWSER" ?
+                <CustomBrowser fieldConfig={fields} form={form} formParams={formParams}
+                               onCustomChange={val => onChange({
+                                 [getKey(fields)]: _.map(_.values(val), o => ({ id: o.id, name: o.name }))
+                               })}/> :
+                <WeaSwitch fieldConfig={fields} form={form} formParams={formParams} onChange={onChange}/>
+            }
             {
               fields.helpfulTitle &&
               <WeaHelpfulTip title={fields.helpfulTitle} style={{ position: "absolute", right: "-20px", top: "25%" }}/>
@@ -137,3 +152,7 @@ export const getIframeParentHeight = (selector, total, extraHeight) => {
   }
   return height;
 };
+export const removeElementById = (id) => {
+  const element = document.getElementById(id);
+  if (element) element.remove();
+};
diff --git a/pc4mobx/hrmSalary/util/request.js b/pc4mobx/hrmSalary/util/request.js
index 4fd7e4e4..ef487037 100644
--- a/pc4mobx/hrmSalary/util/request.js
+++ b/pc4mobx/hrmSalary/util/request.js
@@ -16,12 +16,12 @@ export const formHeaderPost = (url, method, params, header) => {
     body: formdata
   }).then(res => res.json());
 };
-export const postFetch = (url, params) => {
+export const postFetch = (url, params, header = {}) => {
   if (typeof localStorage.access_token === "string" && localStorage.access_token !== "") {
     params.access_token = localStorage.access_token;
   }
   url = server + url + "?__random__=" + (new Date()).valueOf();
-  return fetch(url, getFetchParams("POST", params)).then(res => res.json());
+  return fetch(url, getFetchParams("POST", params, header)).then(res => res.json());
 };
 export const headerRequestFetch = (url, method, params, header) => {
   if (typeof localStorage.access_token === "string" && localStorage.access_token !== "") {