From 999f2d487f6c2177c6c2269d71f2786c5d98c1ce Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Mon, 12 May 2025 21:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8E=A5=E6=94=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/invoice/vo/InvoiceSaveReqVO.java           |  4 +++-
 .../heli/dal/dataobject/invoice/InvoiceDO.java       |  1 -
 .../mes-ui-admin-vue3/src/api/heli/invoice/index.ts  |  1 +
 .../src/views/heli/invoice/detail.vue                | 12 ++++++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoiceSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoiceSaveReqVO.java
index 913ebad..766b6a4 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoiceSaveReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoiceSaveReqVO.java
@@ -23,7 +23,9 @@ public class InvoiceSaveReqVO {
     @Schema(description = "订单id", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "订单不能为空")
     private Long orderId;
-
+    @Schema(description = "订单编码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "订单编码不能为空")
+    private String orderCode;
     @Schema(description = "发票号码", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "发票号码不能为空")
     private String number;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/invoice/InvoiceDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/invoice/InvoiceDO.java
index c55c806..229e708 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/invoice/InvoiceDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/invoice/InvoiceDO.java
@@ -96,7 +96,6 @@ public class InvoiceDO extends BaseDO {
     @TableField(exist = false)
     private String cancellerName;
 
-    @TableField(exist = false)
     private String orderCode;
 
     public boolean canSave(){
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts
index 526300f..367afd7 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts
@@ -4,6 +4,7 @@ export interface InvoiceVO {
   id: number
   businessType: string
   orderId: number
+  orderCode:string
   number: string
   type: string
   billingDate: Date
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue
index 74ccaa3..22af7a0 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/invoice/detail.vue
@@ -156,7 +156,7 @@ const detailDisabled = ref(false)
 
 const formData: any = ref({
   id: undefined,
-  businessType: businessType.value,
+  businessType: "FINANCE_RECEIVE_INVOICE",
   orderId: undefined,
   number: undefined,
   type: undefined,
@@ -189,7 +189,7 @@ const formRules = reactive({
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    businessType: businessType.value,
+    businessType: "FINANCE_RECEIVE_INVOICE",
     projectId: undefined,
     number: undefined,
     type: undefined,
@@ -223,7 +223,8 @@ const queryData = async (id?: number) => {
         pageNo: 1,
         pageSize: 99,
         businessId: id,
-        businessType: businessType.value
+        businessType: businessType.value,
+        businessFileType:businessType.value
       }
       formData.value.attachments = (await getFilePage(attParams)).list
     } finally {
@@ -273,7 +274,8 @@ const uploadRef = ref()
 const uploadFiles = ref<UploadUserFile[]>([])
 const uploadData = ref({
   businessType: businessType.value,
-  businessId: formData.value.id
+  businessId: formData.value.id,
+  businessFileType:businessType.value
 })
 // 下载文件
 const downloadAttachment = async (name, url) => {
@@ -323,11 +325,13 @@ const openOrderDialog = () => {
 }
 
 const handleSelectedOrder = (order) => {
+
   formData.value.orderId = order.id
   formData.value.orderCode = order.code
 }
 
 const handleSelectedPurchaseOrder = (order) => {
+
   formData.value.orderId = order.id
   formData.value.orderCode = order.purchaseNo
 }