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/basicData/mdm/data.ts | 267 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 206 insertions(+), 61 deletions(-)
diff --git a/src/views/basicData/mdm/data.ts b/src/views/basicData/mdm/data.ts
index f294908..29076e7 100644
--- a/src/views/basicData/mdm/data.ts
+++ b/src/views/basicData/mdm/data.ts
@@ -1,38 +1,65 @@
-import type { VbenFormSchema } from "#/adapter/form";
+import type { VbenFormApi, VbenFormSchema } from "#/adapter/form";
import type { VxeTableGridOptions } from "#/adapter/vxe-table";
+
+import { h } from 'vue';
import { CommonStatusEnum, DICT_TYPE } from "#/packages/constants/src";
import { getDictOptions } from "#/packages/effects/hooks/src";
import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MesAutoCodeRuleCode } from '@vben/constants';
+import { getItemTypeSimpleList } from '#/api/mes/md/item/type';
import { getUnitPage } from '#/api/mdm/unit';
-/** 鐗╂枡绫诲瀷閫夐」 */
-export const ITEM_TYPE_OPTIONS = [
- { label: "鍘熸枡", value: 1 },
- { label: "鍗婃垚鍝�", value: 2 },
- { label: "鎴愬搧", value: 3 },
- { label: "杈呮枡", value: 4 },
-];
+import { Button } from 'ant-design-vue';
-/** 鐗╂枡绫诲瀷鏄犲皠 */
-export const ITEM_TYPE_MAP: Record<number, string> = {
- 1: "鍘熸枡",
- 2: "鍗婃垚鍝�",
- 3: "鎴愬搧",
- 4: "杈呮枡",
-};
+// 缂撳瓨鍗曚綅鍒楄〃
+let unitListCache: any[] | null = null;
+let unitListPromise: Promise<any[]> | null = null;
-/** 鐗╂枡绫诲瀷棰滆壊鏄犲皠 */
-export const ITEM_TYPE_COLOR_MAP: Record<number, string> = {
- 1: "green",
- 2: "orange",
- 3: "blue",
- 4: "purple",
-};
+/** 灏嗘墎骞冲垎绫诲垪琛ㄨ浆涓� TreeSelect 鎵�闇�鐨勬爲褰㈢粨鏋� */
+export function buildCategoryTree(list: any[]): any[] {
+ const map = new Map<number, any>();
+ const roots: any[] = [];
+ for (const item of list) {
+ map.set(item.id, { label: item.name, value: item.id, children: [] });
+ }
+ for (const item of list) {
+ const node = map.get(item.id)!;
+ if (item.parentId && map.has(item.parentId)) {
+ map.get(item.parentId)!.children.push(node);
+ } else {
+ roots.push(node);
+ }
+ }
+ return roots;
+}
+
+/** 鑾峰彇鍗曚綅鍒楄〃锛堝甫缂撳瓨锛� */
+async function getUnitListCached() {
+ if (unitListCache) {
+ return unitListCache;
+ }
+ if (unitListPromise) {
+ return unitListPromise;
+ }
+ unitListPromise = getUnitPage({ pageNo: 1, pageSize: 100, status: 0 }).then((res) => {
+ unitListCache = res.list || [];
+ return unitListCache;
+ }).finally(() => {
+ unitListPromise = null;
+ });
+ return unitListPromise;
+}
+
+/** 娓呴櫎鍗曚綅鍒楄〃缂撳瓨 */
+export function clearUnitListCache() {
+ unitListCache = null;
+}
/** 鏂板/淇敼鐨勮〃鍗� */
-export function useFormSchema(): VbenFormSchema[] {
+export function useFormSchema(formApi?: VbenFormApi, categoryTreeData: any[] = []): VbenFormSchema[] {
return [
{
component: "Input",
@@ -47,9 +74,24 @@
fieldName: "code",
label: "鐗╂枡缂栫爜",
componentProps: {
+ maxLength: 64,
placeholder: "璇疯緭鍏ョ墿鏂欑紪鐮�",
},
- rules: "required",
+ rules: z.string().min(1, '鐗╂枡缂栫爜涓嶈兘涓虹┖').max(64),
+ suffix: () =>
+ h(
+ Button,
+ {
+ type: 'default',
+ onClick: async () => {
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.MD_ITEM_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
+ },
+ },
+ { default: () => '鐢熸垚' },
+ ),
},
{
component: "Input",
@@ -61,15 +103,17 @@
rules: "required",
},
{
- component: "RadioGroup",
- fieldName: "itemType",
- label: "鐗╂枡绫诲瀷",
+ component: "TreeSelect",
+ fieldName: "categoryId",
+ label: "鐗╂枡鍒嗙被",
+ rules: "selectRequired",
componentProps: {
- options: ITEM_TYPE_OPTIONS,
- buttonStyle: "solid",
- optionType: "button",
+ placeholder: "璇烽�夋嫨鐗╂枡鍒嗙被",
+ allowClear: true,
+ treeDefaultExpandAll: true,
+ treeData: categoryTreeData,
+ fieldNames: { label: 'label', value: 'value', children: 'children' },
},
- rules: "required",
},
{
component: "Input",
@@ -88,10 +132,7 @@
componentProps: {
placeholder: "璇烽�夋嫨璁￠噺鍗曚綅",
allowClear: true,
- api: async () => {
- const res = await getUnitPage({ pageNo: 1, pageSize: 100, status: 0 });
- return res.list || [];
- },
+ api: getUnitListCached,
labelField: "name",
valueField: "id",
},
@@ -104,10 +145,7 @@
componentProps: {
placeholder: "璇烽�夋嫨杈呭崟浣�1",
allowClear: true,
- api: async () => {
- const res = await getUnitPage({ pageNo: 1, pageSize: 100, status: 0 });
- return res.list || [];
- },
+ api: getUnitListCached,
labelField: "name",
valueField: "id",
},
@@ -132,10 +170,7 @@
componentProps: {
placeholder: "璇烽�夋嫨杈呭崟浣�2",
allowClear: true,
- api: async () => {
- const res = await getUnitPage({ pageNo: 1, pageSize: 100, status: 0 });
- return res.list || [];
- },
+ api: getUnitListCached,
labelField: "name",
valueField: "id",
},
@@ -238,13 +273,13 @@
component: 'Switch',
fieldName: 'isBatchManaged',
label: '鎵规绠＄悊',
- defaultValue: true,
+ defaultValue: false,
componentProps: {
class: "w-auto",
checkedChildren: "鏄�",
unCheckedChildren: "鍚�",
},
- rules: z.boolean().default(true),
+ rules: z.boolean().default(false),
},
{
component: "Switch",
@@ -288,6 +323,126 @@
rows: 3,
},
},
+ // ===== 鎵规灞炴�ч厤缃紙isBatchManaged = true 鏃舵樉绀猴級 =====
+ {
+ component: "Divider",
+ fieldName: "batchConfigDivider",
+ label: "鎵规灞炴�ч厤缃�",
+ formItemClass: "col-span-2",
+ componentProps: {
+ orientation: "left",
+ plain: true,
+ },
+ dependencies: {
+ triggerFields: ["isBatchManaged"],
+ show: (values) => values.isBatchManaged === true,
+ },
+ },
+ {
+ component: "Switch",
+ fieldName: "produceDateFlag",
+ label: "鐢熶骇鏃ユ湡蹇呭～",
+ defaultValue: false,
+ componentProps: {
+ class: "w-auto",
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
+ },
+ dependencies: {
+ triggerFields: ["isBatchManaged"],
+ show: (values) => values.isBatchManaged === true,
+ },
+ },
+ {
+ component: "Switch",
+ fieldName: "expireDateFlag",
+ label: "鏈夋晥鏈熷繀濉�",
+ defaultValue: false,
+ componentProps: {
+ class: "w-auto",
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
+ },
+ dependencies: {
+ triggerFields: ["isBatchManaged"],
+ show: (values) => values.isBatchManaged === true,
+ },
+ },
+ {
+ component: "Switch",
+ fieldName: "receiptDateFlag",
+ label: "鍏ュ簱鏃ユ湡蹇呭～",
+ defaultValue: false,
+ componentProps: {
+ class: "w-auto",
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
+ },
+ dependencies: {
+ triggerFields: ["isBatchManaged"],
+ show: (values) => values.isBatchManaged === true,
+ },
+ },
+ {
+ component: "Switch",
+ fieldName: "vendorFlag",
+ label: "渚涘簲鍟嗗繀濉�",
+ defaultValue: false,
+ componentProps: {
+ class: "w-auto",
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
+ },
+ dependencies: {
+ triggerFields: ["isBatchManaged"],
+ show: (values) => values.isBatchManaged === true,
+ },
+ },
+ {
+ component: "Switch",
+ fieldName: "purchaseOrderCodeFlag",
+ label: "閲囪喘璁㈠崟鍙峰繀濉�",
+ defaultValue: false,
+ componentProps: {
+ class: "w-auto",
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
+ },
+ dependencies: {
+ triggerFields: ["isBatchManaged"],
+ show: (values) => values.isBatchManaged === true,
+ },
+ },
+ {
+ component: "Switch",
+ fieldName: "lotNumberFlag",
+ label: "鐢熶骇鎵瑰彿蹇呭～",
+ defaultValue: false,
+ componentProps: {
+ class: "w-auto",
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
+ },
+ dependencies: {
+ triggerFields: ["isBatchManaged"],
+ show: (values) => values.isBatchManaged === true,
+ },
+ },
+ {
+ component: "Switch",
+ fieldName: "qualityStatusFlag",
+ label: "璐ㄩ噺鐘舵�佸繀濉�",
+ defaultValue: false,
+ componentProps: {
+ class: "w-auto",
+ checkedChildren: "鏄�",
+ unCheckedChildren: "鍚�",
+ },
+ dependencies: {
+ triggerFields: ["isBatchManaged"],
+ show: (values) => values.isBatchManaged === true,
+ },
+ },
];
}
@@ -310,16 +465,6 @@
componentProps: {
placeholder: "璇疯緭鍏ョ墿鏂欏悕绉�",
allowClear: true,
- },
- },
- {
- fieldName: "itemType",
- label: "鐗╂枡绫诲瀷",
- component: "Select",
- componentProps: {
- placeholder: "璇烽�夋嫨鐗╂枡绫诲瀷",
- allowClear: true,
- options: ITEM_TYPE_OPTIONS,
},
},
{
@@ -355,6 +500,12 @@
minWidth: 150,
},
{
+ field: "categoryName",
+ title: "鐗╂枡鍒嗙被",
+ minWidth: 120,
+ slots: { default: "categoryName" },
+ },
+ {
field: "unitMeasureName",
title: "鍗曚綅",
minWidth: 80,
@@ -383,12 +534,6 @@
field: "warehouseName",
title: "榛樿浠撳簱",
minWidth: 100,
- },
- {
- field: "itemType",
- title: "鐗╂枡绫诲瀷",
- minWidth: 100,
- slots: { default: "itemType" },
},
{
field: "purchasePrice",
--
Gitblit v1.9.3