1.订单重复打印问题

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

.env.development

@@ -3,10 +3,10 @@ ENV = development
 
 
 # 正式ws
-# VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client'
+VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client'
 
 #测试ws
-VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client'
+# VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client'
 
 # 阿伟本地ws
 # VITE_API_WSS = 'ws://192.168.2.17:9998/client'
@@ -25,7 +25,7 @@ VITE_API_PHP_URL = 'http://czgdoumei.sxczgkj.com/index.php/api'
 # VITE_API_URL = 'http://192.168.2.41:10589/cashier-client'
 
 # 测试
-VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
+# VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
 
 # 正式
-# VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client'
+VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client'

.env.production

@@ -2,10 +2,10 @@
 ENV = production
 
 # 正式ws
-# VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client'
+VITE_API_WSS = 'wss://cashier.sxczgkj.cn/client'
 
 #测试ws
-VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client'
+# VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client'
 
 # 测试 php
 # VITE_API_PHP_URL = 'http://192.168.2.33:1666/index.php/api'
@@ -14,7 +14,7 @@ VITE_API_WSS = 'wss://wxcashiertest.sxczgkj.cn/client'
 VITE_API_PHP_URL = 'http://czgdoumei.sxczgkj.com/index.php/api'
 
 # 测试
-VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
+# VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client'
 
 # 线上环境接口地址
-# VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/'
+VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client/'

dist-electron/main.js

