From 6fbec5eebedf6d14cf1b262c608d586957180bb7 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 17 七月 2026 17:40:17 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before into dev_pro2.0
---
src/views/erp/sale/order/data.ts | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/views/erp/sale/order/data.ts b/src/views/erp/sale/order/data.ts
index 4428be2..0cf418a 100644
--- a/src/views/erp/sale/order/data.ts
+++ b/src/views/erp/sale/order/data.ts
@@ -6,9 +6,11 @@
import { z } from '#/adapter/form';
import { getAccountSimpleList } from '#/api/erp/finance/account';
import { getItemPage } from '#/api/mdm/item';
-import { getCustomerSimpleList as getCrmCustomerSimpleList } from '#/api/crm/customer';
import { getSimpleUserList } from '#/api/system/user';
import { getRangePickerDefaultProps } from '#/utils';
+import CrmCustomerSelect from '#/components/crm-customer-select.vue';
+
+import { markRaw } from 'vue';
/** 琛ㄥ崟绫诲瀷 */
export type FormType = 'create' | 'detail' | 'edit';
@@ -48,14 +50,10 @@
{
label: '瀹㈡埛',
fieldName: 'customerId',
- component: 'ApiSelect',
+ component: markRaw(CrmCustomerSelect),
componentProps: {
placeholder: '璇烽�夋嫨瀹㈡埛',
allowClear: true,
- showSearch: true,
- api: getCrmCustomerSimpleList,
- labelField: 'name',
- valueField: 'id',
},
rules: 'required',
},
@@ -221,6 +219,12 @@
minWidth: 80,
},
{
+ field: 'needProduction',
+ title: '闇�瑕佺敓浜�',
+ minWidth: 100,
+ slots: { default: 'needProduction' },
+ },
+ {
field: 'remark',
title: '澶囨敞',
minWidth: 150,
@@ -318,14 +322,10 @@
{
fieldName: 'supplierId',
label: '瀹㈡埛',
- component: 'ApiSelect',
+ component: markRaw(CrmCustomerSelect),
componentProps: {
placeholder: '璇烽�夋嫨瀹㈡埛',
allowClear: true,
- showSearch: true,
- api: getCrmCustomerSimpleList,
- labelField: 'name',
- valueField: 'id',
},
},
{
@@ -482,6 +482,13 @@
slots: { default: 'status' },
},
{
+ field: 'needProduction',
+ title: '闇�瑕佺敓浜�',
+ minWidth: 100,
+ fixed: 'right',
+ slots: { default: 'needProduction' },
+ },
+ {
title: '鎿嶄綔',
width: 260,
fixed: 'right',
--
Gitblit v1.9.3