fix: 修改结算应收应付订单详情搜索以及翻译bug

src/pages/balance/accountsPayable/settlementList/logisticsDetail.tsx

@@ -84,6 +84,7 @@ const logisticsDetail: React.FC = () => {
           tableProps={{
             rowKey: 'id',
           }}
+          keepAlive={false}
           columns={logisticsColumn}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(params)}

src/pages/balance/accountsPayable/settlementList/orderDetail.tsx

@@ -49,6 +49,7 @@ const OrderDetail: React.FC = () => {
           tableProps={{
             rowKey: 'orderNo',
           }}
+          keepAlive={false}
           columns={orderColumns}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(getSettleAccountsMemberSettlementPagePayableOrderSettlement, { settlementId: id, ...params })}

src/pages/balance/accountsPayable/settlementList/productNoticeSettlementDetail.tsx

@@ -72,6 +72,7 @@ const ProductNoticeSettlementDetail: React.FC = () => {
           tableProps={{
             rowKey: 'orderNo',
           }}
+          keepAlive={false}
           columns={productNoticecolumns}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(params)}

src/pages/balance/accountsPayable/settlementList/schema/index.tsx

@@ -179,13 +179,13 @@ export const detailSchema: ISchema = {
                 }
               },
             },
-            "[receiveStartTime, receiveEndTime]": {
+            "[payStartTime, payEndTime]": {
               type: 'array',
               'x-component': 'RangePicker',
               'x-component-props': {
                 showTime: false,
                 allowClear: true,
-                placeholder: [intl.formatMessage({id: 'balance.accountsPayable.settlementList.schema.detailSchema.receiveStartTime'}), intl.formatMessage({id: 'balance.accountsPayable.settlementList.schema.detailSchema.receiveEndTime'})],
+                placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.invoice.schema.payStartTime'}), intl.formatMessage({id: 'balance.accountsReceivable.invoice.schema.payEndTime'})],
                 style: {
                   minWidth: "320px"
                 }

src/pages/balance/accountsReceivable/settlementList/hooks/useHandleSettlementList.tsx

@@ -91,16 +91,16 @@ function useHandleSettlementList() {
         switch (record.orderType) {
           // 生产单
           case 1:
-            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/productNoticeSettlementDetail?id=${record.id}`;
+            fullUrl = `/memberCenter/balance/accountsReceivable/settlementList/productNoticeSettlementDetail?id=${record.id}`;
             break;
           // 物流单
           case 2:
-            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/logisticsDetail?id=${record.id}`;
+            fullUrl = `/memberCenter/balance/accountsReceivable/settlementList/logisticsDetail?id=${record.id}`;
             break;
           // 订单
           case 3:
           case 4:
-            fullUrl = `/memberCenter/balance/accountsPayable/settlementList/orderDetail?id=${record.id}`
+            fullUrl = `/memberCenter/balance/accountsReceivable/settlementList/orderDetail?id=${record.id}`
             break;
           // 退货
           case 5:

src/pages/balance/accountsReceivable/settlementList/logisticsDetail.tsx

@@ -70,6 +70,7 @@ const logisticsDetail: React.FC = () => {
           tableProps={{
             rowKey: 'orderNo',
           }}
+          keepAlive={false}
           columns={logisticsColumn}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(params)}

src/pages/balance/accountsReceivable/settlementList/orderDetail.tsx

@@ -46,6 +46,7 @@ const OrderDetail: React.FC = () => {
           tableProps={{
             rowKey: 'orderNo',
           }}
+          keepAlive={false}
           columns={orderColumns}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(getSettleAccountsMemberSettlementPagePayableOrderSettlement, { settlementId: id, ...params })}

src/pages/balance/accountsReceivable/settlementList/productNoticeSettlementDetail.tsx

@@ -73,6 +73,7 @@ const ProductNoticeSettlementDetail: React.FC = () => {
           tableProps={{
             rowKey: (record) => `${record.orderNo}-${record.batch}`,
           }}
+          keepAlive={false}
           columns={productNoticecolumns}
           currentRef={ref}
           fetchTableData={(params: any) => fetchListData(params)}

src/pages/balance/accountsReceivable/settlementList/schema/index.tsx

@@ -175,13 +175,13 @@ export const detailSchema: ISchema = {
                 placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.detailSchema.startTime'}), intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.detailSchema.endTime'})]
               },
             },
-            "[receiveStartTime, receiveEndTime]": {
+            "[payStartTime, payEndTime]": {
               type: 'array',
               'x-component': 'RangePicker',
               'x-component-props': {
                 showTime: false,
                 allowClear: true,
-                placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.detailSchema.receiveStartTime'}), intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.detailSchema.receiveEndTime'})]
+                placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.invoice.schema.payStartTime'}), intl.formatMessage({id: 'balance.accountsReceivable.invoice.schema.payEndTime'})],
               },
             },
 

src/pages/balance/hooks/useFetchBillData.tsx

@@ -32,10 +32,10 @@ function useFetchBillData(getDetailApi) {
   const handleSearch = (values) => {
     const format = 'YYYY-MM-DD'
     const startTime = values.startTime?.format(format);
-    const endTime = values.endTime ? values.endTime.format(format) + " 23:59:59" : "";
-    const receiveStartTime = values.receiveStartTime?.format(format);
-    const receiveEndTime = values.receiveEndTime ? values.receiveEndTime?.format(format) + " 23:59:59" : "";
-    ref.current.reload({...values, startTime, endTime, receiveStartTime, receiveEndTime});
+    const endTime = values.endTime ? values.endTime.endOf("day").format('YYYY-MM-DD HH:mm:ss') : "";
+    const payStartTime = values.payStartTime?.format(format);
+    const payEndTime = values.payEndTime ? values.payEndTime.endOf("day").format('YYYY-MM-DD HH:mm:ss') : "";
+    ref.current.reload({...values, startTime, endTime, payStartTime, payEndTime});
   }
 
   return { ref, handleSearch, fetchListData, infoDetail }