From 5f3dea3fd930afde720677fba10b6bfb2e836a18 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 24 七月 2026 09:54: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/purchase/order/data.ts | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/erp/purchase/order/data.ts b/src/views/erp/purchase/order/data.ts
index 761cbad..fb82f00 100644
--- a/src/views/erp/purchase/order/data.ts
+++ b/src/views/erp/purchase/order/data.ts
@@ -181,16 +181,6 @@
slots: { default: 'productId' },
},
{
- field: 'stockCount',
- title: '搴撳瓨',
- minWidth: 80,
- },
- {
- field: 'productBarCode',
- title: '鏉＄爜',
- minWidth: 120,
- },
- {
field: 'productUnitName',
title: '鍗曚綅',
minWidth: 80,
@@ -320,7 +310,9 @@
label: '鐘舵��',
component: 'Select',
componentProps: {
- options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number'),
+ options: getDictOptions(DICT_TYPE.ERP_AUDIT_STATUS, 'number').filter(
+ (opt) => opt.label !== '鑽夌' && opt.label !== '瀹℃壒涓嶉�氳繃',
+ ),
placeholder: '璇烽�夋嫨鐘舵��',
allowClear: true,
},
@@ -441,14 +433,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