From fb8a9fbc15b917ff3d36eb30e28633a413ff0a42 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 04 八月 2025 10:17:38 +0800
Subject: [PATCH] 页面过滤条件：开始时间和结束时间(根据检验信息中的创建时间进行过滤)、站台(检验信息中的检验工序)、料号(PNL布局信息名称)、批次(lot号) 2.柱状图：x轴lot号，y轴良品率。根据开始时间和结束时间、站台、料号 过滤检验信息并去重(一个PNL里的PCS不能有重复记录)，然后根据料号、批次分组合计得到该料号每个批次的不良PCS的数量合计。然后获取该料号每个批次中PNL条码的数量(PNL条码不能重复)并乘PNL布局信息中子表的记录数(该料号中的PCS数量)得到每个批次的PCS总数。对每个批次进行((PCS总数-不良PCS数量)/PCS总数 *100)得到每个批次的良品率。 3.饼状图：根据开始时间和结束时间、站台、料号 过滤检验信息并去重(一个PNL里的PCS不能有重复记录)，然后根据检验信息中的不良原因分组统计各个原因的数量。在饼状图显示 4.表格：根据开始时间和结束时间、站台、料号 过滤检验信息，表头包含(站台、料号、PNL条码、PCS号、正反面、不良原因)，并针对表头字段进行去重
---
WebTM/layuiadmin/modules/tableSelect.js | 143 ++++++++++++++++++++++++++---------------------
1 files changed, 78 insertions(+), 65 deletions(-)
diff --git a/WebTM/layuiadmin/modules/tableSelect.js b/WebTM/layuiadmin/modules/tableSelect.js
index d0a2659..6d7fa06 100644
--- a/WebTM/layuiadmin/modules/tableSelect.js
+++ b/WebTM/layuiadmin/modules/tableSelect.js
@@ -10,7 +10,7 @@
table = layui.table,
form = layui.form;
var tableSelect = function () {
- this.v = '1.3.0';
+ this.v = '1.4.0';
};
/**
@@ -20,12 +20,13 @@
var elem = $(opt.elem);
//榛樿璁剧疆
- opt.searchKey = opt.searchKey || 'keyword';
+ opt.searchKey = opt.searchKey || 'keyword';//鍙涓敤锛屽垎鍓�
opt.table.page = opt.table.page || false;
opt.table.height = opt.table.height || 290;
- elem.off('click').on('click', function(e) {
+ elem.off('keyup').on('keyup', function(e) {
e.stopPropagation();
- if($('div.tableSelect').length >= 1){
+ //杈撳叆瀛楃灏忎簬浜屾垨鑰呯壒娈婃寜閽笉鏄剧ず
+ if ($('div.tableSelect').length >= 1 || elem.val().length <= 2 || event.key == "F7" || event.key == "F8" || event.key == "F6") {
return false;
}
@@ -43,11 +44,16 @@
//娓叉煋TABLE
opt.table.elem = "#"+tableName;
opt.table.id = tableName;
- //鑻ユ病鏈墂here琛ㄧず涓哄墠绔垎椤�
- if (opt.table.url != undefined) {
- opt.table.where['sWhere'] = opt.sWhere
- } else {
- opt.table.data = opt.ajaxSelect(opt.sWhere);
+ //鑻ユ病鏈塽rl琛ㄧず涓哄墠绔垎椤�
+ //if (opt.table.url != undefined) {
+ // opt.table.where['sWhere'] = opt.sWhere
+ //} else {
+ // opt.table.data = opt.ajaxSelect(opt.sWhere);
+ //}
+ //璁╀竴娆″姞杞芥樉绀烘暟鎹�
+ //褰撳瓧绗﹂暱搴︾瓑浜�3鏃剁涓�娆″姞杞�
+ if (elem.val().length == 3) {
+ searchFirst()
}
opt.table.request={//璁剧疆椤靛弬鏁�
pageName: 'page', // 椤电爜鐨勫弬鏁板悕绉帮紝榛樿锛歱age
@@ -61,51 +67,8 @@
"data": res.data // 瑙ｆ瀽鏁版嵁鍒楄〃
};
}
- //鐢╦ump鏇夸唬鍘熸潵琛ㄦ牸pagejump鐢ㄤ簬鏇存柊鎸夐挳閫変腑鏁伴噺姝ゅ姛鑳藉彂鐜版棤鐢ㄥ垹闄�
- //opt.table.done = function (res, curr, count, origin) {
- // this.page.jump = jump;
- //}
var tableSelect_table = table.render(opt.table);
-
- //jump鍒嗛〉瑙﹀彂鍑芥暟
- //function jump(obj, first) {
- // table.reload(tableName);
- // //鏇存柊鎸夐挳
- // updataButton(table.checkStatus(tableName).data.length)
- //}
-
- //鏇存柊閫変腑鏁伴噺
- function updataButton (n) {
- tableBox.find('.tableSelect_btn_select span').html(n==0?'':'('+n+')')
- }
-
- //鏁扮粍鍘婚噸
- function uniqueObjArray(arr, type){
- var newArr = [];
- var tArr = [];
- if(arr.length == 0){
- return arr;
- }else{
- if(type){
- for(var i=0;i<arr.length;i++){
- if(!tArr[arr[i][type]]){
- newArr.push(arr[i]);
- tArr[arr[i][type]] = true;
- }
- }
- return newArr;
- }else{
- for(var i=0;i<arr.length;i++){
- if(!tArr[arr[i]]){
- newArr.push(arr[i]);
- tArr[arr[i]] = true;
- }
- }
- return newArr;
- }
- }
- }
//FIX浣嶇疆濡備綍涓嬮潰鏀句笉涓嬫斁涓婇潰
var overHeight = (elem.offset().top + elem.outerHeight() + tableBox.outerHeight() - $(window).scrollTop()) > $(window).height();
@@ -148,16 +111,16 @@
if (tr.length == 0) {
tableElem.find('tr:first').children('td').eq(0).click();
} else {
- tr.children('td').click();
- tr['prev']().children('td').click();
+ tr.children('td').eq(0).click();
+ tr['prev']().children('td').eq(0).click();
}
break;
case "ArrowDown"://涓嬮敭
if (tr.length == 0) {
- tr = tableElem.find('tr:first').children('td').eq(0).click();
+ tableElem.find('tr:first').children('td').eq(0).click();
} else {
- tr.children('td').click();
- tr['next']().children('td').click();
+ tr.children('td').eq(0).click();
+ tr['next']().children('td').eq(0).click();
}
break;
case "Enter"://鍥炶溅
@@ -167,13 +130,56 @@
}
})
- //杈撳叆妗嗚緭鍏ユ墽琛�
- elem.off('input').on('input', function (e) {
- // 闃绘琛ㄥ崟鎻愪氦锛堝鏋滆緭鍏ユ鍦ㄨ〃鍗曞唴锛�
- e.preventDefault();
+ // 闃叉姈鍑芥暟
+ function debounce(func, wait) {
+ let timeout;
+ return function () {
+ const context = this, args = arguments;
+ clearTimeout(timeout);
+ timeout = setTimeout(() => func.apply(context, args), wait);
+ };
+ }
+ //鎼滅储鍑芥暟绗竴娆″姞杞�
+ function searchFirst() {
+ var searchKeyList = opt.searchKey.split(',');//鑾峰彇鏌ユ壘鐨勫叧閿瓧鎼滅储妗�
+ //鎷兼帴sql瀛楃涓�
+ var sWhereStr = " and ("
+ searchKeyList.forEach(function (value, index) {
+ if (index == 0) {
+ sWhereStr += (value + " like '%" + elem.val() + "%' ")
+ } else {
+ sWhereStr += ("or " + value + " like '%" + elem.val() + "%' ")
+ }
+ })
+ sWhereStr += ")"
//鍚庣鍒嗛〉鎼滅储
if (opt.table.where != undefined) {
- opt.table.where['sWhere'] = opt.sWhere + " and " + opt.searchKey + " like '%" + elem.val() + "%' ";
+ opt.table.where['sWhere'] = opt.sWhere + sWhereStr;
+ } else {
+ var sWhere = opt.sWhere + sWhereStr;
+ opt.table.data = opt.ajaxSelect(sWhere);
+ }
+ }
+
+ //杈撳叆妗嗚緭鍏ユ墽琛�
+ elem.off('input').on('input', debounce(
+ function (e) {
+ // 闃绘琛ㄥ崟鎻愪氦锛堝鏋滆緭鍏ユ鍦ㄨ〃鍗曞唴锛�
+ e.preventDefault();
+ var searchKeyList = opt.searchKey.split(',');//鑾峰彇鏌ユ壘鐨勫叧閿瓧鎼滅储妗�
+ //鎷兼帴sql瀛楃涓�
+ var sWhereStr = " and ("
+ searchKeyList.forEach(function (value, index) {
+ if (index == 0) {
+ sWhereStr += (value + " like '%" + elem.val() + "%' ")
+ } else {
+ sWhereStr += ("or " + value + " like '%" + elem.val() + "%' ")
+ }
+ })
+ sWhereStr +=")"
+ //鍚庣鍒嗛〉鎼滅储
+ if (opt.table.where != undefined) {
+ opt.table.where['sWhere'] = opt.sWhere + sWhereStr;
tableSelect_table.reload({
where: opt.table.where,
page: {
@@ -181,13 +187,13 @@
}
});
} else {
- var sWhere = opt.sWhere + " and " + opt.searchKey + " like '%" + elem.val() + "%' ";
+ var sWhere = opt.sWhere + sWhereStr;
tableSelect_table.reload({
data: opt.ajaxSelect(sWhere)
});
}
- })
+ },500))
//鍙屽嚮琛岄�変腑
table.on('rowDouble('+tableName+')', function(obj){
@@ -224,7 +230,13 @@
//鎸夐挳閫変腑
tableBox.find('.tableSelect_btn_select').on('click', function() {
var checkStatus = table.checkStatus(tableName);
- selectDone(checkStatus);
+ if (checkStatus.data.length > 0) {
+ selectDone(checkStatus);
+ } else {
+ tableBox.remove();
+ delete table.cache[tableName];
+ }
+
})
//鍐欏�煎洖璋冨拰鍏抽棴
@@ -232,6 +244,7 @@
opt.done(elem, checkStatus);
tableBox.remove();
delete table.cache[tableName];
+ $(opt.elem).blur();
}
//鐐瑰嚮鍏朵粬鍖哄煙鍏抽棴
--
Gitblit v1.9.1