From e1d24d932247e443a8893d8ebe85315fea5a5018 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期二, 26 八月 2025 13:14:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_PdaClient
---
H5/Js/Scllhb.js | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/H5/Js/Scllhb.js b/H5/Js/Scllhb.js
index 455932c..597336d 100644
--- a/H5/Js/Scllhb.js
+++ b/H5/Js/Scllhb.js
@@ -37,8 +37,8 @@
getModel() {
var that = this;
that.isLoading = true;
- that.AxiosHttp("post", 'Womdaa/GetItemsByDaa001', {
- daa001: that.modeInfo.daa001,
+ that.AxiosHttp("post", 'Womdaahb/GetItemsByDaa001', {
+ hbNo: that.modeInfo.daa001,
userName: that.userInfo.loginAccount
}, false)
.then(function (res) {
@@ -48,10 +48,12 @@
console.log(json)
that.ItemDetail = json.data.tbBillList;
that.modeInfo.planNo = json.data.tbBillList.planNo;
+ that.$playSound('success');
that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.daa001.focus();
that.modeInfo.daa001 = "";
that.modeInfo.planNo = "";
@@ -62,6 +64,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
that.$refs.daa001.focus();
that.modeInfo.daa001 = "";
@@ -75,17 +78,19 @@
var that = this;
if (that.modeInfo.daa001.length <= 0) {
- that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$toast.fail("姹囨姤鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
return;
}
if (that.scanInfo.barcode.length * 1 <= 0) {
that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
return;
}
that.isLoading = true;
- that.AxiosHttp("post", 'Womdaa/ScanCode', {
- daa001: that.modeInfo.daa001,
+ that.AxiosHttp("post", 'Womdaahb/ScanCode', {
+ hbNo: that.modeInfo.daa001,
userName: that.userInfo.loginAccount,
barcode: that.scanInfo.barcode,
}, false)
@@ -101,6 +106,7 @@
}
else if (json.status == 2) {
that.$refs.splitNum.focus();
+ that.$playSound('success');
that.scanInfo.splitNum = json.data.tbBillList.splitNum;
that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum;
}
@@ -129,14 +135,17 @@
var that = this;
if (that.modeInfo.daa001.length <= 0) {
that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
return;
}
if (that.scanInfo.splitNum * 1 <= 0) {
that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
return;
}
if (that.scanInfo.barcode.length * 1 <= 0) {
that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
return;
}
//that.ip = "";
@@ -151,7 +160,7 @@
that.isLoading = true;
that.AxiosHttp("post", 'Womdaa/ScanCodeCF', {
- daa001: that.modeInfo.daa001,
+ hbNo: that.modeInfo.daa001,
userName: that.userInfo.loginAccount,
barcode: that.scanInfo.barcode,
Num: that.scanInfo.splitNum,
@@ -340,13 +349,14 @@
console.log(item);
// 姝ｅ垯鍖归厤绗竴涓柟鎷彿鍐呭
const regex = /\[([^\]]+)\]/;
- const matchResult = item.name.match(regex);
+ const matchResult = item.name;
- if (matchResult && matchResult[1]) {
- this.modeInfo.daa001 = matchResult[1]; // PPBOM00000088-1
+ if (matchResult) {
+ this.modeInfo.daa001 = matchResult; // PPBOM00000088-1
console.log('鎻愬彇鐨凞AA001:', this.modeInfo.daa001);
} else {
this.$toast.fail('宸ュ崟鍙锋牸寮忓紓甯�');
+ that.$playSound('error');
this.modeInfo.daa001 = '';
}
this.getModel();
--
Gitblit v1.9.3