From 372a1b35ec2c0b59208255e0f1d7998eb54a81d5 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 27 Mar 2026 09:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96=E6=8D=A2?=
 =?UTF-8?q?=E6=A1=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/carts.ts                    |  12 +-
 src/utils/websocket.ts                        |  29 ++--
 .../tool/Instead/components/carts/list.vue    |   2 +-
 .../Instead/components/popup-rottable.vue     |  19 ++-
 src/views/tool/Instead/index.vue              | 129 ++++--------------
 5 files changed, 68 insertions(+), 123 deletions(-)

diff --git a/src/store/modules/carts.ts b/src/store/modules/carts.ts
index b7ec6cc..d820769 100644
--- a/src/store/modules/carts.ts
+++ b/src/store/modules/carts.ts
@@ -670,11 +670,13 @@ export const useCartsStore = defineStore("carts", () => {
   }
 
   function rotTable(newVal: string | number, cart_id = []) {
-    sendMessage('rottable', {
-      new_table_code: newVal,
-      table_code: table_code.value,
-      cart_id
-    });
+    if (cart_id.length) {
+      sendMessage('rottable', {
+        new_table_code: newVal,
+        table_code: table_code.value,
+        cart_id
+      });
+    }
   }
 
   function del(data: any) {
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index 408ee57..c5158f4 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -3,6 +3,7 @@ import { useUserStoreHook } from "@/store";
 import { ElMessage, ElMessageBox } from "element-plus";
 
 const user = useUserStoreHook();
+let isTips = false
 
 export interface ApifoxModel {
   account: string;
@@ -143,6 +144,7 @@ class WebSocketManager {
       this.autoConnect = false;
     }
   }
+
   // 自动重连机制
   private reconnect() {
     if (!this.autoConnect) {
@@ -156,19 +158,24 @@ class WebSocketManager {
       }, this.reconnectDelay);
     } else {
       clearTimeout(this.reconnectTimer);
-      console.error("达到最大重连次数，停止重连");
-      ElMessageBox.confirm('达到最大重连次数' + this.maxReconnectAttempts + '次，已停止重连,是否立即重连？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      // window.location.reload();
+      // console.error("达到最大重连次数，停止重连");
+      if (!isTips) {
+        ElMessageBox.confirm('达到最大重连次数' + this.maxReconnectAttempts + '次，已停止重连,是否立即重连？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
 
-        callback: (action: string) => {
-          console.log(action);
-          if (action == 'confirm') {
-            this.setupWebSocket();
-            this.reconnectAttempts = 0;
+          callback: (action: string) => {
+            console.log(action);
+            if (action == 'confirm') {
+              isTips = false
+              this.setupWebSocket();
+              this.reconnectAttempts = 0;
+            }
           }
-        }
-      });
+        });
+      }
+      isTips = true
     }
   }
 
diff --git a/src/views/tool/Instead/components/carts/list.vue b/src/views/tool/Instead/components/carts/list.vue
index 041c37d..f04bb43 100644
--- a/src/views/tool/Instead/components/carts/list.vue
+++ b/src/views/tool/Instead/components/carts/list.vue
@@ -27,7 +27,7 @@
         <extra-fee name="餐位费" :number="perpole" :price="canWeiFee"></extra-fee>
       </template>
       <!-- 历史订单 -->
-      <div class="u-flex u-row-between u-m-b-10" v-if="carts.oldOrder.id">
+      <div class="u-flex u-row-between u-m-b-10" v-if="carts.oldOrder.id && !isEmptyObject(carts.oldOrder.detailMap)">
         <span class="u-font-14">历史订单</span>
         <el-button link size="small" type="danger" @click="clearOldOrder()">清空</el-button>
       </div>
diff --git a/src/views/tool/Instead/components/popup-rottable.vue b/src/views/tool/Instead/components/popup-rottable.vue
index 8a2a1c9..30ddab4 100644
--- a/src/views/tool/Instead/components/popup-rottable.vue
+++ b/src/views/tool/Instead/components/popup-rottable.vue
@@ -3,12 +3,7 @@
     <el-form :rules="rules" ref="refForm" :model="form">
       <el-form-item label="转桌到" prop="targetTableCode">
         <el-select v-model="form.targetTableCode" placeholder="请选择转桌到" style="width: 200px">
-          <el-option
-            v-for="item in tableList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.tableCode"
-          ></el-option>
+          <el-option v-for="item in tableList" :key="item.id" :label="item.name" :value="item.tableCode"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="转入类型">
@@ -59,6 +54,7 @@ const basicForm = {
   targetOrderId: "",
   targetTableCode: "",
   detailIds: [],
+  allMerge: 0 // 是否全部转台
 };
 const form = reactive({
   ...basicForm,
@@ -120,6 +116,17 @@ function confirm() {
           type: "error",
         });
       }
