feat(wms): 添加区域基础信息管理功能

- 可修改区域名称、类型、负责人；区域编码和所属仓库不可修改
- 建立规则 “仓库编码 + 区域代号”，如 “WH01A” 代表 WH01 仓库的 A 区；

src/api/wms/wmsBaseArea/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { WmsBaseAreaVO, WmsBaseAreaForm, WmsBaseAreaQuery } from '@/api/wms/wmsBaseArea/types';
+
+/**
+ * 查询区域基础信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listWmsBaseArea = (query?: WmsBaseAreaQuery): AxiosPromise<WmsBaseAreaVO[]> => {
+  return request({
+    url: '/wms/wmsBaseArea/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询区域基础信息详细
+ * @param areaId
+ */
+export const getWmsBaseArea = (areaId: string | number): AxiosPromise<WmsBaseAreaVO> => {
+  return request({
+    url: '/wms/wmsBaseArea/' + areaId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增区域基础信息
+ * @param data
+ */
+export const addWmsBaseArea = (data: WmsBaseAreaForm) => {
+  return request({
+    url: '/wms/wmsBaseArea',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改区域基础信息
+ * @param data
+ */
+export const updateWmsBaseArea = (data: WmsBaseAreaForm) => {
+  return request({
+    url: '/wms/wmsBaseArea',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除区域基础信息
+ * @param areaId
+ */
+export const delWmsBaseArea = (areaId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/wmsBaseArea/' + areaId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询区域基础信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getWmsBaseAreaList (query) {
+    return request({
+        url: '/wms/wmsBaseArea/getWmsBaseAreaList',
+        method: 'get',
+        params: query
+    });
+};

src/api/wms/wmsBaseArea/types.ts

@@ -0,0 +1,161 @@
+export interface WmsBaseAreaVO {
+  /**
+   * 区域ID
+   */
+  areaId: string | number;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId: string | number;
+
+  /**
+   * 区域编码
+   */
+  areaCode: string;
+
+  /**
+   * 区域名称
+   */
+  areaName: string;
+
+  /**
+   * 区域类型（1存储区 2拣货区 3暂存区 4不合格品区）
+   */
+  areaType: string;
+
+  /**
+   * 区域负责人
+   */
+  areaManager: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 仓库编码
+   */
+  warehouseCode: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName: string;
+
+}
+
+export interface WmsBaseAreaForm extends BaseEntity {
+  /**
+   * 区域ID
+   */
+  areaId?: string | number;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 区域编码
+   */
+  areaCode?: string;
+
+  /**
+   * 区域名称
+   */
+  areaName?: string;
+
+  /**
+   * 区域类型（1存储区 2拣货区 3暂存区 4不合格品区）
+   */
+  areaType?: string;
+
+  /**
+   * 区域负责人
+   */
+  areaManager?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+    /**
+   * 仓库编码
+   */
+    warehouseCode?: string;
+
+    /**
+     * 仓库名称
+     */
+    warehouseName?: string;
+
+}
+
+export interface WmsBaseAreaQuery extends PageQuery {
+
+  /**
+   * 区域ID
+   */
+  areaId?: string | number;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 区域编码
+   */
+  areaCode?: string;
+
+  /**
+   * 区域名称
+   */
+  areaName?: string;
+
+  /**
+   * 区域类型（1存储区 2拣货区 3暂存区 4不合格品区）
+   */
+  areaType?: string;
+
+  /**
+   * 区域负责人
+   */
+  areaManager?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+      /**
+   * 仓库编码
+   */
+      warehouseCode?: string;
+
+      /**
+       * 仓库名称
+       */
+      warehouseName?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/views/wms/wmsBaseArea/index.vue

@@ -0,0 +1,436 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" >
+            <!-- <el-form-item label="区域ID" prop="areaId">
+              <el-input v-model="queryParams.areaId" placeholder="请输入区域ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="仓库ID" prop="warehouseId">
+              <el-input v-model="queryParams.warehouseId" placeholder="请输入仓库ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-form-item label="区域编码" prop="areaCode">
+              <el-input v-model="queryParams.areaCode" placeholder="请输入区域编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="区域名称" prop="areaName">
+              <el-input v-model="queryParams.areaName" placeholder="请输入区域名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="区域类型" prop="areaType">
+              <el-select v-model="queryParams.areaType" placeholder="请选择区域类型" clearable >
+                <el-option v-for="dict in area_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label="区域负责人" prop="areaManager">-->
+<!--              <el-input v-model="queryParams.areaManager" placeholder="请输入区域负责人" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="激活标识" prop="activeFlag">-->
+<!--              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >-->
+<!--                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+
+            <el-form-item label="所属仓库" prop="warehouseId">
+              <el-select v-model="queryParams.warehouseId" placeholder="请选择所属仓库" clearable >
+                <el-option v-for="item in warehouseList" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId"/>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:wmsBaseArea:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:wmsBaseArea:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:wmsBaseArea:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:wmsBaseArea:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="wmsBaseAreaList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="区域ID" align="center" prop="areaId" v-if="columns[0].visible"/> -->
+         <!-- 自动序号 -->
+         <el-table-column type="index" label="序号" width="55" align="center"  v-if="columns[0].visible"/>
+        <el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[1].visible"/>
+        <el-table-column label="区域编码" align="center" prop="areaCode" v-if="columns[2].visible"/>
+        <el-table-column label="区域名称" align="center" prop="areaName" v-if="columns[3].visible"/>
+        <el-table-column label="区域类型" align="center" prop="areaType" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="area_type" :value="scope.row.areaType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="区域负责人" align="center" prop="areaManager" v-if="columns[5].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:wmsBaseArea:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:wmsBaseArea:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改区域基础信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="wmsBaseAreaFormRef" :model="form" :rules="rules" label-width="120px">
+        <!-- <el-form-item label="区域ID" prop="areaId">
+          <el-input v-model="form.areaId" placeholder="请输入区域ID" />
+        </el-form-item> -->
+        <el-form-item label="所属仓库" prop="warehouseId">
+          <el-select 
+            v-model="form.warehouseId" 
+            placeholder="请选择所属仓库"  
+            :disabled="!!form.areaId"
+            @change="handleWarehouseChange"
+          >
+            <el-option
+                v-for="item in warehouseList"
+                :key="item.warehouseId"
+                :label="item.warehouseName"
+                :value="item.warehouseId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区域代号" prop="areaCodeSuffix" v-if="!form.areaId">
+          <el-input 
+            v-model="form.areaCodeSuffix" 
+            placeholder="请输入区域代号（如：A、B等）"
+            @input="generateAreaCode"
+            :disabled="!!form.areaId"
+          />
+        </el-form-item>
+        <el-form-item label="区域编码" prop="areaCode">
+          <el-input v-model="form.areaCode" placeholder="区域编码将自动生成" disabled />
+        </el-form-item>
+        <el-form-item label="区域名称" prop="areaName">
+          <el-input v-model="form.areaName" placeholder="请输入区域名称" />
+        </el-form-item>
+        <el-form-item label="区域类型" prop="areaType">
+          <el-select v-model="form.areaType" placeholder="请选择区域类型">
+            <el-option
+                v-for="dict in area_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="区域负责人" prop="areaManager">
+          <el-input v-model="form.areaManager" placeholder="请输入区域负责人" />
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="WmsBaseArea" lang="ts">
+import { getBaseWarehouseList } from '@/api/wms/baseWarehouse';
+import { listWmsBaseArea, getWmsBaseArea, delWmsBaseArea, addWmsBaseArea, updateWmsBaseArea } from '@/api/wms/wmsBaseArea';
+import { WmsBaseAreaVO, WmsBaseAreaQuery, WmsBaseAreaForm } from '@/api/wms/wmsBaseArea/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag, area_type } = toRefs<any>(proxy?.useDict('active_flag', 'area_type'));
+
+const wmsBaseAreaList = ref<WmsBaseAreaVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const wmsBaseAreaFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `序号`, visible: true },
+        // { key: 1, label: `租户号`, visible: true },
+        { key: 2, label: `仓库ID`, visible: true },
+        { key: 3, label: `仓库`, visible: true },
+        { key: 4, label: `区域编码`, visible: true },
+        { key: 5, label: `区域名称`, visible: true },
+        { key: 6, label: `区域类型`, visible: true },
+        { key: 7, label: `区域负责人`, visible: true },
+        { key: 8, label: `激活标识`, visible: true },
+        { key: 9, label: `备注`, visible: true },
+        // { key: 10, label: `创建人`, visible: true },
+        // { key: 11, label: `创建时间`, visible: true },
+        // { key: 12, label: `更新人`, visible: true },
+        // { key: 13, label: `更新时间`, visible: true },
+        // { key: 14, label: `创建部门`, visible: true },
+        // { key: 15, label: `删除标志`, visible: true },
+]);
+
+const initFormData: WmsBaseAreaForm & { areaCodeSuffix?: string } = {
+  areaId: undefined,
+  warehouseId: undefined,
+  areaCode: undefined,
+  areaCodeSuffix: '',
+  areaName: undefined,
+  areaType: undefined,
+  areaManager: undefined,
+  activeFlag: '1',
+  warehouseName: undefined,
+  warehouseCode: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<WmsBaseAreaForm, WmsBaseAreaQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    areaId: undefined,
+    warehouseId: undefined,
+    areaCode: undefined,
+    areaName: undefined,
+    areaType: undefined,
+    areaManager: undefined,
+    activeFlag: undefined,
+    warehouseName: undefined,
+    warehouseCode: undefined,
+    params: {
+    }
+  },
+  rules: {
+    areaName: [
+      { required: true, message: "区域名称不能为空", trigger: "blur" },
+      { min: 1, max: 50, message: "长度在 1 到 50 个字符", trigger: "blur" }
+    ],
+    areaCodeSuffix: [
+      { required: true, message: "区域代号不能为空", trigger: "blur" },
+      { min: 1, max: 10, message: "长度在 1 到 10 个字符", trigger: "blur" }
+    ],
+    areaType:[
+      { required: true, message: "区域类型不能为空", trigger: "blur" }
+    ],
+    areaManager:[
+      { required: true, message: "区域负责人不能为空", trigger: "blur" }
+    ],
+    activeFlag:[
+      { required: true, message: "激活标识不能为空", trigger: "blur" }
+    ],
+    warehouseId:[
+      { required: true, message: "仓库不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询区域基础信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listWmsBaseArea(queryParams.value);
+  wmsBaseAreaList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  wmsBaseAreaFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: WmsBaseAreaVO[]) => {
+  ids.value = selection.map(item => item.areaId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加区域";
+  form.value.activeFlag = '1';
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: WmsBaseAreaVO) => {
+  reset();
+  const _areaId = row?.areaId || ids.value[0];
+  const res = await getWmsBaseArea(_areaId);
+  const data = res.data;
+  
+  // 设置表单数据
+  form.value.areaId = data.areaId;
+  form.value.warehouseId = data.warehouseId;
+  form.value.warehouseName = data.warehouseName;
+  form.value.warehouseCode = data.warehouseCode;
+  form.value.areaCode = data.areaCode;
+  form.value.areaName = data.areaName;
+  form.value.areaType = data.areaType;
+  form.value.areaManager = data.areaManager;
+  form.value.activeFlag = data.activeFlag || '1';
+  form.value.remark = data.remark;
+  
+  // 从区域编码中提取区域代号（去掉仓库编码部分）
+  if (data.areaCode && data.warehouseCode) {
+    form.value.areaCodeSuffix = data.areaCode.replace(data.warehouseCode, '');
+  }
+  
+  dialog.visible = true;
+  dialog.title = "修改区域信息";
+};
+
+/** 提交按钮 */
+// 生成区域编码
+const generateAreaCode = () => {
+  if (!form.value.warehouseCode || !form.value.areaCodeSuffix) return;
+  // 直接拼接仓库编码和区域代号，保留原始大小写
+  form.value.areaCode = `${form.value.warehouseCode}${form.value.areaCodeSuffix}`;
+};
+
+// 仓库选择变化事件
+const handleWarehouseChange = (warehouseId: string | number) => {
+  const selectedWarehouse = warehouseList.value.find(item => item.warehouseId === warehouseId);
+  if (selectedWarehouse) {
+    form.value.warehouseName = selectedWarehouse.warehouseName;
+    form.value.warehouseCode = selectedWarehouse.warehouseCode;
+    // 重新生成区域编码
+    generateAreaCode();
+  }
+};
+
+const submitForm = () => {
+  wmsBaseAreaFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      // 生成区域编码
+      if (!form.value.areaId) {
+        if (!form.value.warehouseCode || !form.value.areaCodeSuffix) {
+          proxy?.$modal.msgWarning('请选择仓库并输入区域代号');
+          return;
+        }
+        form.value.areaCode = `${form.value.warehouseCode}${form.value.areaCodeSuffix.toUpperCase()}`;
+      }
+      
+      buttonLoading.value = true;
+      try {
+        if (form.value.areaId) {
+          // 修改时只允许修改部分字段
+          const updateData = {
+            areaId: form.value.areaId,
+            areaName: form.value.areaName,
+            areaType: form.value.areaType,
+            areaManager: form.value.areaManager,
+            activeFlag: form.value.activeFlag,
+            remark: form.value.remark
+          };
+          await updateWmsBaseArea(updateData);
+        } else {
+          // 新增时提交所有字段
+          await addWmsBaseArea(form.value);
+        }
+        proxy?.$modal.msgSuccess(form.value.areaId ? '修改成功' : '新增成功');
+        dialog.visible = false;
+        await getList();
+      } catch (error) {
+        console.error('操作失败:', error);
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: WmsBaseAreaVO) => {
+  const _areaIds = row?.areaId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除区域基础信息编号为"' + _areaIds + '"的数据项？').finally(() => loading.value = false);
+  await delWmsBaseArea(_areaIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/wmsBaseArea/export', {
+    ...queryParams.value
+  }, `wmsBaseArea_${new Date().getTime()}.xlsx`)
+}
+
+// 查询仓库
+let warehouseList = ref<Array<{warehouseId: string | number, warehouseName: string, warehouseCode: string}>>([]);
+const getWarehouseList = async () => {
+  const res = await getBaseWarehouseList({activeFlag: '1'}); // 只查询激活的仓库
+  warehouseList.value = res.data;
+}
+
+onMounted(() => {
+  getList();
+  getWarehouseList();
+});
+</script>