Merge branch 'release/2.19.1.2503.01-业务线个税' into custom-联特

2025-07-02 18:35:42 +08:00 · 2025-07-02 18:35:42 +08:00 · 55746b6efd
parent 72badf8b09 f8684ce32d
commit 55746b6efd
31 changed files with 345 additions and 159 deletions
--- a/pc4mobx/hrmSalary/apis/payroll.js
+++ b/pc4mobx/hrmSalary/apis/payroll.js
@ -202,8 +202,12 @@ 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 => {
--- 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>
    );
  }
 }
--- 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;
+  }
+}
--- a/pc4mobx/hrmSalary/config.js
+++ b/pc4mobx/hrmSalary/config.js
@ -1,7 +1,7 @@
 export const PAGE = {
  "salaryArchive": ["/hrmSalary/salaryFile"], //薪资档案
-  "salarySob": ["/hrmSalary/ledger"], //薪资账套
-  "salaryAcct": ["/hrmSalary/calculate", "/hrmSalary/calcView"], //薪资核算
+  "salarySob": ["/hrmSalary/ledger", "/hrmSalary/ledger/topologyView/"], //薪资账套
+  "salaryAcct": ["/hrmSalary/calculate", "/hrmSalary/calcView", "/hrmSalary/topologyView"], //薪资核算
  "salaryBill": ["/hrmSalary/payroll", "/hrmSalary/payrollGrant", "/hrmSalary/payrollDetail"], //工资单
  "taxDeclaration": ["/hrmSalary/declare", "/hrmSalary/generateDeclarationDetail"], //个税
  "addUpDeduction": ["/dataAcquisition/cumDeduct"], //累计专项附加扣除
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@ -98,6 +98,7 @@ const Routes = (
      <Route key="specialAddDeduction" path="specialAddDeduction" component={SpecialAddDeduction}/>
    </Route>
    <Route key="ledger" path="ledger" component={Ledger}/>
+    <Route key="topologyView" path="ledger/topologyView/:salarySobId/:salaryItemId" component={TopologyMap}/>
    <Route key="calculate" path="calculate" component={Calculate}/>
    <Route key="calculateDetail" path="calculateDetail" component={CalculateDetail}/>
    <Route key="doCalc" path="calculate/:salaryAcctRecordId" component={DoCalcDetail}/>
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@ -166,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
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
@ -43,7 +43,7 @@ class EditSalaryCalcSlide extends Component {
    });
  };
  renderTitle = () => {
-    const { loading } = this.state, { viewAttr } = this.props;
+    const { loading, itemsByGroup } = this.state, { viewAttr } = this.props;
    return <div className="titleDialog">
      <div className="titleCol titleLeftBox">
        <div className="titleIcon"><i className="icon-coms-fa"/></div>
@ -52,7 +52,7 @@ class EditSalaryCalcSlide extends Component {
      <div className="titleCol titleRightBox">
        {
          viewAttr === 2 &&
-          <Button type="primary" onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>
+          <Button type="primary" disabled={_.isEmpty(itemsByGroup)} onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>
        }
      </div>
    </div>;
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@ -244,6 +244,8 @@
          position: relative;
          margin-top: 10px;
          transition: margin-top .3s;
+          max-height: 80vh;
+          overflow: auto;

          .anchor-list-ink {
            position: absolute;
--- 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>
                     }
      />
--- 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%;
    }
  }

