From 1c7743f06d88ea3aaa23add6e6c1fd9dd5518772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 31 Jul 2024 13:19:06 +0800
Subject: [PATCH] =?UTF-8?q?release/2.15.1.2407.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/declareDetail/components/constants.js   | 12 ++++++++++++
 .../pages/declareDetail/components/paymentBtn.js  | 15 +++++++++++----
 .../declareDetail/components/paymentDialog.js     |  3 ++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/constants.js b/pc4mobx/hrmSalary/pages/declareDetail/components/constants.js
index cb9ce2fe..7a9046ba 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/components/constants.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/constants.js
@@ -86,6 +86,18 @@ export const paymentBankConditions = [
         value: "",
         viewAttr: 1,
         options: []
+      },
+      {
+        colSpan: 1,
+        conditionType: "SELECT",
+        domkey: ["paymentNumber"],
+        fieldcol: 12,
+        label: "缴款帐号",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1,
+        options: []
       }
     ],
     defaultshow: true
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js
index e187d81d..aed803a0 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js
@@ -7,7 +7,7 @@
 import React, { Component } from "react";
 import { WeaLocaleProvider } from "ecCom";
 import { inject, observer } from "mobx-react";
-import { Button, Dropdown, Menu, message, Modal } from "antd";
+import { Button, message, Modal } from "antd";
 import PaymentDialog from "./paymentDialog";
 import {
   taxPaymentAgreemenPay,
@@ -155,6 +155,12 @@ class PaymentBtn extends Component {
                           value: !_.isEmpty(bankForm) ? bankForm.bank : "",
                           options: _.map(feedbacks, o => ({ key: o.sfxyh, showname: o.khhhh }))
                         };
+                      } else if (key === "paymentNumber") {
+                        return {
+                          ...it,
+                          value: !_.isEmpty(bankForm) ? bankForm.bank : "",
+                          options: _.map(feedbacks, o => ({ key: o.sfxyh, showname: o.jkzh }))
+                        };
                       }
                       return { ...it };
                     })
@@ -176,15 +182,16 @@ class PaymentBtn extends Component {
   taxPaymentAgreemenPay = () => {
     const { paymentDialog } = this.state;
     const { taxAmount } = paymentDialog;
-    const { declareStore: { paymentForm } } = this.props;
+    const { declareStore: { paymentForm }, reportType } = this.props;
     const { taxCycle: taxYearMonth, taxAgentId } = this.props.declareInfo;
     paymentForm.validateForm().then(f => {
       if (f.isValid) {
-        const { protocolNumber } = paymentForm.getFormParams();
+        const { protocolNumber, paymentNumber } = paymentForm.getFormDatas();
         const payload = {
           taxDeclareRecordId: getQueryString("id"),
           taxYearMonth: taxYearMonth + "-01",
-          taxAgentId, taxAmount, protocolNumber
+          taxAgentId, taxAmount, protocolNumber: protocolNumber.value,
+          reportType, paymentNumber: paymentNumber.valueSpan
         };
         this.setState({
           paymentDialog: {
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentDialog.js b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentDialog.js
index e5ffc64f..20617418 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/components/paymentDialog.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/paymentDialog.js
@@ -28,7 +28,8 @@ class PaymentDialog extends Component {
     if (key === "protocolNumber") {
       const { declareStore: { paymentForm } } = this.props;
       paymentForm.updateFields({
-        count: val[key].value
+        count: val[key].value,
+        paymentNumber: val[key].value,
       });
     }
   };