From f08a81f01bc4a4104dd9ef04e071bb0bd0eb8afe Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 23 七月 2026 10:50:19 +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/request/data.ts | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/views/erp/purchase/request/data.ts b/src/views/erp/purchase/request/data.ts
index 78201dd..11c9837 100644
--- a/src/views/erp/purchase/request/data.ts
+++ b/src/views/erp/purchase/request/data.ts
@@ -3,7 +3,6 @@
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
-import { erpPriceInputFormatter } from '@vben/utils';
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