From f10cf167372f2d8c4c0e14f42f361d7ab96d8347 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 03 七月 2026 13:59:00 +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/basicData/mdm/data.ts | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 103 insertions(+), 0 deletions(-)
diff --git a/src/views/basicData/mdm/data.ts b/src/views/basicData/mdm/data.ts
index 1808f14..479f150 100644
--- a/src/views/basicData/mdm/data.ts
+++ b/src/views/basicData/mdm/data.ts
@@ -6,6 +6,7 @@
import { z } from '#/adapter/form';
import { getUnitPage } from '#/api/mdm/unit';
+import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
/** 鐗╂枡绫诲瀷閫夐」 */
export const ITEM_TYPE_OPTIONS = [
@@ -72,10 +73,19 @@
rules: 'required',
},
{
+ component: 'Input',
+ fieldName: 'specification',
+ label: '瑙勬牸鍨嬪彿',
+ componentProps: {
+ placeholder: '璇疯緭鍏ヨ鏍煎瀷鍙�',
+ },
+ },
+ {
component: 'ApiSelect',
fieldName: 'unitMeasureId',
label: '璁￠噺鍗曚綅',
rules: 'required',
+ formItemClass: 'col-span-1',
componentProps: {
placeholder: '璇烽�夋嫨璁￠噺鍗曚綅',
allowClear: true,
@@ -83,6 +93,74 @@
const res = await getUnitPage({ pageNo: 1, pageSize: 100, status: 0 });
return res.list || [];
},
+ labelField: 'name',
+ valueField: 'id',
+ },
+ },
+ {
+ component: 'ApiSelect',
+ fieldName: 'unitMeasureId2',
+ label: '杈呭崟浣�1',
+ formItemClass: 'col-span-1',
+ componentProps: {
+ placeholder: '璇烽�夋嫨杈呭崟浣�1',
+ allowClear: true,
+ api: async () => {
+ const res = await getUnitPage({ pageNo: 1, pageSize: 100, status: 0 });
+ return res.list || [];
+ },
+ labelField: 'name',
+ valueField: 'id',
+ },
+ },
+ {
+ component: 'InputNumber',
+ fieldName: 'unitMeasureRate1',
+ label: '杈呭崟浣�1鎹㈢畻姣旂巼',
+ formItemClass: 'col-span-1',
+ componentProps: {
+ class: '!w-full',
+ min: 0,
+ precision: 6,
+ placeholder: '璇疯緭鍏ユ崲绠楁瘮鐜�',
+ },
+ },
+ {
+ component: 'ApiSelect',
+ fieldName: 'unitMeasureId3',
+ label: '杈呭崟浣�2',
+ formItemClass: 'col-span-1',
+ componentProps: {
+ placeholder: '璇烽�夋嫨杈呭崟浣�2',
+ allowClear: true,
+ api: async () => {
+ const res = await getUnitPage({ pageNo: 1, pageSize: 100, status: 0 });
+ return res.list || [];
+ },
+ labelField: 'name',
+ valueField: 'id',
+ },
+ },
+ {
+ component: 'InputNumber',
+ fieldName: 'unitMeasureRate2',
+ label: '杈呭崟浣�2鎹㈢畻姣旂巼',
+ formItemClass: 'col-span-1',
+ componentProps: {
+ class: '!w-full',
+ min: 0,
+ precision: 6,
+ placeholder: '璇疯緭鍏ユ崲绠楁瘮鐜�',
+ },
+ },
+ {
+ component: 'ApiSelect',
+ fieldName: 'warehouseId',
+ label: '榛樿浠撳簱',
+ componentProps: {
+ placeholder: '璇烽�夋嫨榛樿浠撳簱',
+ allowClear: true,
+ api: getWarehouseSimpleList,
labelField: 'name',
valueField: 'id',
},
@@ -275,6 +353,31 @@
minWidth: 80,
},
{
+ field: 'unitMeasureName2',
+ title: '杈呭崟浣�1',
+ minWidth: 80,
+ },
+ {
+ field: 'unitMeasureRate1',
+ title: '杈呭崟浣�1鎹㈢畻姣旂巼',
+ minWidth: 130,
+ },
+ {
+ field: 'unitMeasureName3',
+ title: '杈呭崟浣�2',
+ minWidth: 80,
+ },
+ {
+ field: 'unitMeasureRate2',
+ title: '杈呭崟浣�2鎹㈢畻姣旂巼',
+ minWidth: 130,
+ },
+ {
+ field: 'warehouseName',
+ title: '榛樿浠撳簱',
+ minWidth: 100,
+ },
+ {
field: 'itemType',
title: '鐗╂枡绫诲瀷',
minWidth: 100,
--
Gitblit v1.9.3