From 5367b3b4d92588c4e76728e6bd4ad6aae0cbb967 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 七月 2026 13:05:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/erp/purchase/order/data.ts |   68 +++++++++++++++++----------------
 1 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/views/erp/purchase/order/data.ts b/src/views/erp/purchase/order/data.ts
index 0c2a84d..cf47ffd 100644
--- a/src/views/erp/purchase/order/data.ts
+++ b/src/views/erp/purchase/order/data.ts
@@ -1,15 +1,17 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { DICT_TYPE } from '../../../../packages/constants/src';
-import { getDictOptions } from '../../../../packages/effects/hooks/src';
-import { erpPriceInputFormatter } from '../../../../packages/utils/src';
+import { markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { erpPriceInputFormatter } from '@vben/utils';
 
 import { z } from '#/adapter/form';
 import { getAccountSimpleList } from '#/api/erp/finance/account';
-import { getProductSimpleList } from '#/api/erp/product/product';
 import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
 import { getSimpleUserList } from '#/api/system/user';
+import { MdmItemSelect } from '#/views/basicData/mdm/components';
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 琛ㄥ崟绫诲瀷 */
@@ -59,6 +61,18 @@
         labelField: 'name',
         valueField: 'id',
       },
+      rules: 'required',
+    },
+    {
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        placeholder: '璇疯緭鍏ユ敮浠樿閲�',
+        precision: 2,
+        min: 0,
+      },
+      fieldName: 'depositPrice',
+      label: '鏀粯璁㈤噾',
       rules: 'required',
     },
     {
@@ -151,18 +165,6 @@
         valueField: 'id',
       },
     },
-    {
-      component: 'InputNumber',
-      componentProps: {
-        class: '!w-full',
-        placeholder: '璇疯緭鍏ユ敮浠樿閲�',
-        precision: 2,
-        min: 0,
-      },
-      fieldName: 'depositPrice',
-      label: '鏀粯璁㈤噾',
-      rules: z.number().min(0).optional(),
-    },
   ];
 }
 
@@ -179,16 +181,6 @@
       slots: { default: 'productId' },
     },
     {
-      field: 'stockCount',
-      title: '搴撳瓨',
-      minWidth: 80,
-    },
-    {
-      field: 'productBarCode',
-      title: '鏉＄爜',
-      minWidth: 120,
-    },
-    {
       field: 'productUnitName',
       title: '鍗曚綅',
       minWidth: 80,
@@ -198,6 +190,13 @@
       title: '澶囨敞',
       minWidth: 150,
       slots: { default: 'remark' },
+    },
+    {
+      field: 'qcCheckFlag',
+      title: '鏄惁璐ㄦ',
+      minWidth: 80,
+      fixed: 'right',
+      slots: { default: 'qcCheckFlag' },
     },
     {
       field: 'count',
@@ -266,14 +265,9 @@
     {
       fieldName: 'productId',
       label: '浜у搧',
-      component: 'ApiSelect',
+      component: markRaw(MdmItemSelect),
       componentProps: {
         placeholder: '璇烽�夋嫨浜у搧',
-        allowClear: true,
-        showSearch: true,
-        api: getProductSimpleList,
-        labelField: 'name',
-        valueField: 'id',
       },
     },
     {
@@ -437,14 +431,22 @@
       field: 'status',
       title: '鐘舵��',
       minWidth: 120,
+      fixed: 'right',
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
       },
     },
     {
+      field: 'inStatus',
+      title: '鍏ュ簱鐘舵��',
+      minWidth: 100,
+      fixed: 'right',
+      slots: { default: 'inStatus' },
+    },
+    {
       title: '鎿嶄綔',
-      width: 260,
+      width: 340,
       fixed: 'right',
       slots: { default: 'actions' },
     },

--
Gitblit v1.9.3