diff --git a/js/demandPlan/child/apply_plan_form.js b/js/demandPlan/child/apply_plan_form.js index d1b0389..5f93b4a 100644 --- a/js/demandPlan/child/apply_plan_form.js +++ b/js/demandPlan/child/apply_plan_form.js @@ -174,7 +174,8 @@ function addFitDatas(data) { $.each(newJjDataArr, function (index, item) { updateOrAddObject(item.id, item); }); - setTableData(jjDataArr); + // setTableData(jjDataArr); + goOnAddData(); } else { // 第一次添加数据 jjDataArr = JSON.parse(data); if (jjDataArr && jjDataArr.length > 0) { @@ -289,18 +290,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(), + remarks = $(this).find('td').eq(8).find('input[name="remarks"]').val(); + if (!item.times || parseInt(item.times) === 0) { + item.times = times; + } + if (!item.needNum || parseInt(item.needNum) === 0) { + item.needNum = needNum; + } + if (!item.remarks) { + item.remarks = remarks; + } + } + }) + }); + 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/page/accessory/accessory_out_bound_list.html b/page/accessory/accessory_out_bound_list.html index 7a4e3f8..d85f806 100644 --- a/page/accessory/accessory_out_bound_list.html +++ b/page/accessory/accessory_out_bound_list.html @@ -23,7 +23,7 @@
+ class="layui-input" lay-affix="clear" placeholder="请输入关键字(领料单编号/领用人)" maxlength="30">
diff --git a/page/accessory/accessory_return_list.html b/page/accessory/accessory_return_list.html index 60b0777..eefd97e 100644 --- a/page/accessory/accessory_return_list.html +++ b/page/accessory/accessory_return_list.html @@ -21,9 +21,9 @@
-
+
+ class="layui-input" lay-affix="clear" placeholder="请输入关键字(退料人编号/退料人)" maxlength="30">
diff --git a/page/accessory/accessory_scrap_list.html b/page/accessory/accessory_scrap_list.html index 218e1c8..0fb0f5c 100644 --- a/page/accessory/accessory_scrap_list.html +++ b/page/accessory/accessory_scrap_list.html @@ -23,7 +23,7 @@
+ class="layui-input" lay-affix="clear" placeholder="请输入关键字(报废编号/报废人)" maxlength="30">
diff --git a/page/accessory/accessory_store_list.html b/page/accessory/accessory_store_list.html index 3077aca..049647e 100644 --- a/page/accessory/accessory_store_list.html +++ b/page/accessory/accessory_store_list.html @@ -23,7 +23,7 @@
+ class="layui-input" lay-affix="clear" placeholder="请输入关键字(入库编号/入库人/备注)" maxlength="30">
diff --git a/page/accessory/inventory_count_list.html b/page/accessory/inventory_count_list.html index d58397c..7d1fade 100644 --- a/page/accessory/inventory_count_list.html +++ b/page/accessory/inventory_count_list.html @@ -23,7 +23,7 @@
+ class="layui-input" lay-affix="clear" placeholder="请输入关键字(盘点编号/盘点人)" maxlength="30">
diff --git a/page/basic/fit_type_list.html b/page/basic/fit_type_list.html index 6458381..6ec8d80 100644 --- a/page/basic/fit_type_list.html +++ b/page/basic/fit_type_list.html @@ -26,7 +26,7 @@
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(类型/名称/规格型号)" maxlength="30">
@@ -36,7 +36,7 @@ + class="layui-icon layui-icon-refresh"> 刷 新