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) { {orderSupplierVO.name} ( - {orderSupplierVO.orderVehicle?.origin}- - {orderSupplierVO.orderVehicle?.destination}) + {orderSupplierVO.purchaseOrderVO?.orderVehicle?.origin}- + { + orderSupplierVO.purchaseOrderVO?.orderVehicle + ?.destination + } + ) {orderSupplierVO.poState && ( @@ -120,14 +124,18 @@ export default hocAuth(function Page(props: CommonComponent) { - {orderSupplierVO.orderVehicle?.vehicleNo - ? "第" + orderSupplierVO.orderVehicle?.vehicleNo + "车" + {orderSupplierVO.purchaseOrderVO?.orderVehicle?.vehicleNo + ? "第" + + orderSupplierVO.purchaseOrderVO?.orderVehicle + ?.vehicleNo + + "车" : "暂未生成车次"} - {dayjs(orderSupplierVO.orderVehicle?.deliveryTime).format( - "MM-DD", - )} + {dayjs( + orderSupplierVO.purchaseOrderVO?.orderVehicle + ?.deliveryTime, + ).format("MM-DD")} | {orderSupplierVO.netWeight}斤 @@ -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,