优化小票打印
This commit is contained in:
@@ -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("订单小票:没有小票打印机");
|
||||
}
|
||||
}
|
||||
},
|
||||
// 开始打印小票
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user