From cd855dbb7724bff3cdaf35b20ab271496404b6b2 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 21 Nov 2024 10:06:49 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/demandPlan/child/choose_tool_type_list.js | 12 ++++++++ js/demandPlan/child/delivery_all_list.js | 18 ++++++++++-- js/demandPlan/child/delivery_batch_list.js | 14 +++++++++- js/demandPlan/child/delivery_not_send_list.js | 12 ++++++++ .../child/demand_plan_detail_list.js | 6 ++++ js/demandPlan/child/excess_inventory_list.js | 12 ++++++++ .../child/unplanned_quantity_list.js | 12 ++++++++ js/demandPlan/child/view_data_list.js | 12 ++++++++ js/demandPlan/child/view_data_source_list.js | 28 +++++++++++++------ .../child/view_data_source_list.html | 8 +++--- 10 files changed, 118 insertions(+), 16 deletions(-) diff --git a/js/demandPlan/child/choose_tool_type_list.js b/js/demandPlan/child/choose_tool_type_list.js index 40c6ff5..bb6c317 100644 --- a/js/demandPlan/child/choose_tool_type_list.js +++ b/js/demandPlan/child/choose_tool_type_list.js @@ -21,6 +21,18 @@ function setParams(obj) { // 查询/重置 function queryTable(type) { if (type === 1) { + let pName = $('#pName').val(); + let flag = checkValue(pName); + if (flag) { + $('#pName').val(''); + return layer.msg('物机名称查询包含特殊字符，请重新输入', { icon: 2 }); + } + let name = $('#name').val(); + let flag2 = checkValue(name); + if (flag2) { + $('#name').val(''); + return layer.msg('规格查询包含特殊字符，请重新输入', { icon: 2 }); + } reloadTable(1); } else if (type === 2) { $('#pName').val(''); diff --git a/js/demandPlan/child/delivery_all_list.js b/js/demandPlan/child/delivery_all_list.js index 1256d28..1a01dbb 100644 --- a/js/demandPlan/child/delivery_all_list.js +++ b/js/demandPlan/child/delivery_all_list.js @@ -3,7 +3,7 @@ let type = getUrlParam('type'); // type let form, table, element, tableIns, layer; let pageNum = 1; layui.use(["form", "table", 'element', 'layer'], function () { - if(type){ + if (type) { objParam = JSON.parse(objParam); } form = layui.form; @@ -15,9 +15,9 @@ layui.use(["form", "table", 'element', 'layer'], function () { function isJsonString(str) { try { - JSON.parse(str); + JSON.parse(str); } catch (e) { - return false; + return false; } return true; } @@ -29,6 +29,18 @@ function isJsonObject(obj) { // 查询/重置 function queryTable(type) { if (type === 1) { + let name = $('#name').val(); + let flag = checkValue(name); + if (flag) { + $('#name').val(''); + return layer.msg('物机名称查询包含特殊字符，请重新输入', { icon: 2 }); + } + let module = $('#module').val(); + let flag2 = checkValue(module); + if (flag2) { + $('#module').val(''); + return layer.msg('规格查询包含特殊字符，请重新输入', { icon: 2 }); + } reloadTable(1); } else if (type === 2) { $('#name').val(''); diff --git a/js/demandPlan/child/delivery_batch_list.js b/js/demandPlan/child/delivery_batch_list.js index 5338645..6f2f801 100644 --- a/js/demandPlan/child/delivery_batch_list.js +++ b/js/demandPlan/child/delivery_batch_list.js @@ -84,6 +84,18 @@ function handleFileType(value) { // 查询/重置 function queryTable(type) { if (type === 1) { + let name = $('#name').val(); + let flag = checkValue(name); + if (flag) { + $('#name').val(''); + return layer.msg('物机名称查询包含特殊字符，请重新输入', { icon: 2 }); + } + let module = $('#module').val(); + let flag2 = checkValue(module); + if (flag2) { + $('#module').val(''); + return layer.msg('规格查询包含特殊字符，请重新输入', { icon: 2 }); + } reloadTable(1); } else if (type === 2) { $('#name').val(''); @@ -337,7 +349,7 @@ function exeCommandCopyText(text) { // 预览文件 function viewFile(obj) { let fileName = obj.fileName.toLowerCase(); - if (fileName.indexOf('png') > -1 || fileName.indexOf('jpg') > -1 || fileName.indexOf('jpeg')> -1 ) { + if (fileName.indexOf('png') > -1 || fileName.indexOf('jpg') > -1 || fileName.indexOf('jpeg') > -1) { layer.photos({ shade: 0.5, photos: { diff --git a/js/demandPlan/child/delivery_not_send_list.js b/js/demandPlan/child/delivery_not_send_list.js index 338ff9a..bd74136 100644 --- a/js/demandPlan/child/delivery_not_send_list.js +++ b/js/demandPlan/child/delivery_not_send_list.js @@ -13,6 +13,18 @@ layui.use(["form", "table", 'element', 'layer'], function () { // 查询/重置 function queryTable(type) { if (type === 1) { + let name = $('#name').val(); + let flag = checkValue(name); + if (flag) { + $('#name').val(''); + return layer.msg('物机名称查询包含特殊字符，请重新输入', { icon: 2 }); + } + let module = $('#module').val(); + let flag2 = checkValue(module); + if (flag2) { + $('#module').val(''); + return layer.msg('规格查询包含特殊字符，请重新输入', { icon: 2 }); + } reloadTable(1); } else if (type === 2) { $('#name').val(''); diff --git a/js/demandPlan/child/demand_plan_detail_list.js b/js/demandPlan/child/demand_plan_detail_list.js index 6bf2940..406f350 100644 --- a/js/demandPlan/child/demand_plan_detail_list.js +++ b/js/demandPlan/child/demand_plan_detail_list.js @@ -16,6 +16,12 @@ function setParams(obj) { // 查询/重置 function queryTable(type) { if (type === 1) { + let keyWord = $('#keyWord').val(); + let flag = checkValue(keyWord); + if (flag) { + $('#keyWord').val(''); + return layer.msg('关键字查询包含特殊字符，请重新输入', { icon: 2 }); + } reloadTable(1); } else if (type === 2) { $('#keyWord').val(''); diff --git a/js/demandPlan/child/excess_inventory_list.js b/js/demandPlan/child/excess_inventory_list.js index d2c03e0..95524db 100644 --- a/js/demandPlan/child/excess_inventory_list.js +++ b/js/demandPlan/child/excess_inventory_list.js @@ -11,6 +11,18 @@ layui.use(["form", "table", 'element', 'layer'], function () { // 查询/重置 function queryTable(type) { if (type === 1) { + let name = $('#name').val(); + let flag = checkValue(name); + if (flag) { + $('#name').val(''); + return layer.msg('物机名称查询包含特殊字符，请重新输入', { icon: 2 }); + } + let module = $('#module').val(); + let flag2 = checkValue(module); + if (flag2) { + $('#module').val(''); + return layer.msg('规格查询包含特殊字符，请重新输入', { icon: 2 }); + } reloadTable(1); } else if (type === 2) { $('#name').val(''); diff --git a/js/demandPlan/child/unplanned_quantity_list.js b/js/demandPlan/child/unplanned_quantity_list.js index 61df28f..0b05a3d 100644 --- a/js/demandPlan/child/unplanned_quantity_list.js +++ b/js/demandPlan/child/unplanned_quantity_list.js @@ -11,6 +11,18 @@ layui.use(["form", "table", 'element', 'layer'], function () { // 查询/重置 function queryTable(type) { if (type === 1) { + let name = $('#name').val(); + let flag = checkValue(name); + if (flag) { + $('#name').val(''); + return layer.msg('物机名称查询包含特殊字符，请重新输入', { icon: 2 }); + } + let module = $('#module').val(); + let flag2 = checkValue(module); + if (flag2) { + $('#module').val(''); + return layer.msg('规格查询包含特殊字符，请重新输入', { icon: 2 }); + } reloadTable(1); } else if (type === 2) { $('#name').val(''); diff --git a/js/demandPlan/child/view_data_list.js b/js/demandPlan/child/view_data_list.js index 3bb4d21..44779de 100644 --- a/js/demandPlan/child/view_data_list.js +++ b/js/demandPlan/child/view_data_list.js @@ -21,6 +21,18 @@ function setParams(type) { // 查询/重置 function queryTable(type) { if (type === 1) { + let name = $('#name').val(); + let flag = checkValue(name); + if (flag) { + $('#name').val(''); + return layer.msg('物机名称查询包含特殊字符，请重新输入', { icon: 2 }); + } + let module = $('#module').val(); + let flag2 = checkValue(module); + if (flag2) { + $('#module').val(''); + return layer.msg('规格查询包含特殊字符，请重新输入', { icon: 2 }); + } reloadTable(1); } else if (type === 2) { $('#name').val(''); diff --git a/js/demandPlan/child/view_data_source_list.js b/js/demandPlan/child/view_data_source_list.js index 810e730..68714b9 100644 --- a/js/demandPlan/child/view_data_source_list.js +++ b/js/demandPlan/child/view_data_source_list.js @@ -45,10 +45,22 @@ function getDataInfoDetails() { // 查询/重置 function queryTable(type) { if (type === 1) { + let proName = $('#proName').val(); + let flag = checkValue(proName); + if (flag) { + $('#proName').val(''); + return layer.msg('工程名称查询包含特殊字符，请重新输入', { icon: 2 }); + } + let code = $('#code').val(); + let flag2 = checkValue(code); + if (flag2) { + $('#code').val(''); + return layer.msg('规格查询包含特殊字符，请重新输入', { icon: 2 }); + } reloadTable(1); } else if (type === 2) { - $('#name').val(''); - $('#module').val(''); + $('#proName').val(''); + $('#code').val(''); layui.form.render(); reloadTable(1); } @@ -67,8 +79,8 @@ function reloadTable(pageNum) { }, where: { encryptedData: JSON.stringify({ - 'name': $('#name').val(), - 'module': $('#module').val(), + 'proName': $('#proName').val(), + 'code': $('#code').val(), 'moduleId': objParam.moduleId }), }, @@ -87,8 +99,8 @@ function initTable() { url: dataUrl + "backstage/planOut/getDataPlanByPage", where: { encryptedData: JSON.stringify({ - 'name': $('#name').val(), - 'module': $('#module').val(), + 'proName': $('#proName').val(), + 'code': $('#code').val(), 'moduleId': objParam.moduleId }), }, @@ -200,8 +212,8 @@ function setNumColor(value, type) { // 导出 function exportExcel() { let params = { - 'name': $('#name').val(), - 'module': $('#module').val(), + 'proName': $('#proName').val(), + 'code': $('#code').val(), 'moduleId': objParam.moduleId } let url = dataUrl + "backstage/export/exportDetails"; diff --git a/page/demandPlan/child/view_data_source_list.html b/page/demandPlan/child/view_data_source_list.html index cf6c77b..80dc92e 100644 --- a/page/demandPlan/child/view_data_source_list.html +++ b/page/demandPlan/child/view_data_source_list.html @@ -66,14 +66,14 @@
- +
- +