From 7d3f5dc149738ed07bbdc284280cffc8bc781003 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 4 Oct 2025 21:26:43 +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/return=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=204/4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/erp/purchase/return/data.ts     | 16 -----
 .../return/modules/purchase-order-grid.vue    | 55 --------------
 .../return/modules/purchase-order-select.vue  | 71 +++++++++++++++----
 3 files changed, 59 insertions(+), 83 deletions(-)
 delete mode 100644 apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-grid.vue

diff --git a/apps/web-antd/src/views/erp/purchase/return/data.ts b/apps/web-antd/src/views/erp/purchase/return/data.ts
index 48d030114..71d6ba596 100644
--- a/apps/web-antd/src/views/erp/purchase/return/data.ts
+++ b/apps/web-antd/src/views/erp/purchase/return/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: '备注',
@@ -188,7 +173,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
       component: 'ApiSelect',
       componentProps: {
         placeholder: '请选择结算账户',
-        disabled: true,
         allowClear: true,
         showSearch: true,
         api: getAccountSimpleList,
diff --git a/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-grid.vue b/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-grid.vue
deleted file mode 100644
index b22d652d9..000000000
--- a/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-grid.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<script lang="ts" setup>
-import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
-
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getPurchaseOrderPage } from '#/api/erp/purchase/order';
-
-import { useOrderGridColumns, useOrderGridFormSchema } from '../data';
-
-const emit = defineEmits(['selectRow']);
-
-const [Grid] = useVbenVxeGrid({
-  formOptions: {
-    schema: useOrderGridFormSchema(),
-  },
-  gridOptions: {
-    columns: useOrderGridColumns(),
-    height: 'auto',
-    keepSource: true,
-    proxyConfig: {
-      ajax: {
-        query: async ({ page }, formValues) => {
-          return await getPurchaseOrderPage({
-            pageNo: page.currentPage,
-            pageSize: page.pageSize,
-            returnEnable: true,
-            ...formValues,
-          });
-        },
-      },
-    },
-    rowConfig: {
-      keyField: 'id',
-      isHover: true,
-    },
-    radioConfig: {
-      trigger: 'row',
-      highlight: true,
-    },
-    toolbarConfig: {
-      refresh: true,
-      search: true,
-    },
-  } as VxeTableGridOptions<ErpPurchaseOrderApi.PurchaseOrder>,
-  gridEvents: {
-    radioChange: ({ row }: { row: ErpPurchaseOrderApi.PurchaseOrder }) => {
-      emit('selectRow', row);
-    },
-  },
-});
-</script>
-
-<template>
-  <Grid class="max-h-[600px]" table-title="采购订单列表(仅展示可退货)" />
-</template>
diff --git a/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue b/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue
index 1add67317..45b0ec65b 100644
--- a/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue
+++ b/apps/web-antd/src/views/erp/purchase/return/modules/purchase-order-select.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
 import { ref } from 'vue';
@@ -7,9 +8,12 @@ import { IconifyIcon } from '@vben/icons';
 
 import { Input, message, Modal } from 'ant-design-vue';
 
-import PurchaseOrderGrid from './purchase-order-grid.vue';
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getPurchaseOrderPage } from '#/api/erp/purchase/order';
 
-const props = defineProps({
+import { useOrderGridColumns, useOrderGridFormSchema } from '../data';
+
+defineProps({
   orderNo: {
     type: String,
     default: () => undefined,
@@ -19,16 +23,61 @@ const props = defineProps({
     default: false,
   },
 });
+
 const emit = defineEmits<{
   'update:order': [order: ErpPurchaseOrderApi.PurchaseOrder];
 }>();
-const order = ref<ErpPurchaseOrderApi.PurchaseOrder>();
-const open = ref<boolean>(false);
 
-const handleSelectOrder = (selectOrder: ErpPurchaseOrderApi.PurchaseOrder) => {
+const order = ref<ErpPurchaseOrderApi.PurchaseOrder>(); // 选择的采购订单
+const open = ref<boolean>(false); // 选择采购订单弹窗是否打开
+
+/** 表格配置 */
+const [Grid] = useVbenVxeGrid({
+  formOptions: {
+    schema: useOrderGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useOrderGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getPurchaseOrderPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            returnEnable: true,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    radioConfig: {
+      trigger: 'row',
+      highlight: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<ErpPurchaseOrderApi.PurchaseOrder>,
+  gridEvents: {
+    radioChange: ({ row }: { row: ErpPurchaseOrderApi.PurchaseOrder }) => {
+      handleSelectOrder(row);
+    },
+  },
+});
+
+/** 选择采购订单 */
+function handleSelectOrder(selectOrder: ErpPurchaseOrderApi.PurchaseOrder) {
   order.value = selectOrder;
-};
+}
 
+/** 确认选择采购订单 */
 const handleOk = () => {
   if (!order.value) {
     message.warning('请选择一个采购订单');
@@ -41,7 +90,6 @@ const handleOk = () => {
 
 <template>
   <Input
-    v-bind="$attrs"
     readonly
     :value="orderNo"
     :disabled="disabled"
@@ -52,19 +100,18 @@ const handleOk = () => {
         <IconifyIcon
           class="h-full w-6 cursor-pointer"
           icon="ant-design:setting-outlined"
-          :style="{ cursor: props.disabled ? 'not-allowed' : 'pointer' }"
-          @click="() => !props.disabled && (open = true)"
+          :style="{ cursor: disabled ? 'not-allowed' : 'pointer' }"
+          @click="() => !disabled && (open = true)"
         />
       </div>
     </template>
   </Input>
   <Modal
+    class="!w-[50vw]"
     v-model:open="open"
     title="选择关联订单"
-    class="!w-[50vw]"
-    :show-confirm-button="true"
     @ok="handleOk"
   >
-    <PurchaseOrderGrid @select-row="handleSelectOrder" />
+    <Grid class="max-h-[600px]" table-title="采购订单列表(仅展示可退货)" />
   </Modal>
 </template>