From b64a0deae5b5d33f9e20671a68936b27f0b9b00b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 七月 2026 18:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/erp/purchase/request/data.ts | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/src/views/erp/purchase/request/data.ts b/src/views/erp/purchase/request/data.ts
index fb3c4ae..11c9837 100644
--- a/src/views/erp/purchase/request/data.ts
+++ b/src/views/erp/purchase/request/data.ts
@@ -1,9 +1,8 @@
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 { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
import { getSimpleUserList } from '#/api/system/user';
@@ -55,7 +54,7 @@
rules: 'required',
},
{
- label: '渚涘簲鍟嗭紙鍙�夛級',
+ label: '渚涘簲鍟�',
fieldName: 'supplierId',
component: 'ApiSelect',
componentProps: {
@@ -67,6 +66,7 @@
valueField: 'id',
disabled: formType === 'detail',
},
+ rules: 'required',
},
{
fieldName: 'discountPercent',
@@ -76,6 +76,17 @@
placeholder: '璇疯緭鍏ヤ紭鎯犵巼',
min: 0,
max: 100,
+ precision: 2,
+ disabled: formType === 'detail',
+ },
+ },
+ {
+ fieldName: 'depositPrice',
+ label: '瀹氶噾',
+ component: 'InputNumber',
+ componentProps: {
+ placeholder: '璇疯緭鍏ュ畾閲�',
+ min: 0,
precision: 2,
disabled: formType === 'detail',
},
@@ -137,11 +148,6 @@
slots: { default: 'productId' },
},
{
- field: 'productBarCode',
- title: '鏉＄爜',
- minWidth: 120,
- },
- {
field: 'productUnitName',
title: '鍗曚綅',
minWidth: 80,
@@ -152,6 +158,13 @@
minWidth: 120,
fixed: 'right',
slots: { default: 'count' },
+ },
+ {
+ field: 'inCount',
+ title: '鍏ュ簱鏁伴噺',
+ minWidth: 100,
+ fixed: 'right',
+ formatter: 'formatAmount6',
},
{
field: 'productPrice',
@@ -186,6 +199,13 @@
title: '澶囨敞',
minWidth: 150,
slots: { default: 'remark' },
+ },
+ {
+ field: 'qcCheckFlag',
+ title: '鏄惁璐ㄦ',
+ minWidth: 80,
+ fixed: 'right',
+ slots: { default: 'qcCheckFlag' },
},
{
title: '鎿嶄綔',
@@ -311,6 +331,12 @@
minWidth: 120,
},
{
+ field: 'depositPrice',
+ title: '瀹氶噾',
+ formatter: 'formatAmount2',
+ minWidth: 120,
+ },
+ {
field: 'productNames',
title: '鐢宠浜у搧',
minWidth: 150,
@@ -328,6 +354,12 @@
slots: { default: 'status' },
},
{
+ field: 'inStatus',
+ title: '鍏ュ簱鐘舵��',
+ minWidth: 100,
+ slots: { default: 'inStatus' },
+ },
+ {
field: 'requestReason',
title: '鐢宠鐞嗙敱',
minWidth: 150,
--
Gitblit v1.9.3