feat：策略

nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/warehousestrategy/index.ts

@@ -1,58 +1,58 @@
-import type { PageParam, PageResult } from '@vben/request';
-import type { Dayjs } from 'dayjs';
-
-import { requestClient } from '#/api/request';
-
-export namespace WmsWarehouseStrategyApi {
-  /** 出入库策略信息 */
-  export interface WarehouseStrategy {
-    sectionCode?: string; // 库区编码
-    strategy?: string; // 规则
-    strategyType: string; // 策略类型
-    description: string; // 描述
-  }
-}
-
-/** 查询出入库策略分页 */
-export function getWarehouseStrategyPage(params: PageParam) {
-  return requestClient.get<PageResult<WmsWarehouseStrategyApi.WarehouseStrategy>>(
-    '/wms/warehouse-strategy/page',
-    { params },
-  );
-}
-
-/** 查询出入库策略详情 */
-export function getWarehouseStrategy(id: number) {
-  return requestClient.get<WmsWarehouseStrategyApi.WarehouseStrategy>(
-    `/wms/warehouse-strategy/get?id=${id}`,
-  );
-}
-
-/** 新增出入库策略 */
-export function createWarehouseStrategy(data: WmsWarehouseStrategyApi.WarehouseStrategy) {
-  return requestClient.post('/wms/warehouse-strategy/create', data);
-}
-
-/** 修改出入库策略 */
-export function updateWarehouseStrategy(data: WmsWarehouseStrategyApi.WarehouseStrategy) {
-  return requestClient.put('/wms/warehouse-strategy/update', data);
-}
-
-/** 删除出入库策略 */
-export function deleteWarehouseStrategy(id: number) {
-  return requestClient.delete(`/wms/warehouse-strategy/delete?id=${id}`);
-}
-
-/** 批量删除出入库策略 */
-export function deleteWarehouseStrategyList(ids: number[]) {
-  return requestClient.delete(
-    `/wms/warehouse-strategy/delete-list?ids=${ids.join(',')}`,
-  );
-}
-
-/** 导出出入库策略 */
-export function exportWarehouseStrategy(params: any) {
-  return requestClient.download('/wms/warehouse-strategy/export-excel', { params });
-}
-
-
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace WmsWarehouseStrategyApi {
+  /** 出入库策略信息 */
+  export interface WarehouseStrategy {
+    id?: number;
+    sectionCode?: string; // 库区编码
+    strategy?: string; // 规则
+    strategyType: string; // 策略类型
+    description: string; // 描述
+  }
+}
+
+/** 查询出入库策略分页 */
+export function getWarehouseStrategyPage(params: PageParam) {
+  return requestClient.get<PageResult<WmsWarehouseStrategyApi.WarehouseStrategy>>(
+    '/wms/warehouse-strategy/page',
+    { params },
+  );
+}
+
+/** 查询出入库策略详情 */
+export function getWarehouseStrategy(id: number) {
+  return requestClient.get<WmsWarehouseStrategyApi.WarehouseStrategy>(
+    `/wms/warehouse-strategy/get?id=${id}`,
+  );
+}
+
+/** 新增出入库策略 */
+export function createWarehouseStrategy(data: WmsWarehouseStrategyApi.WarehouseStrategy) {
+  return requestClient.post('/wms/warehouse-strategy/create', data);
+}
+
+/** 修改出入库策略 */
+export function updateWarehouseStrategy(data: WmsWarehouseStrategyApi.WarehouseStrategy) {
+  return requestClient.put('/wms/warehouse-strategy/update', data);
+}
+
+/** 删除出入库策略 */
+export function deleteWarehouseStrategy(id: number) {
+  return requestClient.delete(`/wms/warehouse-strategy/delete?id=${id}`);
+}
+
+/** 批量删除出入库策略 */
+export function deleteWarehouseStrategyList(ids: number[]) {
+  return requestClient.delete(
+    `/wms/warehouse-strategy/delete-list?ids=${ids.join(',')}`,
+  );
+}
+
+/** 导出出入库策略 */
+export function exportWarehouseStrategy(params: any) {
+  return requestClient.download('/wms/warehouse-strategy/export-excel', { params });
+}
+
+

nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/warehousestrategyconfig/index.ts

@@ -16,6 +16,12 @@ export namespace WmsWarehouseStrategyConfigApi {
     ban: boolean; // 禁止操作
     formData: string; // 限定参数
   }
