From 29d52b87325bc8406d6f6beb73939007e947e6fd Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 24 十二月 2025 17:42:57 +0800
Subject: [PATCH] 生产报工模糊查询装配条件
---
H5/Js/Scbg.js | 230 +++++++++++++--------------------------------------------
1 files changed, 53 insertions(+), 177 deletions(-)
diff --git a/H5/Js/Scbg.js b/H5/Js/Scbg.js
index 2079542..2a8e4f9 100644
--- a/H5/Js/Scbg.js
+++ b/H5/Js/Scbg.js
@@ -1,4 +1,4 @@
-锘縱ar vm = new Vue({
+var vm = new Vue({
el: '#app',
data: function () {
return {
@@ -12,26 +12,22 @@
stafId: "",
stafName: "",
stafList: [],
- BarcodesDetail: [],
+
taskNo: "", //宸ュ崟鍙�
itemNo: "", //鐗╂枡缂栧彿
planQty: "", //璁″垝鏁伴噺
reportedQty: "", //宸叉姤宸ユ暟閲�
currentQty: "", //鏈鎶ュ伐鏁伴噺
barcodeQty: "", //鏉＄爜鏁伴噺
- sjBillNo:"",//閫佹鍗曞彿
itemName: "", //鐗╂枡鍚嶇О
itemModel: "", //鐗╂枡鍨嬪彿
load: false,
active: 0,
- actions: [],//鍒楄〃鐨勫��
- show: false,//鍒楄〃灞曠ず
-
- billactive: 0,
- billactions: [],//鍒楄〃鐨勫��
- billshow: false,//鍒楄〃灞曠ず
+ show: false,
+ actions: [],
+ filterCondition: "瑁呴厤杞﹂棿",
}
},
mounted() {
@@ -51,24 +47,7 @@
return { name: item.staffName }
});
- 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("鏈壘鍒板尮閰嶇殑 鐢ㄦ埛鍚嶇О");
- }
}
else {
that.$toast.fail(json.message);
@@ -80,19 +59,10 @@
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', {
@@ -101,41 +71,28 @@
.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;
- }
- else {
- that.$toast.fail(json.message);
- }
- that.isLoading = false;
- })
- .catch(function (error) {
- that.isLoading = false;
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- console.log(error);
- });
- },
- selectBillNo() {
- this.billshow = true;
+
+ let searchText = that.filterCondition ? String(that.filterCondition).trim().toLowerCase() : "";
+ let filteredList = that.stafList;
- 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 }
- });
+ 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);
+ });
+ }
- that.stafList = json.data.result.rksqOrderList;
+ if (filteredList.length === 0) {
+ that.$toast("鏈壘鍒板尮閰嶇殑鍛樺伐");
+ that.actions = [];
+ } else {
+ that.actions = filteredList.map(item => {
+ return { name: item.staffName, data: item }
+ });
+ that.show = true;
+ }
}
else {
that.$toast.fail(json.message);
@@ -158,31 +115,19 @@
// 鍙互閫氳繃 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("鏈壘鍒板尮閰嶇殑閫佹鍗曞彿");
+ let staf = this.stafList.filter(it => it.staffName === item.name);
+ if (staf.length > 0) {
+ this.stafName = staf[0].staffName;
+ this.stafId = staf[0].staffNo;
+ this.$refs.barcode.focus();
+ } else {
+ this.$toast("鏈壘鍒板尮閰嶇殑 staffName");
+ }
}
//this.GetMesItemBlDetailByBillNo();
//this.$toast(item.name);
@@ -203,7 +148,6 @@
});
that.stafList = json.data.tbBillList;
- console.log('DAWDADWDADADADWD' + that.stafList);
}
else {
that.$toast.fail(json.message);
@@ -218,10 +162,7 @@
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 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));
+ let staf = that.stafList.filter(it => it.staffNo === that.stafId);
if (staf.length > 0) {
that.stafName = staf[0].staffName;
@@ -237,7 +178,7 @@
getBarcode() {
//this.barcode = value;
- //this.show = true;
+
var that = this;
@@ -275,11 +216,6 @@
that.barcodeQty = entity.barcodeQty; //鏉＄爜鏁伴噺
that.itemName = entity.itemName; //鐗╂枡鍚嶇О
that.itemModel = entity.itemModel; //鐗╂枡鍨嬪彿
- that.sjBillNo = entity.sjBillNo;
- that.BarcodesDetail = entity.barcodesDetail;
- console.log('DADWADWD WDD AD AD A');
- console.log(entity.barcodesDetail);
- console.log(that.BarcodesDetail);
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
that.$refs.barcode.focus();
that.barcode = null;
@@ -310,41 +246,33 @@
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("鎶ュ伐鏁伴噺闇�瑕佸ぇ浜庨浂");
- // that.load = false;
- // return;
- //}
-
- if (!that.sjBillNo) {
- this.$toast.fail("閫佹鍗曞彿涓嶈兘涓虹┖");
+ if (that.currentQty <=0) {
+ this.$toast.fail("鎶ュ伐鏁伴噺闇�瑕佸ぇ浜庨浂");
that.load = false;
return;
}
that.AxiosHttp("post", 'MesWorkProd/ScanWorkProd', {
- userNo: that.stafId,
- //itemBarcode: that.barcode,
- //quantity: that.currentQty
- sjBillNo: that.sjBillNo
+ userNo: that.userInfo.loginAccount,
+ itemBarcode: that.barcode,
+ quantity: that.currentQty
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.$notify({ type: 'success', message: '閫佹鎴愬姛' });
- that.BarcodesDetail = [];
+ that.$notify({ type: 'success', message: '淇濆瓨鎴愬姛' });
}
else {
that.$toast.fail(json.message);
@@ -357,58 +285,6 @@
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
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;
- console.log('DADWADWD WDD AD AD A');
- console.log(entity.barcodesDetail);
- console.log(that.BarcodesDetail);
- that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
- that.$refs.sjBillNo.focus();
- }
- else {
- that.$toast.fail(json.message);
- that.$refs.sjBillNo.focus();
- that.barcode = null;
- }
- that.isLoading = false;
- })
- .catch(function (error) {
- that.isLoading = false;
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- 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