From 77a2d94762f81da09be82aeab75cdabbf95d2926 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 25 八月 2025 10:28:10 +0800
Subject: [PATCH] 1.核对送检优化 2.样式优化
---
H5/Js/Cpbdsj.js | 296 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 266 insertions(+), 30 deletions(-)
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index d75d54c..e2fa8a3 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -1,4 +1,5 @@
-锘縱ar vm = new Vue({
+锘�
+var vm = new Vue({
el: '#app',
data: function () {
return {
@@ -15,8 +16,23 @@
KbBarMxInfo: [],
GX: "G007:鏍稿閫佹",
Xvalue:4,
- XbarInfo: [],
+ XbarInfo: [
+ //{
+ // iteM_BARCODE: "", // 鏉＄爜
+ // item_no: "", // 鐗╂枡缂栧彿
+ // item_name: "", // 鐗╂枡鍚嶇О
+ // item_model: "", // 瑙勬牸鍨嬪彿
+ // quantity: 0, // 鏁伴噺
+ // is_hedui: "0", // 鏄惁鏍稿(1:宸叉牳瀵� 0:鏈牳瀵�),
+ // weight: "" // 浜у搧閲嶉噺
+ //}
+ ],
DAA001: [],
+ show: false,//鍒楄〃灞曠ず
+ actions: [],//鍒楄〃鐨勫��
+ xtName: "",//绾夸綋鍚嶇О
+ xtNum: "",//绾夸綋缂栧彿
+ agvChecked: false,//鏄惁鍕鹃�堿GV
}
},
mounted() {
@@ -45,6 +61,7 @@
that.XBar = "";
}
else {
+ that.$playSound('error');
that.$toast.fail(json.message);
that.$refs.KbBar.focus();
that.KbBar = "";
@@ -53,6 +70,7 @@
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
that.$refs.KbBar.focus();
that.KbBar = "";
@@ -61,6 +79,7 @@
getXBarInfo() {
var that = this;
if (that.KbBar.length <= 0) {
+ that.$playSound('error');
that.$toast.fail("鍗℃澘鏉＄爜涓嶈兘涓虹┖锛�");
that.$refs.KbBar.focus();
that.XBar = "";
@@ -68,6 +87,7 @@
}
if (that.DAA001.length <= 0) {
+ that.$playSound('error');
that.$toast.fail("鎸囦护宸ュ崟涓嶈兘涓虹┖锛�");
that.$refs.KbBar.focus();
that.XBar = "";
@@ -76,7 +96,18 @@
// 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
if (that.XbarInfo.length >= that.Xvalue) {
+ that.$playSound('error');
that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
+ that.XBar = "";
+ return;
+ }
+
+ //寰呰鏁�
+ var Dvalue = (that.KbBarInfo.quantity || 0) - +(that.KbBarInfo.ySum || 0)
+ // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
+ if (that.Xvalue > Dvalue) {
+ that.$playSound('error');
+ that.$toast.fail(`瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`);
that.XBar = "";
return;
}
@@ -84,6 +115,7 @@
// 妫�鏌ユ潯鐮佹槸鍚﹀凡瀛樺湪
const isExist = that.XbarInfo.some(item => item.iteM_BARCODE === that.XBar);
if (isExist) {
+ that.$playSound('error');
that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
that.XBar = "";
return;
@@ -91,36 +123,53 @@
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) {
var json = res;
if (json.status == 0) {
that.XbarInfo.push(json.data.tbBillList.xBarInfo[0]);
+ that.$playSound('success');
that.$refs.XBar.focus();
that.XBar = "";
+
+ // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
+ if (that.XbarInfo.length >= that.Xvalue) {
+ that.$refs.LsBar.focus();
+ }
+
}
else {
+ that.$playSound('error');
+ that.XBar = "";
that.$toast.fail(json.message);
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.XBar = "";
+ 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 +184,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 +202,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;
}
@@ -189,24 +227,62 @@
if (matchedItem.is_hedui === "1") {
that.$toast("宸叉牳瀵�");
} else {
- that.$set(matchedItem, 'is_hedui', "1");
- that.$notify({ type: 'success', message: "鏍稿鎴愬姛" });
- that.LsBar = "";
- // 妫�鏌ユ槸鍚︽墍鏈夎閮藉凡鏍稿
- const allChecked = that.XbarInfo.every(item => item.is_hedui === "1");
- if (allChecked && that.XbarInfo.length > 0) {
- that.submitAllChecked();
- }
+
+ that.AxiosHttp("post", 'Womdaa/GetWeightByXt', {
+ LsBar: that.LsBar,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ var weigth = json.data.tbBillList.weight;
+ that.$set(matchedItem, 'is_hedui', "1");
+ that.$set(matchedItem, 'weight', weigth);
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: "鏍稿鎴愬姛" });
+ that.LsBar = "";
+ // 妫�鏌ユ槸鍚︽墍鏈夎閮藉凡鏍稿
+ const allChecked = that.XbarInfo.every(item => item.is_hedui === "1");
+ if (allChecked && that.XbarInfo.length > 0 && that.XbarInfo.length === that.Xvalue) {
+ that.submitAllChecked();
+ }
+ }
+ else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ });
}
} else {
+ that.$playSound('error');
that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
}
that.LsBar = ""; // 娓呯┖杈撳叆妗�
},
+ handleClear() {
+ this.KbBar = "";
+ this.XBar = "";
+ this.LsBar = "";
+ this.DAA001 = [];
+ this.XbarInfo = [];
+
+ },
+
// 鏂板鏂规硶锛氭彁浜ゆ墍鏈夊凡鏍稿鐨勬暟鎹�
submitAllChecked() {
+
+ if (this.isLoading) {
+ return;
+ }
+
var that = this;
that.isLoading = true;
@@ -218,9 +294,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,21 +309,29 @@
})
.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;
}
// 璁＄畻鍙鏁板拰宸茶鏁�
- const oldqty = +(that.KbBarInfo.oldqty || 0);
+ const oldqty = +(that.KbBarInfo.quantity || 0);
const ySum = +(that.KbBarInfo.ySum || 0);
if (oldqty !== ySum) {
+ that.$playSound('error');
that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
return;
}
@@ -258,6 +344,7 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
+ that.$playSound('success');
that.$notify({ type: 'success', message: json.message });
// 娓呯┖鏁版嵁
that.KbBar = "";
@@ -265,15 +352,164 @@
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();
});
},
+
+ onSelect(action) {
+ this.xtNum = action.lineNo; // 缁戝畾line_no鍒皒tNum瀛楁
+ console.log("閫夋嫨鐨勭嚎浣撶紪鍙凤細", this.xtNum);
+ this.xtName = action.name; // 缁戝畾name鍒皒tName瀛楁
+ this.show = false;
+ },
+ //鑾峰彇鍙懠鍙獳GV鐨勭嚎浣�
+ selectXt() {
+ this.show = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetAgvXt', {
+ selectKey: that.selectKey,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.name,
+ lineNo: item.line_no // 鏂板
+ };
+ });
+ }
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ });
+ },
+
+ //AGV閫佹
+ handleAGVInspection() {
+
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+
+ var that = this;
+ if (that.agvChecked === false)
+ {
+ that.$playSound('error');
+ that.$toast.fail("AGV閫佹璇峰厛鍕鹃�� AGV");
+ return;
+ }
+
+ if (!that.KbBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
+ return;
+ }
+
+ // 璁＄畻鍙鏁板拰宸茶鏁�
+ const oldqty = +(that.KbBarInfo.quantity || 0);
+ const ySum = +(that.KbBarInfo.ySum || 0);
+
+ if (oldqty !== ySum) {
+ that.$playSound('error');
+ that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAGVInspection', {
+ KbBar: that.KbBar,
+ userAccount: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("AGV閫佹澶辫触锛岃閲嶈瘯锛�");
+ that.$refs.KbBar.focus();
+ });
+ },
+
+ //AGV鍛煎彨
+ handleAGVCall() {
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.xtNum) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛閫夋嫨绾夸綋");
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAGVCall', {
+ XtNum: that.xtNum,
+ userAccount: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("AGV鍛煎彨澶辫触锛岃閲嶈瘯锛�");
+ that.$refs.KbBar.focus();
+ });
+ }
+
+
}
})
\ No newline at end of file
--
Gitblit v1.9.3