From 52dbfd767f2485a1d615c5d9db50d648a1d8214a Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期二, 23 十二月 2025 23:56:58 +0800
Subject: [PATCH] 生产报工模糊查询
---
H5/Js/Scbg.js | 304 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 259 insertions(+), 45 deletions(-)
diff --git a/H5/Js/Scbg.js b/H5/Js/Scbg.js
index cbafb1f..45cc400 100644
--- a/H5/Js/Scbg.js
+++ b/H5/Js/Scbg.js
@@ -12,21 +12,27 @@
stafId: "",
stafName: "",
stafList: [],
-
+ BarcodesDetail: [],
+ itemDetail: [],
taskNo: "", //宸ュ崟鍙�
itemNo: "", //鐗╂枡缂栧彿
planQty: "", //璁″垝鏁伴噺
reportedQty: "", //宸叉姤宸ユ暟閲�
currentQty: "", //鏈鎶ュ伐鏁伴噺
barcodeQty: "", //鏉＄爜鏁伴噺
+ sjBillNo: "",//閫佹鍗曞彿
itemName: "", //鐗╂枡鍚嶇О
itemModel: "", //鐗╂枡鍨嬪彿
load: false,
active: 0,
- show: false,
- actions: [],
+ actions: [],//鍒楄〃鐨勫��
+ show: false,//鍒楄〃灞曠ず
+
+ billactive: 0,
+ billactions: [],//鍒楄〃鐨勫��
+ billshow: false,//鍒楄〃灞曠ず
}
},
mounted() {
@@ -43,27 +49,52 @@
var json = res;
if (json.status == 0) {
that.actions = json.data.tbBillList.map(item => {
- return { name: item.staffName }
+ return { name: item.staffName + ' (' + item.staffNo + ')', data: item }
});
+ that.stafId = that.userInfo.loginAccount;
+ //that.stafId = '0305';
+ console.log('DAccccccccDAD' + that.stafId);
+
that.stafList = json.data.tbBillList;
+ //console.log('DAWDADWDADADADWD' + that.stafList);
+ //console.log('DAWDADWDA' + that.stafList);
+ //console.log('DADADAD' + that.stafId);
+
+ let staf = that.stafList.filter(it => String(it.staffNo) === String(that.stafId));
+
+ if (staf.length > 0) {
+ that.stafName = staf[0].staffName;
+ that.stafId = staf[0].staffNo;
+ that.$refs.barcode.focus();
+ } else {
+ that.$toast("鏈壘鍒板尮閰嶇殑 鐢ㄦ埛鍚嶇О");
+ that.$playSound('error');
+ }
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.log(error);
});
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+
+
+ //this.GetMesItemBlDetailByBillNo();
+ //this.$toast(item.name);
+
},
methods: {
getInfo() {
- this.show = true;
-
var that = this;
that.isLoading = true;
that.AxiosHttp("post", 'MesStaff/GetList', {
@@ -72,14 +103,68 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.actions = json.data.tbBillList.map(item => {
- return { name: item.staffName }
- });
-
that.stafList = json.data.tbBillList;
+
+ let searchText = that.stafId ? String(that.stafId).trim().toLowerCase() : "";
+ let filteredList = that.stafList;
+
+ if (searchText) {
+ filteredList = that.stafList.filter(item => {
+ let sName = item.staffName ? String(item.staffName).toLowerCase() : "";
+ let sNo = item.staffNo ? String(item.staffNo).toLowerCase() : "";
+ return sName.includes(searchText) || sNo.includes(searchText);
+ });
+ }
+
+ if (filteredList.length === 0) {
+ that.$toast("鏈壘鍒板尮閰嶇殑鍛樺伐");
+ that.actions = [];
+ } else {
+ that.actions = filteredList.map(item => {
+ return { name: item.staffName + ' (' + item.staffNo + ')', data: item }
+ });
+ that.show = true;
+ that.$playSound('success');
+ }
}
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);
+ });
+ },
+ selectBillNo() {
+ this.billshow = true;
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesWorkProd/GetRksqSelect',
+ {
+ staffNo: that.stafId
+ //name: that.userInfo.loginAccount,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.billactions = json.data.result.rksqOrderList.map(item => {
+ return { name: item.billNo }
+ });
+
+
+
+ that.stafList = json.data.result.rksqOrderList;
+ that.$playSound('success');
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
@@ -99,15 +184,33 @@
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
this.show = false;
- let staf = this.stafList.filter(it => it.staffName === item.name);
-
- if (staf.length > 0) {
- this.stafName = staf[0].staffName;
- this.stafId = staf[0].staffNo;
+ if (item.data) {
+ this.stafName = item.data.staffName;
+ this.stafId = item.data.staffNo;
this.$refs.barcode.focus();
} else {
this.$toast("鏈壘鍒板尮閰嶇殑 staffName");
}
+ //this.GetMesItemBlDetailByBillNo();
+ //this.$toast(item.name);
+
+ },
+ onBillSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.billshow = false;
+
+ let staf = this.stafList.filter(it => it.billNo === item.name);
+
+ if (staf.length > 0) {
+ this.sjBillNo = staf[0].billNo;
+ this.$refs.sjBillNo.focus();
+ } else {
+ this.$toast("鏈壘鍒板尮閰嶇殑閫佹鍗曞彿");
+ that.$playSound('error');
+ }
+
+ this.getBillNo();
//this.GetMesItemBlDetailByBillNo();
//this.$toast(item.name);
@@ -122,34 +225,63 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.actions = json.data.tbBillList.map(item => {
- return { name: item.staffName }
- });
-
that.stafList = json.data.tbBillList;
+
+ let searchText = that.stafId ? String(that.stafId).trim().toLowerCase() : "";
+ let filteredList = that.stafList;
+
+ if (searchText) {
+ filteredList = that.stafList.filter(item => {
+ let sName = item.staffName ? String(item.staffName).toLowerCase() : "";
+ let sNo = item.staffNo ? String(item.staffNo).toLowerCase() : "";
+ return sName.includes(searchText) || sNo.includes(searchText);
+ });
+ }
+
+ if (filteredList.length === 0) {
+ that.$toast("鏈壘鍒板尮閰嶇殑鍛樺伐");
+ that.$playSound('error');
+ } else if (filteredList.length === 1) {
+ let item = filteredList[0];
+ that.stafName = item.staffName;
+ that.stafId = item.staffNo;
+ that.$refs.barcode.focus();
+ that.$playSound('success');
+ } else {
+ that.actions = filteredList.map(item => {
+ return { name: item.staffName + ' (' + item.staffNo + ')', data: item }
+ });
+ that.show = true;
+ that.$playSound('success');
+ }
}
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);
});
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
- let staf = that.stafList.filter(it => it.staffNo === that.stafId);
+ //console.log('DAWDADWDA' + that.stafList);
+ //console.log('DADADAD' + this.stafId);
- if (staf.length > 0) {
- that.stafName = staf[0].staffName;
- that.stafId = staf[0].staffNo;
- that.$refs.barcode.focus();
- } else {
- that.$toast("鏈壘鍒板尮閰嶇殑 鐢ㄦ埛鍚嶇О");
- }
+ //let staf = that.stafList.filter(it => String(it.staffNo) === String(that.stafId));
+
+ //if (staf.length > 0) {
+ // that.stafName = staf[0].staffName;
+ // that.stafId = staf[0].staffNo;
+ // that.$refs.barcode.focus();
+ //} else {
+ // that.$toast("鏈壘鍒板尮閰嶇殑 鐢ㄦ埛鍚嶇О");
+ //}
//this.GetMesItemBlDetailByBillNo();
//this.$toast(item.name);
@@ -157,22 +289,25 @@
getBarcode() {
//this.barcode = value;
-
+ //this.show = true;
var that = this;
-
+
if (!that.userInfo.loginAccount) {
this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+ that.$playSound('error');
return;
}
if (!that.barcode) {
this.$toast.fail("鏉＄爜涓嶈兘涓虹┖");
+ that.$playSound('error');
return;
}
if (!that.stafId) {
that.$toast.fail("鍛樺伐涓嶅厑璁镐负绌�");
+ that.$playSound('error');
return;
}
@@ -195,12 +330,20 @@
that.barcodeQty = entity.barcodeQty; //鏉＄爜鏁伴噺
that.itemName = entity.itemName; //鐗╂枡鍚嶇О
that.itemModel = entity.itemModel; //鐗╂枡鍨嬪彿
+ that.sjBillNo = entity.sjBillNo;
+ that.BarcodesDetail = entity.barcodesDetail;
+ that.itemDetail = entity.itemDetail;
+ console.log('DADWADWD WDD AD AD A');
+ console.log(entity.barcodesDetail);
+ console.log(that.BarcodesDetail);
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$playSound('success');
that.$refs.barcode.focus();
that.barcode = null;
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.barcode.focus();
that.barcode = null;
}
@@ -209,6 +352,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
},
@@ -221,40 +365,53 @@
if (!that.userInfo.loginAccount) {
this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+ that.$playSound('error');
that.load = false;
return;
}
- if (!that.barcode) {
- this.$toast.fail("鏉＄爜涓嶈兘涓虹┖");
- that.load = false;
- return;
- }
+ //if (!that.barcode) {
+ // this.$toast.fail("鏉＄爜涓嶈兘涓虹┖");
+ // that.load = false;
+ // return;
+ //}
- if (!that.currentQty) {
- this.$toast.fail("鎶ュ伐鏁伴噺涓嶈兘涓虹┖");
- that.load = false;
- return;
- }
+ //if (!that.currentQty) {
+ // this.$toast.fail("鎶ュ伐鏁伴噺涓嶈兘涓虹┖");
+ // that.load = false;
+ // return;
+ //}
- if (that.currentQty <=0) {
- this.$toast.fail("鎶ュ伐鏁伴噺闇�瑕佸ぇ浜庨浂");
+ //if (that.currentQty <=0) {
+ // this.$toast.fail("鎶ュ伐鏁伴噺闇�瑕佸ぇ浜庨浂");
+ // that.load = false;
+ // return;
+ //}
+
+ if (!that.sjBillNo) {
+ this.$toast.fail("閫佹鍗曞彿涓嶈兘涓虹┖");
+ that.$playSound('error');
that.load = false;
return;
}
that.AxiosHttp("post", 'MesWorkProd/ScanWorkProd', {
- userNo: that.userInfo.loginAccount,
- itemBarcode: that.barcode,
- quantity: that.currentQty
+ userNo: that.stafId,
+ //itemBarcode: that.barcode,
+ //quantity: that.currentQty
+ sjBillNo: that.sjBillNo
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.$notify({ type: 'success', message: '淇濆瓨鎴愬姛' });
+ that.$notify({ type: 'success', message: '閫佹鎴愬姛' });
+ that.sjBillNo = "";
+ that.BarcodesDetail = [];
+ that.$playSound('success');
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
that.load = false;
@@ -262,8 +419,65 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
+ },
+
+ getBillNo() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesWorkProd/GetRksqList', {
+ staffNo: that.stafId,
+ sjBillNo: that.sjBillNo
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ let entity = json.data.result;
+ that.BarcodesDetail = entity.barcodesDetail;
+ that.itemDetail = entity.itemDetail;
+ console.log('DADWADWD WDD AD AD A');
+ console.log(entity.barcodesDetail);
+ console.log(that.BarcodesDetail);
+ that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$refs.sjBillNo.focus();
+ that.$playSound('success');
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.sjBillNo.focus();
+ that.$playSound('error');
+ that.barcode = null;
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ });
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+
+ //console.log('DAWDADWDA' + that.stafList);
+ //console.log('DADADAD' + this.stafId);
+
+ //let staf = that.stafList.filter(it => String(it.staffNo) === String(that.stafId));
+
+ //if (staf.length > 0) {
+ // that.stafName = staf[0].staffName;
+ // that.stafId = staf[0].staffNo;
+ // that.$refs.barcode.focus();
+ //} else {
+ // that.$toast("鏈壘鍒板尮閰嶇殑 鐢ㄦ埛鍚嶇О");
+ //}
+ //this.GetMesItemBlDetailByBillNo();
+ //this.$toast(item.name);
+
}
+
}
})
\ No newline at end of file
--
Gitblit v1.9.3