--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/columns.js
@ -149,6 +149,17 @@ export const dataCollectCondition = [
 export const taxDetailSettingsConditions = {
  freeIncome: [{
    items: [
+      {
+        conditionType: "SELECT",
+        domkey: ["incomeCategory"],
+        fieldcol: 14,
+        label: "所得项目",
+        lanId: 111,
+        labelcol: 8,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
      {
        conditionType: "INPUT",
        domkey: ["freeItem"],
@ -190,6 +201,17 @@ export const taxDetailSettingsConditions = {
  }],
  healthInsurance: [{
    items: [
+      {
+        conditionType: "SELECT",
+        domkey: ["incomeCategory"],
+        fieldcol: 14,
+        label: "所得项目",
+        lanId: 111,
+        labelcol: 8,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
      {
        conditionType: "INPUT",
        domkey: ["identificationNumber"],
@ -265,6 +287,17 @@ export const taxDetailSettingsConditions = {
  }],
  endowmentInsurance: [{
    items: [
+      {
+        conditionType: "SELECT",
+        domkey: ["incomeCategory"],
+        fieldcol: 14,
+        label: "所得项目",
+        lanId: 111,
+        labelcol: 8,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
      {
        conditionType: "MONTHPICKER",
        domkey: ["deductionMonth"],
@ -347,6 +380,17 @@ export const taxDetailSettingsConditions = {
  }],
  grantDonation: [{
    items: [
+      {
+        conditionType: "SELECT",
+        domkey: ["incomeCategory"],
+        fieldcol: 14,
+        label: "所得项目",
+        lanId: 111,
+        labelcol: 8,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
      {
        conditionType: "INPUT",
        domkey: ["recipientName"],
@ -446,6 +490,17 @@ export const taxDetailSettingsConditions = {
  }],
  derateDeduction: [{
    items: [
+      {
+        conditionType: "SELECT",
+        domkey: ["incomeCategory"],
+        fieldcol: 14,
+        label: "所得项目",
+        lanId: 111,
+        labelcol: 8,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
      {
        conditionType: "INPUT",
        domkey: ["derateItem"],
@ -487,6 +542,17 @@ export const taxDetailSettingsConditions = {
  }],
  otherDerateDeduction: [{
    items: [
+      {
+        conditionType: "SELECT",
+        domkey: ["incomeCategory"],
+        fieldcol: 14,
+        label: "所得项目",
+        lanId: 111,
+        labelcol: 8,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
      {
        conditionType: "INPUTNUMBER",
        domkey: ["otherDeduction"],
@ -519,6 +585,17 @@ export const taxDetailSettingsConditions = {
  }],
  personalPension: [{
    items: [
+      {
+        conditionType: "SELECT",
+        domkey: ["incomeCategory"],
+        fieldcol: 14,
+        label: "所得项目",
+        lanId: 111,
+        labelcol: 8,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      },
      {
        conditionType: "SELECT",
        domkey: ["voucherTypeName"],
@ -559,8 +636,3 @@ export const taxDetailSettingsConditions = {
    col: 1
  }]
 };
-
-
-
-
-
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/detailSettingsDialog.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/detailSettingsDialog.js
@ -16,6 +16,8 @@ import { taxDetailSettingsConditions } from "./columns";
 import { Button, message } from "antd";
 import { getDomkes, toDecimal_n } from "../../../util";
 import { postFetch } from "../../../util/request";
+import { getIncomeCategoryList } from "../../../apis/ledger"; //获取薪资类型
+import cs from "classnames";

 const getKey = WeaTools.getKey;
 const getLabel = WeaLocaleProvider.getLabel;
@ -30,19 +32,30 @@ class DetailSettingsDialog extends Component {
    };
  }

-  componentWillReceiveProps(nextProps, nextContext) {
+  async componentWillReceiveProps(nextProps, nextContext) {
    if (nextProps.visible !== this.props.visible && nextProps.visible) {
+      const { data } = await getIncomeCategoryList();
      this.setState({
        conditions: _.map(taxDetailSettingsConditions[nextProps.dataType], item => ({
          ...item, items: _.map(item.items, o => ({
            ...o, options: getKey(o) === "voucherTypeName" ?
-              [{ key: "MONTH", showname: "月度" }, { key: "YEAR", showname: "年度" }] : []
+              [{ key: "MONTH", showname: "月度" }, { key: "YEAR", showname: "年度" }] :
+              getKey(o) === "incomeCategory" ? _.map(data, it => ({
+                key: it.value.toString(),
+                showname: <div className="reportTypeName-box">
+                  <span>{it.defaultLabel}</span>
+                  <span
+                    className={cs("reportTypeName", { "danger": it.reportTypeName === getLabel(111, "非居民所得") })}>
+                      {it.reportTypeName}
+                    </span>
+                </div>
+              })) : []
          }))
        }))
      }, () => {
        this.props.otherDeductStore.settingsForm.initFormFields(this.state.conditions);
        if (nextProps.id) _.map(getDomkes(this.state.conditions), domkey => {
-          this.props.otherDeductStore.settingsForm.updateFields({ [domkey]: { value: nextProps.record[domkey] } });
+          this.props.otherDeductStore.settingsForm.updateFields({ [domkey]: { value: nextProps.record[domkey].toString() } });
        });
      });
    } else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
@ -54,19 +67,21 @@ class DetailSettingsDialog extends Component {
    const { otherDeductStore: { settingsForm }, mainId, id, dataType } = this.props;
    settingsForm.validateForm().then(f => {
      if (f.isValid) {
-        let { deductionMonth, ...payload } = settingsForm.getFormParams();
+        let { deductionMonth, incomeCategory, ...payload } = settingsForm.getFormParams();
        deductionMonth && (payload = { ...payload, deductionMonth: deductionMonth + "-01" });
        this.setState({ loading: true });
-        postFetch(`/api/bs/hrmsalary/otherDeduction/save${_.upperFirst(dataType)}`, { ...payload, mainId, id })
-          .then(({ status, errormsg }) => {
-            this.setState({ loading: false });
-            if (status) {
-              message.success(getLabel(111, "操作成功！"));
-              this.props.onCancel(this.props.onSuccess);
-            } else {
-              message.error(errormsg);
-            }
-          });
+        postFetch(`/api/bs/hrmsalary/otherDeduction/save${_.upperFirst(dataType)}`, {
+          ...payload, mainId, id,
+          incomeCategory: Number(incomeCategory)
+        }).then(({ status, errormsg }) => {
+          this.setState({ loading: false });
+          if (status) {
+            message.success(getLabel(111, "操作成功！"));
+            this.props.onCancel(this.props.onSuccess);
+          } else {
+            message.error(errormsg);
+          }
+        });
      } else {
        f.showErrors();
      }
@ -146,6 +161,7 @@ class DetailSettingsDialog extends Component {
                           onBlur={(v) => v && form.updateFields({ payAmount: { value: toDecimal_n(v, 2) } })}/>);
      }
    };
+    if (_.reduce(conditions, (pre, cur) => (pre += cur.items.length), 0) * 47 + 33 === 33) return null;
    return (
      <WeaDialog
        {...this.props} initLoadCss title={getLabel(111, "明细设置")}
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js
@ -66,12 +66,12 @@ class TaxSetDialog extends Component {
      });
  };
  handleDelete = (ids = []) => {
-    const { selectedRowKeys } = this.state, { dataType } = this.props;
+    const { selectedRowKeys } = this.state, { dataType, id: mainId } = this.props;
    Modal.confirm({
      title: getLabel(131329, "信息确认"),
      content: getLabel(388758, "确认要删除吗?"),
      onOk: () => {
-        postFetch(`/api/bs/hrmsalary/otherDeduction/delete${_.upperFirst(dataType)}`, { ids })
+        postFetch(`/api/bs/hrmsalary/otherDeduction/delete${_.upperFirst(dataType)}`, { ids, mainId })
          .then(({ status, errormsg }) => {
            if (status) {
              message.success(getLabel(502230, "删除成功！"));
--- a/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/customTreeSelect.js
+++ b/pc4mobx/hrmSalary/pages/datapush/components/PDDialog/customTreeSelect.js
@ -73,9 +73,14 @@ class CustomTreeSelect extends Component {
    const { itemName } = detail;
    return (
      <TreeSelect dropdownStyle={{ maxHeight: 320, overflow: "auto" }} defaultValue={itemName}
-                  dropdownMatchSelectWidth className="custom_item_treeselect"
+                  dropdownMatchSelectWidth className="custom_item_treeselect" showSearch
                  loadData={(node) => this.getSourceItem(node.props.value)}
-                  onSelect={this.handleSelect}>
+                  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}>
--- a/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
@ -48,7 +48,7 @@ class Index extends Component {
                    options: _.map(data, g => ({ key: String(g.id), showname: g.name }))
                    // helpfulTitle: getLabel(563420, "提示：可选择单个个税扣缴义务人进行申报，若不选择，则批量对管理下的所有个税扣缴义务人进行申报；")
                  };
-                } else if (getKey(o) === "salaryMonthStr") {
+                } else if (getKey(o) === "salaryMonth") {
                  return {
                    ...o,
                    label: sysinfo["TAX_DECLARATION_DATE_TYPE"] === "1" ? getLabel(111, "税款所属期") : getLabel(111, "薪资所属月")
--- 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>
--- 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, Tag } from "antd";
 import { getDeclareList, taxdeclarationUpdateIcon, withDrawTaxDeclaration } from "../../../../apis/declare";
-import { sysConfCodeRule } from "../../../../apis/ruleconfig";
+import { sysConfCodeRule, sysinfo } from "../../../../apis/ruleconfig";

 const getLabel = WeaLocaleProvider.getLabel;

@ -36,9 +36,9 @@ class Index extends Component {
      if (status && data === "1") this.setState({ showWithDrawBtn: data === "1" && showOperateBtn });
    });
  };
-  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 [fromSalaryMonth, endSalaryMonth] = dateRange || [];
    const params = { fromSalaryMonth: fromSalaryMonth + "-01", endSalaryMonth: endSalaryMonth + "-01", ...extra };
@ -47,7 +47,8 @@ class Index extends Component {
    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 => {
--- a/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
+++ b/pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
@ -73,9 +73,9 @@ export default class GenerateDeclarationDetail extends React.Component {

  render() {
    const { loading, pageInfo, columns, dataSource } = this.state;
-    const { taxAgentStore: { showOperateBtn } } = this.props;
-    const buttons = showOperateBtn ? [<Button type="primary"
-                                              onClick={this.handleExport}>{getLabel(111, "导出全部")}</Button>] : [];
+    const { taxAgentStore: { PageAndOptAuth } } = this.props;
+    const buttons = !!PageAndOptAuth.opts.length ? [<Button type="primary"
+                                                            onClick={this.handleExport}>{getLabel(111, "导出全部")}</Button>] : [];
    const pagination = {
      ...pageInfo,
      showTotal: (total) => `共 ${total} 条`,
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@ -254,7 +254,7 @@ class LedgerSalaryItemTable extends Component {
        render: (text, record) => {
          const { salarySobId, salaryItemId } = record;
          return <a
-            href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${salaryItemId}?type=ledger`}
+            href={`/spa/hrmSalary/static/index.html#/main/hrmSalary/ledger/topologyView/${salarySobId}/${salaryItemId}?type=ledger`}
            target="_blank">{text}</a>;
        }
      },
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@ -38,15 +38,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 () => {
@ -120,7 +117,7 @@ export default class MobilePayroll extends React.Component {
  handleGoFeedback = () => {
    Modal.confirm({
      title: getLabel(131329, "信息确认"),
-      content: getLabel(111, "请确认薪资信息是有误，进行反馈并发起反馈流程。"),
+      content: getLabel(111, "确认是否发起反馈流程？"),
      onOk: () => {
        const { salaryBillToken } = this.state;
        feedBackSalaryBill({ salaryInfoId: getQueryString("id"), header: salaryBillToken })
@ -165,11 +162,17 @@ export default class MobilePayroll extends React.Component {
      {pwdModifyVisible && <SecondarypwdModify {...this.props} salaryBillToken={this.state.salaryBillToken}
                                               onSuccess={() => this.setState({ pwdModifyVisible: false }, () => this.initMobile())}/>}
      {/*发送验证码*/}
-      <CaptchaModal
-        visible={captchaVisible} id={getQueryString("id")}
-        onCancel={() => this.setState({ captchaVisible: false })}
-        onConfirm={() => this.props.mySalaryStore.setInitEmVerify()}
-      />
+      {
+        captchaVisible &&
+        <CaptchaModal
+          visible={captchaVisible} id={getQueryString("id")}
+          onCancel={() => this.setState({ captchaVisible: false })}
+          onConfirm={() => {
+            setInitEmVerify();
+            this.getMySalaryBill(getQueryString("id"));
+          }}
+        />
+      }
    </React.Fragment>;
    const {
      salaryTemplate, salaryGroups, employeeInformation, sendTime, confirmStatus, showAck, showFeedback
--- 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: [
--- 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>;
--- 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",
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
@ -53,7 +53,7 @@ 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) {
+      if (autoSendStatus !== "1" && emailStatus !== "1" && msgStatus !== "1" && smsStatus !== "1") {
        message.warning(getLabel(111, "工资单模板至少开启一个发送通道"));
        return;
      }
--- a/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
+++ b/pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
@ -59,7 +59,6 @@ class PersonalScopeModal extends Component {
                          ...scopeSelectLinkageDatas[cur],
                          browserConditionParam: {
                            ...scopeSelectLinkageDatas[cur].browserConditionParam,
-                            isSingle: true,
                            replaceDatas: !_.isEmpty(record) ? [{
                              id: String(record.targetId),
                              name: record.targetName
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@ -30,7 +30,7 @@ class SalaryItemForm extends Component {
  componentDidMount() {
    const { salaryItemFieldsList } = this.state;
    const { request, editable, record, isAdd = false, taxAgentAdminOption, isLedger = false } = this.props;
-    const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType } = request;
+    const { systemType = "", sharedType, valueType, useInEmployeeSalary, dataType, pattern } = request;
    this.setState({
      salaryItemFieldsList: _.map(salaryItemFieldsList, item => {
        const { key } = item;
@ -87,6 +87,7 @@ class SalaryItemForm extends Component {
          case "defaultValue":
            return {
              ...item,
+              precision: pattern ? pattern : item.precision,
              type: dataType === "number" ? "INPUTNUMBER" : "INPUT",
              display: valueType && valueType.toString() === "1" && useInEmployeeSalary == 0,
              viewAttr: (isLedger && record.canEdit) || (editable && record.canEdit) || isAdd ? 2 : 1
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
@ -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 })}/>
      {/*核算进度条*/}
      {
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareAdvanceSearchPannel/index.js
@ -54,6 +54,12 @@ class WelfareAdvanceSearchPannel extends Component {
                    viewAttr: 2
                  }
                };
+              } else if (getKey(o) === "siSchemeId" || getKey(o) === "fundSchemeId" || getKey(o) === "otherSchemeId" || getKey(o) === "taxAgentId") {
+                return {
+                  ...o, otherParams: {
+                    showSearch: true, optionFilterProp: "children"
+                  }
+                };
              }
              return { ...o };
            })
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js
@ -113,7 +113,10 @@ class Index extends Component {
                    return {
                      ...g, label: getLabel(g.lanId, g.label),
                      viewAttr: (runStatuses === "4,5" || !showOperateBtn) ? 1 : g.viewAttr,
-                      options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options
+                      options: _.find(props[`${o.title}Items`], j => j.domkey[0] === key).options,
+                      otherParams: {
+                        showSearch: true, optionFilterProp: "children"
+                      }
                    };
                  } else if (getKey(g).indexOf("StartTime") !== -1) {
                    return {
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
@ -189,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}
--- a/pc4mobx/hrmSalary/style/index.less
+++ b/pc4mobx/hrmSalary/style/index.less
@ -151,6 +151,7 @@
    background-color: #fff5db;
    border-radius: 2px;
    height: 24px;
+    min-width: 66px;
  }

  .danger {