feat(商品管理): 添加自动审批功能

在商品管理模块中新增自动审批功能，包括在商品表单、编辑模态框和列表中添加自动审批开关及相关逻辑。同时更新了商品DTO接口以支持自动审批字段。
feat: 更新品牌标识和订单列表字段
2025-04-21 11:40:59 +08:00 · 2025-04-21 09:31:56 +08:00 · 2025-04-19 16:28:04 +08:00 · 2025-04-19 09:27:58 +08:00
16 changed files with 318 additions and 40 deletions
--- a/index.html
+++ b/index.html
@ -7,7 +7,7 @@
  <meta name="renderer" content="webkit" />
  <meta name="viewport"
    content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0" />
-  <title>借还柜</title>
+  <title>智借还</title>
  <link rel="icon" href="/favicon.ico" />
  <script>
    window.process = {};
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/logo.png
+++ b/public/logo.png
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@ -1,6 +1,6 @@
 {
  "Version": "4.4.0",
-  "Title": "借还柜",
+  "Title": "智借还",
  "FixedHeader": true,
  "HiddenSideBar": false,
  "MultiTagsCache": false,
--- a/src/api/cabinet/cabinet-cell.ts
+++ b/src/api/cabinet/cabinet-cell.ts
@ -19,6 +19,7 @@ export interface CabinetCellDTO {
  goodsName?: string;
  price?: number;
  coverImg?: string;
+  stock?: number;
 }

 export interface AddCabinetCellCommand {
@ -68,3 +69,9 @@ export const configureGoodsCells = (cellId: number, goodsId: number) => {
 export const configureGoodsCellsStock = (cellId: number, goodsId: number, stock: number) => {
  return http.request<ResponseData<void>>('put', `/cabinet/cell/configureGoodsCellsStock/${cellId}/${goodsId}/${stock}`);
 };
+export const changeGoodsCellsStock = (cellId: number, stock: number) => {
+  return http.request<ResponseData<void>>('put', `/cabinet/cell/changeGoodsCellsStock/${cellId}/${stock}`);
+};
+export const clearGoodsCells = (cellId: number) => {
+  return http.request<ResponseData<void>>('put', `/cabinet/cell/clearGoodsCells/${cellId}`);
+};
--- a/src/api/shop/goods.ts
+++ b/src/api/shop/goods.ts
@ -5,26 +5,48 @@ export interface GoodsQuery extends BasePageQuery {
  categoryId?: number;
  status?: number;
  goodsId?: number;
+  autoApproval?: number;
 }

 /** 商品DTO */
 export interface GoodsDTO {
+  /** 商品ID */
  goodsId?: number;
+  /** 商品名称 */
  goodsName: string;
+  /** 商品分类ID */
  categoryId: number;
+  /** 商品价格 */
  price: number;
+  /** 库存数量 */
  stock: number;
+  /** 商品状态（0下架 1上架） */
  status: number;
+  /** 自动审批开关（0关闭 1开启） */
+  autoApproval: number;
+  /** 商品封面图 */
  coverImg: string;
+  /** 商品详情（富文本） */
  goodsDetail: string;
+  /** 创建人ID */
  creatorId?: number;
+  /** 创建时间 */
  createTime?: Date;
+  /** 更新人ID */
  updaterId?: number;
+  /** 更新时间 */
  updateTime?: Date;
+  /** 备注信息 */
  remark?: string;
+  /** 删除标志（0存在 1删除） */
  deleted?: number;
+  /** 所属货柜名称 */
  cabinetName?: string;
+  /** 货柜单元格编号 */
  cellNo?: number;
+  /** 单元格编号（字符串形式） */
+  cellNoStr?: string;
+  /** 总库存量（含所有仓库） */
  totalStock?: number;
 }

@ -35,6 +57,7 @@ export interface GoodsRequest {
  price: number;
  stock: number;
  status: number;
+  autoApproval: number;
  coverImg?: string;
  goodsDetail: string;
  remark?: string;
--- a/src/api/shop/order.ts
+++ b/src/api/shop/order.ts
@ -0,0 +1,37 @@
+import { http } from "@/utils/http";
+
+export interface OrderQuery extends BasePageQuery {
+  orderNumber?: string;
+  status?: number;
+  payStatus?: number;
+  startTime?: string;
+  endTime?: string;
+}
+
+export interface OrderDTO {
+  orderId: number;
+  ucid?: string;
+  openid?: string;
+  tradeId?: string;
+  mobile?: string;
+  userid?: string;
+  name?: string;
+  isInternal?: number;
+  bizOrderId?: string;
+  totalAmount: number;
+  status: number;
+  payStatus: number;
+  paymentMethod?: string;
+  payTime?: string;
+}
+
+export const getOrderListApi = (params?: OrderQuery) => {
+  return http.request<ResponseData<PageDTO<OrderDTO>>>("get", "/shop/order/list", {
+    params: {
+      ...params,
+      // 处理时间范围参数格式
+      startTime: params?.startTime ? new Date(params.startTime).toISOString() : undefined,
+      endTime: params?.endTime ? new Date(params.endTime).toISOString() : undefined
+    }
+  });
+};
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@ -36,7 +36,7 @@ nextTick(() => {
 <template>
  <div v-loading="usePermissionStoreHook().wholeMenus.length === 0" class="horizontal-header">
    <div class="horizontal-header-left" @click="backTopMenu">
-      <img src="/logo.svg" alt="logo" />
+      <img src="/logo.png" alt="logo" />
      <span>{{ title }}</span>
    </div>
    <el-menu router ref="menuRef" mode="horizontal" class="horizontal-header-menu" :default-active="defaultActive">
--- a/src/layout/components/sidebar/logo.vue
+++ b/src/layout/components/sidebar/logo.vue
@ -12,24 +12,13 @@ const { title } = useNav();
 <template>
  <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
    <transition name="sidebarLogoFade">
-      <router-link
-        v-if="props.collapse"
-        key="props.collapse"
-        :title="title"
-        class="sidebar-logo-link"
-        :to="getTopMenu()?.path ?? '/'"
-      >
-        <img src="/logo.svg" alt="logo" />
+      <router-link v-if="props.collapse" key="props.collapse" :title="title" class="sidebar-logo-link"
+        :to="getTopMenu()?.path ?? '/'">
+        <img src="/logo.png" alt="logo" />
        <span class="sidebar-title">{{ title }}</span>
      </router-link>
-      <router-link
-        v-else
-        key="expand"
-        :title="title"
-        class="sidebar-logo-link"
-        :to="getTopMenu()?.path ?? '/'"
-      >
-        <img src="/logo.svg" alt="logo" />
+      <router-link v-else key="expand" :title="title" class="sidebar-logo-link" :to="getTopMenu()?.path ?? '/'">
+        <img src="/logo.png" alt="logo" />
        <span class="sidebar-title">{{ title }}</span>
      </router-link>
    </transition>
--- a/src/views/shop/approval/index.vue
+++ b/src/views/shop/approval/index.vue
@ -9,6 +9,10 @@ import Refresh from "@iconify-icons/ep/refresh";
 import View from "@iconify-icons/ep/view";
 import { ElMessage, ElMessageBox } from "element-plus";

+defineOptions({
+  name: "Approval"
+});
+
 const formRef = ref();
 const tableRef = ref();

--- a/src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue
+++ b/src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue
@ -59,6 +59,14 @@ const handleConfigure = async (row: GoodsDTO) => {
      }
    );

+    if (!value) {
+      ElMessage.warning('请输入库存数量');
+      return;
+    }
+    if (Number(value) > row.stock - row.totalStock) {
+      ElMessage.warning('分配数量不能超过剩余库存');
+      return;
+    }
    await configureGoodsCellsStock(props.cellId, row.goodsId!, Number(value));
    ElMessage.success('配置成功');
    emit('refresh');
@ -118,9 +126,6 @@ defineExpose({ getList });
          </el-button>
        </template>
      </el-table-column>
-      <div class="dialog-footer" style="margin-top: 20px; text-align: right">
-        <el-button @click="closeModal">取消</el-button>
-      </div>
    </el-table>

    <el-pagination v-model:current-page="pagination.currentPage" v-model:page-size="pagination.pageSize"
--- a/src/views/shop/cabinet-goods/index.vue
+++ b/src/views/shop/cabinet-goods/index.vue
@ -3,7 +3,7 @@ import { ref, onMounted } from "vue";
 import { PureTableBar } from "@/components/RePureTableBar";
 import { onBeforeRouteUpdate, useRoute } from "vue-router";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import { getCabinetCellList, deleteCabinetCell, CabinetCellDTO } from "@/api/cabinet/cabinet-cell";
+import { getCabinetCellList, deleteCabinetCell, CabinetCellDTO, changeGoodsCellsStock, clearGoodsCells } from "@/api/cabinet/cabinet-cell";
 import { allCabinets, SmartCabinetDTO } from "@/api/cabinet/smart-cabinet";
 import EditPen from "@iconify-icons/ep/edit-pen";
 import Delete from "@iconify-icons/ep/delete";
@ -154,6 +154,40 @@ const switchCellType = (cellType: number) => {
  }
 };

+const handleStockConfig = async (row: CabinetCellDTO) => {
+  try {
+    const { value } = await ElMessageBox.prompt(
+      `请输入${row.goodsName || '未配置商品'}的库存数量`,
+      '配置库存',
+      {
+        inputPattern: /^0$|^[1-9]\d*/,
+        inputValue: row.stock?.toString(),
+        inputErrorMessage: '库存必须大于等于0'
+      }
+    );
+
+    await changeGoodsCellsStock(row.cellId!, Number(value));
+    ElMessage.success('库存更新成功');
+    getList();
+  } catch (error) {
+    console.error('库存配置取消或失败', error);
+  }
+};
+
+const handleClearGoods = async (row: CabinetCellDTO) => {
+  try {
+    await ElMessageBox.confirm(
+      `确认要下架${row.goodsName || '未配置商品'}吗？`,
+      '警告',
+      { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
+    );
+    await clearGoodsCells(row.cellId!);
+    ElMessage.success('商品下架成功');
+    getList();
+  } catch (error) {
+    console.error('操作取消或失败', error);
+  }
+};
 </script>

 <template>
@ -218,19 +252,17 @@ const switchCellType = (cellType: number) => {
        </el-table-column>
        <el-table-column label="操作" width="150" fixed="right">
          <template #default="{ row }">
-            <el-button type="primary" link :icon="useRenderIcon(EditPen)" @click="handleEdit(row)">
-              编辑
-            </el-button>
            <el-button type="success" link :icon="useRenderIcon(AddFill)" @click="handleConfigure(row)">
              配置商品
            </el-button>
-            <el-popconfirm :title="`确认删除【${row.cellNo}】号单元格？`" @confirm="handleDelete(row)">
-              <template #reference>
-                <el-button type="danger" link :icon="useRenderIcon(Delete)">
-                  删除
+            <el-button v-if="row.goodsId" type="warning" link :icon="useRenderIcon(EditPen)"
+              @click="handleStockConfig(row)">
+              配置库存
+            </el-button>
+            <el-button v-if="row.goodsId" type="danger" link :icon="useRenderIcon(Delete)"
+              @click="handleClearGoods(row)">
+              下架商品
            </el-button>
-              </template>
-            </el-popconfirm>
          </template>
        </el-table-column>
      </el-table>
@ -238,7 +270,9 @@ const switchCellType = (cellType: number) => {
        :page-sizes="[10, 20, 50]" layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
        @size-change="onSizeChange" @current-change="onCurrentChange" />
    </PureTableBar>
+    <el-dialog v-model="configVisible" title="配置商品" width="80%">
      <CabinetGoodsConfigModal v-model="configVisible" :cell-id="currentCellId" @refresh="getList" />
+    </el-dialog>
  </div>
 </template>

--- a/src/views/shop/goods/goods-edit-modal.vue
+++ b/src/views/shop/goods/goods-edit-modal.vue
@ -29,6 +29,7 @@ const formData = reactive<GoodsDTO>({
  price: 0,
  stock: 0,
  status: 1,
+  autoApproval: 0,
  categoryId: 0,
  goodsDetail: "",
  coverImg: ""
@ -154,6 +155,10 @@ watch(
        </el-select>
      </el-form-item>

+      <el-form-item label="自动审批" prop="autoApproval">
+        <el-switch v-model="formData.autoApproval" :active-value="1" :inactive-value="0" active-text="启用"
+          inactive-text="关闭" />
+      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-radio-group v-model="formData.status">
          <el-radio :label="1">上架</el-radio>
--- a/src/views/shop/goods/goods-form-modal.vue
+++ b/src/views/shop/goods/goods-form-modal.vue
@ -2,7 +2,7 @@
 import { ref, reactive, onMounted, watch } from "vue";
 import { ElMessage, FormRules } from "element-plus";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import { addGoodsApi } from "@/api/shop/goods";
+import { addGoodsApi, GoodsDTO } from "@/api/shop/goods";
 import { CategoryDTO, getCategoryAllApi } from "@/api/shop/category";
 import Confirm from "@iconify-icons/ep/check";
 import Upload from "@iconify-icons/ep/upload";
@ -18,11 +18,12 @@ const props = defineProps({
 const emit = defineEmits(["update:visible", "refresh"]);

 const formRef = ref();
-const formData = reactive({
+const formData = reactive<GoodsDTO>({
  goodsName: "",
  price: 0,
  stock: 0,
  status: 1,
+  autoApproval: 0,
  categoryId: 0,
  goodsDetail: "",
  coverImg: ""
@ -123,6 +124,11 @@ const beforeAvatarUpload = (rawFile) => {
        </el-select>
      </el-form-item>

+      <el-form-item label="自动审批" prop="autoApproval">
+        <el-switch v-model="formData.autoApproval" :active-value="1" :inactive-value="0" active-text="启用"
+          inactive-text="关闭" />
+      </el-form-item>
+
      <el-form-item label="状态" prop="status">
        <el-radio-group v-model="formData.status">
          <el-radio :label="1">上架</el-radio>
--- a/src/views/shop/goods/index.vue
+++ b/src/views/shop/goods/index.vue
@ -38,7 +38,7 @@ const pagination = ref({

 // 加载数据
 const loading = ref(false);
-const dataList = ref([]);
+const dataList = ref<GoodsDTO[]>([]);
 const multipleSelection = ref<number[]>([]);
 const editVisible = ref(false);
 const configVisible = ref(false);
@ -181,9 +181,16 @@ const handleEdit = (row: GoodsDTO) => {
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="自动审批" prop="autoApproval" width="120">
+          <template #default="{ row }">
+            <el-tag :type="row.autoApproval === 1 ? 'success' : 'info'">
+              {{ row.autoApproval === 1 ? '启用' : '关闭' }}
+            </el-tag>
+          </template>
+        </el-table-column>
        <el-table-column label="柜口" prop="cellNo" width="120">
          <template #default="{ row }">
-            {{ !row.cellNo ? '未配置' : row.cabinetName + ' 格口' + row.cellNo }}
+            {{ !row.cellNoStr ? '未配置' : row.cabinetName + ' 格口' + row.cellNoStr }}
          </template>
        </el-table-column>
        <el-table-column label="操作" width="150" fixed="right">
@ -191,10 +198,10 @@ const handleEdit = (row: GoodsDTO) => {
            <el-button type="primary" link :icon="useRenderIcon(EditPen)" @click="handleEdit(row)" class="right-btn">
              编辑
            </el-button>
-            <el-button type="warning" link :icon="useRenderIcon(Setting)" class="right-btn"
+            <!-- <el-button type="warning" link :icon="useRenderIcon(Setting)" class="right-btn"
              @click="currentRow = row; configVisible = true">
              配置格口
-            </el-button>
+            </el-button> -->
            <el-popconfirm :title="`确认删除【${row.goodsName}】？`" @confirm="handleDelete(row)">
              <template #reference>
                <el-button type="danger" link :icon="useRenderIcon(Delete)" class="right-btn">
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@ -0,0 +1,161 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import { PureTableBar } from "@/components/RePureTableBar";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
+import { getOrderListApi, type OrderDTO } from "@/api/shop/order";
+import Search from "@iconify-icons/ep/search";
+import Refresh from "@iconify-icons/ep/refresh";
+import { ElMessage } from "element-plus";
+
+defineOptions({
+  name: "ShopOrder"
+});
+
+const formRef = ref();
+const tableRef = ref();
+
+const searchFormParams = ref({
+  orderNumber: "",
+  status: null,
+  payStatus: null,
+  startTime: "",
+  endTime: ""
+});
+
+const pagination = ref({
+  pageSize: 10,
+  currentPage: 1,
+  total: 0
+});
+
+const loading = ref(false);
+const dataList = ref<OrderDTO[]>([]);
+
+const getList = async () => {
+  try {
+    loading.value = true;
+    const { data } = await getOrderListApi({
+      ...searchFormParams.value,
+      pageSize: pagination.value.pageSize,
+      pageNum: pagination.value.currentPage
+    });
+    dataList.value = data.rows;
+    pagination.value.total = data.total;
+  } finally {
+    loading.value = false;
+  }
+};
+
+const onSearch = () => {
+  pagination.value.currentPage = 1;
+  getList();
+};
+
+const resetForm = () => {
+  formRef.value.resetFields();
+  onSearch();
+};
+
+const onSizeChange = (val: number) => {
+  pagination.value.pageSize = val;
+  getList();
+};
+
+const onCurrentChange = (val: number) => {
+  pagination.value.currentPage = val;
+  getList();
+};
+
+getList();
+</script>
+
+<template>
+  <div class="main">
+    <el-form ref="formRef" :inline="true" :model="searchFormParams"
+      class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px]">
+      <el-form-item label="时间范围：">
+        <el-date-picker v-model="searchFormParams.startTime" type="datetime" placeholder="开始时间"
+          value-format="YYYY-MM-DD HH:mm:ss" class="!w-[200px]" />
+        <span class="mx-2">至</span>
+        <el-date-picker v-model="searchFormParams.endTime" type="datetime" placeholder="结束时间"
+          value-format="YYYY-MM-DD HH:mm:ss" class="!w-[200px]" />
+      </el-form-item>
+      <el-form-item label="订单编号：" prop="orderNumber">
+        <el-input v-model="searchFormParams.orderNumber" placeholder="请输入订单编号" clearable class="!w-[200px]" />
+      </el-form-item>
+      <el-form-item label="订单状态：" prop="status">
+        <el-select v-model="searchFormParams.status" placeholder="请选择状态" clearable class="!w-[180px]">
+          <el-option label="待付款" :value="1" />
+          <el-option label="已付款" :value="2" />
+          <el-option label="已发货" :value="3" />
+          <el-option label="已完成" :value="4" />
+          <el-option label="已取消" :value="5" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="支付状态：" prop="payStatus">
+        <el-select v-model="searchFormParams.payStatus" placeholder="请选择支付状态" clearable class="!w-[180px]">
+          <el-option label="未支付" :value="1" />
+          <el-option label="已支付" :value="2" />
+          <el-option label="退款中" :value="3" />
+          <el-option label="已退款" :value="4" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" :icon="useRenderIcon(Search)" @click="onSearch">
+          搜索
+        </el-button>
+        <el-button :icon="useRenderIcon(Refresh)" @click="resetForm">
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <PureTableBar title="订单列表" @refresh="getList">
+      <el-table ref="tableRef" v-loading="loading" :data="dataList" row-key="orderId" border>
+        <el-table-column label="订单ID" prop="orderId" width="120" />
+        <el-table-column label="用户id" prop="userid" width="120" />
+        <el-table-column label="姓名" prop="name" width="120" />
+        <el-table-column label="手机号" prop="mobile" width="120" />
+        <el-table-column label="订单金额" prop="totalAmount" width="120">
+          <template #default="{ row }">{{ row.totalAmount }}元</template>
+        </el-table-column>
+        <el-table-column label="订单状态" prop="status" width="120">
+          <template #default="{ row }">
+            <el-tag :type="row.status === 2 ? 'success' : row.status === 5 ? 'danger' : 'info'">
+              {{ { 1: '待付款', 2: '已付款', 3: '已发货', 4: '已完成', 5: '已取消' }[row.status] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付状态" prop="payStatus" width="120">
+          <template #default="{ row }">
+            <el-tag :type="row.payStatus === 2 ? 'success' : 'info'">
+              {{ { 1: '未支付', 2: '已支付', 3: '退款中', 4: '已退款' }[row.payStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付方式" prop="paymentMethod" width="120" />
+        <el-table-column label="支付时间" prop="payTime" width="180">
+          <template #default="{ row }">
+            {{ row.payTime ? new Date(row.payTime).toLocaleString() : '-' }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="操作" width="100" fixed="right">
+          <template #default="{ row }">
+            <el-button type="primary" link @click="handleDetail(row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column> -->
+      </el-table>
+      <el-pagination v-model:current-page="pagination.currentPage" v-model:page-size="pagination.pageSize"
+        :page-sizes="[10, 20, 50]" layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
+        @size-change="onSizeChange" @current-change="onCurrentChange" />
+    </PureTableBar>
+  </div>
+</template>
+
+<style scoped>
+.right-btn {
+  margin: 0;
+}
+</style>
Author	SHA1	Message	Date
dzq	bad63e65d7	feat(商品管理): 添加自动审批功能在商品管理模块中新增自动审批功能，包括在商品表单、编辑模态框和列表中添加自动审批开关及相关逻辑。同时更新了商品DTO接口以支持自动审批字段。	2025-04-21 11:40:59 +08:00
dzq	e4ee388f0f	feat: 更新品牌标识和订单列表字段更新了品牌名称从“借还柜”改为“智借还”，并替换了相关logo文件。在订单列表页面新增了用户id、姓名和手机号字段，以便更好地展示订单信息。	2025-04-21 09:31:56 +08:00
dzq	cfb96f1af1	feat(shop/order): 新增订单管理模块，包括前端页面和API接口新增订单管理模块，包含订单列表展示、搜索、分页等功能。前端页面使用Vue3和Element Plus实现，后端API接口包括订单查询、分页处理等。同时添加了订单实体类、查询条件类以及控制器类，支持订单状态的筛选和支付状态的查询。	2025-04-19 16:28:04 +08:00
dzq	0b3138e5f0	feat(商品管理): 增加商品库存配置和下架功能在商品管理模块中，新增了库存配置和下架商品的功能。具体修改包括： 1. 在GoodsDTO和CabinetCellDTO中新增了相关字段。 2. 增加了changeGoodsCellsStock和clearGoodsCells接口用于库存配置和下架商品。 3. 在商品配置模态框中增加了库存校验逻辑。 4. 移除了部分冗余代码，优化了界面显示。	2025-04-19 09:27:58 +08:00