1.订单重复打印问题

2.订单增加时间筛选
3.订单增加桌号展示

src/store/socket.js

@@ -41,7 +41,7 @@ export const useSocket = defineStore({
       function () {
         if (this.ws.readyState == ReconnectingWebSocket.OPEN) return;
         this.ws.reconnect();
-        console.log("11111");
+        // console.log("11111");
       },
       2000,
       { leading: true, trailing: false }
@@ -94,7 +94,7 @@ export const useSocket = defineStore({
           // printBill(data)
           // 打印标签小票
           if (!this.orderList.some((el) => el == data.orderInfo.orderNo)) {
-            console.log("打印", data);
+            // console.log("打印", data);
             printStore.labelPrint(data);
             this.orderList.push(data.orderInfo.orderNo);
             if (this.orderList.length > 30) {

src/views/order/components/add.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="demo_tabs_box">
+    <div class="demo_tabs_box" v-loading="props.loading">
         <div class="demo_tabs_boxitem" v-for="(item, index) in ordereData.list" :key="index"
             @click="clickitemboxshow(item)">
             <!-- <div class="demo_tabs_boxitem_oneyt" v-if="item.status == 'refund'  && item.orderType == 'return'">已退款</div> -->
@@ -53,6 +53,10 @@ const props = defineProps({
                 names: []
             }]
         }
+    },
+    loading: {
+        type: Boolean,
+        default: false
     }
 })
 const emit = defineEmits(["emititemboxshow"])

src/views/order/index.vue

@@ -9,32 +9,34 @@
             <!-- <el-button style="margin-left: 10px;" type="primary" @click="onSubmit">搜索</el-button> -->
             <dateRange @success="dateConfirm" />
           </div>
-          <add :loading="loadingboxshow" :ordereData="ordereData" @emititemboxshow="emititemboxshow"
+          <add :loading="ordereData.loading" :ordereData="ordereData" @emititemboxshow="emititemboxshow"
             v-if="ordereData.list.length">
           </add>
           <div v-else style="width: 100%; text-align: center; margin: 30px 0">
             暂无数据
           </div>
-          <el-pagination v-if="ordereData.list.length" layout="prev, pager, next, jumper" style="margin-top: 20px"
-            :total="Number(ordereData.total)" @current-change="handleCurrentChange" />
+          <el-pagination background v-if="ordereData.list.length" layout="prev, pager, next"
+            style="margin-top: 20px" :total="Number(ordereData.total)" @current-change="handleCurrentChange" />
         </el-tab-pane>
         <el-tab-pane label="销售" name="closed">
-          <add :ordereData="ordereData" @emititemboxshow="emititemboxshow" v-if="ordereData.list.length">
+          <add :loading="ordereData.loading" :ordereData="ordereData" @emititemboxshow="emititemboxshow"
+            v-if="ordereData.list.length">
           </add>
           <div v-else style="width: 100%; text-align: center; margin: 30px 0">
             暂无数据
           </div>
-          <el-pagination v-if="ordereData.list.length" layout="prev, pager, next, jumper" style="margin-top: 20px"
-            :total="Number(ordereData.total)" @current-change="handleCurrentChange" />
+          <el-pagination v-if="ordereData.list.length" background layout="prev, pager, next"
+            style="margin-top: 20px" :total="Number(ordereData.total)" @current-change="handleCurrentChange" />
         </el-tab-pane>
         <el-tab-pane label="退单" name="refund">
-          <add :ordereData="ordereData" @emititemboxshow="emititemboxshow" v-if="ordereData.list.length">
+          <add :loading="ordereData.loading" :ordereData="ordereData" @emititemboxshow="emititemboxshow"
+            v-if="ordereData.list.length">
           </add>
           <div v-else style="width: 100%; text-align: center; margin: 30px 0">
             暂无数据
           </div>
-          <el-pagination v-if="ordereData.list.length" layout="prev, pager, next, jumper" style="margin-top: 20px"
-            :total="Number(ordereData.total)" @current-change="handleCurrentChange" />
+          <el-pagination v-if="ordereData.list.length" background layout="prev, pager, next"
+            style="margin-top: 20px" :total="Number(ordereData.total)" @current-change="handleCurrentChange" />
         </el-tab-pane>
         <el-tab-pane label="快捷收银" name="cash">
           <cashTable />
@@ -303,6 +305,7 @@ const reforderboxrightbuttonheight = ref(null); //获取元素高度
 const handleClick = (Name) => {
   //切换teb
   ordereData.status = Name.props.name;
+  ordereData.page = 1
   asyncorderfindOrder();
 };
 
@@ -543,11 +546,13 @@ const ordereData = reactive({
   total: "",
   orderNo: "",
   startTime: '',
-  endTime: ''
+  endTime: '',
+  loading: false
 });
 const asyncorderfindOrder = async () => {
   //获取流水
   try {
+    ordereData.loading = true
     let res = await orderfindOrder({
       shopId: store.userInfo.shopId,
       status: ordereData.status,
@@ -557,6 +562,7 @@ const asyncorderfindOrder = async () => {
       startTime: ordereData.startTime,
       endTime: ordereData.endTime
     });
+    ordereData.loading = false
     ordereData.total = res.total;
     ordereData.list = res.list;
   } catch (error) {