feature/2.19.1.2501.01-套打功能

pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js

@@ -12,6 +12,7 @@ import { getSearchs } from "../../../../util";
 import { getTaxAgentSelectListAsAdmin } from "../../../../apis/taxAgent";
 import { saveDeclare } from "../../../../apis/declare";
 import { declareConditions } from "./condition";
+import * as API from "../../../../apis/ruleconfig";
 
 const getKey = WeaTools.getKey;
 const getLabel = WeaLocaleProvider.getLabel;
@@ -31,7 +32,8 @@ 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) {
@@ -44,6 +46,11 @@ class Index extends Component {
                   ...o, options: _.map(data, g => ({ key: g.id, showname: g.content }))
                   // helpfulTitle: getLabel(563420, "提示：可选择单个个税扣缴义务人进行申报，若不选择，则批量对管理下的所有个税扣缴义务人进行申报；")
                 };
+              } else if (getKey(o) === "salaryMonthStr") {
+                return {
+                  ...o,
+                  label: sysinfo["TAX_DECLARATION_DATE_TYPE"] === "1" ? getLabel(111, "税款所属期") : getLabel(111, "薪资所属月")
+                };
               }
               return { ...o };
             })
@@ -58,7 +65,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, "操作成功"));

pc4mobx/hrmSalary/pages/ruleConfig/conditions.js

@@ -222,6 +222,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: "算税规则",

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 };
         })
@@ -154,6 +161,7 @@ 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":
             if (!this.handleDebounce) {
               this.handleDebounce = _.debounce(() => {
@@ -173,7 +181,8 @@ class RuleConfig extends Component {
                   APPROVAL_CAN_RE_CALC_STATUS: getLabel(111, "开启审批的核算记录允许重新核算"),
                   APPROVAL_CAN_EDIT_RESULT_STATUS: getLabel(111, "审批流程发起后允许修改核算数据"),
                   ATTENDANCE_SERIAL_COLLECTION_BTN: getLabel(111, "考勤引用是否采集班次数据"),
-                  SHOT_EMP_BTN: getLabel(111, "启用组织快照")
+                  TAX_DECLARATION_DATE_TYPE: getLabel(111, "申报日期类型"),
+                  SHOT_EMP_BTN: getLabel(111, "启用组织快照"),
                 };
                 this.unifiedSettings(key, confTitle[key]);
                 this.handleDebounce = null;