+
+      if (rottableType.value == 1) {
+        form.allMerge = 1;
+      } else {
+        console.log('oldCartGoods.value===', oldCartGoods.value);
+        const orderCount = Object.values(oldCartGoods.value).reduce((sum, arr) => {
+          return sum + arr.length
+        }, 0)
+        form.allMerge = orderCount == detailIds.length ? 1 : 0
+      }
+
       emits(
         "confirm",
         {
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 362e315..ef3338e 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1,9 +1,5 @@
 <template>
-  <div
-    class="box"
-    v-loading="!carts.isLinkFinshed"
-    element-loading-text="购物车连接初始化中，请稍等……"
-  >
+  <div class="box" v-loading="!carts.isLinkFinshed" element-loading-text="购物车连接初始化中，请稍等……">
     <div class="content">
       <div class="top">
         <div class="left u-flex u-col-center">
@@ -13,12 +9,8 @@
               <el-button type="primary" v-if="!carts.vipUser.id">选择用户</el-button>
 
               <div v-else class="flex cur-pointer">
-                <img
-                  v-if="carts.vipUser.headImg && carts.vipUser.headImg != 'null'"
-                  class="headimg"
-                  :src="carts.vipUser.headImg"
-                  alt=""
-                />
+                <img v-if="carts.vipUser.headImg && carts.vipUser.headImg != 'null'" class="headimg"
+                  :src="carts.vipUser.headImg" alt="" />
                 <div v-else class="headimg flex flex-x-y-center">
                   <i class="el-icon-user"></i>
                 </div>
@@ -36,19 +28,11 @@
               </div>
             </div>
             <el-popover placement="right" width="333" trigger="click" ref="refTable">
-              <el-input
-                placeholder="请输入内容"
-                prefix-icon="search"
-                v-model="tableSearchText"
-                @input="tablesearchInput"
-              ></el-input>
+              <el-input placeholder="请输入内容" prefix-icon="search" v-model="tableSearchText"
+                @input="tablesearchInput"></el-input>
               <div style="max-height: 398px; overflow-y: scroll" class="u-m-t-12">
-                <div
-                  class="u-flex u-row-between u-p-t-8 table-item u-p-b-8 u-p-r-30"
-                  v-for="(item, index) in tableList"
-                  :key="index"
-                  @click="tableClick(item, index)"
-                >
+                <div class="u-flex u-row-between u-p-t-8 table-item u-p-b-8 u-p-r-30" v-for="(item, index) in tableList"
+                  :key="index" @click="tableClick(item, index)">
                   <span>{{ item.name }}</span>
                   <span :style="{ color: returnTableColor(item.status) }">
                     {{ returnTableLabel(item.status) }}
@@ -68,12 +52,7 @@
           </div>
         </div>
         <div class="right">
-          <el-input
-            placeholder="请输入商品名称"
-            v-model="goods.query.name"
-            clearable
-            @change="getGoods"
-          >
+          <el-input placeholder="请输入商品名称" v-model="goods.query.name" clearable @change="getGoods">
             <template #suffix>
               <el-icon class="el-input__icon">
                 <search />
@@ -87,24 +66,16 @@
           <div class="diners">
             <!-- 就餐类型 -->
             <el-button-group v-model="diners.sel" style="width: 100%; display: flex">
-              <el-button
-                :class="{ active: index == diners.sel }"
-                v-for="(item, index) in diners.list"
-                :disabled="dinerDisabled(item, index)"
-                @click="changeDinersSel(index)"
-                :key="index"
-              >
+              <el-button :class="{ active: index == diners.sel }" v-for="(item, index) in diners.list"
+                :disabled="dinerDisabled(item, index)" @click="changeDinersSel(index)" :key="index">
                 {{ item.label }}
               </el-button>
             </el-button-group>
           </div>
 
           <div class="u-flex u-font-14 clear u-m-t-10 perpoles">
-            <div
-              @click="showDinerNumber"
-              class="u-flex u-p-r-14 u-m-r-14"
-              style="border-right: 1px solid #ebebeb; line-height: 1"
-            >
+            <div @click="showDinerNumber" class="u-flex u-p-r-14 u-m-r-14"
+              style="border-right: 1px solid #ebebeb; line-height: 1">
               <span>就餐人数：{{ perpole || "-" }} 位</span>
               <el-icon>
                 <ArrowRight />
@@ -115,39 +86,19 @@
             </el-button>
           </div>
           <!-- 购物车 -->
-          <cartsList
-            @editNote="showNote(true)"
-            @createOrder="createOrder"
-            @hideOrder="hideOrder"
-            @clearOldOrder="clearOldOrder"
-            :showOrder="showOrder"
-            :goodsList="carts.goods"
-            :dinerType="diners.sel"
-            :perpole="perpole"
-            :remark="remark"
-            :table="carts.tableInfo"
-            ref="refCart"
-          ></cartsList>
+          <cartsList @editNote="showNote(true)" @createOrder="createOrder" @hideOrder="hideOrder"
+            @clearOldOrder="clearOldOrder" :showOrder="showOrder" :goodsList="carts.goods" :dinerType="diners.sel"
+            :perpole="perpole" :remark="remark" :table="carts.tableInfo" ref="refCart"></cartsList>
         </div>
         <div class="center">
           <!-- 购物车控制操作按钮 -->
-          <Controls
-            @noteClick="showNote"
-            @packClick="showPack"
-            @changePriceClick="showChangePrice"
-            @return="refReturnCartShow"
-            @rottable="rottableShow"
-            @changeCartNumberShow="refChangeNumberShow"
-          />
+          <Controls @noteClick="showNote" @packClick="showPack" @changePriceClick="showChangePrice"
+            @return="refReturnCartShow" @rottable="rottableShow" @changeCartNumberShow="refChangeNumberShow" />
         </div>
         <div class="right">
           <template v-if="!showOrder">
             <div class="flex categoty u-col-center">
-              <div
-                class="show_more_btn"
-                :class="{ showAll: category.showAll }"
-                @click="toggleShowAll"
-              >
+              <div class="show_more_btn" :class="{ showAll: category.showAll }" @click="toggleShowAll">
                 <div class="flex">
                   <div class="flex showmore">
                     <el-icon color="#fff">
@@ -158,16 +109,8 @@
                 </div>
               </div>
               <div class="flex categorys" :class="{ 'flex-wrap': category.showAll }">
-                <div
-                  v-for="(item, index) in category.list"
-                  :key="index"
-                  @click="changeCategoryId(item)"
-                >
-                  <el-tag
-                    size="large"
-                    :type="goods.query.categoryId === item.id ? 'primary' : 'info'"
-                    effect="dark"
-                  >
+                <div v-for="(item, index) in category.list" :key="index" @click="changeCategoryId(item)">
+                  <el-tag size="large" :type="goods.query.categoryId === item.id ? 'primary' : 'info'" effect="dark">
                     {{ item.name }}
                   </el-tag>
                 </div>
@@ -181,25 +124,13 @@
                 </el-icon>
                 <div class="u-m-t-10">临时菜</div>
               </div>
-              <GoodsItem
-                :item="item"
-                @itemClick="goodsClick(item)"
-                v-for="item in carts.goods"
-                :key="item.id"
-              ></GoodsItem>
+              <GoodsItem :item="item" @itemClick="goodsClick(item)" v-for="item in carts.goods" :key="item.id">
+              </GoodsItem>
             </div>
           </template>
           <!-- 订单信息展示 -->
-          <Order
-            ref="refOrder"
-            :orderInfo="carts.oldOrder"
-            @chooseUser="showChooseUser"
-            @paysuccess="refresh"
-            :table="carts.tableInfo"
-            :perpole="perpole"
-            v-else
-            :user="user"
-          ></Order>
+          <Order ref="refOrder" :orderInfo="carts.oldOrder" @chooseUser="showChooseUser" @paysuccess="refresh"
+            :table="carts.tableInfo" :perpole="perpole" v-else :user="user"></Order>
         </div>
       </div>
     </div>
@@ -214,11 +145,7 @@
     <!-- 临时菜 -->
     <addLingShiCai ref="refAddLingShiCai" @confirm="addLingShiCaiConfirm"></addLingShiCai>
     <!-- 改价 -->
-    <changePrice
-      ref="refChangePrice"
-      :useVipPrice="carts.useVipPrice"
-      @confirm="changePriceConfirm"
-    ></changePrice>
+    <changePrice ref="refChangePrice" :useVipPrice="carts.useVipPrice" @confirm="changePriceConfirm"></changePrice>
     <!-- 称重商品 -->
     <change-weight ref="refChangeWeight" @confirm="changeWeightConfirm"></change-weight>
     <!-- 可选套餐 -->
@@ -291,7 +218,9 @@ function rottableShow() {
 }
 async function rottableConfirm(form, cart_id) {
   carts.rotTable(form.targetTableCode, cart_id);
-  const res = await orderApi.mergeOrder(form);
+  if (form.detailIds.length) {
+    await orderApi.mergeOrder(form);
+  }
   ElNotification({
     title: "成功",
     message: "合并成功",
@@ -589,7 +518,7 @@ async function getTableDetail(params) {
   const res = await tableApi.get(params);
   return res;
 }
-function tablesearchInput() {}
+function tablesearchInput() { }
 //返回桌台状态颜色
 function returnTableColor(key) {
   const item = $status[key];