From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/crm/product/components/data.ts | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/src/views/crm/product/components/data.ts b/src/views/crm/product/components/data.ts
index ece3e43..75d25ba 100644
--- a/src/views/crm/product/components/data.ts
+++ b/src/views/crm/product/components/data.ts
@@ -1,31 +1,29 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import { DICT_TYPE } from '../../../../packages/constants/src';
-
/** 浜у搧璇︽儏鍒楄〃鐨勫垪瀹氫箟 */
export function useDetailListColumns(
showBusinessPrice: boolean,
): VxeTableGridOptions['columns'] {
return [
{
- field: 'productName',
+ field: 'itemName',
title: '浜у搧鍚嶇О',
},
{
- field: 'productNo',
- title: '浜у搧鏉＄爜',
+ field: 'itemCode',
+ title: '鐗╂枡缂栫爜',
},
{
- field: 'productUnit',
- title: '浜у搧鍗曚綅',
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.CRM_PRODUCT_UNIT },
- },
+ field: 'itemBarCode',
+ title: '鐗╂枡鏉＄爜',
},
{
- field: 'productPrice',
- title: '浜у搧浠锋牸锛堝厓锛�',
+ field: 'itemUnitName',
+ title: '鍗曚綅',
+ },
+ {
+ field: 'itemPrice',
+ title: '鍘熶环锛堝厓锛�',
formatter: 'formatAmount2',
},
{
@@ -58,36 +56,42 @@
return [
{ type: 'seq', title: '搴忓彿', minWidth: 50 },
{
- field: 'productId',
+ field: 'itemId',
title: '浜у搧鍚嶇О',
minWidth: 100,
- slots: { default: 'productId' },
+ slots: { default: 'itemId' },
},
{
- field: 'productNo',
- title: '鏉＄爜',
- minWidth: 150,
+ field: 'itemSpecification',
+ title: '瑙勬牸鍨嬪彿',
+ minWidth: 120,
},
{
- field: 'productUnit',
+ field: 'itemUnitName',
title: '鍗曚綅',
- minWidth: 100,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.CRM_PRODUCT_UNIT },
- },
+ minWidth: 80,
},
{
- field: 'productPrice',
- title: '浠锋牸锛堝厓锛�',
+ field: 'itemUnitName2',
+ title: '杈呭崟浣�1',
+ minWidth: 80,
+ },
+ {
+ field: 'itemUnitName3',
+ title: '杈呭崟浣�2',
+ minWidth: 80,
+ },
+ {
+ field: 'itemPrice',
+ title: '鍘熶环锛堝厓锛�',
minWidth: 100,
formatter: 'formatAmount2',
},
{
- field: 'sellingPrice',
- title: '鍞环锛堝厓锛�',
+ field: 'contractPrice',
+ title: '鍚堝悓浠凤紙鍏冿級',
minWidth: 100,
- slots: { default: 'sellingPrice' },
+ slots: { default: 'contractPrice' },
},
{
field: 'count',
--
Gitblit v1.9.3