diff --git a/src/api/shop/order.ts b/src/api/shop/order.ts
index 4b939f8..4eee8e7 100644
--- a/src/api/shop/order.ts
+++ b/src/api/shop/order.ts
@@ -3,6 +3,8 @@ import { http } from "@/utils/http";
 export interface OrderQuery extends BasePageQuery {
   /** 订单编号 */
   orderId?: number;
+  /** 柜机id */
+  cabinetId?: number;
   /** 格口id */
   cellId?: number;
   /** 
diff --git a/src/views/cabinet/operation/index.vue b/src/views/cabinet/operation/index.vue
index 65b6aff..05a7501 100644
--- a/src/views/cabinet/operation/index.vue
+++ b/src/views/cabinet/operation/index.vue
@@ -111,6 +111,7 @@ getList();
     <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="格口ID" prop="cellId" 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" />
diff --git a/src/views/cabinet/smart-cabinet/index.vue b/src/views/cabinet/smart-cabinet/index.vue
index 78d5847..14e4b70 100644
--- a/src/views/cabinet/smart-cabinet/index.vue
+++ b/src/views/cabinet/smart-cabinet/index.vue
@@ -199,8 +199,7 @@ getList();
             <el-button type="primary" link :icon="useRenderIcon(EditPen)" @click="handleEdit(row)">
               编辑
             </el-button>
-            <el-button type="warning" link :icon="useRenderIcon('fluent:cell-phone-arrow-right-20-regular')"
-              @click="goCellManagement(row)">
+            <el-button type="warning" link :icon="useRenderIcon(EditPen)" @click="goCellManagement(row)">
               格口
             </el-button>
             <el-button type="warning" link :icon="useRenderIcon('ant-design:gateway-outlined')"
diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index 44ad3fb..26d549b 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
-import { ref, watch } from "vue";
+import { ref, watch, onMounted } from "vue";
 import { PureTableBar } from "@/components/RePureTableBar";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { getOrderListApi, exportOrderExcelApi, type OrderDTO, OrderQuery } from "@/api/shop/order";
+import { allCabinets, SmartCabinetDTO } from "@/api/cabinet/smart-cabinet";
 import Search from "@iconify-icons/ep/search";
 import Refresh from "@iconify-icons/ep/refresh";
 import { ElMessage } from "element-plus";
@@ -15,8 +16,10 @@ const route = useRoute();
 
 const formRef = ref();
 const tableRef = ref();
+const cabinets = ref<SmartCabinetDTO[]>([]);
 
 const searchFormParams = ref<OrderQuery>({
+  cabinetId: null,
   orderId: null,
   cellId: null,
   status: null,
@@ -36,6 +39,15 @@ const pagination = ref({
 const loading = ref(false);
 const dataList = ref<OrderDTO[]>([]);
 
+onMounted(async () => {
+  const { data } = await allCabinets();
+  cabinets.value = data;
+  if (data.length > 0) {
+    searchFormParams.value.cabinetId = data[0].cabinetId;
+    getList();
+  }
+});
+
 const getList = async () => {
   try {
     loading.value = true;
@@ -107,125 +119,138 @@ 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="时间范围：">
+  <div class="main flex">
+    <!-- 左侧柜机列表 -->
+    <div class="w-[200px] mr-4 bg-white rounded shadow p-4">
+      <div class="text-lg font-bold mb-4">柜机列表</div>
+      <div class="space-y-2">
+        <div v-for="cabinet in cabinets" :key="cabinet.cabinetId" class="p-2 rounded cursor-pointer hover:bg-gray-100"
+          :class="{ 'bg-blue-50': searchFormParams.cabinetId === cabinet.cabinetId }"
+          @click="searchFormParams.cabinetId = cabinet.cabinetId; onSearch()">
+          {{ cabinet.cabinetName }}
+        </div>
+      </div>
+    </div>
+    <div class="flex-1">
+      <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="date" 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="date" placeholder="结束时间"
           value-format="YYYY-MM-DD HH:mm:ss" class="!w-[200px]" />
       </el-form-item> -->
-      <el-form-item label="支付日期：">
-        <el-date-picker v-model="searchFormParams.payTime" type="date" placeholder="支付时间"
-          value-format="YYYY-MM-DD HH:mm:ss" class="!w-[200px]" />
-      </el-form-item>
-      <el-form-item label="订单编号：" prop="orderId">
-        <el-input v-model="searchFormParams.orderId" placeholder="请输入订单编号" clearable class="!w-[200px]" />
-      </el-form-item>
-      <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="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 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">
-          搜索
-        </el-button>
-        <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>
+        <el-form-item label="支付日期：">
+          <el-date-picker v-model="searchFormParams.payTime" type="date" placeholder="支付时间"
+            value-format="YYYY-MM-DD HH:mm:ss" class="!w-[200px]" />
+        </el-form-item>
+        <el-form-item label="订单编号：" prop="orderId">
+          <el-input v-model="searchFormParams.orderId" placeholder="请输入订单编号" clearable class="!w-[200px]" />
+        </el-form-item>
+        <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="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 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">
+            搜索
+          </el-button>
+          <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>
 
-    <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="商品名称" prop="goodsNames" width="180">
-          <template #default="{ row }">
-            <span v-if="row.goodsNames">
-              {{ row.goodsNames.split(',').join(', ') }}
-            </span>
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品封面" prop="coverImgs" width="100">
-          <template #default="{ row }">
-            <div v-if="row.coverImgs" class="flex gap-2">
-              <el-image v-for="(img, index) in row.coverImgs.split(',')" :key="index" :src="img"
-                :preview-src-list="row.coverImgs.split(',')" :z-index="9999" :preview-teleported="true"
-                :hide-on-click-modal="true" fit="cover" class="rounded" width="60" height="60" />
-            </div>
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
-        <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">
-          <template #default="{ row }">
-            {{ { wechat: '微信支付', balance: '余额支付' }[row.paymentMethod] || row.paymentMethod }}
-          </template>
-        </el-table-column>
-        <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">
+      <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="商品名称" prop="goodsNames" width="180">
+            <template #default="{ row }">
+              <span v-if="row.goodsNames">
+                {{ row.goodsNames.split(',').join(', ') }}
+              </span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品封面" prop="coverImgs" width="100">
+            <template #default="{ row }">
+              <div v-if="row.coverImgs" class="flex gap-2">
+                <el-image v-for="(img, index) in row.coverImgs.split(',')" :key="index" :src="img"
+                  :preview-src-list="row.coverImgs.split(',')" :z-index="9999" :preview-teleported="true"
+                  :hide-on-click-modal="true" fit="cover" class="rounded" width="60" height="60" />
+              </div>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <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">
+            <template #default="{ row }">
+              {{ { wechat: '微信支付', balance: '余额支付' }[row.paymentMethod] || row.paymentMethod }}
+            </template>
+          </el-table-column>
+          <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="[5, 10, 20, 50]" layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
-        @size-change="onSizeChange" @current-change="onCurrentChange" />
-    </PureTableBar>
+        </el-table>
+        <el-pagination v-model:current-page="pagination.currentPage" v-model:page-size="pagination.pageSize"
+          :page-sizes="[5, 10, 20, 50]" layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
+          @size-change="onSizeChange" @current-change="onCurrentChange" />
+      </PureTableBar>
+    </div>
   </div>
 </template>