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 | 118 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 80 insertions(+), 38 deletions(-)
diff --git a/H5/Js/Scbg.js b/H5/Js/Scbg.js
index 78864ea..45cc400 100644
--- a/H5/Js/Scbg.js
+++ b/H5/Js/Scbg.js
@@ -13,13 +13,14 @@
stafName: "",
stafList: [],
BarcodesDetail: [],
+ itemDetail: [],
taskNo: "", //宸ュ崟鍙�
itemNo: "", //鐗╂枡缂栧彿
planQty: "", //璁″垝鏁伴噺
reportedQty: "", //宸叉姤宸ユ暟閲�
currentQty: "", //鏈鎶ュ伐鏁伴噺
barcodeQty: "", //鏉＄爜鏁伴噺
- sjBillNo:"",//閫佹鍗曞彿
+ sjBillNo: "",//閫佹鍗曞彿
itemName: "", //鐗╂枡鍚嶇О
itemModel: "", //鐗╂枡鍨嬪彿
@@ -48,7 +49,7 @@
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;
@@ -86,16 +87,14 @@
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 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', {
@@ -104,12 +103,29 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.actions = json.data.tbBillList.map(item => {
- return { name: item.staffName }
- });
- that.$playSound('success');
-
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);
@@ -130,16 +146,18 @@
var that = this;
that.isLoading = true;
that.AxiosHttp("post", 'MesWorkProd/GetRksqSelect',
- {
- staffNo: that.stafId
- //name: that.userInfo.loginAccount,
- }, false)
+ {
+ 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');
@@ -166,11 +184,9 @@
// 鍙互閫氳繃 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");
@@ -193,6 +209,8 @@
this.$toast("鏈壘鍒板尮閰嶇殑閫佹鍗曞彿");
that.$playSound('error');
}
+
+ this.getBillNo();
//this.GetMesItemBlDetailByBillNo();
//this.$toast(item.name);
@@ -207,13 +225,35 @@
.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;
- that.$playSound('success');
- console.log('DAWDADWDADADADWD' + that.stafList);
+
+ 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);
@@ -230,18 +270,18 @@
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
- console.log('DAWDADWDA'+that.stafList);
- console.log('DADADAD'+ this.stafId);
+ //console.log('DAWDADWDA' + that.stafList);
+ //console.log('DADADAD' + this.stafId);
- let staf = that.stafList.filter(it => String(it.staffNo) === String(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("鏈壘鍒板尮閰嶇殑 鐢ㄦ埛鍚嶇О");
- }
+ //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);
@@ -251,7 +291,7 @@
//this.barcode = value;
//this.show = true;
var that = this;
-
+
if (!that.userInfo.loginAccount) {
this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
@@ -292,6 +332,7 @@
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);
@@ -364,7 +405,7 @@
var json = res;
if (json.status == 0) {
that.$notify({ type: 'success', message: '閫佹鎴愬姛' });
-
+ that.sjBillNo = "";
that.BarcodesDetail = [];
that.$playSound('success');
}
@@ -396,6 +437,7 @@
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);
--
Gitblit v1.9.3