From b4df78d549ec066454af0458b33f5cebb29accee Mon Sep 17 00:00:00 2001
From: shenyifei <m809745357@gmail.com>
Date: Sat, 20 Dec 2025 14:08:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(invoice):=20=E6=9B=B4=E6=96=B0=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=BA=90=E5=8F=8A?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 all.tsx 页面中车辆信息和交付时间的取值路径
- 在 all.tsx、pending.tsx 和 upload.tsx 中增加 poType 筛选条件
- 设置默认查询状态为 WAITING_AUDIT 和 COMPLETED
- 优化代码格式，调整导入语句末尾逗号
---
 packages/app-client/src/pages/invoice/all.tsx | 24 +++++++++++++------
 .../app-client/src/pages/invoice/pending.tsx  |  1 +
 .../app-client/src/pages/invoice/upload.tsx   |  1 +
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/app-client/src/pages/invoice/all.tsx b/packages/app-client/src/pages/invoice/all.tsx
index 1b0f58d..a9ae792 100644
--- a/packages/app-client/src/pages/invoice/all.tsx
+++ b/packages/app-client/src/pages/invoice/all.tsx
@@ -105,8 +105,12 @@ export default hocAuth(function Page(props: CommonComponent) {
                   <View className="flex items-start justify-between">
                     <View className="text-base font-medium text-gray-800">
                       {orderSupplierVO.name} (
-                      {orderSupplierVO.orderVehicle?.origin}-
-                      {orderSupplierVO.orderVehicle?.destination})
+                      {orderSupplierVO.purchaseOrderVO?.orderVehicle?.origin}-
+                      {
+                        orderSupplierVO.purchaseOrderVO?.orderVehicle
+                          ?.destination
+                      }
+                      )
                     </View>
                     <View className={"flex-shrink-0"}>
                       {orderSupplierVO.poState && (
@@ -120,14 +124,18 @@ export default hocAuth(function Page(props: CommonComponent) {
                   </View>
                   <View className="my-1 flex flex-row flex-wrap gap-1 text-sm text-gray-600">
                     <View className="text-primary">
-                      {orderSupplierVO.orderVehicle?.vehicleNo
-                        ? "第" + orderSupplierVO.orderVehicle?.vehicleNo + "车"
+                      {orderSupplierVO.purchaseOrderVO?.orderVehicle?.vehicleNo
+                        ? "第" +
+                          orderSupplierVO.purchaseOrderVO?.orderVehicle
+                            ?.vehicleNo +
+                          "车"
                         : "暂未生成车次"}
                     </View>
                     <View>
-                      {dayjs(orderSupplierVO.orderVehicle?.deliveryTime).format(
-                        "MM-DD",
-                      )}
+                      {dayjs(
+                        orderSupplierVO.purchaseOrderVO?.orderVehicle
+                          ?.deliveryTime,
+                      ).format("MM-DD")}
                     </View>
                     <View>|</View>
                     <View>{orderSupplierVO.netWeight}斤</View>
@@ -179,6 +187,8 @@ export default hocAuth(function Page(props: CommonComponent) {
             orderSupplierPageQry: {
               ...params,
               invoiceUpload: true,
+              poStates: ["WAITING_AUDIT", "COMPLETED"],
+              poType: "PRODUCTION_PURCHASE",
               ...(supplierVO
                 ? {
                     supplierId: supplierVO.supplierId,
diff --git a/packages/app-client/src/pages/invoice/pending.tsx b/packages/app-client/src/pages/invoice/pending.tsx
index 8f48c56..c7724b5 100644
--- a/packages/app-client/src/pages/invoice/pending.tsx
+++ b/packages/app-client/src/pages/invoice/pending.tsx
@@ -448,6 +448,7 @@ export default hocAuth(function Page(props: CommonComponent) {
               ...params,
               invoiceUpload: false,
               poStates: ["WAITING_AUDIT", "COMPLETED"],
+              poType: "PRODUCTION_PURCHASE",
               ...(supplierVO
                 ? {
                     supplierId: supplierVO.supplierId,
diff --git a/packages/app-client/src/pages/invoice/upload.tsx b/packages/app-client/src/pages/invoice/upload.tsx
index d2433f8..c70db78 100644
--- a/packages/app-client/src/pages/invoice/upload.tsx
+++ b/packages/app-client/src/pages/invoice/upload.tsx
@@ -430,6 +430,7 @@ export default hocAuth(function Page(props: CommonComponent) {
               ...params,
               invoiceUpload: false,
               poStates: ["WAITING_AUDIT", "COMPLETED"],
+              poType: "PRODUCTION_PURCHASE",
               ...(supplierVO
                 ? {
                     supplierId: supplierVO.supplierId,