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/erp/purchase/request/data.ts | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/views/erp/purchase/request/data.ts b/src/views/erp/purchase/request/data.ts
index eeb1013..11c9837 100644
--- a/src/views/erp/purchase/request/data.ts
+++ b/src/views/erp/purchase/request/data.ts
@@ -148,11 +148,6 @@
slots: { default: 'productId' },
},
{
- field: 'productBarCode',
- title: '鏉＄爜',
- minWidth: 120,
- },
- {
field: 'productUnitName',
title: '鍗曚綅',
minWidth: 80,
@@ -163,6 +158,13 @@
minWidth: 120,
fixed: 'right',
slots: { default: 'count' },
+ },
+ {
+ field: 'inCount',
+ title: '鍏ュ簱鏁伴噺',
+ minWidth: 100,
+ fixed: 'right',
+ formatter: 'formatAmount6',
},
{
field: 'productPrice',
@@ -335,12 +337,6 @@
minWidth: 120,
},
{
- field: 'qcCheckFlag',
- title: '鏄惁璐ㄦ',
- minWidth: 80,
- slots: { default: 'qcCheckFlag' },
- },
- {
field: 'productNames',
title: '鐢宠浜у搧',
minWidth: 150,
@@ -358,6 +354,12 @@
slots: { default: 'status' },
},
{
+ field: 'inStatus',
+ title: '鍏ュ簱鐘舵��',
+ minWidth: 100,
+ slots: { default: 'inStatus' },
+ },
+ {
field: 'requestReason',
title: '鐢宠鐞嗙敱',
minWidth: 150,
--
Gitblit v1.9.3