From b48cbaed482a5e530052a9e31fa0d2e8fd06cec4 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 08 九月 2025 09:00:51 +0800
Subject: [PATCH] 1.巡检上下限为0的，判定为选择合格不合格(已更新) 2.AGV选择点位 3.现场收料新增参数
---
H5/Js/Scbl.js | 131 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 119 insertions(+), 12 deletions(-)
diff --git a/H5/Js/Scbl.js b/H5/Js/Scbl.js
index f8b69fb..0f63308 100644
--- a/H5/Js/Scbl.js
+++ b/H5/Js/Scbl.js
@@ -16,9 +16,20 @@
barcode: "",
ItemBlDetail:[],
modeInfo: [],
+ queryInfo: { dateTime: "", lineNo: "", lineName: "" },
active: 0,
show: false,
+ show1:false,
actions: [],
+ actions1: [],
+ ItemDetail: [],
+ minDate: new Date(new Date().getFullYear() - 1, 0, 1), // 杩囧幓涓�骞�
+ maxDate: new Date(new Date().getFullYear() + 1, 11, 31), // 鏈潵涓�骞�
+ showScDatePicker: false,
+ tempDate: new Date(),
+ showDatePicker: false,
+ ItemBarKw: [],
+ currentIndex: -1,
}
},
mounted() {
@@ -31,16 +42,72 @@
selectType = this.type == "bl" ? selectType = "鐢熶骇琛ユ枡" : selectType = "鐢熶骇瓒呴";
},
methods: {
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ },
+ GetBarKwByItem() {
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
+ formatDate(date) {
+ const d = new Date(date);
+ console.log(d);
+ return `${d.getFullYear()}-${(d.getMonth() + 1).toString().padStart(2, '0')}-${d.getDate().toString().padStart(2, '0')}`;
+ },
+ onDateConfirm(date) {
+ this.queryInfo.dateTime = this.formatDate(date);
+ this.showDatePicker = false;
+ },
getInfo() {
this.show = true;
var that = this;
that.isLoading = true;
-
-
that.AxiosHttp("post", 'MesItemBl/GetSCBLBillNo', {
type: selectType,
+ dateTime: that.queryInfo.dateTime,
+ lineNo: that.queryInfo.lineNo
}, false)
.then(function (res) {
var json = res;
@@ -64,11 +131,6 @@
console.log(error);
});
},
- onClick(index, title) {
- this.$toast(`${index} ${title}`);
- this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
-
- },
onSelect(item) {
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
@@ -78,6 +140,11 @@
this.GetMesItemBlDetailByBillNo();
//this.$toast(item.name);
+ },
+ onSelect1(actions1) {
+ this.queryInfo.lineNo = actions1.lineNo;
+ this.show1 = false;
+ this.queryInfo.lineName = actions1.name;
},
GetMesItemBlDetailByBillNo() {
var that = this;
@@ -89,9 +156,13 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemBlDetail = json.data.tbBillList.item2;
- that.daa001 = json.data.tbBillList.item1;
+ that.ItemDetail = json.data.tbBillList;
+ that.daa001 = json.data.tbBillList.daa001;
+ console.log(json.data.tbBillList.daa001);
+ console.log(json.data.tbBillList.items);
that.$refs.barcode.focus();
+ that.currentIndex = -1;
+ that.ItemBarKw = [];
}
else {
that.$toast.fail(json.message);
@@ -112,8 +183,40 @@
that.ItemBlDetail = [];
});
},
+ getLineInfo() {
+ var that = this;
+ that.show1 = true;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesItemBl/GetLineInfo', {
+ selectLine: that.selectLine
+ }, false)
+ .then(function (res) {
+ var json = res;
+ console.log(json);
+ if (json.status == 0 && json.data.tbLineInfo.length > 0) {
+ that.actions1 = json.data.tbLineInfo.map(item => ({
+ name: item.lineName,
+ lineNo: item.lineNo
+ }));
+ } else {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function () {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ });
+ },
getBarcode() {
-
+ // 娣诲姞闃叉姈鍒ゆ柇
+ if (this.isLoading) {
+ return;
+ }
+
//this.barcode = value;
var that = this;
@@ -239,12 +342,16 @@
var json = res;
if (json.status == 0) {
that.ItemBlDetail = json.data.pendingList;
- that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
- that.$refs.barcode.focus();
that.barcode = "";
that.num = "";
that.splitNum = "";
+ that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
that.GetMesItemBlDetailByBillNo();
+ //that.sendMessage(json.data.tbBillList);
+ that.sendPrintMessage(json.data.tbBillList);
+
+ that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
--
Gitblit v1.9.3