|
|
|
|
@ -195,7 +195,8 @@
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row :gutter="0">
|
|
|
|
|
<el-col :span="20" style="margin-top: 0px;margin-bottom: 10px;margin-left: 80px">
|
|
|
|
|
<el-checkbox v-model="checked" v-if="!this.formData.billNo && this.formDataVisible.scanType != 1">定向查询</el-checkbox>
|
|
|
|
|
<el-checkbox v-model="checked" v-if="!this.formData.billNo && this.formDataVisible.scanType != 1">定向查询
|
|
|
|
|
</el-checkbox>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-alert
|
|
|
|
|
@ -505,6 +506,7 @@ export default {
|
|
|
|
|
warnVisible: false,
|
|
|
|
|
errVisible: false,
|
|
|
|
|
workplaceId: null,
|
|
|
|
|
ws: null,
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
@ -539,9 +541,9 @@ export default {
|
|
|
|
|
this.formData.workPlaceCode = this.workplaceId
|
|
|
|
|
this.checked = false
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
this.checked = true
|
|
|
|
|
this.formData.billNo = null
|
|
|
|
|
this.formData.billNo = null
|
|
|
|
|
this.$message.error(res.message)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
@ -571,7 +573,7 @@ export default {
|
|
|
|
|
this.findFromInvList("");
|
|
|
|
|
this.getInvList();
|
|
|
|
|
this.placeholder = '请点击输入框进行扫码生成业务单据';
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
this.findCurOrder();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -586,7 +588,7 @@ export default {
|
|
|
|
|
this.findFromInvList("");
|
|
|
|
|
this.getInvList();
|
|
|
|
|
this.placeholder = '请点击输入框进行扫码生成业务单据';
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
this.findCurOrder();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -795,7 +797,7 @@ export default {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
enterBillNoKey() {
|
|
|
|
|
enterBillNoKey(billNo) {
|
|
|
|
|
this.checkSuccess = true;
|
|
|
|
|
this.filterQuery.code = this.scanCode;
|
|
|
|
|
let tQuery = {
|
|
|
|
|
@ -805,6 +807,9 @@ export default {
|
|
|
|
|
busType: this.formData.busType,
|
|
|
|
|
code: this.filterQuery.code.trim(),
|
|
|
|
|
};
|
|
|
|
|
if (billNo != null) {
|
|
|
|
|
tQuery.code = billNo
|
|
|
|
|
}
|
|
|
|
|
enterCodeBillNo(tQuery).then((response) => {
|
|
|
|
|
if (response.code === 20000) {
|
|
|
|
|
this.$refs.inputRef.focus();
|
|
|
|
|
@ -1173,7 +1178,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
vailOrderFinish() {
|
|
|
|
|
if (!this.autoFinishOrderFlag){
|
|
|
|
|
if (!this.autoFinishOrderFlag) {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
vailOrderFinish(this.formData).then(res => {
|
|
|
|
|
@ -1353,6 +1358,23 @@ export default {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
handleScanComplete(fullScanData) {
|
|
|
|
|
console.log("Scan complete:", fullScanData.join(";"));
|
|
|
|
|
if (this.formData.billNo == null && this.formDataVisible.scanType != 1) {
|
|
|
|
|
this.enterBillNoKey(fullScanData[0])
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
let params = {
|
|
|
|
|
codeList: fullScanData,
|
|
|
|
|
};
|
|
|
|
|
if (this.formData.billNo == null) {
|
|
|
|
|
this.$message.error("请先选入单据！");
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
this.batchVailCode(params)
|
|
|
|
|
// 在这里处理完整的扫码数据，如提交到后台或显示
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
parseString(str) {
|
|
|
|
|
// 1. 判断是否以 "MA" 开头
|
|
|
|
|
if (str.startsWith("MA")) {
|
|
|
|
|
@ -1382,6 +1404,62 @@ export default {
|
|
|
|
|
// 如果没有任何条件满足，返回 false
|
|
|
|
|
return false;
|
|
|
|
|
},
|
|
|
|
|
socketListener() {
|
|
|
|
|
let lastScanTime = Date.now();
|
|
|
|
|
let scanBuffer = [];
|
|
|
|
|
let scanTimeout = null;
|
|
|
|
|
const SCAN_TIMEOUT = 1000; // 1秒间隔，表示扫码结束的判定标准
|
|
|
|
|
const self = this;
|
|
|
|
|
console.log("启用监听")
|
|
|
|
|
this.ws.onmessage = function (event) {
|
|
|
|
|
let scanData = event.data; // 获取扫码数据
|
|
|
|
|
let currentTime = Date.now();
|
|
|
|
|
console.log(scanData)
|
|
|
|
|
// 如果时间间隔超过预设的阈值，表示这是一次新的扫码
|
|
|
|
|
if (currentTime - lastScanTime > SCAN_TIMEOUT) {
|
|
|
|
|
// 处理上一次完整的扫码数据
|
|
|
|
|
if (scanBuffer.length > 0) {
|
|
|
|
|
self.handleScanComplete(scanBuffer);
|
|
|
|
|
}
|
|
|
|
|
// 清空缓冲区，开始新的扫码
|
|
|
|
|
scanBuffer = [];
|
|
|
|
|
}
|
|
|
|
|
// 重置上一次扫码的时间
|
|
|
|
|
lastScanTime = currentTime;
|
|
|
|
|
// 将数据添加到缓冲区
|
|
|
|
|
scanBuffer.push(scanData);
|
|
|
|
|
|
|
|
|
|
// 如果已经有一个定时器在等待，可以清除它
|
|
|
|
|
if (scanTimeout) {
|
|
|
|
|
clearTimeout(scanTimeout);
|
|
|
|
|
}
|
|
|
|
|
// 设置新的定时器，等待指定的时间后执行扫码结束处理
|
|
|
|
|
scanTimeout = setTimeout(() => {
|
|
|
|
|
// 定时器到时，处理扫码结束
|
|
|
|
|
self.handleScanComplete(scanBuffer);
|
|
|
|
|
scanBuffer = [];
|
|
|
|
|
}, SCAN_TIMEOUT);
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
handleVisibilityChange() {
|
|
|
|
|
if (document.visibilityState === 'visible') {
|
|
|
|
|
console.log('用户切回到了处理页面');
|
|
|
|
|
if (this.ws == null || this.ws.readyState === WebSocket.CLOSED) {
|
|
|
|
|
this.ws = new WebSocket("ws://127.0.0.1:9988");
|
|
|
|
|
const self = this;
|
|
|
|
|
this.ws.onopen = function (evt) {
|
|
|
|
|
console.log("处理单据WebSocket 连接中 ...");
|
|
|
|
|
self.socketListener()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (this.ws && this.ws.readyState === WebSocket.OPEN) {
|
|
|
|
|
this.ws.close();
|
|
|
|
|
console.log("关闭处理单据websocket成功")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
mounted() {
|
|
|
|
|
this.$refs.inputRef.focus();
|
|
|
|
|
@ -1391,9 +1469,36 @@ export default {
|
|
|
|
|
window.removeEventListener('djcl', this.handleRecCodesEvent);
|
|
|
|
|
window.addEventListener('djcl', this.handleRecCodesEvent);
|
|
|
|
|
}
|
|
|
|
|
document.addEventListener('visibilitychange', this.handleVisibilityChange);
|
|
|
|
|
// window.addEventListener('storage', (event) => {
|
|
|
|
|
// if (document.visibilityState == 'hidden') {
|
|
|
|
|
// console.log("关闭处理单据websocket")
|
|
|
|
|
// if (this.ws && this.ws.readyState === WebSocket.OPEN) {
|
|
|
|
|
// this.ws.close();
|
|
|
|
|
// console.log("关闭处理单据websocket成功")
|
|
|
|
|
// }
|
|
|
|
|
// } else {
|
|
|
|
|
// if (!this.ws) {
|
|
|
|
|
// this.ws = new WebSocket("ws://127.0.0.1:9988");
|
|
|
|
|
// this.ws.onopen = function (evt) {
|
|
|
|
|
// console.log("处理单据WebSocket 连接中 ...");
|
|
|
|
|
// };
|
|
|
|
|
// this.socketListener()
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
beforeDestroy() {
|
|
|
|
|
window.removeEventListener('djcl', this.handleRecCodesEvent);
|
|
|
|
|
document.removeEventListener('visibilitychange', this.handleVisibilityChange);
|
|
|
|
|
|
|
|
|
|
this.ws.close();
|
|
|
|
|
this.ws.onclose = function (evt) {
|
|
|
|
|
console.log("处理单据 Connection closed.");
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
getHead("prescribeTagCodeDeal", "1").then((re) => {
|
|
|
|
|
|
qyt
5 months ago