feat(审批): 添加退货审批列表导出功能并调整表格列宽

在审批页面中增加了导出Excel的功能，允许用户导出退货审批列表。同时调整了表格列的宽度以改善显示效果。
feat(审批模块): 新增支付方式和审批时间字段，优化退货和审核图片展示
2025-04-28 11:05:44 +08:00 · 2025-04-28 09:54:46 +08:00 · 2025-04-27 17:10:43 +08:00 · 2025-04-27 10:49:15 +08:00 · 2025-04-26 16:09:58 +08:00
9 changed files with 412 additions and 49 deletions
--- a/src/api/cabinet/cabinet-cell.ts
+++ b/src/api/cabinet/cabinet-cell.ts
@ -7,27 +7,48 @@ export interface CabinetCellQuery extends BasePageQuery {
 }

 export interface CabinetCellDTO {
+  /** 格口唯一ID */
  cellId?: number;
+  /** 关联柜机ID */
  cabinetId: number;
+  /** 格口号 */
  cellNo: number;
+  /** 针脚序号 */
  pinNo: number;
+  /** 格口类型（1小格 2中格 3大格 4超大格） */
  cellType: number;
+  /** 使用状态（1空闲 2已占用） */
  usageStatus: number;
+  /** 可用状态（1正常 2故障） */
  availableStatus: number;
+  /** 操作人 */
  operator?: string;
+  /** 关联商品ID */
  goodsId?: number;
+  /** 商品名称 */
  goodsName?: string;
+  /** 商品价格 */
  price?: number;
+  /** 商品封面图 */
  coverImg?: string;
+  /** 库存数量 */
  stock?: number;
+  /** 历史订单数量 */
+  orderCount?: number;
 }

 export interface AddCabinetCellCommand {
+  /** 关联柜机ID */
  cabinetId: number;
+  /** 格口号 */
  cellNo: number;
+  /** 针脚序号 */
  pinNo: number;
+  /** 格口类型（1小格 2中格 3大格 4超大格） */
  cellType: number;
+  /** 使用状态（1空闲 2已占用） */
  usageStatus: number;
+  /** 可用状态（1正常 2故障） */
  availableStatus: number;
 }

--- a/src/api/cabinet/cell-operation.ts
+++ b/src/api/cabinet/cell-operation.ts
@ -0,0 +1,78 @@
+import { http } from '@/utils/http';
+
+export interface SearchCabinetCellOperationQuery extends BasePageQuery {
+  /** 关联格口ID */
+  cellId?: number;
+  /** 关联商品ID */
+  goodsId?: number;
+  /** 操作类型（1: 用户操作 2: 管理员操作） */
+  operationType?: number;
+  /** 操作状态（1: 正常 2: 操作失败） */
+  status?: number;
+}
+
+export interface CabinetCellOperationDTO {
+  /** 操作流水号 */
+  operationId: number;
+  /** 关联格口ID */
+  cellId: number;
+  /** 关联商品ID */
+  goodsId: number;
+  /** 商品名称 */
+  goodsName: string;
+  /** 企业微信用户ID */
+  userid: string;
+  /** 是否内部用户（false: 否 true: 是） */
+  isInternal: boolean;
+  /** 成员名称 */
+  name: string;
+  /** 手机号码 */
+  mobile: string;
+  /** 操作类型（1: 用户操作 2: 管理员操作） */
+  operationType: number;
+  /** 操作状态（1: 正常 2: 操作失败） */
+  status: number;
+  /** 状态说明 */
+  statusDesc: string;
+  /** 操作人 */
+  operator: string;
+  /** 创建时间 */
+  createTimeStr: string;
+}
+
+export interface AddCabinetCellOperationCommand {
+  /** 关联格口ID */
+  cellId: number;
+  /** 关联商品ID */
+  goodsId: number;
+  /** 操作类型（1: 用户操作 2: 管理员操作） */
+  operationType: number;
+  /** 操作状态（1: 正常 2: 操作失败） */
+  status: number;
+}
+
+export interface UpdateCabinetCellOperationCommand extends AddCabinetCellOperationCommand {
+  operationId: number;
+}
+
+export const getCabinetCellOperationList = (params?: SearchCabinetCellOperationQuery) => {
+  return http.request<ResponseData<PageDTO<CabinetCellOperationDTO>>>('get', '/cabinet/cellOperations', {
+    params
+  });
+};
+
+export const addCabinetCellOperation = (data: AddCabinetCellOperationCommand) => {
+  return http.request<ResponseData<void>>('post', '/cabinet/cellOperations', {
+    data
+  });
+};
+
+export const updateCabinetCellOperation = (operationId: number, data: UpdateCabinetCellOperationCommand) => {
+  return http.request<ResponseData<void>>('put', `/cabinet/cellOperations/${operationId}`, {
+    data
+  });
+};
+
+export const deleteCabinetCellOperation = (ids: string) => {
+  return http.request<ResponseData<void>>('delete', `/cabinet/cellOperations/${ids}`);
+};
--- a/src/api/shop/approval.ts
+++ b/src/api/shop/approval.ts
@ -5,6 +5,13 @@ export interface SearchReturnApprovalQuery extends BasePageQuery {
  orderId?: number;
  goodsId?: number;
  status?: number;
+  approvalTime?: string;
+  /** 
+ * 支付方式
+ * @remarks 
+ * wechat-微信支付 | balance-余额支付
+ */
+  paymentMethod?: string;
 }

 /** 退货审批DTO */
