feat(shop): 添加电子围栏功能并重命名仓库相关接口

- 新增电子围栏模型定义和API接口
- 添加电子围栏编辑组件实现CRUD功能
- 将仓库相关接口从shopWarehouse重命名为shopStoreWarehouse
- 更新仓库模型字段定义和页面组件
- 添加仓库搜索组件和主页面实现
- 配置开发环境API地址为启用状态

.env.development

@@ -1,5 +1,5 @@
 VITE_APP_NAME=后台管理(开发环境)
-#VITE_API_URL=http://127.0.0.1:9200/api
+VITE_API_URL=http://127.0.0.1:9200/api
 #VITE_SERVER_API_URL=http://127.0.0.1:8000/api
 
 

src/api/shop/shopStoreFence/index.ts

@@ -0,0 +1,105 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { ShopStoreFence, ShopStoreFenceParam } from './model';
+
+/**
+ * 分页查询黄家明_电子围栏
+ */
+export async function pageShopStoreFence(params: ShopStoreFenceParam) {
+  const res = await request.get<ApiResult<PageResult<ShopStoreFence>>>(
+    '/shop/shop-store-fence/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询黄家明_电子围栏列表
+ */
+export async function listShopStoreFence(params?: ShopStoreFenceParam) {
+  const res = await request.get<ApiResult<ShopStoreFence[]>>(
+    '/shop/shop-store-fence',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加黄家明_电子围栏
+ */
+export async function addShopStoreFence(data: ShopStoreFence) {
+  const res = await request.post<ApiResult<unknown>>(
+    '/shop/shop-store-fence',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改黄家明_电子围栏
+ */
+export async function updateShopStoreFence(data: ShopStoreFence) {
+  const res = await request.put<ApiResult<unknown>>(
+    '/shop/shop-store-fence',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除黄家明_电子围栏
+ */
+export async function removeShopStoreFence(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    '/shop/shop-store-fence/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除黄家明_电子围栏
+ */
+export async function removeBatchShopStoreFence(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    '/shop/shop-store-fence/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询黄家明_电子围栏
+ */
+export async function getShopStoreFence(id: number) {
+  const res = await request.get<ApiResult<ShopStoreFence>>(
+    '/shop/shop-store-fence/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/api/shop/shopStoreFence/model/index.ts

@@ -0,0 +1,43 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 黄家明_电子围栏
+ */
+export interface ShopStoreFence {
+  // 自增ID
+  id?: number;
+  // 围栏名称
+  name?: string;
+  // 类型 0圆形 1方形
+  type?: number;
+  // 定位
+  location?: string;
+  // 经度
+  longitude?: string;
+  // 纬度
+  latitude?: string;
+  // 区域
+  district?: string;
+  // 电子围栏轮廓
+  points?: string;
+  // 排序(数字越小越靠前)
+  sortNumber?: number;
+  // 备注
+  comments?: string;
+  // 状态, 0正常, 1冻结
+  status?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+  // 修改时间
+  updateTime?: string;
+}
+
+/**
+ * 黄家明_电子围栏搜索条件
+ */
+export interface ShopStoreFenceParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}

src/api/shop/shopStoreWarehouse/index.ts

@@ -1,13 +1,13 @@
 import request from '@/utils/request';
 import type { ApiResult, PageResult } from '@/api';
-import type { ShopWarehouse, ShopWarehouseParam } from './model';
+import type { ShopStoreWarehouse, ShopStoreWarehouseParam } from './model';
 
 /**
  * 分页查询仓库
  */
-export async function pageShopWarehouse(params: ShopWarehouseParam) {
+export async function pageShopStoreWarehouse(params: ShopStoreWarehouseParam) {
-  const res = await request.get<ApiResult<PageResult<ShopWarehouse>>>(
+  const res = await request.get<ApiResult<PageResult<ShopStoreWarehouse>>>(
-    '/shop/shop-warehouse/page',
+    '/shop/shop-store-warehouse/page',
     {
       params
     }
@@ -21,9 +21,9 @@ export async function pageShopWarehouse(params: ShopWarehouseParam) {
 /**
  * 查询仓库列表
  */
-export async function listShopWarehouse(params?: ShopWarehouseParam) {
+export async function listShopStoreWarehouse(params?: ShopStoreWarehouseParam) {
-  const res = await request.get<ApiResult<ShopWarehouse[]>>(
+  const res = await request.get<ApiResult<ShopStoreWarehouse[]>>(
-    '/shop/shop-warehouse',
+    '/shop/shop-store-warehouse',
     {
       params
     }
@@ -37,9 +37,9 @@ export async function listShopWarehouse(params?: ShopWarehouseParam) {
 /**
  * 添加仓库
  */
-export async function addShopWarehouse(data: ShopWarehouse) {
+export async function addShopStoreWarehouse(data: ShopStoreWarehouse) {
   const res = await request.post<ApiResult<unknown>>(
-    '/shop/shop-warehouse',
+    '/shop/shop-store-warehouse',
     data
   );
   if (res.data.code === 0) {
@@ -51,9 +51,9 @@ export async function addShopWarehouse(data: ShopWarehouse) {
 /**
  * 修改仓库
  */
-export async function updateShopWarehouse(data: ShopWarehouse) {
+export async function updateShopStoreWarehouse(data: ShopStoreWarehouse) {
   const res = await request.put<ApiResult<unknown>>(
-    '/shop/shop-warehouse',
+    '/shop/shop-store-warehouse',
     data
   );
   if (res.data.code === 0) {
@@ -65,9 +65,9 @@ export async function updateShopWarehouse(data: ShopWarehouse) {
 /**
  * 删除仓库
  */
-export async function removeShopWarehouse(id?: number) {
+export async function removeShopStoreWarehouse(id?: number) {
   const res = await request.delete<ApiResult<unknown>>(
-    '/shop/shop-warehouse/' + id
+    '/shop/shop-store-warehouse/' + id
   );
   if (res.data.code === 0) {
     return res.data.message;
@@ -78,9 +78,9 @@ export async function removeShopWarehouse(id?: number) {
 /**
  * 批量删除仓库
  */
-export async function removeBatchShopWarehouse(data: (number | undefined)[]) {
+export async function removeBatchShopStoreWarehouse(data: (number | undefined)[]) {
   const res = await request.delete<ApiResult<unknown>>(
-    '/shop/shop-warehouse/batch',
+    '/shop/shop-store-warehouse/batch',
     {
       data
     }
@@ -94,9 +94,9 @@ export async function removeBatchShopWarehouse(data: (number | undefined)[]) {
 /**
  * 根据id查询仓库
  */
-export async function getShopWarehouse(id: number) {
+export async function getShopStoreWarehouse(id: number) {
-  const res = await request.get<ApiResult<ShopWarehouse>>(
+  const res = await request.get<ApiResult<ShopStoreWarehouse>>(
-    '/shop/shop-warehouse/' + id
+    '/shop/shop-store-warehouse/' + id
   );
   if (res.data.code === 0 && res.data.data) {
     return res.data.data;

src/api/shop/shopStoreWarehouse/model/index.ts

@@ -3,7 +3,7 @@ import type { PageParam } from '@/api';
 /**
  * 仓库
  */
-export interface ShopWarehouse {
+export interface ShopStoreWarehouse {
   // 自增ID
   id?: number;
   // 仓库名称
@@ -18,12 +18,12 @@ export interface ShopWarehouse {
   realName?: string;
   // 联系电话
   phone?: string;
-  // 省份
+  // 所在省份
   province?: string;
-  // 城市
+  // 所在城市
-  city: undefined,
+  city?: string;
-  // 区域
+  // 所在辖区
-  region: undefined,
+  region?: string;
   // 经纬度
   lngAndLat?: string;
   // 用户ID
@@ -34,8 +34,6 @@ export interface ShopWarehouse {
   sortNumber?: number;
   // 是否删除
   isDelete?: number;
-  // 状态
-  status?: number;
   // 租户id
   tenantId?: number;
   // 创建时间
@@ -47,7 +45,7 @@ export interface ShopWarehouse {
 /**
  * 仓库搜索条件
  */
-export interface ShopWarehouseParam extends PageParam {
+export interface ShopStoreWarehouseParam extends PageParam {
   id?: number;
   keywords?: string;
 }

src/views/shop/shopStoreFence/components/shopStoreFenceEdit.vue

@@ -0,0 +1,245 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑电子围栏' : '添加电子围栏'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="围栏名称" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入围栏名称"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="类型 0圆形 1方形" name="type">
+        <a-input
+          allow-clear
+          placeholder="请输入类型 0圆形 1方形"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="定位" name="location">
+        <a-input
+          allow-clear
+          placeholder="请输入定位"
+          v-model:value="form.location"
+        />
+      </a-form-item>
+      <a-form-item label="经度" name="longitude">
+        <a-input
+          allow-clear
+          placeholder="请输入经度"
+          v-model:value="form.longitude"
+        />
+      </a-form-item>
+      <a-form-item label="纬度" name="latitude">
+        <a-input
+          allow-clear
+          placeholder="请输入纬度"
+          v-model:value="form.latitude"
+        />
+      </a-form-item>
+      <a-form-item label="区域" name="district">
+        <a-input
+          allow-clear
+          placeholder="请输入区域"
+          v-model:value="form.district"
+        />
+      </a-form-item>
+      <a-form-item label="电子围栏轮廓" name="points">
+        <a-input
+          allow-clear
+          placeholder="请输入电子围栏轮廓"
+          v-model:value="form.points"
+        />
+      </a-form-item>
+      <a-form-item label="排序" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addShopStoreFence, updateShopStoreFence } from '@/api/shop/shopStoreFence';
+  import { ShopStoreFence } from '@/api/shop/shopStoreFence/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: ShopStoreFence | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<ShopStoreFence>({
+    id: undefined,
+    name: undefined,
+    type: undefined,
+    location: undefined,
+    longitude: undefined,
+    latitude: undefined,
+    district: undefined,
+    points: undefined,
+    sortNumber: undefined,
+    comments: undefined,
+    status: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    shopStoreFenceId: undefined,
+    shopStoreFenceName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    shopStoreFenceName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写电子围栏名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateShopStoreFence : addShopStoreFence;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

src/views/shop/shopStoreWarehouse/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

src/views/shop/shopStoreWarehouse/index.vue

@@ -0,0 +1,241 @@
+<template>
+  <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="id"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <ShopStoreWarehouseEdit v-model:visible="showEdit" :data="current" @done="reload" />
+  </a-page-header>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import {getPageTitle} from '@/utils/common';
+  import ShopStoreWarehouseEdit from './components/shopStoreWarehouseEdit.vue';
+  import { pageShopStoreWarehouse, removeShopStoreWarehouse, removeBatchShopStoreWarehouse } from '@/api/shop/shopStoreWarehouse';
+  import type { ShopStoreWarehouse, ShopStoreWarehouseParam } from '@/api/shop/shopStoreWarehouse/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<ShopStoreWarehouse[]>([]);
+  // 当前编辑数据
+  const current = ref<ShopStoreWarehouse | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageShopStoreWarehouse({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 完整的列配置（包含所有字段）
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '仓库名称',
+      dataIndex: 'name',
+      key: 'name'
+    },
+    {
+      title: '仓库编号',
+      dataIndex: 'code',
+      key: 'code'
+    },
+    {
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type'
+    },
+    {
+      title: '仓库地址',
+      dataIndex: 'address',
+      key: 'address',
+    },
+    {
+      title: '所在城市',
+      dataIndex: 'city',
+      key: 'city',
+      align: 'center'
+    },
+    {
+      title: '排序号',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      width: 120,
+      align: 'center'
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      width: 200,
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: ShopStoreWarehouseParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: ShopStoreWarehouse) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: ShopStoreWarehouse) => {
+    const hide = message.loading('请求中..', 0);
+    removeShopStoreWarehouse(row.id)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchShopStoreWarehouse(selection.value.map((d) => d.id))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: ShopStoreWarehouse) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'ShopStoreWarehouse'
+  };
+</script>
+
+<style lang="less" scoped></style>