From cf8f7ace45a1876e06483f26446394a98afebc15 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 14 Nov 2024 17:33:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/demandPlan/child/apply_plan_form.js | 55 ++++++------------- js/demandPlan/child/choose_tool_type_list.js | 19 +++---- page/demandPlan/child/apply_plan_form.html | 6 +- .../child/choose_tool_type_list.html | 10 ++-- 4 files changed, 35 insertions(+), 55 deletions(-) diff --git a/js/demandPlan/child/apply_plan_form.js b/js/demandPlan/child/apply_plan_form.js index aab92cc..ea0f206 100644 --- a/js/demandPlan/child/apply_plan_form.js +++ b/js/demandPlan/child/apply_plan_form.js @@ -85,7 +85,9 @@ function submitApply(data) { let loadingMsg = layer.msg('正在提交保存,请稍等...', { icon: 16, shade: 0.01, time: '0' }); console.log(JSON.stringify(data.field)); let url = dataUrl + 'backstage/planApplication/addPlan'; - let params = JSON.stringify(data.field); + let params = { + encryptedData:JSON.stringify(data.field) + }; ajaxRequest(url, 'POST', params, true, function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); @@ -106,7 +108,7 @@ function submitApply(data) { $('.save').removeClass("layui-btn-disabled").attr("disabled", false); $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); errorFn(xhr, status, error) - }, 'application/json'); + }, null); } // 获取机具明细数据 @@ -138,44 +140,23 @@ function chooseFitType() { // 查询 function search() { - let keyWord = $('#type').val(); + let keyWord = $('#pName').val(); let keyWord2 = $('#name').val(); - let keyWord3 = $('#model').val(); - if (!keyWord && !keyWord2 && !keyWord3) { + if (!keyWord && !keyWord2) { setTableData(jjDataArr); - } else if (keyWord && !keyWord2 && !keyWord3) { + } else if (keyWord && !keyWord2) { let dataList = jjDataArr.filter(item => { - return item.type.indexOf(keyWord) > -1; + return item.pName.indexOf(keyWord) > -1; }) setTableData(dataList); - } else if (!keyWord && keyWord2 && !keyWord3) { + } else if (!keyWord && keyWord2) { let dataList = jjDataArr.filter(item => { return item.name.indexOf(keyWord2) > -1; }) setTableData(dataList); - } else if (!keyWord && !keyWord2 && keyWord3) { + } else if (keyWord && keyWord2) { let dataList = jjDataArr.filter(item => { - return item.model.indexOf(keyWord3) > -1; - }) - setTableData(dataList); - } else if (keyWord && keyWord2 && !keyWord3) { - let dataList = jjDataArr.filter(item => { - return item.type.indexOf(keyWord) > -1 && item.name.indexOf(keyWord2) > -1; - }) - setTableData(dataList); - } else if (keyWord && !keyWord2 && keyWord3) { - let dataList = jjDataArr.filter(item => { - return item.type.indexOf(keyWord) > -1 && item.model.indexOf(keyWord3) > -1; - }) - setTableData(dataList); - } else if (!keyWord && keyWord2 && keyWord3) { - let dataList = jjDataArr.filter(item => { - return item.name.indexOf(keyWord2) > -1 && item.model.indexOf(keyWord3) > -1; - }) - setTableData(dataList); - } else if (keyWord && keyWord2 && keyWord3) { - let dataList = jjDataArr.filter(item => { - return item.type.indexOf(keyWord) > -1 && item.name.indexOf(keyWord2) > -1 && item.model.indexOf(keyWord3) > -1; + return item.pName.indexOf(keyWord) > -1 && item.name.indexOf(keyWord2) > -1; }) setTableData(dataList); } @@ -183,7 +164,7 @@ function search() { // 重置 function resetSearch() { - $('#type').val(''); + $('#pName').val(''); $('#name').val(''); setTableData(jjDataArr); } @@ -230,12 +211,12 @@ function setTableData(results) { html += ''; html += "" + (i + 1) + ""; - html += "" + l.type + ""; + html += "" + l.ppName + ""; + html += "" + l.pName + ""; html += "" + l.name + ""; - html += "" + l.model + ""; html += "" + l.unit + ""; html += "" + setFormInput(l.needNum, 1) + ""; - html += "" + setFormInput(l.times, 2) + ""; + html += "" + setFormInput(l.times == null ? 0 : l.times, 2) + ""; html += "" + setFormInput(l.remarks, 3) + ""; html += ""; } @@ -249,9 +230,9 @@ function setTableData(results) { function setFormInput(value, type) { let html = '
'; if (type === 1) { // 需用量 - html += ''; + html += ''; } else if (type === 2) { // 需用天数 - html += ''; + html += ''; } else if (type === 3) { // 备注 html += ''; } @@ -328,7 +309,7 @@ function checkValue(that, type, name) { const regex = /^(0|[1-9]\d{0,6})$/; if (!regex.test(value) && value) { layer.msg('' + name + '输入不合法，请重新输入!', { icon: 5 }) - $(that).val(''); + $(that).val(0); } } } diff --git a/js/demandPlan/child/choose_tool_type_list.js b/js/demandPlan/child/choose_tool_type_list.js index f1f7bae..62c4dad 100644 --- a/js/demandPlan/child/choose_tool_type_list.js +++ b/js/demandPlan/child/choose_tool_type_list.js @@ -24,8 +24,8 @@ function queryTable(type) { if (type === 1) { reloadTable(1); } else if (type === 2) { + $('#pName').val(''); $('#name').val(''); - $('#module').val(''); layui.form.render(); reloadTable(1); } @@ -39,8 +39,8 @@ function reloadTable(pageNum) { }, where: { encryptedData: JSON.stringify({ + 'pName': $('#pName').val(), 'name': $('#name').val(), - 'model': $('#model').val(), }), }, }, @@ -57,10 +57,10 @@ function initTable() { headers: { authorization: sessionStorage.getItem("gz-token"), }, - url: dataUrl + "backstage/paType/findByPage", + url: dataUrl + "backstage/planApplication/getTypeList", where: { encryptedData: JSON.stringify({ - 'type': $('#type').val(), + 'pName': $('#pName').val(), 'name': $('#name').val(), }), }, @@ -73,10 +73,9 @@ function initTable() { $.each(res.list, function (index, item) { $.each(jjDetailArr, function (index2, item2) { if (item.id === item2.id) { - item.num = item2.num; - item.price = item2.price; + item.needNum = item2.needNum; + item.tiems = item2.tiems; item.remarks = item2.remarks; - item.manufacturer = item2.manufacturer; } }); }); @@ -100,21 +99,21 @@ function initTable() { }, }, { - field: "type", + field: "ppName", width: '10%', title: "物机类型", unresize: true, align: "center", }, { - field: "name", + field: "pName", width: '10%', title: "物机名称", unresize: true, align: "center", }, { - field: "model", + field: "name", width: '10%', title: "规格", unresize: true, diff --git a/page/demandPlan/child/apply_plan_form.html b/page/demandPlan/child/apply_plan_form.html index 64c253e..8f45ec6 100644 --- a/page/demandPlan/child/apply_plan_form.html +++ b/page/demandPlan/child/apply_plan_form.html @@ -79,14 +79,14 @@
- +
+ lay-affix="clear" placeholder="输入规格" maxlength="30">
diff --git a/page/demandPlan/child/choose_tool_type_list.html b/page/demandPlan/child/choose_tool_type_list.html index 3c56ace..eec10d6 100644 --- a/page/demandPlan/child/choose_tool_type_list.html +++ b/page/demandPlan/child/choose_tool_type_list.html @@ -42,15 +42,15 @@
-
- +
+
-
+
+ class="layui-input" lay-affix="clear" placeholder="输入规格" maxlength="30">