From 2b970864063a4a29966c13cb6a1a6e94b743019e Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 22 Jan 2025 09:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/car_basic/child/supplier_band_user_form.js | 2 +- js/car_basic/child/type_form.js | 14 ++++ .../child/emerg_internal_car_form.js | 74 +++++++++++++++---- js/car_demand_plan/dispatch_car_list.js | 2 +- js/car_demand_plan/dispatch_input_list.js | 2 +- 5 files changed, 78 insertions(+), 16 deletions(-) diff --git a/js/car_basic/child/supplier_band_user_form.js b/js/car_basic/child/supplier_band_user_form.js index 0933659..24aeb89 100644 --- a/js/car_basic/child/supplier_band_user_form.js +++ b/js/car_basic/child/supplier_band_user_form.js @@ -67,7 +67,7 @@ function getDTreeData() { if (result.code === 200) { if (result.data.tree && result.data.tree.length > 0) { $.each(result.data.tree, function (index, item) { - dataNum += item.children.length; + dataNum += (item.children ? item.children.length : 0); list.push(item); }) $.each(result.data.check, function (index, item) { diff --git a/js/car_basic/child/type_form.js b/js/car_basic/child/type_form.js index f4ac708..112c2d4 100644 --- a/js/car_basic/child/type_form.js +++ b/js/car_basic/child/type_form.js @@ -154,6 +154,7 @@ function submitApply(data) { if (result.code === 200) { parent.layer.msg(result.msg, { icon: 1 }); if (isGoOn === '1') { // 保存并继续添加 + clearFormData(); closePage(2, result.data); } else if (isGoOn === '0' && objParam.type !== 3) { // 保存 closePage(1, result.data); @@ -174,6 +175,19 @@ function submitApply(data) { }, null); } +// 保存并继续添加，清空表单数据 +function clearFormData(){ + if (objParam.level === '1') { + $('#name').val(''); + } else if (objParam.level === '2') { + $('#name').val(''); + } else if (objParam.level === '3') { + $('#name').val(''); + $('#unit').val(''); + $('#remark').val(''); + } +} + // 关闭页面 type:2 保存并继续添加 function closePage(type, obj) { let index = parent.layer.getFrameIndex(window.name); diff --git a/js/car_demand_plan/child/emerg_internal_car_form.js b/js/car_demand_plan/child/emerg_internal_car_form.js index ff4ad76..6a895c5 100644 --- a/js/car_demand_plan/child/emerg_internal_car_form.js +++ b/js/car_demand_plan/child/emerg_internal_car_form.js @@ -20,6 +20,13 @@ function setParams(obj) { form.on('submit(formData)', function (data) { submitApply(data); }); + form.on('radio(type)', function (data) { + $('#baseTable tbody').empty(); + jjDataArr.splice(0, jjDataArr.length); + $('#no_data_title').removeAttr('style'); + $('#search-info').css({ 'display': 'none' }); + $('#table-box').css({ 'display': 'none' }); + }); let uploadObj = upload.render({ elem: '#test2', multiple: true, @@ -261,16 +268,10 @@ function addFitDatas(data) { if (jjDataArr.length > 0) { // 继续添加数据 let newJjDataArr = JSON.parse(data); // 如何切换了类型，则清空之前的数据 - let oldType = jjDataArr[0].type; - let newType = newJjDataArr[0].type; - if (oldType === newType) { - $.each(newJjDataArr, function (index, item) { - updateOrAddObject(item.id, item); - }); - setTableData(jjDataArr); - } else { - setTableData(newJjDataArr); - } + $.each(newJjDataArr, function (index, item) { + updateOrAddObject(item.id, item); + }); + goOnAddData(); } else { // 第一次添加数据 jjDataArr = JSON.parse(data); if (jjDataArr && jjDataArr.length > 0) { @@ -385,18 +386,65 @@ function delFitType() { } } } - delIdArr.splice(0, delIdArr.length); if (jjDataArr.length === 0) { $('#no_data_title').removeAttr('style'); $('#search-info').css({ 'display': 'none' }); $('#table-box').css({ 'display': 'none' }); } else { - setTableData(jjDataArr); + // setTableData(jjDataArr); + handleDelTableData(delIdArr); } - + delIdArr.splice(0, delIdArr.length); }); } +// 删除表格数据 +function handleDelTableData(delIdArr) { + if (delIdArr.length > 0) { + $.each(delIdArr, function (index, item) { + $('#baseTable tbody tr').each(function () { + let id = $(this).attr('id'); + if (parseInt(id) === item) { + $(this).remove(); + return false; + } + }) + }) + } + $('#baseTable tbody tr').each(function (index, item) { + $(this).find('td').eq(1).html(index + 1); + }) +} + +// 继续添加数据 +function goOnAddData() { + if (jjDataArr.length > 0) { + $.each(jjDataArr, function (index, item) { + $('#baseTable tbody tr').each(function () { + let id = $(this).attr('id'); + if (parseInt(id) === parseInt(item.id)) { + let times = $(this).find('td').eq(7).find('input[name="times"]').val(), + needNum = $(this).find('td').eq(6).find('input[name="needNum"]').val(), + remark = $(this).find('td').eq(8).find('input[name="remarks"]').val(); + if (!item.times || item.times === 0) { + item.times = times; + } + if (!item.needNum || item.needNum === 0) { + item.needNum = needNum; + } + if (!item.needNum || item.remark === 0) { + item.remark = remark; + } + } + }) + }); + setTableData(jjDataArr); + $('#baseTable tbody tr').each(function (index, item) { + $(this).find('td').eq(1).html(index + 1); + }) + } +} + // 校验数据 function checkValue(that, type, name) { let value = $(that).val(); diff --git a/js/car_demand_plan/dispatch_car_list.js b/js/car_demand_plan/dispatch_car_list.js index 190e91d..56d002d 100644 --- a/js/car_demand_plan/dispatch_car_list.js +++ b/js/car_demand_plan/dispatch_car_list.js @@ -89,7 +89,7 @@ function queryTable(type) { // 刷新页面数据 function reloadData() { - reloadTable(1); + reloadTable(pageNum); getProStatisticsDetails(); } diff --git a/js/car_demand_plan/dispatch_input_list.js b/js/car_demand_plan/dispatch_input_list.js index d47a496..92cfaf0 100644 --- a/js/car_demand_plan/dispatch_input_list.js +++ b/js/car_demand_plan/dispatch_input_list.js @@ -32,7 +32,7 @@ function queryTable(type) { // 刷新页面数据 function reloadData() { - reloadTable(1); + reloadTable(pageNum); } // 重载表格