From 160967106cde2e2f9144b98b4c77d9706bb64fc1 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 13 十月 2025 14:29:18 +0800
Subject: [PATCH] 1.产品绑定提示样式调整 2.其他入库优化(已更新) 3.核对送检提示样式调整 4.内箱核对提示样式调整
---
H5/Cpbd.aspx | 2
H5/Nxhd.aspx | 2
H5/Js/Cpbd.js | 32 +++++
H5/Js/Cpbdsj.js | 192 +++++++++++++++++++++++++++++++++----
H5/Js/Qtrk.js | 5
H5/Qtrk.aspx | 2
H5/Cpdbsj.aspx | 2
H5/Js/Nxhd.js | 32 +++++
8 files changed, 232 insertions(+), 37 deletions(-)
diff --git a/H5/Cpbd.aspx b/H5/Cpbd.aspx
index 9117907..4b795d0 100644
--- a/H5/Cpbd.aspx
+++ b/H5/Cpbd.aspx
@@ -155,5 +155,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbd.js?<%=1211122 %>"></script>
+ <script src="Js/Cpbd.js?<%=1211123 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index 8f38866..af65c85 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -266,5 +266,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbdsj.js?<%=1212111421525 %>"></script>
+ <script src="Js/Cpbdsj.js?<%=1212111421526 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Js/Cpbd.js b/H5/Js/Cpbd.js
index bb144f8..8bf9d59 100644
--- a/H5/Js/Cpbd.js
+++ b/H5/Js/Cpbd.js
@@ -39,7 +39,13 @@
that.$refs.LsBar.focus();
}
else {
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = "";
@@ -50,7 +56,13 @@
})
.catch(function (error) {
that.isLoading = false;
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = "";
@@ -88,7 +100,13 @@
that.LsBar = null;
}
else {
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = null;
@@ -99,7 +117,13 @@
})
.catch(function (error) {
that.isLoading = false;
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = null;
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index 329bdf8..56de108 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -94,7 +94,13 @@
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
that.KbBar = "";
}
@@ -103,7 +109,13 @@
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
that.KbBar = "";
});
@@ -129,7 +141,13 @@
// 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
if (that.XbarInfo.length >= that.Xvalue) {
that.$playSound('error');
- that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
+ //that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
+ that.$dialog.alert({
+ message: `宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XBar = "";
return;
}
@@ -139,7 +157,13 @@
// 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
if (that.Xvalue > Dvalue) {
that.$playSound('error');
- that.$toast.fail(`瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`);
+ //that.$toast.fail(`瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`);
+ that.$dialog.alert({
+ message: `瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XBar = "";
return;
}
@@ -148,7 +172,13 @@
const isExist = that.XbarInfo.some(item => item.iteM_BARCODE === that.XBar);
if (isExist) {
that.$playSound('error');
- that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
+ //that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
+ that.$dialog.alert({
+ message: "璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XBar = "";
return;
}
@@ -177,7 +207,13 @@
else {
that.$playSound('error');
that.XBar = "";
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
@@ -185,7 +221,13 @@
that.isLoading = false;
that.XBar = "";
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
});
},
productBinding() {
@@ -224,7 +266,13 @@
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.ZsBar = null;
@@ -235,7 +283,13 @@
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.ZsBar = null;
@@ -281,19 +335,37 @@
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
});
}
} else {
that.$playSound('error');
- that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
+ //that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
+ that.$dialog.alert({
+ message: "鏈壘鍒板尮閰嶇殑绠辨潯鐮�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.LsBar = ""; // 娓呯┖杈撳叆妗�
@@ -331,7 +403,13 @@
that.getKbBarInfo();
} else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XbarInfo = [];
that.XBar = "";
that.LsBar = "";
@@ -342,7 +420,13 @@
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缁戝畾澶辫触锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缁戝畾澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
});
},
handleSubmit() {
@@ -364,7 +448,13 @@
if (oldqty !== ySum) {
that.$playSound('error');
- that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ //that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ that.$dialog.alert({
+ message: `瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
return;
}
@@ -385,14 +475,26 @@
that.$refs.KbBar.focus();
} else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
+ //that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
});
},
@@ -440,14 +542,26 @@
}
}
else {
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$playSound('error');
console.log(error);
});
@@ -490,7 +604,13 @@
if (oldqty !== ySum) {
that.$playSound('error');
- that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ //that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ that.$dialog.alert({
+ message: `瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
return;
}
@@ -507,14 +627,26 @@
that.$notify({ type: 'success', message: json.message });
} else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("AGV閫佹澶辫触锛岃閲嶈瘯锛�");
+ //that.$toast.fail("AGV閫佹澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "AGV閫佹澶辫触锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
});
},
@@ -547,14 +679,26 @@
that.$notify({ type: 'success', message: json.message });
} else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("AGV鍛煎彨澶辫触锛岃閲嶈瘯锛�");
+ //that.$toast.fail("AGV鍛煎彨澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "AGV鍛煎彨澶辫触锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
});
}
diff --git a/H5/Js/Nxhd.js b/H5/Js/Nxhd.js
index 4b350ad..b6bfc2a 100644
--- a/H5/Js/Nxhd.js
+++ b/H5/Js/Nxhd.js
@@ -44,7 +44,13 @@
that.$refs.LsBar.focus();
}
else {
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = "";
@@ -55,7 +61,13 @@
})
.catch(function (error) {
that.isLoading = false;
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = "";
@@ -98,7 +110,13 @@
that.LsBar = null;
}
else {
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = null;
@@ -109,7 +127,13 @@
})
.catch(function (error) {
that.isLoading = false;
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = null;
diff --git a/H5/Js/Qtrk.js b/H5/Js/Qtrk.js
index d37f5c4..6e3cb49 100644
--- a/H5/Js/Qtrk.js
+++ b/H5/Js/Qtrk.js
@@ -86,6 +86,9 @@
that.ItemDetail = json.data.tbBillList;
that.$refs.sectionCode.focus();
//that.sectionCode = null;
+ if (that.sectionCode) {
+ that.$refs.barcode.focus();
+ }
}
else {
that.$toast.fail(json.message);
@@ -206,7 +209,7 @@
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
that.$playSound('success');
that.GetMesItemBlDetailByBillNo();
- that.$refs.barcode.focus();
+ //that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
diff --git a/H5/Nxhd.aspx b/H5/Nxhd.aspx
index 36d0880..e76efb8 100644
--- a/H5/Nxhd.aspx
+++ b/H5/Nxhd.aspx
@@ -155,5 +155,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Nxhd.js?<%=1111 %>"></script>
+ <script src="Js/Nxhd.js?<%=1112 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Qtrk.aspx b/H5/Qtrk.aspx
index 7be4e6f..9ad3c75 100644
--- a/H5/Qtrk.aspx
+++ b/H5/Qtrk.aspx
@@ -158,5 +158,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Qtrk.js?<%=1240003 %>"></script>
+ <script src="Js/Qtrk.js?<%=1240004 %>"></script>
</asp:Content>
--
Gitblit v1.9.3