@@ -1,201 +1 @@
-"use strict";
+"use strict";const o=require("path"),e=require("electron"),p=require("os");let i;e.app.whenReady().then(()=>{i=new e.BrowserWindow({title:"银收客",width:1024,height:768,fullscreenable:!0,fullscreen:!process.env.VITE_DEV_SERVER_URL,simpleFullscreen:!0,frame:!!process.env.VITE_DEV_SERVER_URL,webPreferences:{nodeIntegration:!0,contextIsolation:!1}}),process.env.VITE_DEV_SERVER_URL?i.loadURL(process.env.VITE_DEV_SERVER_URL):i.loadFile(o.resolve(__dirname,"../dist/index.html")),e.app.on("activate",()=>{e.BrowserWindow.getAllWindows().length===0&&createWindow()}),e.ipcMain.on("quitHandler",(n,t)=>{i=null,e.app.exit()}),e.ipcMain.on("getPrintList",()=>{i.webContents.getPrintersAsync().then(n=>{i.webContents.send("printList",n)})}),e.ipcMain.on("getOSmacSync",()=>{let n="";p.networkInterfaces().WLAN?(n=p.networkInterfaces().WLAN[0].mac,console.log("wlan.mac===",n)):(n=p.networkInterfaces().以太网[0].mac,console.log("以太网.mac===",n)),i.webContents.send("getOSmacRes",n)});const r=new e.BrowserWindow({show:!1,width:464,height:1726,webPreferences:{nodeIntegration:!0,contextIsolation:!1}});process.env.VITE_DEV_SERVER_URL?r.loadFile(o.join(__dirname,"../public/print.html")):r.loadFile(o.resolve(__dirname,"../dist/print.html")),e.ipcMain.on("printerInfoSync",(n,t)=>{r.webContents.send("getParams",t)}),e.ipcMain.on("printStart",(n,t)=>{console.log(t);let a=JSON.parse(t).deviceName;r.webContents.print({silent:!0,deviceName:a,pageSize:{width:58e3,height:216e3},scaleFactor:80,landscape:!1,margins:{marginType:"none",top:0,bottom:0,left:0,right:0},dpi:{horizontal:203,vertical:203}})});const s=new e.BrowserWindow({show:!1,width:464,height:1726,webPreferences:{nodeIntegration:!0,contextIsolation:!1}});process.env.VITE_DEV_SERVER_URL?s.loadFile(o.join(__dirname,"../public/work_print.html")):s.loadFile(o.resolve(__dirname,"../dist/work_print.html")),e.ipcMain.on("printerWorkSync",(n,t)=>{s.webContents.send("getParams",t)}),e.ipcMain.on("printWorkStart",(n,t)=>{let a=JSON.parse(t).deviceName;s.webContents.print({silent:!0,deviceName:a,pageSize:{width:58e3,height:216e3},scaleFactor:80,landscape:!1,margins:{marginType:"none",top:0,bottom:0,left:0,right:0},dpi:{horizontal:203,vertical:203}})});const l=new e.BrowserWindow({show:!1,width:360,height:240,webPreferences:{nodeIntegration:!0,contextIsolation:!1}});process.env.VITE_DEV_SERVER_URL?l.loadFile(o.join(__dirname,"../public/tag_print.html")):l.loadFile(o.resolve(__dirname,"../dist/tag_print.html")),e.ipcMain.on("printerTagSync",(n,t)=>{console.log(t),l.webContents.send("getParams",t)}),e.ipcMain.on("printTagStart",(n,t)=>{let a=JSON.parse(t).deviceName;l.webContents.print({silent:!0,deviceName:a,pageSize:{width:45e3,height:3e4},scaleFactor:80,landscape:!1,margins:{marginType:"none",top:0,bottom:0,left:0,right:0},dpi:{horizontal:203,vertical:203}})}),e.app.requestSingleInstanceLock()?e.app.on("second-instance",(n,t,c)=>{i&&(i.isMinimized()&&i.restore(),i.focus(),i.show())}):e.app.quit(),i.on("close",n=>{n.preventDefault(),i.webContents.send("showCloseDialog")})});e.app.on("window-all-closed",()=>{process.platform!=="darwin"&&e.app.quit()});
-const path = require("path");
-const electron = require("electron");
-const os = require("os");
-let win;
-electron.app.whenReady().then(() => {
-  win = new electron.BrowserWindow({
-    title: "银收客",
-    width: 1024,
-    height: 768,
-    fullscreenable: true,
-    fullscreen: process.env.VITE_DEV_SERVER_URL ? false : true,
-    simpleFullscreen: true,
-    frame: process.env.VITE_DEV_SERVER_URL ? true : false,
-    webPreferences: {
-      // 集成网页和 Node.js，也就是在渲染进程中，可以调用 Node.js 方法
-      nodeIntegration: true,
-      contextIsolation: false
-    }
-  });
-  if (process.env.VITE_DEV_SERVER_URL) {
-    win.loadURL(process.env.VITE_DEV_SERVER_URL);
-  } else {
-    win.loadFile(path.resolve(__dirname, "../dist/index.html"));
-  }
-  electron.app.on("activate", () => {
-    if (electron.BrowserWindow.getAllWindows().length === 0) {
-      createWindow();
-    }
-  });
-  electron.ipcMain.on("quitHandler", (_, msg) => {
-    win = null;
-    electron.app.exit();
-  });
-  electron.ipcMain.on("getPrintList", () => {
-    win.webContents.getPrintersAsync().then((res) => {
-      win.webContents.send("printList", res);
-    });
-  });
-  electron.ipcMain.on("getOSmacSync", () => {
-    let mac = "";
-    if (os.networkInterfaces().WLAN) {
-      mac = os.networkInterfaces().WLAN[0].mac;
-      console.log("wlan.mac===", mac);
-    } else {
-      mac = os.networkInterfaces()["以太网"][0].mac;
-      console.log("以太网.mac===", mac);
-    }
-    win.webContents.send("getOSmacRes", mac);
-  });
-  const printWin = new electron.BrowserWindow({
-    show: false,
-    width: 464,
-    height: 1726,
-    webPreferences: {
-      // 集成网页和 Node.js，也就是在渲染进程中，可以调用 Node.js 方法
-      nodeIntegration: true,
-      contextIsolation: false
-    }
-  });
-  if (process.env.VITE_DEV_SERVER_URL) {
-    printWin.loadFile(path.join(__dirname, "../public/print.html"));
-  } else {
-    printWin.loadFile(path.resolve(__dirname, "../dist/print.html"));
-  }
-  electron.ipcMain.on("printerInfoSync", (event, arg) => {
-    printWin.webContents.send("getParams", arg);
-  });
-  electron.ipcMain.on("printStart", (event, arg) => {
-    console.log(arg);
-    const _parmas = JSON.parse(arg);
-    let name = _parmas.deviceName;
-    printWin.webContents.print({
-      silent: true,
-      deviceName: name,
-      pageSize: {
-        width: 58e3,
-        height: 216e3
-      },
-      scaleFactor: 80,
-      landscape: false,
-      margins: {
-        marginType: "none",
-        top: 0,
-        bottom: 0,
-        left: 0,
-        right: 0
-      },
-      dpi: {
-        horizontal: 203,
-        vertical: 203
-      }
-    });
-  });
-  const workPrintWin = new electron.BrowserWindow({
-    show: false,
-    width: 464,
-    height: 1726,
-    webPreferences: {
-      nodeIntegration: true,
-      contextIsolation: false
-    }
-  });
-  if (process.env.VITE_DEV_SERVER_URL) {
-    workPrintWin.loadFile(path.join(__dirname, "../public/work_print.html"));
-  } else {
-    workPrintWin.loadFile(path.resolve(__dirname, "../dist/work_print.html"));
-  }
-  electron.ipcMain.on("printerWorkSync", (event, arg) => {
-    workPrintWin.webContents.send("getParams", arg);
-  });
-  electron.ipcMain.on("printWorkStart", (event, arg) => {
-    const _parmas = JSON.parse(arg);
-    let name = _parmas.deviceName;
-    workPrintWin.webContents.print({
-      silent: true,
-      deviceName: name,
-      pageSize: {
-        width: 58e3,
-        height: 216e3
-      },
-      scaleFactor: 80,
-      landscape: false,
-      margins: {
-        marginType: "none",
-        top: 0,
-        bottom: 0,
-        left: 0,
-        right: 0
-      },
-      dpi: {
-        horizontal: 203,
-        vertical: 203
-      }
-    });
-  });
-  const tagPrintWin = new electron.BrowserWindow({
-    show: false,
-    width: 360,
-    height: 240,
-    webPreferences: {
-      nodeIntegration: true,
-      contextIsolation: false
-    }
-  });
-  if (process.env.VITE_DEV_SERVER_URL) {
-    tagPrintWin.loadFile(path.join(__dirname, "../public/tag_print.html"));
-  } else {
-    tagPrintWin.loadFile(path.resolve(__dirname, "../dist/tag_print.html"));
-  }
-  electron.ipcMain.on("printerTagSync", (event, arg) => {
-    console.log(arg);
-    tagPrintWin.webContents.send("getParams", arg);
-  });
-  electron.ipcMain.on("printTagStart", (event, arg) => {
-    const _parmas = JSON.parse(arg);
-    let name = _parmas.deviceName;
-    tagPrintWin.webContents.print({
-      silent: true,
-      deviceName: name,
-      pageSize: {
-        width: 45e3,
-        height: 3e4
-      },
-      scaleFactor: 80,
-      landscape: false,
-      margins: {
-        marginType: "none",
-        top: 0,
-        bottom: 0,
-        left: 0,
-        right: 0
-      },
-      dpi: {
-        horizontal: 203,
-        vertical: 203
-      }
-    });
-  });
-  const gotTheLock = electron.app.requestSingleInstanceLock();
-  if (!gotTheLock) {
-    electron.app.quit();
-  } else {
-    electron.app.on("second-instance", (event, commandLine, workingDirectory) => {
-      if (win) {
-        if (win.isMinimized())
-          win.restore();
-        win.focus();
-        win.show();
-      }
-    });
-  }
-  win.on("close", (e) => {
-    e.preventDefault();
-    win.webContents.send("showCloseDialog");
-  });
-});
-electron.app.on("window-all-closed", () => {
-  if (process.platform !== "darwin")
-    electron.app.quit();
-});

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "1.3.61",
+	"version": "1.4.3",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",

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"
+          <el-pagination background v-if="ordereData.list.length" layout="prev, pager, next"
-            :total="Number(ordereData.total)" @current-change="handleCurrentChange" />
+            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"
+          <el-pagination v-if="ordereData.list.length" background layout="prev, pager, next"
-            :total="Number(ordereData.total)" @current-change="handleCurrentChange" />
+            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"
+          <el-pagination v-if="ordereData.list.length" background layout="prev, pager, next"
-            :total="Number(ordereData.total)" @current-change="handleCurrentChange" />
+            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) {