Merge branch 'featStrategies' into dev

src/constants/index.ts

@@ -1048,7 +1048,9 @@ export const PurchaseOrderInsideWorkStateTexts = {
   14: '订单待入库',
   15: '订单待归档',
   16: '订单入库待审核',
-  17: '待手工收货'
+  17: '待手工收货',
+  18: '已确认收货',
+  19: '已归档',
 }
 
 // 销售订单内部显示文案
@@ -1078,6 +1080,9 @@ export const SaleOrderInsideWorkStateTexts = {
   28: '不接受物流单',
   29: '订单已归档',
   30: '已手工发货',
+  31: '已确认发货',
+  32: '已确认回单',
+  33: '已归档',
 }
 
 // 订单流转记录外部状态

src/pages/transaction/components/orderPayTabs/index.tsx

@@ -34,9 +34,9 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
   const processEnum = data.processEnum
 
   useEffect(() => {
-    // 过滤支付信息 取第一个待支付的id
+    // 过滤支付信息 取第一个待支付或者未到账的id
     if(data?.paymentInformationResponses?.length) {
-      let payments = data.paymentInformationResponses.filter(item => item.externalState === 1)
+      let payments = data.paymentInformationResponses.filter(item => item.externalState === 1 || item.externalState === 4)
       if(payments.length) {
         ctl.setPayId(payments[0].id)
       }