From 8c99ae416c5277e737e950ce7702776d7c9b6430 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 03 八月 2026 17:57:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/returnsales/modules/line-list.vue | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/views/wls/returnsales/modules/line-list.vue b/src/views/wls/returnsales/modules/line-list.vue
index d1ab690..9c635e2 100644
--- a/src/views/wls/returnsales/modules/line-list.vue
+++ b/src/views/wls/returnsales/modules/line-list.vue
@@ -1,6 +1,7 @@
<script lang="ts" setup>
import type { FormType } from '../data';
+import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesWmReturnSalesDetailApi } from '#/api/mes/wm/returnsales/detail';
import type { MesWmReturnSalesLineApi } from '#/api/mes/wm/returnsales/line';
@@ -29,6 +30,7 @@
clientId?: number;
formType: FormType;
returnId: number;
+ saleOrderItems?: ErpSaleOrderApi.SaleOrderItem[];
salesOrderCode?: string;
}>();
@@ -64,6 +66,7 @@
lineFormModalApi
.setData({
clientId: props.clientId,
+ items: props.saleOrderItems,
returnId: props.returnId,
salesOrderCode: props.salesOrderCode,
})
@@ -76,6 +79,7 @@
.setData({
clientId: props.clientId,
id: row.id,
+ items: props.saleOrderItems,
returnId: props.returnId,
salesOrderCode: props.salesOrderCode,
})
--
Gitblit v1.9.3