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 |   93 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/H5/Js/Scbg.js b/H5/Js/Scbg.js
index 3aa7fe6..45cc400 100644
--- a/H5/Js/Scbg.js
+++ b/H5/Js/Scbg.js
@@ -49,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;
@@ -95,8 +95,6 @@
     },
     methods: {
         getInfo() {
-            this.show = true;
-
             var that = this;
             that.isLoading = true;
             that.AxiosHttp("post", 'MesStaff/GetList', {
@@ -105,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);
@@ -169,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");
@@ -212,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);
@@ -235,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);
 

--
Gitblit v1.9.3