From 5c576ddfcb9f8386f92ec69df698e600800176ce Mon Sep 17 00:00:00 2001 From: Timer <@> Date: Thu, 9 Apr 2026 14:16:18 +0800 Subject: [PATCH] bug --- .../controller/work/KPIPointController.java | 19 ++++- .../webapp/jsp/maintenance/abnormityAdd.jsp | 4 +- .../webapp/jsp/maintenance/abnormityEdit.jsp | 8 +- .../webapp/jsp/maintenance/abnormityList.jsp | 4 +- .../jsp/maintenance/abnormityList_new.jsp | 8 +- .../maintenance/anticorrosiveLibraryList.jsp | 8 +- .../jsp/maintenance/defectEndRecordList.jsp | 4 +- .../jsp/maintenance/defectRecordList.jsp | 4 +- .../jsp/maintenance/maintenanceDetailList.jsp | 4 +- src/main/webapp/jsp/work/KPIPointAdd.jsp | 10 +-- src/main/webapp/jsp/work/KPIPointEdit.jsp | 16 ++-- src/main/webapp/jsp/work/KPIPointList.jsp | 15 ++-- .../webapp/jsp/work/KPIPointProfessorList.jsp | 77 ++++++++----------- .../webapp/jsp/work/cameraIdsHisShowlist.jsp | 13 ++-- .../webapp/jsp/work/cameraIdsShowlist.jsp | 13 ++-- src/main/webapp/jsp/work/kPointList.jsp | 4 +- src/main/webapp/jsp/work/mPointList.jsp | 12 +-- src/main/webapp/jsp/work/mPointListES.jsp | 12 +-- .../jsp/workorder/overHaulRecordAdd.jsp | 12 +-- .../jsp/workorder/overHaulRecordEdit.jsp | 8 +- .../jsp/workorder/overHaulRecordList.jsp | 12 +-- 21 files changed, 137 insertions(+), 130 deletions(-) diff --git a/src/main/java/com/sipai/controller/work/KPIPointController.java b/src/main/java/com/sipai/controller/work/KPIPointController.java index 1ecb9ada..a39ce77b 100644 --- a/src/main/java/com/sipai/controller/work/KPIPointController.java +++ b/src/main/java/com/sipai/controller/work/KPIPointController.java @@ -89,11 +89,26 @@ public class KPIPointController { // List lists = mPointHistoryService.selectListByTableAWhere("tb_mp_11_GNJ1_F","MeasureDT='2016-01-10 10:16:57'"); // int dd= mPointHistoryService.deleteByTableAWhere("tb_mp_11_GNJ1_F","MeasureDT='2016-01-10 10:16:57'"); for (int i=0; i < list.size(); i++) { - ProcessSection processSection = this.processSectionService.selectById(list.get(i).getProcesssectionid()); + String rawBizId = list.get(i).getBizid(); + ProcessSection processSection = this.processSectionService.selectById(list.get(i).getProcesssectionid()); + if (processSection == null && list.get(i).getProcesssectionid() != null && !list.get(i).getProcesssectionid().isEmpty()) { + // KPI里历史数据存在按code保存工艺段的场景，优先按厂区code匹配，再回退到系统库 + List processSectionList = this.processSectionService.selectSimpleListByWhere( + "where code='" + list.get(i).getProcesssectionid() + "' and unit_id='" + rawBizId + "' " + ); + if (processSectionList == null || processSectionList.isEmpty()) { + processSectionList = this.processSectionService.selectSimpleListByWhere( + "where code='" + list.get(i).getProcesssectionid() + "' and unit_id='" + ProcessSection.UnitId_Sys + "' " + ); + } + if (processSectionList != null && !processSectionList.isEmpty()) { + processSection = processSectionList.get(0); + } + } if (processSection != null) { list.get(i).setProcessectionname(processSection.getName()); } - Company company = this.unitService.getCompById(list.get(i).getBizid()); + Company company = this.unitService.getCompById(rawBizId); if (company != null) { list.get(i).setBizid(company.getName()); } diff --git a/src/main/webapp/jsp/maintenance/abnormityAdd.jsp b/src/main/webapp/jsp/maintenance/abnormityAdd.jsp index a777df4d..8d26ae04 100644 --- a/src/main/webapp/jsp/maintenance/abnormityAdd.jsp +++ b/src/main/webapp/jsp/maintenance/abnormityAdd.jsp @@ -173,8 +173,8 @@ return repo.text; } // 函数用于呈现当前的选择 }); - selelct_.val('').trigger("change"); - selelct_.on('change', function () { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () { //工艺段选择后，清空原有工艺段选择的设备 $("#equipmentIds").val(""); $("#equipname").val(""); diff --git a/src/main/webapp/jsp/maintenance/abnormityEdit.jsp b/src/main/webapp/jsp/maintenance/abnormityEdit.jsp index f74ea4e4..a7161e5e 100644 --- a/src/main/webapp/jsp/maintenance/abnormityEdit.jsp +++ b/src/main/webapp/jsp/maintenance/abnormityEdit.jsp @@ -159,8 +159,8 @@ formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); - selelct_.val('${abnormity.processSectionId}').trigger("change"); - },'json'); + selelct_.val('${abnormity.processSectionId}').trigger("change.select2"); + },'json'); }; var companyId = "${abnormity.bizId}"; $(function(){ @@ -181,9 +181,9 @@ formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); if(data!=null && data.length>0){ - selelct_.val('${abnormity.processSectionId}').trigger("change"); + selelct_.val('${abnormity.processSectionId}').trigger("change.select2"); } - selelct_.on('change',function(){ + selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(){ //工艺段选择后，清空原有工艺段选择的设备 $("#equipmentIds").val(""); $("#equipname").val(""); diff --git a/src/main/webapp/jsp/maintenance/abnormityList.jsp b/src/main/webapp/jsp/maintenance/abnormityList.jsp index 8bce31f3..b20696d1 100644 --- a/src/main/webapp/jsp/maintenance/abnormityList.jsp +++ b/src/main/webapp/jsp/maintenance/abnormityList.jsp @@ -195,8 +195,8 @@ formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); - selelct_.val('').trigger("change"); - selelct_.on("change",function(e){ + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(e){ dosearch(); }); },'json'); diff --git a/src/main/webapp/jsp/maintenance/abnormityList_new.jsp b/src/main/webapp/jsp/maintenance/abnormityList_new.jsp index 389c2ddd..656f3362 100644 --- a/src/main/webapp/jsp/maintenance/abnormityList_new.jsp +++ b/src/main/webapp/jsp/maintenance/abnormityList_new.jsp @@ -156,8 +156,8 @@ return repo.text; } // 函数用于呈现当前的选择 }); - selelct_.val('').trigger("change"); - selelct_.on("change", function (e) { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { initAPPFun(); }); }, 'json'); @@ -493,8 +493,8 @@ return repo.text; } // 函数用于呈现当前的选择 }); - selelct_.val('').trigger("change"); - selelct_.on("change", function (e) { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { // dosearch(); $("#table").bootstrapTable('refresh'); }); diff --git a/src/main/webapp/jsp/maintenance/anticorrosiveLibraryList.jsp b/src/main/webapp/jsp/maintenance/anticorrosiveLibraryList.jsp index cccd2fd4..f3071424 100644 --- a/src/main/webapp/jsp/maintenance/anticorrosiveLibraryList.jsp +++ b/src/main/webapp/jsp/maintenance/anticorrosiveLibraryList.jsp @@ -170,16 +170,16 @@ return repo.text; } // 函数用于呈现当前的选择 }); - selelct_.val('').trigger("change"); - selelct_.on("change", function (e) { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { dosearch(); }); }, 'json'); var statusSelect = $("#statusSelect").select2({ minimumResultsForSearch: 10, placeholder: '请选择', - }).val('').trigger("change"); - statusSelect.on("change", function (e) { + }).val('').trigger("change.select2"); + statusSelect.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { dosearch(); }); $("#table").bootstrapTable({ // 对应table标签的id diff --git a/src/main/webapp/jsp/maintenance/defectEndRecordList.jsp b/src/main/webapp/jsp/maintenance/defectEndRecordList.jsp index fd4f5550..3f15d115 100644 --- a/src/main/webapp/jsp/maintenance/defectEndRecordList.jsp +++ b/src/main/webapp/jsp/maintenance/defectEndRecordList.jsp @@ -174,8 +174,8 @@ return repo.text; } // 函数用于呈现当前的选择 }); - selelct_.val("").trigger("change"); - selelct_.on("change", function (e) { + selelct_.val("").trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { dosearch(); }); }, 'json'); diff --git a/src/main/webapp/jsp/maintenance/defectRecordList.jsp b/src/main/webapp/jsp/maintenance/defectRecordList.jsp index be801d42..2c246e4e 100644 --- a/src/main/webapp/jsp/maintenance/defectRecordList.jsp +++ b/src/main/webapp/jsp/maintenance/defectRecordList.jsp @@ -187,8 +187,8 @@ return repo.text; } // 函数用于呈现当前的选择 }); - selelct_.val("").trigger("change"); - selelct_.on("change", function (e) { + selelct_.val("").trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { dosearch(); }); }, 'json'); diff --git a/src/main/webapp/jsp/maintenance/maintenanceDetailList.jsp b/src/main/webapp/jsp/maintenance/maintenanceDetailList.jsp index 84c9c05a..10c25372 100644 --- a/src/main/webapp/jsp/maintenance/maintenanceDetailList.jsp +++ b/src/main/webapp/jsp/maintenance/maintenanceDetailList.jsp @@ -271,8 +271,8 @@ formatResult: function formatRepo(repo) { return repo.text; }, // 函数用来渲染结果 formatSelection: function formatRepoSelection(repo) { return repo.text; } // 函数用于呈现当前的选择 }); - selelct_.val("").trigger("change"); - selelct_.on("change", function (e) { + selelct_.val("").trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { dosearch(); }); }, 'json'); diff --git a/src/main/webapp/jsp/work/KPIPointAdd.jsp b/src/main/webapp/jsp/work/KPIPointAdd.jsp index fd4ab0da..38eb60e0 100644 --- a/src/main/webapp/jsp/work/KPIPointAdd.jsp +++ b/src/main/webapp/jsp/work/KPIPointAdd.jsp @@ -113,7 +113,7 @@ var selectMPint = function(pid) { formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); if(data!=null && data.length>0){ - selelct_.val(data[0].id).trigger("change"); + selelct_.val(data[0].id).trigger("change.select2"); } },'json'); }else{ @@ -131,8 +131,8 @@ var selectMPint = function(pid) { formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); - selelct.val('').trigger("change"); - selelct.on("change",function(e){ + selelct.val('').trigger("change.select2"); + selelct.off("select2:select select2:clear").on("select2:select select2:clear",function(){ var companyId= $(this).val(); $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) { $("#processsectionid").empty(); @@ -147,8 +147,8 @@ var selectMPint = function(pid) { formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); - selelct_.val('${kPIPoint.processsectionid}').trigger("change"); - },'json'); + selelct_.val('${kPIPoint.processsectionid}').trigger("change.select2"); + },'json'); }); } },'json'); diff --git a/src/main/webapp/jsp/work/KPIPointEdit.jsp b/src/main/webapp/jsp/work/KPIPointEdit.jsp index 919c0860..44e6dbc3 100644 --- a/src/main/webapp/jsp/work/KPIPointEdit.jsp +++ b/src/main/webapp/jsp/work/KPIPointEdit.jsp @@ -89,8 +89,8 @@ var selectMPint = function(pid) { formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); - selelct_.val('${kPIPoint.processsectionid}').trigger("change"); - },'json'); + selelct_.val('${kPIPoint.processsectionid}').trigger("change.select2"); + },'json'); }; $(function(){ @@ -116,8 +116,8 @@ var selectMPint = function(pid) { formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); - selelct_.val('${kPIPoint.processsectionid}').trigger("change"); - },'json'); + selelct_.val('${kPIPoint.processsectionid}').trigger("change.select2"); + },'json'); }else{ $("#hidden_bizid").attr("disabled","disabled"); $("#input_bizid").css("display", "none"); @@ -133,8 +133,8 @@ var selectMPint = function(pid) { formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); - selelct.val('${kPIPoint.bizid}').trigger("change"); - selelct.on("change",function(e){ + selelct.val('${kPIPoint.bizid}').trigger("change.select2"); + selelct.off("select2:select select2:clear").on("select2:select select2:clear",function(){ var companyId= $(this).val(); $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) { $("#processsectionid").empty(); @@ -149,8 +149,8 @@ var selectMPint = function(pid) { formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); - selelct_.val('').trigger("change"); - },'json'); + selelct_.val('').trigger("change.select2"); + },'json'); }); } },'json'); diff --git a/src/main/webapp/jsp/work/KPIPointList.jsp b/src/main/webapp/jsp/work/KPIPointList.jsp index ec57207b..8542aaff 100644 --- a/src/main/webapp/jsp/work/KPIPointList.jsp +++ b/src/main/webapp/jsp/work/KPIPointList.jsp @@ -179,9 +179,14 @@ } }); $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}); - selelct_.val('').trigger("change"); - selelct_.off("change").on("change", function () { - dosearch(); + // 初始化时仅刷新控件显示，不触发查询 + selelct_.val('').trigger("change.select2"); + // 用select2事件触发查询，避免普通change导致选中文本被立即重置 + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () { + // 让select2先完成渲染，再执行查询 + setTimeout(function () { + dosearch(); + }, 0); }); }, 'json'); }; @@ -239,9 +244,9 @@ } // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}) - selelct.val('').trigger("change"); + selelct.val('').trigger("change.select2"); refreshSelect(); - selelct.on("change", function (e) { + selelct.off("select2:select select2:clear").on("select2:select select2:clear", function () { companyId = $(this).val(); dosearch(); refreshSelect(); diff --git a/src/main/webapp/jsp/work/KPIPointProfessorList.jsp b/src/main/webapp/jsp/work/KPIPointProfessorList.jsp index 8140d8b1..69938439 100644 --- a/src/main/webapp/jsp/work/KPIPointProfessorList.jsp +++ b/src/main/webapp/jsp/work/KPIPointProfessorList.jsp @@ -139,6 +139,34 @@ var companyId = ""; var dosearch = function() { $("#table").bootstrapTable('refresh'); }; + var loadProcessSectionSelect = function(companyId) { + if (!companyId) { + refreshSelect(); + return; + } + $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) { + $("#processSection").empty(); + var selelct_ =$("#processSection").select2({ + data: data, + cache : false, + placeholder:'请选择', + allowClear: true, + escapeMarkup: function (markup) { return markup; }, + language: "zh-CN", + minimumInputLength: 0, + minimumResultsForSearch: 10, + formatResult: function formatRepo(repo){return repo.text;}, + formatSelection: function formatRepoSelection(repo){return repo.text;} + }); + $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'}); + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(){ + setTimeout(function(){ + dosearch(); + },0); + }); + },'json'); + }; var refreshSelect = function() { var selelct_ =$("#processSection").select2({ data: null, @@ -163,27 +191,7 @@ var companyId = ""; $("#company").text(data[0].text); companyId=data[0].id; dosearch(); - $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) { - $("#processSection").empty(); - var selelct_ =$("#processSection").select2({ - data: data, - cache : false, - placeholder:'请选择',//默认文字提示 - allowClear: true,//允许清空 - escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入 - language: "zh-CN", - minimumInputLength: 0, - minimumResultsForSearch: 10,//数据超过十个启用搜索框 - formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 - formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 - }); - $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'}) - selelct_.val('').trigger("change"); - selelct_.on("change",function(e){ - dosearch(); - }); - - },'json'); + loadProcessSectionSelect(companyId); }else{ $("#company").css("display", "none"); var selelct=$("#search_code").select2({ @@ -198,33 +206,14 @@ var companyId = ""; formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'}) - selelct.val('').trigger("change"); + selelct.val('').trigger("change.select2"); refreshSelect(); - selelct.on("change",function(e){ + selelct.off("select2:select select2:clear").on("select2:select select2:clear",function(){ companyId= $(this).val(); dosearch(); refreshSelect(); - $.post(ext.contextPath + "/user/processSection/getProcessSection4Select.do", {companyId:companyId}, function(data) { - $("#processSection").empty(); - var selelct_ =$("#processSection").select2({ - data: data, - cache : false, - placeholder:'请选择',//默认文字提示 - allowClear: true,//允许清空 - escapeMarkup: function (markup) { return markup; }, // 自定义格式化防止xss注入 - language: "zh-CN", - minimumInputLength: 0, - minimumResultsForSearch: 10,//数据超过十个启用搜索框 - formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 - formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 - }); - $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'}) - selelct_.val('').trigger("change"); - selelct_.on("change",function(e){ - dosearch(); - }); - },'json'); - }); + loadProcessSectionSelect(companyId); + }); } },'json'); diff --git a/src/main/webapp/jsp/work/cameraIdsHisShowlist.jsp b/src/main/webapp/jsp/work/cameraIdsHisShowlist.jsp index ca7a0eb1..fb11c59c 100644 --- a/src/main/webapp/jsp/work/cameraIdsHisShowlist.jsp +++ b/src/main/webapp/jsp/work/cameraIdsHisShowlist.jsp @@ -366,8 +366,8 @@ } // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}) - selelct_.val('').trigger("change"); - selelct_.on("change", function (e) { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { dosearch(); }); }, 'json'); @@ -394,9 +394,8 @@ } // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}) - selelct.val('').trigger("change"); - //refreshSelect(); - selelct.on("change", function (e) { + selelct.val('').trigger("change.select2"); + selelct.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { companyId = $(this).val(); //dosearch(); //refreshSelect(); @@ -422,8 +421,8 @@ } // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}) - selelct_.val('').trigger("change"); - selelct_.on("change", function (e) { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { dosearch(); }); }, 'json'); diff --git a/src/main/webapp/jsp/work/cameraIdsShowlist.jsp b/src/main/webapp/jsp/work/cameraIdsShowlist.jsp index 2cad3feb..1a5fc7d4 100644 --- a/src/main/webapp/jsp/work/cameraIdsShowlist.jsp +++ b/src/main/webapp/jsp/work/cameraIdsShowlist.jsp @@ -325,8 +325,8 @@ } // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}) - selelct_.val('').trigger("change"); - selelct_.on("change", function (e) { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { dosearch(); }); }, 'json'); @@ -353,9 +353,8 @@ } // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}) - selelct.val('').trigger("change"); - //refreshSelect(); - selelct.on("change", function (e) { + selelct.val('').trigger("change.select2"); + selelct.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { companyId = $(this).val(); //dosearch(); //refreshSelect(); @@ -381,8 +380,8 @@ } // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}) - selelct_.val('').trigger("change"); - selelct_.on("change", function (e) { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function (e) { dosearch(); }); }, 'json'); diff --git a/src/main/webapp/jsp/work/kPointList.jsp b/src/main/webapp/jsp/work/kPointList.jsp index 202de01c..96883a31 100644 --- a/src/main/webapp/jsp/work/kPointList.jsp +++ b/src/main/webapp/jsp/work/kPointList.jsp @@ -133,8 +133,8 @@ formatSelection: function formatRepoSelection(repo) { return repo.text; } // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({ 'height': '30px', 'paddingTop': '4px' }) - selelct_.val('').trigger("change"); - selelct_.on("change", function (e) { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () { $("#table").bootstrapTable('refresh'); }); diff --git a/src/main/webapp/jsp/work/mPointList.jsp b/src/main/webapp/jsp/work/mPointList.jsp index ee045578..d3fa316e 100644 --- a/src/main/webapp/jsp/work/mPointList.jsp +++ b/src/main/webapp/jsp/work/mPointList.jsp @@ -149,8 +149,8 @@ minimumInputLength: 0, minimumResultsForSearch: 10,//数据超过十个启用搜索框 }); - select.val('').trigger("change"); - select.on("change", function (e) { + select.val('').trigger("change.select2"); + select.off("select2:select select2:clear").on("select2:select select2:clear", function () { $("#table").bootstrapTable('refresh'); }); @@ -166,8 +166,8 @@ minimumInputLength: 0, minimumResultsForSearch: 10,//数据超过十个启用搜索框 }); - select.val("").trigger("change"); - select.on("change", function (e) { + select.val("").trigger("change.select2"); + select.off("select2:select select2:clear").on("select2:select select2:clear", function () { $("#table").bootstrapTable('refresh'); }); @@ -196,8 +196,8 @@ } // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}) - selelct_.val('').trigger("change"); - selelct_.on("change", function (e) { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () { $("#table").bootstrapTable('refresh'); }); diff --git a/src/main/webapp/jsp/work/mPointListES.jsp b/src/main/webapp/jsp/work/mPointListES.jsp index b80edc59..7a5494e6 100644 --- a/src/main/webapp/jsp/work/mPointListES.jsp +++ b/src/main/webapp/jsp/work/mPointListES.jsp @@ -181,8 +181,8 @@ minimumInputLength: 0, minimumResultsForSearch: 10,//数据超过十个启用搜索框 }); - select.val('').trigger("change"); - select.on("change", function (e) { + select.val('').trigger("change.select2"); + select.off("select2:select select2:clear").on("select2:select select2:clear", function () { $("#table").bootstrapTable('refresh', {pageNumber: 1}); }); @@ -200,8 +200,8 @@ minimumInputLength: 0, minimumResultsForSearch: 10,//数据超过十个启用搜索框 }); - select.val("").trigger("change"); - select.on("change", function (e) { + select.val("").trigger("change.select2"); + select.off("select2:select select2:clear").on("select2:select select2:clear", function () { $("#table").bootstrapTable('refresh', {pageNumber: 1}); }); @@ -231,8 +231,8 @@ } // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height': '30px', 'paddingTop': '4px'}) - selelct_.val('').trigger("change"); - selelct_.on("change", function (e) { + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear", function () { $("#table").bootstrapTable('refresh', {pageNumber: 1}); }); diff --git a/src/main/webapp/jsp/workorder/overHaulRecordAdd.jsp b/src/main/webapp/jsp/workorder/overHaulRecordAdd.jsp index 9c4fdc2b..2a5329b9 100644 --- a/src/main/webapp/jsp/workorder/overHaulRecordAdd.jsp +++ b/src/main/webapp/jsp/workorder/overHaulRecordAdd.jsp @@ -108,7 +108,7 @@ formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); if(data!=null && data.length>0){ - selelct_.val(data[0].id).trigger("change"); + selelct_.val(data[0].id).trigger("change.select2"); } },'json'); }else{ @@ -126,7 +126,7 @@ formatResult: function formatRepo(repo){return repo.text;}, // 函数用来渲染结果 formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); - selelct.on("change",function(e){ + selelct.off("select2:select select2:clear").on("select2:select select2:clear",function(){ companyId= $(this).val(); //重新选择厂区后清空设备和工艺段数据 $("#equipname").val(""); @@ -134,7 +134,7 @@ $("#processSectionId").val(""); $("#processectionname").val(""); }); - selelct.val('').trigger("change"); + selelct.val('').trigger("change.select2"); } },'json'); @@ -149,9 +149,9 @@ .updateStatus('plannedenddt', 'NOT_VALIDATED',null) .validateField('plannedenddt'); }); - $("#active").select2({minimumResultsForSearch: 10}).val('${Active_True}').trigger("change"); - $("#maintenanceWay").select2({minimumResultsForSearch: 10}).val('${INTER_MAINTENANCE}').trigger("change"); - }); + $("#active").select2({minimumResultsForSearch: 10}).val('${Active_True}').trigger("change.select2"); + $("#maintenanceWay").select2({minimumResultsForSearch: 10}).val('${INTER_MAINTENANCE}').trigger("change.select2"); + }); //选择设备，根据厂区id选择厂内设备 var selectEquipmentCard = function() { $.post(ext.contextPath + '/equipment/showEquipmentCardForSelect.do', {companyId:companyId, equipmentId:$("#equipid").val()} , function(data) { diff --git a/src/main/webapp/jsp/workorder/overHaulRecordEdit.jsp b/src/main/webapp/jsp/workorder/overHaulRecordEdit.jsp index 70cb6981..44bad2df 100644 --- a/src/main/webapp/jsp/workorder/overHaulRecordEdit.jsp +++ b/src/main/webapp/jsp/workorder/overHaulRecordEdit.jsp @@ -101,7 +101,7 @@ formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); if(data!=null && data.length>0){ - selelct_.val(data[0].id).trigger("change"); + selelct_.val(data[0].id).trigger("change.select2"); } },'json'); }else{ @@ -119,7 +119,7 @@ formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); - selelct.on("change",function(e){ + selelct.off("select2:select select2:clear").on("select2:select select2:clear", function(e){ companyId = $(this).val(); //重新选择厂区后清空设备和工艺段数据 if(companyId != "${maintenanceDetail.companyid}"){ @@ -129,10 +129,10 @@ $("#processectionname").val(""); } }); - selelct.val('${maintenanceDetail.companyid}').trigger("change"); + selelct.val('${maintenanceDetail.companyid}').trigger("change.select2"); } },'json'); - $("#maintenanceWay").select2({minimumResultsForSearch: 10}).val("${maintenanceDetail.maintenanceWay}").trigger("change"); + $("#maintenanceWay").select2({minimumResultsForSearch: 10}).val("${maintenanceDetail.maintenanceWay}").trigger("change.select2"); //选择时间 $('#startDate').datepicker({ language: 'zh-CN', diff --git a/src/main/webapp/jsp/workorder/overHaulRecordList.jsp b/src/main/webapp/jsp/workorder/overHaulRecordList.jsp index d5ef5622..f45ae793 100644 --- a/src/main/webapp/jsp/workorder/overHaulRecordList.jsp +++ b/src/main/webapp/jsp/workorder/overHaulRecordList.jsp @@ -133,8 +133,8 @@ formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'}) - selelct_.val('').trigger("change"); - selelct_.on("change",function(e){ + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(){ dosearch(); }); @@ -153,9 +153,9 @@ formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'}) - selelct.val('').trigger("change"); + selelct.val('').trigger("change.select2"); refreshSelect(); - selelct.on("change",function(e){ + selelct.off("select2:select select2:clear").on("select2:select select2:clear",function(){ companyId= $(this).val(); dosearch(); refreshSelect(); @@ -174,8 +174,8 @@ formatSelection: function formatRepoSelection(repo){return repo.text;} // 函数用于呈现当前的选择 }); $(".select2-selection--single").css({'height':'30px','paddingTop':'4px'}) - selelct_.val('').trigger("change"); - selelct_.on("change",function(e){ + selelct_.val('').trigger("change.select2"); + selelct_.off("select2:select select2:clear").on("select2:select select2:clear",function(){ dosearch(); }); },'json');