@ -22,10 +29,10 @@ export interface ReturnApprovalDTO {
  goodsPrice: number;
  /** 退还金额 */
  returnAmount: number;
-  /** 归还图片路径数组 */
-  returnImages: string[];
-  /** 审核图片路径数组 */
-  auditImages: string[];
+  /** 归还图片路径（逗号分隔） */
+  returnImages: string;
+  /** 审核图片路径（逗号分隔） */
+  auditImages: string;
  /** 归还说明 */
  returnRemark?: string;
  /** 审核说明 */
@ -37,6 +44,17 @@ export interface ReturnApprovalDTO {
  createTime?: Date;
  updaterId?: number;
  updateTime?: Date;
+  approvalTime?: Date;
+  goodsName?: string;
+  coverImg?: string;
+  mobile?: string;
+  name?: string;
+  /**
+ * 支付方式
+ * @remarks 
+ * wechat-微信支付 | balance-余额支付
+ */
+  paymentMethod?: string;
 }

 export interface AddReturnApprovalCommand {
@ -46,8 +64,8 @@ export interface AddReturnApprovalCommand {
  goodsId: number;
  /** 归还数量 */
  returnQuantity: number;
-  /** 归还图片路径数组 */
-  returnImages: string[];
+  /** 归还图片路径（逗号分隔） */
+  returnImages: string;
  /** 归还说明 */
  returnRemark?: string;
 }
@ -57,8 +75,8 @@ export interface UpdateReturnApprovalCommand {
  approvalId: number;
  /** 归还数量 */
  returnQuantity: number;
-  /** 审核图片路径数组 */
-  auditImages: string[];
+  /** 审核图片路径（逗号分隔） */
+  auditImages: string;
  /** 审核说明 */
  auditRemark?: string;
  /** 审批状态(1待审核 2已通过 3已驳回) */
@ -69,10 +87,23 @@ export interface UpdateReturnApprovalCommand {
 export const getReturnApprovalListApi = (params?: SearchReturnApprovalQuery) => {
  return http.request<ResponseData<PageDTO<ReturnApprovalDTO>>>(
    'get',
-    '/shop/returnApproval',
-    { params }
+    '/shop/returnApproval', {
+    params: {
+      ...params,
+      approvalTime: params?.approvalTime ? params.approvalTime : undefined
+    }
+  }
  );
 };
+/** 批量导出订单 */
+export const exportReturnApprovalExcelApi = (params: SearchReturnApprovalQuery, fileName: string) => {
+  return http.download("/shop/returnApproval/excel", fileName, {
+    params: {
+      ...params,
+      approvalTime: params?.approvalTime ? params.approvalTime : undefined
+    }
+  });
+};

 /** 新增退货审批 */
 export const addReturnApprovalApi = (data: AddReturnApprovalCommand) => {
--- a/src/style/element-plus.scss
+++ b/src/style/element-plus.scss
@ -37,10 +37,15 @@
 }

 /* 重置 el-button 中 icon 的 margin */
-.reset-margin [class*="el-icon"] + span {
+.reset-margin [class*="el-icon"]+span {
  margin-left: 2px !important;
 }

+/* 移除所有相邻按钮的左侧间距 */
+.el-button+.el-button {
+  margin-left: 0 !important;
+}
+
 /* 自定义 popover 的类名 */
 .pure-popper {
  padding: 0 !important;
@ -93,6 +98,7 @@
 }

 .el-icon {
+
  &.el-dialog__close,
  &.el-drawer__close,
  &.el-message-box__close,
@ -168,4 +174,4 @@
    padding-bottom: 10px;
    box-shadow: 0 -1px 0 0 #e0e3e8, 0 -3px 6px 0 rgb(69 98 155 / 12%);
  }
-}
+}
--- a/src/views/cabinet/operation/index.vue
+++ b/src/views/cabinet/operation/index.vue
@ -0,0 +1,144 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import { PureTableBar } from "@/components/RePureTableBar";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
+import { getCabinetCellOperationList, type CabinetCellOperationDTO, type SearchCabinetCellOperationQuery } from "@/api/cabinet/cell-operation";
+import Search from "@iconify-icons/ep/search";
+import Refresh from "@iconify-icons/ep/refresh";
+import { useRoute } from 'vue-router'
+import { watch } from 'vue';
+
+defineOptions({
+  name: "CellOperation"
+});
+
+const formRef = ref();
+const tableRef = ref();
+
+const searchFormParams = ref<SearchCabinetCellOperationQuery>({
+  cellId: null,
+  goodsId: null,
+  operationType: null,
+  status: null
+});
+
+const pagination = ref({
+  pageSize: 10,
+  currentPage: 1,
+  total: 0
+});
+
+const loading = ref(false);
+const dataList = ref<CabinetCellOperationDTO[]>([]);
+
+const getList = async () => {
+  try {
+    loading.value = true;
+    const { data } = await getCabinetCellOperationList({
+      ...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();
+};
+
+const route = useRoute();
+
+watch(() => route.query.cellId,
+  (newVal) => {
+    searchFormParams.value.cellId = newVal ? Number(newVal) : null;
+    getList();
+  },
+  {
+    immediate: true
+  });
+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="格口ID：" prop="cellId">
+        <el-input v-model="searchFormParams.cellId" placeholder="请输入格口ID" clearable class="!w-[200px]" />
+      </el-form-item>
+      <el-form-item label="操作类型：" prop="operationType">
+        <el-select v-model="searchFormParams.operationType" placeholder="请选择类型" clearable class="!w-[180px]">
+          <el-option label="用户操作" :value="1" />
+          <el-option label="管理员操作" :value="2" />
+        </el-select>
+      </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-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="operationId" border>
+        <el-table-column label="操作ID" prop="operationId" width="120" />
+        <el-table-column label="操作人" prop="name" width="120" />
+        <el-table-column label="手机号" prop="mobile" width="120" />
+        <el-table-column label="商品名称" prop="goodsName" width="180" />
+        <el-table-column label="操作类型" prop="operationType" width="120">
+          <template #default="{ row }">
+            <el-tag :type="row.operationType === 1 ? 'success' : 'warning'">
+              {{ { 1: '用户', 2: '管理员' }[row.operationType] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作状态" prop="status" width="120">
+          <template #default="{ row }">
+            <el-tag :type="row.status === 1 ? 'success' : 'danger'">
+              {{ { 1: '正常', 2: '操作失败' }[row.status] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作时间" prop="createTimeStr" width="180" />
+      </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>
--- a/src/views/login/utils/rule.ts
+++ b/src/views/login/utils/rule.ts
@ -17,7 +17,7 @@ const loginRules = reactive<FormRules>({
      validator: (rule, value, callback) => {
        if (value === "") {
          callback(new Error("请输入密码"));
-        } else if (!REGEXP_PWD.test(value)) {
+        } else if (false && !REGEXP_PWD.test(value)) {
          callback(
            new Error("密码格式应为8-18位数字、字母、符号的任意两种组合")
          );
--- a/src/views/shop/approval/index.vue
+++ b/src/views/shop/approval/index.vue
@ -2,7 +2,7 @@
 import { ref } from "vue";
 import { PureTableBar } from "@/components/RePureTableBar";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import { getReturnApprovalListApi, deleteReturnApprovalApi, ReturnApprovalDTO } from "@/api/shop/approval";
+import { getReturnApprovalListApi, deleteReturnApprovalApi, exportReturnApprovalExcelApi, ReturnApprovalDTO, SearchReturnApprovalQuery } from "@/api/shop/approval";
 import Delete from "@iconify-icons/ep/delete";
 import Search from "@iconify-icons/ep/search";
 import Refresh from "@iconify-icons/ep/refresh";
@ -17,11 +17,13 @@ const formRef = ref();
 const tableRef = ref();

 // 搜索表单
-const searchFormParams = ref({
+const searchFormParams = ref<SearchReturnApprovalQuery>({
  approvalId: null,
  orderId: null,
  goodsId: null,
-  status: null
+  status: null,
+  approvalTime: null,
+  paymentMethod: null
 });

 // 分页参数
@ -32,6 +34,7 @@ const pagination = ref({
 });

 const loading = ref(false);
+const exportLoading = ref(false);
 const dataList = ref<ReturnApprovalDTO[]>([]);
 const multipleSelection = ref<number[]>([]);
 const detailVisible = ref(false);
@ -48,7 +51,8 @@ const getList = async () => {
    });
    dataList.value = data.rows.map(item => ({
      ...item,
-      statusStr: { 1: '待审核', 2: '已通过', 3: '已驳回' }[item.status]
+      statusStr: { 1: '待审核', 2: '已通过', 3: '已驳回' }[item.status],
+      auditImages: item.status === 2 ? item.auditImages : ''
    }));
    pagination.value.total = data.total;
  } finally {
@ -72,6 +76,26 @@ const resetForm = () => {
 const handlePaginationChange = () => getList();

 // 批量删除
+const handleExport = async () => {
+  try {
+    exportLoading.value = true;
+    const dateSuffix = searchFormParams.value.approvalTime
+      ? `_${searchFormParams.value.approvalTime.split(' ')[0].replace(/-/g, '')}`
+      : '';
+    const fileName = `退货审批列表${dateSuffix}.xlsx`;
+    await exportReturnApprovalExcelApi({
+      ...searchFormParams.value,
+      pageSize: pagination.value.pageSize,
+      pageNum: pagination.value.currentPage
+    }, fileName);
+    ElMessage.success('导出任务已开始，请稍后查看下载文件');
+  } catch (e) {
+    ElMessage.error('导出失败');
+  } finally {
+    exportLoading.value = false;
+  }
+};
+
 const handleBulkDelete = async () => {
  if (multipleSelection.value.length === 0) return;

@ -104,6 +128,10 @@ getList();
  <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.approvalTime" type="date" placeholder="选择审批时间"
+          value-format="YYYY-MM-DD HH:mm:ss" class="!w-[200px]" />
+      </el-form-item>
      <el-form-item label="审批ID：" prop="approvalId">
        <el-input v-model.number="searchFormParams.approvalId" placeholder="请输入审批ID" clearable class="!w-[180px]" />
      </el-form-item>
@ -120,6 +148,12 @@ getList();
          <el-option label="已驳回" :value="3" />
        </el-select>
      </el-form-item>
+      <el-form-item label="支付方式：" prop="paymentMethod">
+        <el-select v-model="searchFormParams.paymentMethod" placeholder="请选择支付方式" clearable class="!w-[180px]">
+          <el-option label="微信支付" value="wechat" />
+          <el-option label="余额支付" value="balance" />
+        </el-select>
+      </el-form-item>
      <el-form-item>
        <el-button type="primary" :icon="useRenderIcon(Search)" @click="onSearch">
          搜索
@ -127,6 +161,10 @@ getList();
        <el-button :icon="useRenderIcon(Refresh)" @click="resetForm">
          重置
        </el-button>
+        <el-button type="success" :loading="exportLoading" :icon="useRenderIcon('vscode-icons:file-type-excel2')"
+          @click="handleExport">
+          导出Excel
+        </el-button>
      </el-form-item>
    </el-form>

@ -139,11 +177,39 @@ getList();
      </template>
      <el-table ref="tableRef" v-loading="loading" :data="dataList" row-key="approvalId"
        @selection-change="rows => multipleSelection = rows.map(r => r.approvalId)" border>
-        <el-table-column type="selection" width="55" />
-        <el-table-column label="审批ID" prop="approvalId" width="120" />
-        <el-table-column label="订单ID" prop="orderId" width="120" />
-        <el-table-column label="商品ID" prop="goodsId" width="120" />
-        <el-table-column label="退货数量" prop="returnQuantity" width="100" />
+        <el-table-column label="审批ID" prop="approvalId" width="80" />
+        <el-table-column label="订单ID" prop="orderId" width="80" />
+        <el-table-column label="商品ID" prop="goodsId" width="80" />
+        <el-table-column label="用户姓名" prop="name" width="100" />
+        <el-table-column label="手机号" prop="mobile" width="120" />
+        <el-table-column label="商品名称" prop="goodsName" width="120" />
+        <el-table-column label="商品封面" width="120">
+          <template #default="{ row }">
+            <div v-if="row.coverImg" class="flex gap-2">
+              <el-image v-for="(img, index) in row.coverImg.split(',')" :key="index" :src="img"
+                :preview-src-list="row.coverImg.split(',')" :z-index="9999" :preview-teleported="true"
+                :hide-on-click-modal="true" fit="cover" class="rounded" width="40" height="40" />
+            </div>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品价格" prop="goodsPrice" width="90">
+          <template #default="{ row }">{{ row.goodsPrice }}元</template>
+        </el-table-column>
+        <el-table-column label="支付方式" prop="paymentMethod" width="100">
+          <template #default="{ row }">
+            {{ { wechat: '微信支付', balance: '余额支付' }[row.paymentMethod] || row.paymentMethod }}
+          </template>
+        </el-table-column>
+        <el-table-column label="退货数量" prop="returnQuantity" width="90" />
+        <el-table-column label="退款金额" prop="returnAmount" width="90">
+          <template #default="{ row }">{{ row.returnAmount }}元</template>
+        </el-table-column>
+        <el-table-column label="提交时间" prop="createTime" width="180">
+          <template #default="{ row }">
+            {{ row.createTime ? new Date(row.createTime).toLocaleString() : '-' }}
+          </template>
+        </el-table-column>
        <el-table-column label="状态" prop="status" width="100">
          <template #default="{ row }">
            <el-tag :type="{ 1: 'warning', 2: 'success', 3: 'danger' }[row.status]">
@ -151,19 +217,34 @@ getList();
            </el-tag>
          </template>
        </el-table-column>
+        <el-table-column label="审批时间" prop="approvalTime" width="180">
+          <template #default="{ row }">
+            {{ row.approvalTime ? new Date(row.approvalTime).toLocaleString() : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="退货图片" width="140">
+          <template #default="{ row }">
+            <div v-if="row.returnImages" class="flex gap-2">
+              <el-image v-for="(img, index) in row.returnImages.split(',')" :key="index" :src="img"
+                :preview-src-list="row.returnImages.split(',')" :z-index="9999" :preview-teleported="true"
+                :hide-on-click-modal="true" fit="cover" class="rounded" width="40" height="40" />
+            </div>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
        <el-table-column label="操作" width="120" fixed="right">
          <template #default="{ row }">
            <el-button type="primary" link :icon="useRenderIcon(View)" @click="showDetail(row)">
              详情
            </el-button>
-            <el-popconfirm :title="`确认删除审批记录#${row.approvalId}？`"
+            <!-- <el-popconfirm :title="`确认删除审批记录#${row.approvalId}？`"
              @confirm="() => deleteReturnApprovalApi([row.approvalId])">
              <template #reference>
                <el-button type="danger" link :icon="useRenderIcon(Delete)">
                  删除
                </el-button>
              </template>
-            </el-popconfirm>
+    </el-popconfirm> -->
          </template>
        </el-table-column>
      </el-table>
@ -175,22 +256,21 @@ getList();
    <!-- 详情弹窗 -->
    <el-dialog v-model="detailVisible" title="审批详情" width="50%">
      <el-descriptions :column="2" border>
-        <el-descriptions-item label="退货图片">
-          <div class="flex flex-wrap gap-2">
-            <el-image v-for="(img, index) in currentDetail?.returnImages" :key="index" :src="img"
-              :preview-src-list="currentDetail?.returnImages" :initial-index="index" fit="cover"
-              class="w-20 h-20 rounded" />
-          </div>
-        </el-descriptions-item>
-        <el-descriptions-item label="审核图片">
-          <div class="flex flex-wrap gap-2">
-            <el-image v-for="(img, index) in currentDetail?.auditImages" :key="index" :src="img"
-              :preview-src-list="currentDetail?.auditImages" :initial-index="index" fit="cover"
-              class="w-20 h-20 rounded" />
-          </div>
-        </el-descriptions-item>
        <el-descriptions-item label="退货说明">{{ currentDetail?.returnRemark || '无' }}</el-descriptions-item>
        <el-descriptions-item label="审核说明">{{ currentDetail?.auditRemark || '无' }}</el-descriptions-item>
+        <el-descriptions-item label="退货图片" :span="2">
+          <div class="flex flex-wrap gap-2">
+            <el-image v-for="(img, index) in currentDetail?.returnImages?.split(',')" :key="index" :src="img"
+              :preview-src-list="currentDetail?.returnImages?.split(',')" :initial-index="index" fit="cover"
+              class="w-20 h-20 rounded" />
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item label="审核图片" :span="2" v-if="currentDetail?.auditImages?.length">
+          <div class="flex flex-wrap gap-2">
+            <el-image v-for="(img, index) in currentDetail?.auditImages?.split(',')" :key="index" :src="img"
+              :preview-src-list="currentDetail?.auditImages?.split(',')" fit="cover" class="w-20 h-20 rounded" />
+          </div>
+        </el-descriptions-item>
      </el-descriptions>
    </el-dialog>
  </div>
--- 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, changeGoodsCellsStock, clearGoodsCells } from "@/api/cabinet/cabinet-cell";
+import { getCabinetCellList, deleteCabinetCell, CabinetCellDTO, changeGoodsCellsStock, clearGoodsCells, CabinetCellQuery } 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";
@ -24,7 +24,7 @@ const router = useRouter();
 const formRef = ref();
 const tableRef = ref();

-const searchFormParams = ref({
+const searchFormParams = ref<CabinetCellQuery>({
  cabinetId: null,
  cellNo: null,
  cellType: null
@ -37,7 +37,7 @@ const pagination = ref({
 });

 const loading = ref(false);
-const dataList = ref([]);
+const dataList = ref<CabinetCellDTO[]>([]);
 const multipleSelection = ref<number[]>([]);
 const currentRow = ref<CabinetCellDTO>();
 const configVisible = ref(false);
@ -275,17 +275,22 @@ const handleClearGoods = async (row: CabinetCellDTO) => {
          </el-table-column>
          <el-table-column label="价格" prop="price" width="80" />
          <el-table-column label="库存" prop="stock" width="80" />
-          <el-table-column label="单元格类型" prop="cellType">
+          <el-table-column label="单元格类型" prop="cellType" width="120">
            <template #default="{ row }">
              {{ switchCellType(row.cellType) }}
            </template>
          </el-table-column>
+          <el-table-column label="购买次数" prop="orderCount" width="100" />
          <el-table-column label="相关信息" width="150" fixed="right">
            <template #default="{ row }">
-              <el-button type="primary" link :icon="useRenderIcon('document')"
+              <el-button type="success" link :icon="useRenderIcon('document')"
                @click="router.push({ path: '/shop/order/index', query: { cellId: row.cellId } })">
                购买记录
              </el-button>
+              <el-button type="warning" link :icon="useRenderIcon('document')"
+                @click="router.push({ path: '/cabinet/operation/index', query: { cellId: row.cellId } })">
+                开启记录
+              </el-button>
            </template>
          </el-table-column>
          <el-table-column label="操作" width="150" fixed="right">
@ -315,7 +320,7 @@ const handleClearGoods = async (row: CabinetCellDTO) => {
  </div>
 </template>

-<style scoped>
+<style lang="scss" scoped>
 .flex {
  display: flex;
 }
--- a/src/views/system/role/utils/hook.tsx
+++ b/src/views/system/role/utils/hook.tsx
@ -94,10 +94,8 @@ export function useRole() {

  function onChange({ row, index }) {
    ElMessageBox.confirm(
-      `确认要<strong>${
-        row.status === 0 ? "停用" : "启用"
-      }</strong><strong style='color:var(--el-color-primary)'>${
-        row.roleName
+      `确认要<strong>${row.status === 0 ? "停用" : "启用"
+      }</strong><strong style='color:var(--el-color-primary)'>${row.roleName
      }</strong>吗?`,
      "系统提示",
      {
@ -176,7 +174,7 @@ export function useRole() {
    if (menuTree.value?.length) {
      return menuTree.value;
    }
-    const { data } = await getMenuListApi({ isButton: false });
+    const { data } = await getMenuListApi({ isButton: undefined });
    console.log("menu data", data);
    menuTree.value = toTree(data, "id", "parentId");
    return menuTree.value;
Author	SHA1	Message	Date
dzq	e0bdcaee0d	feat(审批): 添加退货审批列表导出功能并调整表格列宽在审批页面中增加了导出Excel的功能，允许用户导出退货审批列表。同时调整了表格列的宽度以改善显示效果。	2025-04-28 11:05:44 +08:00
dzq	b400da676d	feat(审批模块): 新增支付方式和审批时间字段，优化退货和审核图片展示在审批模块中新增了支付方式和审批时间字段，支持微信支付和余额支付两种支付方式。同时，将退货图片和审核图片的展示方式从数组改为逗号分隔的字符串，优化了图片的预览功能。此外，还新增了批量导出订单的功能，并调整了审批详情弹窗的布局。	2025-04-28 09:54:46 +08:00
dzq	e58ea7d14e	refactor(login): 禁用密码格式验证以提高用户体验 refactor(system/role): 简化角色状态变更提示信息并优化菜单列表查询条件在登录模块中，禁用了密码格式验证，以避免用户在输入密码时遇到不必要的限制。在系统角色模块中，简化了角色状态变更的提示信息，并优化了菜单列表的查询条件，使其更加灵活。	2025-04-27 17:10:43 +08:00
dzq	5643cbc145	refactor(views): 更新searchFormParams的类型为CabinetCellQuery 为了确保searchFormParams的类型与API定义一致，将其类型显式声明为CabinetCellQuery，提高代码的可维护性和类型安全性。	2025-04-27 10:49:15 +08:00
dzq	8c2265ccf1	feat: 添加格口操作记录功能并优化样式 - 新增格口操作记录页面及API接口，支持查看格口开启记录 - 在商品管理页面添加“开启记录”按钮，跳转至操作记录页面 - 优化按钮间距及样式，修复样式文件中多余的空行 - 为CabinetCellDTO接口添加orderCount字段，用于记录购买次数	2025-04-26 16:09:58 +08:00