feat:修复问题

config/env.config.js

@@ -2,11 +2,11 @@ const isProduction = process.env.NODE_ENV === 'production';
 const isPre = process.env.PRE_ENV === 'pre';
 
 const envAPi = {
-  api: '//backstms-test2.liangkebang.net',
+  api: '//backstms-test9.liangkebang.net',
   kdspOpApi: 'https://kdsp-operation-test2.liangkebang.net',
   kdspApi: 'https://sc-op-api-test2.liangkebang.net',
   goodsApi: 'https://sc-op-api-test2.liangkebang.net',
-  querysApi: 'https://sc-settlement-api-test2.liangkebang.net',
+  querysApi: 'https://sc-settlement-api-test9.liangkebang.net',
   // goodsApi: '//192.168.188.111:7000',
   prologueDomain: 'https://mall-test2.liangkebang.net',
   qiniuHost: 'https://appsync.lkbang.net',

src/pages/PaymentMange/ToExamine/data.js

@@ -6,7 +6,7 @@ export function renderModal() {
     <Button type="primary" key="cancel" onClick={() => this.handleCancel()}>
       取消
     </Button>,
-    <Button type="primary" onClick={() => this.handleSubmit} key="save">
+    <Button type="primary" onClick={() => this.handleSubmit()} key="save">
       提交
     </Button>,
   ];

src/pages/PaymentMange/data.js

 import React from 'react';
-import { Button, Switch, Popconfirm } from 'antd';
+import { Button } from 'antd';
 import styles from './style.less';
 
 export const payStateEnum = {
@@ -150,7 +150,7 @@ export function columns(res) {
           </Button>
           <Button
             type="primary"
-            disabled={row.blueInvoiceState !== 2}
+            disabled={row.blueInvoiceState === 1}
             className={styles.button}
             onClick={() => res.edit(2, row)}
           >

src/pages/PaymentMange/index.jsx

@@ -97,10 +97,12 @@ const PaymentMange = () => {
   const onExport = async () => {
     const params = formRef.current.getFieldsValue();
     setloading(true);
-    const data = await selfPaymentExport(params);
-    if (!data) {
+    if (params?.dateTimeRange?.[0]) {
+      const data = await selfPaymentExport(params);
       const blob = new Blob([data]);
       saveAs(blob, `付款单导出数据-${format(new Date(), 'yyyyMMddHHmmss')}.xlsx`);
+    } else {
+      notification.error({ message: '付款单开始时间不能为空' });
     }
     setloading(false);
   };

src/pages/PaymentMange/service.js

 import request from '@/utils/request';
 import config from '../../../config/env.config';
-
+import moment from 'moment';
 // 分页查询所有数据
 const { querysApi } = config;
 
@@ -48,6 +48,7 @@ export async function selfPaymentExport(params) {
   return request.post('/selfPaymentBill/merchant/export', {
     prefix: querysApi,
     data: queryParams,
+    responseType: 'arrayBuffer',
   });
 }
 // 付款单导出
@@ -55,6 +56,7 @@ export async function selfPaymentexportDetail(params) {
   return request.post('/selfPaymentBill/merchant/exportDetail', {
     prefix: querysApi,
     data: params,
+    responseType: 'arrayBuffer',
     headers: {
       'Content-Type': 'application/json;charset=UTF-8',
     },

src/pages/ReconciliationQuery/service.js

@@ -37,5 +37,6 @@ export async function downloadSelfBillDetail(params) {
   return request.post('/selfBill/merchant/downloadSelfBillDetail', {
     prefix: querysApi,
     data: params,
+    responseType: 'arrayBuffer',
   });
 }

src/pages/SettlementSheet/index.jsx

@@ -22,7 +22,7 @@ const SettlementSheet = () => {
   // 计算当前结算金额为0或负
   const checkedAmount = data => {
     const totalPrice = data.reduce(
-      (totalPrice, item) => (totalPrice += Number(item.refundAmount)),
+      (totalPrice, item) => (totalPrice += Number(item.payableAmount)),
       0,
     );
     if (totalPrice <= 0) {
@@ -47,27 +47,27 @@ const SettlementSheet = () => {
   };
   // 检查帐期周期是否连续
   const checkedTime = data => {
-    const minTime = data[0]?.billPeriodStart?.split(' ')[0];
-    const maxTime = data[0]?.billPeriodEnd?.split(' ')[0];
+    const minTime = data[0]?.billPeriodStart;
+    const maxTime = data[0]?.billPeriodEnd;
     let minTimeNum = new Date(minTime).getTime();
     let maxTimeNum = new Date(maxTime).getTime();
     if (data.length < 2) {
       return true;
     }
     for (let i = 1; i < data.length; i += 1) {
-      const startTime = data[i]?.billPeriodStart?.split(' ')[0];
-      const endTime = data[i]?.billPeriodEnd?.split(' ')[0];
+      const startTime = data[i]?.billPeriodStart;
+      const endTime = data[i]?.billPeriodEnd;
       const startTimeNum = new Date(startTime).getTime();
       const endTimeNum = new Date(endTime).getTime();
       if (startTimeNum > maxTimeNum && maxTimeNum + 24 * 3600 * 1000 === startTimeNum) {
         maxTimeNum = endTimeNum;
-      } else if (minTimeNum > endTimeNum && endTimeNum + 24 * 3600 * 1000 === minTimeum) {
+      } else if (minTimeNum > endTimeNum && endTimeNum + 24 * 3600 * 1000 === minTimeNum) {
         minTimeNum = startTimeNum;
       }
     }
-    const endRulstTime = data[data.length - 1]?.billPeriodEnd?.split(' ')[0];
+    const endRulstTime = data[data.length - 1]?.billPeriodEnd;
     const endRulstTimeNum = new Date(endRulstTime).getTime();
-    if (endRulstTimeNum === maxTimeNum) {
+    if (endRulstTimeNum <= maxTimeNum && minTimeNum <= endRulstTimeNum) {
       return true;
     }
     notification.error({ message: '账单周期不连续' });
@@ -85,13 +85,13 @@ const SettlementSheet = () => {
   };
 
   const paymentOrder = async () => {
-    if (checkedBillType(selectedRows)) {
+    if (checkedBillType(selectedRowsList)) {
       setloading(true);
-      checkedAmount(selectedRows);
+      checkedAmount(selectedRowsList);
       const data = await selfPaymentBill(selectedRowKeys);
       if (data.businessCode === '0000') {
         setselectedRowKeys([]);
-        setselectedRows([]);
+        setselectedRowsList([]);
         reload();
         notification.success({ message: '生成付款单成功' });
       }
@@ -105,7 +105,7 @@ const SettlementSheet = () => {
     selectedRowKeys,
     onChange: onSelectChange,
     getCheckboxProps: record => ({
-      disabled: !!(record.settleState === 1 && record.payBatchNo), // Column configuration not to be checked
+      disabled: !(record.settleState === 1 && !record.payBatchNo), // Column configuration not to be checked
     }),
   };