+
+  /** 仓储策略配置精简信息 */
+  export interface WarehouseStrategyConfigSimple {
+    strategyCode: string; // 策略编码
+    strategyName: string; // 策略名称
+  }
 }
 
 /** 查询仓储策略配置分页 */
@@ -60,4 +66,11 @@ export function exportWarehouseStrategyConfig(params: any) {
   return requestClient.download('/wms/warehouse-strategy-config/export-excel', { params });
 }
 
+/** 查询仓储策略配置精简列表 */
+export function getWarehouseStrategyConfigSimpleList() {
+  return requestClient.get<WmsWarehouseStrategyConfigApi.WarehouseStrategyConfigSimple[]>(
+    '/wms/warehouse-strategy-config/simple-list',
+  );
+}
+
 

nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/warehousestrategy/data.ts

@@ -2,10 +2,18 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { WmsWarehouseStrategyApi } from '#/api/wms/warehousestrategy';
 
+import { ref } from 'vue';
+
 import { getRangePickerDefaultProps } from '#/utils';
 import {getDictOptions} from "@vben/hooks";
 import {DICT_TYPE} from "@vben/constants";
 
+/** 策略配置选项（供表单多选和列表显示使用） */
+export const strategyConfigOptions = ref<{ label: string; value: string }[]>([]);
+
+/** 策略编码 -> 名称的映射 */
+export const strategyNameMap = ref<Record<string, string>>({});
+
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -39,9 +47,11 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'strategy',
       label: '规则',
       rules: 'required',
