From f10cf167372f2d8c4c0e14f42f361d7ab96d8347 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 03 七月 2026 13:59:00 +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 | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/src/views/erp/sale/order/data.ts b/src/views/erp/sale/order/data.ts
index 8f0cdcc..24cd0b3 100644
--- a/src/views/erp/sale/order/data.ts
+++ b/src/views/erp/sale/order/data.ts
@@ -1,14 +1,12 @@
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 { z } from '#/adapter/form';
import { getAccountSimpleList } from '#/api/erp/finance/account';
-import { getProductSimpleList } from '#/api/erp/product/product';
-import { getCustomerSimpleList } from '#/api/erp/sale/customer';
+import { getItemPage } from '#/api/mdm/item';
+import { getCustomerSimpleList as getCrmCustomerSimpleList } from '#/api/crm/customer';
import { getSimpleUserList } from '#/api/system/user';
import { getRangePickerDefaultProps } from '#/utils';
@@ -55,7 +53,7 @@
placeholder: '璇烽�夋嫨瀹㈡埛',
allowClear: true,
showSearch: true,
- api: getCustomerSimpleList,
+ api: getCrmCustomerSimpleList,
labelField: 'name',
valueField: 'id',
},
@@ -192,6 +190,11 @@
slots: { default: 'productId' },
},
{
+ field: 'productSpecification',
+ title: '瑙勬牸鍨嬪彿',
+ minWidth: 120,
+ },
+ {
field: 'stockCount',
title: '搴撳瓨',
minWidth: 80,
@@ -205,6 +208,16 @@
{
field: 'productUnitName',
title: '鍗曚綅',
+ minWidth: 80,
+ },
+ {
+ field: 'productUnitName2',
+ title: '杈呭崟浣�1',
+ minWidth: 80,
+ },
+ {
+ field: 'productUnitName3',
+ title: '杈呭崟浣�2',
minWidth: 80,
},
{
@@ -285,7 +298,10 @@
placeholder: '璇烽�夋嫨浜у搧',
allowClear: true,
showSearch: true,
- api: getProductSimpleList,
+ api: async () => {
+ const res = await getItemPage({ pageNo: 1, pageSize: 100, status: 0 });
+ return res.list || [];
+ },
labelField: 'name',
valueField: 'id',
},
@@ -307,7 +323,7 @@
placeholder: '璇烽�夋嫨瀹㈡埛',
allowClear: true,
showSearch: true,
- api: getCustomerSimpleList,
+ api: getCrmCustomerSimpleList,
labelField: 'name',
valueField: 'id',
},
@@ -330,7 +346,11 @@
label: '鐘舵��',
component: 'Select',
componentProps: {
- options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
+ options: [
+ { label: '鏈鏍�', value: 10 },
+ { label: '宸插鏍�', value: 20 },
+ { label: '宸蹭綔搴�', value: 30 },
+ ],
placeholder: '璇烽�夋嫨鐘舵��',
allowClear: true,
},
@@ -388,6 +408,7 @@
title: '璁㈠崟鍗曞彿',
width: 200,
fixed: 'left',
+ slots: { default: 'no' },
},
{
field: 'productNames',
@@ -399,6 +420,12 @@
field: 'customerName',
title: '瀹㈡埛',
minWidth: 120,
+ },
+ {
+ field: 'contractNo',
+ title: '鍏宠仈鍚堝悓',
+ minWidth: 150,
+ slots: { default: 'contractNo' },
},
{
field: 'orderTime',
@@ -450,11 +477,9 @@
{
field: 'status',
title: '鐘舵��',
- minWidth: 120,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
- },
+ minWidth: 100,
+ fixed: 'right',
+ slots: { default: 'status' },
},
{
title: '鎿嶄綔',
--
Gitblit v1.9.3