diff --git a/src/pages/DigitalElectronics/index.tsx b/src/pages/DigitalElectronics/index.tsx index 74c2fe9..4372cab 100644 --- a/src/pages/DigitalElectronics/index.tsx +++ b/src/pages/DigitalElectronics/index.tsx @@ -311,7 +311,10 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { } } } - + // 处理税号中的特殊字符 + const cleanString = (str: string) => { + return str.replace(/[\s]/g, ''); + } // 红冲发票 const handleRedGoBill = async (record?: any) => { // 这个方法 比较复杂 我做一下注释 @@ -396,6 +399,8 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { }) } + + let obj: any = { billNo: record?.BILL_NO ? `HC-${record?.BILL_NO}` : "", // 单据编号 billDate: moment(record?.BILL_DATE).format('YYYY-MM-DD'), // 单据日期 @@ -404,7 +409,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { autoInvoice: "1",// 自动开票标记 invoiceProperty: "1", invoiceType: record?.BILL_TYPE == 1000 ? '08xdp' : record?.BILL_TYPE == 2000 ? '10xdp' : '', //发票种类 - buyerTaxpayerId: record?.TAXPAYER_IDENTIFYCODE,// 购方税号 + buyerTaxpayerId: cleanString(record?.TAXPAYER_IDENTIFYCODE),// 购方税号 buyerName: record?.MERCHANTS_NAME, // 购买方名称 buyerProperty: "0", // 购买方性质 0-企业，1-个人，2-非企业单位 // sellerTaxpayerId: "91530112MA7MQ2JR9U", // 销方税号 写死 @@ -413,10 +418,13 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { sellerName: publicParams.sellerName, // 销方名称 写死 sellerBankAndAccount: "", // 销方银行和账号 写死 sellerAddressAndTel: "", // 销方地址和电话 写死 应该可以不传 - drawer: record?.BILL_PERSON,// 开票人 + payee: "周洁萍", // 收款人 + reviewer: "杨尚涛",// 复核人 + drawer: "杨木青",// 开票人 buyerRecipientPhone: record?.RECEIVE_PHONENUMBER,// 购方收票手机号 buyerRecipientMail: record?.RECEIVE_EMAIL,// 购方收件邮箱 - + buyerAddressAndTel: `${record?.MERCHANTS_ADDRESS}、${record?.MERCHANTS_TEL}`,// 购方地址、电话 + buyerBankAndAccount: `${record?.BANK_NAME}${record?.BANK_ACCOUNT}`,// 购方银行、账号 redReason: formData?.redReasonSelect || "", autoMerge: "0", // blueinvoiceNo: '23249322851717775360', @@ -424,7 +432,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { // originalIssueTime: record?.originalIssueTime, // blueInvoiceType: record?.blueInvoiceType, blueinvoiceCode: "", - billDetail: billDetailReq + billDetail: billDetailReq, } // 构造原始数据 @@ -541,7 +549,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { autoInvoice: "1",// 自动开票标记 invoiceType: record?.BILL_TYPE == 1000 ? '08xdp' : record?.BILL_TYPE == 2000 ? '10xdp' : '', //发票种类 - buyerTaxpayerId: record?.TAXPAYER_IDENTIFYCODE,// 购方税号 + buyerTaxpayerId: cleanString(record?.TAXPAYER_IDENTIFYCODE),// 购方税号 buyerName: record?.MERCHANTS_NAME, // 购买方名称 buyerProperty: "0", // 购买方性质 0-企业，1-个人，2-非企业单位 @@ -552,11 +560,16 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { sellerBankAndAccount: "", // 销方银行和账号 写死 sellerAddressAndTel: "", // 销方地址和电话 写死 应该可以不传 - drawer: record?.BILL_PERSON,// 开票人 buyerRecipientPhone: record?.RECEIVE_PHONENUMBER,// 购方收票手机号 buyerRecipientMail: record?.RECEIVE_EMAIL,// 购方收件邮箱 remark: record?.BILL_DESC, + buyerAddressAndTel: `${record?.MERCHANTS_ADDRESS}、${record?.MERCHANTS_TEL}`,// 购方地址、电话 + buyerBankAndAccount: `${record?.BANK_NAME}${record?.BANK_ACCOUNT}`,// 购方银行、账号 + payee: "周洁萍", // 收款人 + reviewer: "杨尚涛",// 复核人 + drawer: "杨木青",// 开票人 + // redReason: record?.BILL_DESC, // blueinvoiceNo: record?.blueinvoiceNo, @@ -793,7 +806,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { BILL_DATE: obj?.BILL_DATE,// 开票日期 BANK_NAME: obj?.BANK_NAME,// 开户银行 BANK_ACCOUNT: obj?.BANK_ACCOUNT,// 银行账号 - TAXPAYER_IDENTIFYCODE: obj?.TAXPAYER_IDENTIFYCODE,// 统一信用代码 + TAXPAYER_IDENTIFYCODE: cleanString(obj?.TAXPAYER_IDENTIFYCODE),// 统一信用代码 INTERBANK_NO: obj?.INTERBANK_NO,// 联行号 TAXPAYER_CODE: obj?.sellerTaxpayerId,// 开票方纳税人识别号 ACCOUNTED_TYPE: obj?.ACCOUNTED_TYPE,// 入账类型 diff --git a/src/pages/InvoiceInquiry/index.tsx b/src/pages/InvoiceInquiry/index.tsx index 27eb971..314984b 100644 --- a/src/pages/InvoiceInquiry/index.tsx +++ b/src/pages/InvoiceInquiry/index.tsx @@ -188,7 +188,10 @@ const InvoiceInquiry: React.FC<{ currentUser: any }> = (props) => { }, ] - + // 处理税号中的特殊字符 + const cleanString = (str: string) => { + return str.replace(/[\s]/g, ''); + } // 红冲发票 const handleRedGoBill = async (record?: any) => { // 这个方法 比较复杂 我做一下注释 @@ -279,7 +282,7 @@ const InvoiceInquiry: React.FC<{ currentUser: any }> = (props) => { autoInvoice: "1",// 自动开票标记 invoiceProperty: "1", invoiceType: record?.BILL_TYPE == 1000 ? '08xdp' : record?.BILL_TYPE == 2000 ? '10xdp' : '', //发票种类 - buyerTaxpayerId: record?.TAXPAYER_IDENTIFYCODE,// 购方税号 + buyerTaxpayerId: cleanString(record?.TAXPAYER_IDENTIFYCODE),// 购方税号 buyerName: record?.MERCHANTS_NAME, // 购买方名称 buyerProperty: "0", // 购买方性质 0-企业，1-个人，2-非企业单位 // sellerTaxpayerId: "91530112MA7MQ2JR9U", // 销方税号 写死 @@ -288,7 +291,12 @@ const InvoiceInquiry: React.FC<{ currentUser: any }> = (props) => { sellerName: publicParams.sellerName, // 销方名称 写死 sellerBankAndAccount: "", // 销方银行和账号 写死 sellerAddressAndTel: "", // 销方地址和电话 写死 应该可以不传 - drawer: record?.BILL_PERSON,// 开票人 + payee: "周洁萍", // 收款人 + reviewer: "杨尚涛",// 复核人 + drawer: "杨木青",// 开票人 + + buyerAddressAndTel: `${record?.MERCHANTS_ADDRESS}、${record?.MERCHANTS_TEL}`,// 购方地址、电话 + buyerBankAndAccount: `${record?.BANK_NAME}${record?.BANK_ACCOUNT}`,// 购方银行、账号 buyerRecipientPhone: record?.RECEIVE_PHONENUMBER,// 购方收票手机号 buyerRecipientMail: record?.RECEIVE_EMAIL,// 购方收件邮箱 @@ -412,7 +420,7 @@ const InvoiceInquiry: React.FC<{ currentUser: any }> = (props) => { autoInvoice: "1",// 自动开票标记 invoiceType: record?.BILL_TYPE == 1000 ? '08xdp' : record?.BILL_TYPE == 2000 ? '10xdp' : '', //发票种类 - buyerTaxpayerId: record?.TAXPAYER_IDENTIFYCODE,// 购方税号 + buyerTaxpayerId: cleanString(record?.TAXPAYER_IDENTIFYCODE),// 购方税号 buyerName: record?.MERCHANTS_NAME, // 购买方名称 buyerProperty: "0", // 购买方性质 0-企业，1-个人，2-非企业单位 @@ -423,7 +431,12 @@ const InvoiceInquiry: React.FC<{ currentUser: any }> = (props) => { sellerBankAndAccount: "", // 销方银行和账号 写死 sellerAddressAndTel: "", // 销方地址和电话 写死 应该可以不传 - drawer: record?.BILL_PERSON,// 开票人 + payee: "周洁萍", // 收款人 + reviewer: "杨尚涛",// 复核人 + drawer: "杨木青",// 开票人 + + buyerAddressAndTel: `${record?.MERCHANTS_ADDRESS}、${record?.MERCHANTS_TEL}`,// 购方地址、电话 + buyerBankAndAccount: `${record?.BANK_NAME}${record?.BANK_ACCOUNT}`,// 购方银行、账号 buyerRecipientPhone: record?.RECEIVE_PHONENUMBER,// 购方收票手机号 buyerRecipientMail: record?.RECEIVE_EMAIL,// 购方收件邮箱 @@ -659,7 +672,7 @@ const InvoiceInquiry: React.FC<{ currentUser: any }> = (props) => { BILL_DATE: obj?.BILL_DATE,// 开票日期 BANK_NAME: obj?.BANK_NAME,// 开户银行 BANK_ACCOUNT: obj?.BANK_ACCOUNT,// 银行账号 - TAXPAYER_IDENTIFYCODE: obj?.TAXPAYER_IDENTIFYCODE,// 统一信用代码 + TAXPAYER_IDENTIFYCODE: cleanString(obj?.TAXPAYER_IDENTIFYCODE),// 统一信用代码 INTERBANK_NO: obj?.INTERBANK_NO,// 联行号 TAXPAYER_CODE: obj?.sellerTaxpayerId,// 开票方纳税人识别号 ACCOUNTED_TYPE: obj?.ACCOUNTED_TYPE,// 入账类型 diff --git a/src/pages/redReversal/components/InvoiceDetial.tsx b/src/pages/redReversal/components/InvoiceDetial.tsx index b94ca05..d731ef9 100644 --- a/src/pages/redReversal/components/InvoiceDetial.tsx +++ b/src/pages/redReversal/components/InvoiceDetial.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useRef, useState } from "react"; -import ProForm, { ProFormSelect, ProFormText } from "@ant-design/pro-form"; -import { Col, Drawer, FormInstance, Row, Table, Typography, Space, Button, Empty } from "antd"; +import ProForm, { ProFormSelect, ProFormText, ProFormTextArea } from "@ant-design/pro-form"; +import { Col, Drawer, FormInstance, Row, Table, Typography, Space, Button, Empty, Divider } from "antd"; import { connect } from "umi"; import { ProTable } from "@ant-design/pro-components"; import { handleGetAPPLYAPPROVEList, handleGetBILLDETAILList } from "@/pages/DigitalElectronics/service"; @@ -103,6 +103,7 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P title:
税额
, align: 'right', width: 80, + valueType: 'digit', dataIndex: "INVOICE_TAX" }, { @@ -178,6 +179,7 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P setShowDetail(false); setParentRow(undefined); }} + bodyStyle={{ padding: '0 24px 24px' }} destroyOnClose > {/* 统一 labelCol 宽度：通过 formProps 设置 */} @@ -188,14 +190,8 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P formProps={{ labelCol: { span: 8 } }} > {/* 第一行：三列（每列 span=8） */} + 票据基本信息 - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + {/* */} + {/* */} - + 收票方 {/* 第二行 */} - + - - - + + + + + - - - {/* 发票图片：显示为链接 */} + + + 查看发票图片 - ) : '无发票图片', + ) : '', }} /> + + - - {/* 第三行：备注信息（仍三列） */} - - - {/* 修改 label 文案为 纳税人识别号 */} - - - - - - - + + + diff --git a/src/pages/redReversal/index.tsx b/src/pages/redReversal/index.tsx index 82bb196..f2ef2a6 100644 --- a/src/pages/redReversal/index.tsx +++ b/src/pages/redReversal/index.tsx @@ -443,6 +443,10 @@ const RedReversal: React.FC<{ currentUser: any }> = (props) => { ), }, ] + // 处理税号中的特殊字符 + const cleanString = (str: string) => { + return str.replace(/[\s]/g, ''); + } // 红冲发票 const handleRedGoBill = async (record?: any) => { // 这个方法 比较复杂 我做一下注释 @@ -525,6 +529,11 @@ const RedReversal: React.FC<{ currentUser: any }> = (props) => { }) } + let newDesc: string = '' + let addStr: string = `被红冲蓝字数电发票号码：${record?.blueinvoiceNo || ""}\t\t红字发票信息确认单编号：${record?.BILL_NO ? `HC-${record?.BILL_NO}` : ""};\n` + + newDesc = record?.BILL_DESC.replace(/收款人/, addStr + "收款人"); + let obj: any = { billNo: record?.BILL_NO ? `HC-${record?.BILL_NO}` : "", // 单据编号 billDate: moment(record?.BILL_DATE).format('YYYY-MM-DD'), // 单据日期 @@ -533,7 +542,7 @@ const RedReversal: React.FC<{ currentUser: any }> = (props) => { autoInvoice: "1",// 自动开票标记 invoiceProperty: "1", invoiceType: record?.BILL_TYPE == 1000 ? '08xdp' : record?.BILL_TYPE == 2000 ? '10xdp' : '', //发票种类 - buyerTaxpayerId: record?.TAXPAYER_IDENTIFYCODE,// 购方税号 + buyerTaxpayerId: cleanString(record?.TAXPAYER_IDENTIFYCODE),// 购方税号 buyerName: record?.MERCHANTS_NAME, // 购买方名称 buyerProperty: "0", // 购买方性质 0-企业，1-个人，2-非企业单位 // sellerTaxpayerId: "91530112MA7MQ2JR9U", // 销方税号 写死 @@ -542,7 +551,12 @@ const RedReversal: React.FC<{ currentUser: any }> = (props) => { sellerName: publicParams.sellerName, // 销方名称 写死 sellerBankAndAccount: "", // 销方银行和账号 写死 sellerAddressAndTel: "", // 销方地址和电话 写死 应该可以不传 - drawer: record?.BILL_PERSON,// 开票人 + payee: "周洁萍", // 收款人 + reviewer: "杨尚涛",// 复核人 + drawer: "杨木青",// 开票人 + + buyerAddressAndTel: `${record?.MERCHANTS_ADDRESS}、${record?.MERCHANTS_TEL}`,// 购方地址、电话 + buyerBankAndAccount: `${record?.BANK_NAME}${record?.BANK_ACCOUNT}`,// 购方银行账号 buyerRecipientPhone: record?.RECEIVE_PHONENUMBER,// 购方收票手机号 buyerRecipientMail: record?.RECEIVE_EMAIL,// 购方收件邮箱 @@ -553,7 +567,8 @@ const RedReversal: React.FC<{ currentUser: any }> = (props) => { // originalIssueTime: record?.originalIssueTime, // blueInvoiceType: record?.blueInvoiceType, blueinvoiceCode: "", - billDetail: billDetailReq + billDetail: billDetailReq, + remark: newDesc || "", } // 构造原始数据 @@ -667,7 +682,7 @@ const RedReversal: React.FC<{ currentUser: any }> = (props) => { autoInvoice: "1",// 自动开票标记 invoiceType: record?.BILL_TYPE == 1000 ? '08xdp' : record?.BILL_TYPE == 2000 ? '10xdp' : '', //发票种类 - buyerTaxpayerId: record?.TAXPAYER_IDENTIFYCODE,// 购方税号 + buyerTaxpayerId: cleanString(record?.TAXPAYER_IDENTIFYCODE),// 购方税号 buyerName: record?.MERCHANTS_NAME, // 购买方名称 buyerProperty: "0", // 购买方性质 0-企业，1-个人，2-非企业单位 @@ -678,7 +693,12 @@ const RedReversal: React.FC<{ currentUser: any }> = (props) => { sellerBankAndAccount: "", // 销方银行和账号 写死 sellerAddressAndTel: "", // 销方地址和电话 写死 应该可以不传 - drawer: record?.BILL_PERSON,// 开票人 + payee: "周洁萍", // 收款人 + reviewer: "杨尚涛",// 复核人 + drawer: "杨木青",// 开票人 + + buyerAddressAndTel: `${record?.MERCHANTS_ADDRESS}、${record?.MERCHANTS_TEL}`,// 购方地址、电话 + buyerBankAndAccount: `${record?.BANK_NAME}${record?.BANK_ACCOUNT}`,// 购方银行账号 buyerRecipientPhone: record?.RECEIVE_PHONENUMBER,// 购方收票手机号 buyerRecipientMail: record?.RECEIVE_EMAIL,// 购方收件邮箱 @@ -911,7 +931,7 @@ const RedReversal: React.FC<{ currentUser: any }> = (props) => { BILL_DATE: obj?.BILL_DATE,// 申请时间 BANK_NAME: obj?.BANK_NAME,// 开户银行 BANK_ACCOUNT: obj?.BANK_ACCOUNT,// 银行账号 - TAXPAYER_IDENTIFYCODE: obj?.TAXPAYER_IDENTIFYCODE,// 统一信用代码 + TAXPAYER_IDENTIFYCODE: cleanString(obj?.TAXPAYER_IDENTIFYCODE),// 统一信用代码 INTERBANK_NO: obj?.INTERBANK_NO,// 联行号 TAXPAYER_CODE: obj?.sellerTaxpayerId,// 开票方纳税人识别号 ACCOUNTED_TYPE: obj?.ACCOUNTED_TYPE,// 入账类型 diff --git a/src/utils/requestOld.ts b/src/utils/requestOld.ts index 26e1e81..b983de6 100644 --- a/src/utils/requestOld.ts +++ b/src/utils/requestOld.ts @@ -7,8 +7,8 @@ import CryptoJS from "crypto-js"; const { UMI_APP_BASEURL } = process.env; // const instance = axios.create({ baseURL: UMI_APP_BASEURL }); -// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); -const instance = axios.create({ baseURL: 'https://samember.yciccloud.com:8999/EShangApiMain' }); +const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); +// const instance = axios.create({ baseURL: 'https://samember.yciccloud.com:8999/EShangApiMain' }); // const instance = axios.create({ baseURL: '/auth' });