-      component: 'Input',
+      component: 'Select',
       componentProps: {
-        placeholder: '请输入规则',
+        mode: 'multiple',
+        options: strategyConfigOptions,
+        placeholder: '请选择规则',
       },
     },
     {
@@ -110,7 +120,8 @@ export function useGridColumns(): VxeTableGridOptions<WmsWarehouseStrategyApi.Wa
     {
       field: 'strategy',
       title: '规则',
-      minWidth: 120,
+      minWidth: 200,
+      slots: { default: 'strategy' },
     },
     {
       field: 'strategyType',

nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/warehousestrategy/index.vue

@@ -2,7 +2,7 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { WmsWarehouseStrategyApi } from '#/api/wms/warehousestrategy';
 
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 
 import { confirm, Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
@@ -16,9 +16,10 @@ import {
   exportWarehouseStrategy,
   getWarehouseStrategyPage,
 } from '#/api/wms/warehousestrategy';
+import { getWarehouseStrategyConfigSimpleList } from '#/api/wms/warehousestrategyconfig';
 import { $t } from '#/locales';
 
-import { useGridColumns, useGridFormSchema } from './data';
+import { strategyConfigOptions, strategyNameMap, useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 
 const [FormModal, formModalApi] = useVbenModal({
@@ -26,6 +27,37 @@ const [FormModal, formModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
+/** 将 strategy JSON 字符串解析为显示名称 */
+function resolveStrategyNames(strategy?: string): string {
+  if (!strategy) return '';
+  try {
+    const arr = JSON.parse(strategy);
+    if (!Array.isArray(arr)) return strategy;
+    return arr.map((code: string) => strategyNameMap.value[code] || code).join('、');
+  } catch {
+    return strategy;
+  }
+}
+
+onMounted(async () => {
+  if (strategyConfigOptions.value.length === 0) {
+    try {
+      const configList = await getWarehouseStrategyConfigSimpleList();
+      strategyConfigOptions.value = configList.map((item) => ({
+        label: `${item.strategyName}(${item.strategyCode})`,
+        value: item.strategyCode,
+      }));
+      const map: Record<string, string> = {};
+      configList.forEach((item) => {
+        map[item.strategyCode] = item.strategyName;
+      });
+      strategyNameMap.value = map;
+    } catch {
+      // ignore
+    }
+  }
+});
+
 /** 刷新表格 */
 function handleRefresh() {
   gridApi.query();
@@ -157,6 +189,9 @@ const [Grid, gridApi] = useVbenVxeGrid({
           ]"
         />
       </template>
+      <template #strategy="{ row }">
+        {{ resolveStrategyNames(row.strategy) }}
+      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[

nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/warehousestrategy/modules/form.vue

@@ -9,9 +9,10 @@ import { message } from 'antdv-next';
 
 import { useVbenForm } from '#/adapter/form';
 import { createWarehouseStrategy, getWarehouseStrategy, updateWarehouseStrategy } from '#/api/wms/warehousestrategy';
+import { getWarehouseStrategyConfigSimpleList } from '#/api/wms/warehousestrategyconfig';
 import { $t } from '#/locales';
 
-import { useFormSchema } from '../data';
+import { strategyConfigOptions, strategyNameMap, useFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
 const formData = ref<WmsWarehouseStrategyApi.WarehouseStrategy>();
@@ -21,6 +22,23 @@ const getTitle = computed(() => {
     : $t('ui.actionTitle.create', ['出入库策略']);
 });
 
+/** 解析 strategy JSON 字符串为数组 */
+function parseStrategy(strategy?: string): string[] {
+  if (!strategy) return [];
+  try {
+    const parsed = JSON.parse(strategy);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch {
+    return [];
+  }
+}
+
+/** 将 strategy 数组转为 JSON 字符串 */
+function stringifyStrategy(arr?: string[]): string {
+  if (!arr || arr.length === 0) return '[]';
+  return JSON.stringify(arr);
+}
+
 const [Form, formApi] = useVbenForm({
   commonConfig: {
     componentProps: {
@@ -43,6 +61,8 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as WmsWarehouseStrategyApi.WarehouseStrategy;
+    // 将 strategy 数组转为 JSON 字符串存储
+    data.strategy = stringifyStrategy(data.strategy as unknown as string[]);
     try {
       await (formData.value?.id ? updateWarehouseStrategy(data) : createWarehouseStrategy(data));
       // 关闭并提示
@@ -58,6 +78,24 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
+    // 加载策略配置选项（首次加载）
+    if (strategyConfigOptions.value.length === 0) {
+      try {
+        const configList = await getWarehouseStrategyConfigSimpleList();
+        strategyConfigOptions.value = configList.map((item) => ({
+          label: `${item.strategyName}(${item.strategyCode})`,
+          value: item.strategyCode,
+        }));
+        // 构建编码 -> 名称映射
+        const map: Record<string, string> = {};
+        configList.forEach((item) => {
+          map[item.strategyCode] = item.strategyName;
+        });
+        strategyNameMap.value = map;
+      } catch {
+        // ignore
+      }
+    }
     // 加载数据
     const data = modalApi.getData<WmsWarehouseStrategyApi.WarehouseStrategy>();
     if (!data || !data.id) {
@@ -66,6 +104,8 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getWarehouseStrategy(data.id);
+      // 将 strategy JSON 字符串解析为数组供多选组件使用
+      formData.value.strategy = parseStrategy(formData.value.strategy) as unknown as string;
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {

nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/warehousestrategyconfig/data.ts

@@ -5,7 +5,7 @@ import type { WmsWarehouseStrategyConfigApi } from '#/api/wms/warehousestrategyc
 import { getDictOptions } from '@vben/hooks';
 
 import { getRangePickerDefaultProps } from '#/utils';
-import {CommonStatusEnum, DICT_TYPE} from "@vben/constants";
+import { CommonTrueOrFalseEnum, DICT_TYPE} from "@vben/constants";
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -79,22 +79,22 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '是否启用',
       component: 'RadioGroup',
       componentProps: {
-        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        options: getDictOptions(DICT_TYPE.COMMON_TRUE_FALSE, 'boolean'),
         buttonStyle: 'solid',
         optionType: 'button',
       },
-      rules: z.number().default(CommonStatusEnum.ENABLE),
+      rules: z.boolean().default(CommonTrueOrFalseEnum.TRUE),
     },
     {
       fieldName: 'ban',
       label: '禁止操作',
       component: 'RadioGroup',
       componentProps: {
-        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        options: getDictOptions(DICT_TYPE.COMMON_TRUE_FALSE, 'boolean'),
         buttonStyle: 'solid',
         optionType: 'button',
       },
-      rules: z.number().default(CommonStatusEnum.DISABLE),
+      rules: z.boolean().default(CommonTrueOrFalseEnum.FALSE),
     },
     {
       fieldName: 'formData',

nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/packages/constants/src/biz-system-enum.ts

@@ -5,6 +5,12 @@ export const CommonStatusEnum = {
   DISABLE: 1, // 禁用
 };
 
+// true or false
+export const CommonTrueOrFalseEnum = {
+  TRUE: true,
+  FALSE: false,
+};
+
 // 全局用户类型枚举
 export const UserTypeEnum = {
   MEMBER: 1, // 会员