+
+
+
+
备注：${data.remark}
+
打印时间：${data.printTime}
-
+
.
+
.
+
.
+
.
`;
let lastHtml = `${html}${table}${str}`;
diff --git a/src/store/print.js b/src/store/print.js
index 6b392d7..89a851e 100644
--- a/src/store/print.js
+++ b/src/store/print.js
@@ -125,15 +125,11 @@ export const usePrint = defineStore({
}, 800);
},
// 添加小票打印对列表数据
- pushReceiptData(props) {
- if (
- this.deviceNoteList.length &&
- this.checkLocalPrint(this.deviceNoteList[0].config.deviceName)
- ) {
- console.log(props);
-
+ pushReceiptData(props, isDevice = true) {
+ console.log("pushReceiptData===", props);
+ if (!isDevice) {
+ // 测试打印，无需校验本地打印机
const store = useUser();
- props.deviceName = this.deviceNoteList[0].config.deviceName;
props.shop_name = store.userInfo.shopName;
props.loginAccount = store.userInfo.loginAccount;
props.createdAt = dayjs(props.createdAt).format("YYYY-MM-DD HH:mm:ss");
@@ -146,7 +142,28 @@ export const usePrint = defineStore({
this.receiptList.push(props);
this.startReceiptPrint();
} else {
- console.log("订单小票：没有小票打印机");
+ if (
+ this.deviceNoteList.length &&
+ this.checkLocalPrint(this.deviceNoteList[0].config.deviceName)
+ ) {
+ const store = useUser();
+ props.deviceName = this.deviceNoteList[0].config.deviceName;
+ props.shop_name = store.userInfo.shopName;
+ props.loginAccount = store.userInfo.loginAccount;
+ props.createdAt = dayjs(props.createdAt).format(
+ "YYYY-MM-DD HH:mm:ss"
+ );
+ props.printTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
+ if (!props.orderInfo.masterId) {
+ props.orderInfo.masterId = props.orderInfo.tableName;
+ }
+ props.orderInfo.outNumber = props.outNumber;
+
+ this.receiptList.push(props);
+ this.startReceiptPrint();
+ } else {
+ console.log("订单小票：没有小票打印机");
+ }
}
},
// 开始打印小票
diff --git a/src/store/socket.js b/src/store/socket.js
index 0d9a4a8..31979ef 100644
--- a/src/store/socket.js
+++ b/src/store/socket.js
@@ -57,7 +57,14 @@ export const useSocket = defineStore({
if (this.ws == null) {
console.log("创建新的ws连接");
- this.ws = new ReconnectingWebSocket(wsUrl);
+
+ const protocols = []; // 可选的子协议数组
+ const options = {
+ // 自动重新连接的选项（可选）
+ connectionTimeout: 1000,
+ maxRetries: 100,
+ };
+ this.ws = new ReconnectingWebSocket(wsUrl, protocols, options);
} else {
console.log("重新连接ws");
this.wsReconnect();
diff --git a/src/views/device/add.vue b/src/views/device/add.vue
index 3cad97e..d8e9255 100644
--- a/src/views/device/add.vue
+++ b/src/views/device/add.vue
@@ -178,12 +178,12 @@ const printData = reactive({
}
],
amount: '30.00',
- remark: '',
+ remark: '给我多放点辣椒，谢谢老板',
orderInfo: {
masterId: '#002',
orderNo: '202404021023542223445'
},
- deviceName: form.value.config.deviceName,
+ deviceName: '',
createdAt: '2024-04-02 10:15',
printTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
});
@@ -203,8 +203,9 @@ function printHandle() {
return;
}
printDataLoading.value = true
+ printData.deviceName = form.value.config.deviceName
printData.printTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
- printStore.pushReceiptData(printData)
+ printStore.pushReceiptData(printData, false)
setTimeout(() => {
printDataLoading.value = false
}, 1500)
diff --git a/src/views/home/components/settleAccount.vue b/src/views/home/components/settleAccount.vue
index 285bd46..52c580e 100644
--- a/src/views/home/components/settleAccount.vue
+++ b/src/views/home/components/settleAccount.vue
@@ -125,6 +125,7 @@ const printHandle = _.throttle(async function () {
const data = {
shop_name: store.userInfo.shopName,
loginAccount: store.userInfo.loginAccount,
+ isBefore: true,
carts: props.cart,
amount: props.amount,
remark: props.remark,
diff --git a/src/views/work/index.vue b/src/views/work/index.vue
index fd9095a..c97391f 100644
--- a/src/views/work/index.vue
+++ b/src/views/work/index.vue
@@ -212,10 +212,12 @@ const exit = async () => {
data = await handoverData({
id: infoData.value.id
})
+
data.printTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
data.printShop = isPrint.value
printStore.printWork(data)
+ // return
await loginlogout({
status: 1
})