From 0d193338eedb3afecbb8e6b8f9ebf3592343651e Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 08 五月 2025 15:20:48 +0800
Subject: [PATCH] 1.产品绑定送检优化
---
H5/Js/Cpbdsj.js | 69 ++++++++++++++++++++++++++--------
H5/Cpdbsj.aspx | 2
2 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index 4ea12d2..4764a29 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -219,5 +219,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbdsj.js?<%=121111112 %>"></script>
+ <script src="Js/Cpbdsj.js?<%=121111114 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index d75d54c..ed2086c 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -45,6 +45,7 @@
that.XBar = "";
}
else {
+ that.$playSound('error');
that.$toast.fail(json.message);
that.$refs.KbBar.focus();
that.KbBar = "";
@@ -53,6 +54,7 @@
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
that.$refs.KbBar.focus();
that.KbBar = "";
@@ -61,6 +63,7 @@
getXBarInfo() {
var that = this;
if (that.KbBar.length <= 0) {
+ that.$playSound('error');
that.$toast.fail("鍗℃澘鏉＄爜涓嶈兘涓虹┖锛�");
that.$refs.KbBar.focus();
that.XBar = "";
@@ -68,6 +71,7 @@
}
if (that.DAA001.length <= 0) {
+ that.$playSound('error');
that.$toast.fail("鎸囦护宸ュ崟涓嶈兘涓虹┖锛�");
that.$refs.KbBar.focus();
that.XBar = "";
@@ -76,7 +80,18 @@
// 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
if (that.XbarInfo.length >= that.Xvalue) {
+ that.$playSound('error');
that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
+ that.XBar = "";
+ return;
+ }
+
+ //寰呰鏁�
+ var Dvalue = (that.KbBarInfo.oldqty || 0) - +(that.KbBarInfo.ySum || 0)
+ // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
+ if (that.Xvalue > Dvalue) {
+ that.$playSound('error');
+ that.$toast.fail(`瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`);
that.XBar = "";
return;
}
@@ -84,6 +99,7 @@
// 妫�鏌ユ潯鐮佹槸鍚﹀凡瀛樺湪
const isExist = that.XbarInfo.some(item => item.iteM_BARCODE === that.XBar);
if (isExist) {
+ that.$playSound('error');
that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
that.XBar = "";
return;
@@ -91,8 +107,9 @@
that.isLoading = true;
that.AxiosHttp("post", 'Womdaa/getXBarInfo', {
- Kbbarcode: that.KbBar,
+ KbBar: that.KbBar,
DAA001: that.DAA001,
+ userName: that.userInfo.loginAccount,
Xbarcode: that.XBar
}, false)
.then(function (res) {
@@ -103,24 +120,33 @@
that.XBar = "";
}
else {
+ that.$playSound('error');
that.$toast.fail(json.message);
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
});
},
productBinding() {
+
+ if (this.isLoading) {
+ return;
+ }
+
var that = this;
if (that.ZsBar.length <= 0) {
+ that.$playSound('error');
that.$toast.fail("杩芥函鐮佷笉鑳戒负绌猴紒");
return;
}
if (that.LsBar.length <= 0) {
+ that.$playSound('error');
that.$toast.fail("鍚庣洊鐮佷笉鑳戒负绌猴紒");
return;
}
@@ -135,12 +161,14 @@
var json = res;
if (json.status == 0) {
// that.scanInfo = json.data.tbBillList;
+ that.$playSound('success');
that.$notify({ type: 'success', message: json.message });
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.ZsBar = null;
}
else {
+ that.$playSound('error');
that.$toast.fail(json.message);
that.$refs.ZsBar.focus();
that.ZsBar = null;
@@ -151,31 +179,18 @@
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.ZsBar = null;
});
},
- //鎵撳嵃鏈烘敞閲�
- //selectPrinter(printer) {
- // this.selectedPrinter = printer.printerId; // 鏇存柊閫変腑鐨勬墦鍗版満缂栧彿
- //},
- //confirmSelection() {
- // if (this.selectedPrinter) {
- // alert(`鎮ㄩ�夋嫨浜嗘墦鍗版満锛�${this.selectedPrinter}`);
- // // 鍦ㄨ繖閲屽鐞嗛�夋嫨缁撴灉锛屼緥濡傝皟鐢ㄦ帴鍙ｆ垨鏇存柊鐘舵��
- // this.isPrinterPopupVisible = false; // 鍏抽棴寮圭獥
- // } else {
- // alert('璇烽�夋嫨涓�涓墦鍗版満锛�');
- // }
- //},
- //onPrinterSelected(value) {
- // console.log('褰撳墠閫変腑鐨勬墦鍗版満缂栧彿:', value);
- //},
checkProductBarcode() {
+
var that = this;
if (!that.LsBar) {
+ that.$playSound('error');
that.$toast.fail("璇疯緭鍏ヤ骇鍝佹潯鐮�");
return;
}
@@ -190,6 +205,7 @@
that.$toast("宸叉牳瀵�");
} else {
that.$set(matchedItem, 'is_hedui', "1");
+ that.$playSound('success');
that.$notify({ type: 'success', message: "鏍稿鎴愬姛" });
that.LsBar = "";
// 妫�鏌ユ槸鍚︽墍鏈夎閮藉凡鏍稿
@@ -199,6 +215,7 @@
}
}
} else {
+ that.$playSound('error');
that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
}
@@ -207,6 +224,11 @@
// 鏂板鏂规硶锛氭彁浜ゆ墍鏈夊凡鏍稿鐨勬暟鎹�
submitAllChecked() {
+
+ if (this.isLoading) {
+ return;
+ }
+
var that = this;
that.isLoading = true;
@@ -218,9 +240,11 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
+ that.$playSound('success');
that.$notify({ type: 'success', message: json.message });
that.getKbBarInfo();
} else {
+ that.$playSound('error');
that.$toast.fail(json.message);
that.XbarInfo = [];
that.XBar = "";
@@ -231,12 +255,19 @@
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缁戝畾澶辫触锛岃閲嶈瘯锛�");
});
},
handleSubmit() {
+
+ if (this.isLoading) {
+ return;
+ }
+
var that = this;
if (!that.KbBar) {
+ that.$playSound('error');
that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
return;
}
@@ -246,6 +277,7 @@
const ySum = +(that.KbBarInfo.ySum || 0);
if (oldqty !== ySum) {
+ that.$playSound('error');
that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
return;
}
@@ -258,6 +290,7 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
+ that.$playSound('success');
that.$notify({ type: 'success', message: json.message });
// 娓呯┖鏁版嵁
that.KbBar = "";
@@ -265,12 +298,14 @@
that.KbBarInfo = [];
that.$refs.KbBar.focus();
} else {
+ that.$playSound('error');
that.$toast.fail(json.message);
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
that.$refs.KbBar.focus();
});
--
Gitblit v1.9.3