From a40798a6290b41c4aacab2e142a23b944743bda9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 19 八月 2025 10:48:32 +0800
Subject: [PATCH] 1.核对送检新增AGV送检和AGV呼叫 2.样式优化
---
H5/Js/Cpbdsj.js | 135 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 123 insertions(+), 12 deletions(-)
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index f43b7c5..5aa7ed7 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 {
@@ -31,6 +32,7 @@
actions: [],//鍒楄〃鐨勫��
xtName: "",//绾夸綋鍚嶇О
xtNum: "",//绾夸綋缂栧彿
+ agvChecked: false,//鏄惁鍕鹃�堿GV
}
},
mounted() {
@@ -101,7 +103,7 @@
}
//寰呰鏁�
- var Dvalue = (that.KbBarInfo.oldqty || 0) - +(that.KbBarInfo.ySum || 0)
+ var Dvalue = (that.KbBarInfo.quantity || 0) - +(that.KbBarInfo.ySum || 0)
// 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
if (that.Xvalue > Dvalue) {
that.$playSound('error');
@@ -130,8 +132,15 @@
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');
@@ -257,7 +266,12 @@
},
handleClear() {
-
+ this.KbBar = "";
+ this.XBar = "";
+ this.LsBar = "";
+ this.DAA001 = [];
+ this.XbarInfo = [];
+
},
// 鏂板鏂规硶锛氭彁浜ゆ墍鏈夊凡鏍稿鐨勬暟鎹�
@@ -311,7 +325,7 @@
}
// 璁＄畻鍙鏁板拰宸茶鏁�
- const oldqty = +(that.KbBarInfo.oldqty || 0);
+ const oldqty = +(that.KbBarInfo.quantity || 0);
const ySum = +(that.KbBarInfo.ySum || 0);
if (oldqty !== ySum) {
@@ -349,12 +363,11 @@
});
},
- onSelect(item) {
+ onSelect(action) {
+ this.xtNum = action.lineNo; // 缁戝畾line_no鍒皒tNum瀛楁
+ console.log("閫夋嫨鐨勭嚎浣撶紪鍙凤細", this.xtNum);
+ this.xtName = action.name; // 缁戝畾name鍒皒tName瀛楁
this.show = false;
- console.log(item);
- // 姝ｅ垯鍖归厤绗竴涓柟鎷彿鍐呭
- this.modeInfo.Xt = item;
-
},
//鑾峰彇鍙懠鍙獳GV鐨勭嚎浣�
selectXt() {
@@ -376,9 +389,8 @@
that.itemInfo = json.data.tbBillList;
that.actions = json.data.tbBillList.map(item => {
return {
- name: item.daaInfo, // 鎷兼帴瀛楁
- subname:"[绾夸綋鍚嶇О][]"
-
+ name: item.name,
+ lineNo: item.line_no // 鏂板
};
});
}
@@ -397,6 +409,105 @@
});
},
+ //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