From a7c4e6ac113fa3c0d136af3ba0310c56976ab00e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 4 Oct 2025 21:34:11 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90antd=E3=80=91=E3=80=90erp?=
 =?UTF-8?q?=20=E7=B3=BB=E7=BB=9F=E3=80=91purchase/in=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=204/4(bugfix)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/erp/purchase/in/data.ts         | 23 +------------------
 .../erp/purchase/in/modules/item-form.vue     |  4 ++--
 .../in/modules/purchase-order-select.vue      |  2 +-
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/apps/web-antd/src/views/erp/purchase/in/data.ts b/apps/web-antd/src/views/erp/purchase/in/data.ts
index 6d1d33d5a..c249080fe 100644
--- a/apps/web-antd/src/views/erp/purchase/in/data.ts
+++ b/apps/web-antd/src/views/erp/purchase/in/data.ts
@@ -74,21 +74,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
       },
       rules: 'required',
     },
-    {
-      fieldName: 'purchaseUserId',
-      label: '采购人员',
-      component: 'ApiSelect',
-      componentProps: {
-        placeholder: '请选择采购人员',
-        allowClear: true,
-        showSearch: true,
-        api: getSimpleUserList,
-        fieldNames: {
-          label: 'nickname',
-          value: 'id',
-        },
-      },
-    },
     {
       fieldName: 'remark',
       label: '备注',
@@ -318,13 +303,6 @@ export function useFormItemColumns(
   ];
 }
 
-/** 采购订单项表格列（兼容旧代码） */
-export function usePurchaseOrderItemTableColumns(
-  formData?: any[],
-): VxeTableGridOptions['columns'] {
-  return useFormItemColumns(formData);
-}
-
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
@@ -543,6 +521,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
+
 /** 列表的搜索表单 */
 export function useOrderGridFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/item-form.vue b/apps/web-antd/src/views/erp/purchase/in/modules/item-form.vue
index 74e7a4a7a..6e733504c 100644
--- a/apps/web-antd/src/views/erp/purchase/in/modules/item-form.vue
+++ b/apps/web-antd/src/views/erp/purchase/in/modules/item-form.vue
@@ -65,7 +65,7 @@ const summaries = computed(() => {
 /** 表格配置 */
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    columns: useFormItemColumns(),
+    columns: useFormItemColumns(tableData.value),
     data: tableData.value,
     minHeight: 250,
     autoResize: true,
@@ -290,4 +290,4 @@ onMounted(async () => {
       </div>
     </template>
   </Grid>
-</template>
\ No newline at end of file
+</template>
diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue
index 45b0ec65b..2f28dc454 100644
--- a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue
+++ b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue
@@ -46,7 +46,7 @@ const [Grid] = useVbenVxeGrid({
           return await getPurchaseOrderPage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
-            returnEnable: true,
+            inEnable: true,
             ...formValues,
           });
         },