From 4796a44e6c7052658a3ec5a8cab4ed7cb54666df Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 22 Jan 2025 10:40:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=97=AE=E9=A2=98=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../child/add_back_material.js | 56 +++++++++++++-- .../child/apply_plan_edit_form.js | 60 ++++++++++++++-- js/aq_demand_plan/child/apply_plan_form.js | 56 +++++++++++++-- .../child/inventory_add_take_stock.js | 70 ++++++++++++++++--- .../child/choose_plan_code_list.js | 11 +++ js/aq_settlement/child/payment_form.js | 12 +++- js/aq_settlement/child/settlement_detail.js | 3 + .../child/apply_plan_detail.html | 2 +- 8 files changed, 244 insertions(+), 26 deletions(-) diff --git a/js/aq_back_material/child/add_back_material.js b/js/aq_back_material/child/add_back_material.js index df9558b..341f9f9 100644 --- a/js/aq_back_material/child/add_back_material.js +++ b/js/aq_back_material/child/add_back_material.js @@ -278,7 +278,8 @@ function addFitDatas(data) { $.each(newJjDataArr, function (index, item) { updateOrAddObject(item.id, item); }); - setTableData(jjDataArr); + goOnAddData(); + // setTableData(jjDataArr); } else { // 第一次添加数据 jjDataArr = JSON.parse(data); if (jjDataArr && jjDataArr.length > 0) { @@ -322,7 +323,7 @@ function setTableData(results) { html += ""; } } else { - html += "没有相关数据"; + html += "没有相关数据"; } $("#baseTable tbody").empty().append(html); layui.form.render(); @@ -390,17 +391,60 @@ 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); }); - let list = getBaseTableData(); +} + +// 删除表格数据 +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 num = $(this).find('td').eq(6).find('input[name="num"]').val(), + remark = $(this).find('td').eq(7).find('input[name="remark"]').val(); + if (!item.num || parseInt(item.num) === 0) { + item.num = num; + } + if (!item.remark) { + item.remark = remark; + } + } + }) + }); + setTableData(jjDataArr); + $('#baseTable tbody tr').each(function (index, item) { + $(this).find('td').eq(1).html(index + 1); + }) + } } // 校验手机号 diff --git a/js/aq_demand_plan/child/apply_plan_edit_form.js b/js/aq_demand_plan/child/apply_plan_edit_form.js index 1d22d10..dc8ca7e 100644 --- a/js/aq_demand_plan/child/apply_plan_edit_form.js +++ b/js/aq_demand_plan/child/apply_plan_edit_form.js @@ -266,7 +266,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) { @@ -281,6 +282,8 @@ function addFitDatas(data) { const index = jjDataArr.findIndex(obj => obj.id === parseInt(id)); if (index !== -1) { // 如果对象存在，则替换它 + let oldData = jjDataArr[index]; + newObject.dataId = oldData.dataId; jjDataArr[index] = newObject; } else { // 如果对象不存在，则添加到数组 @@ -381,18 +384,67 @@ 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/js/aq_demand_plan/child/apply_plan_form.js b/js/aq_demand_plan/child/apply_plan_form.js index 17b90b1..34ca521 100644 --- a/js/aq_demand_plan/child/apply_plan_form.js +++ b/js/aq_demand_plan/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/js/aq_inventory/child/inventory_add_take_stock.js b/js/aq_inventory/child/inventory_add_take_stock.js index 13d3a62..6f095df 100644 --- a/js/aq_inventory/child/inventory_add_take_stock.js +++ b/js/aq_inventory/child/inventory_add_take_stock.js @@ -276,7 +276,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) { @@ -324,7 +325,7 @@ function setTableData(results) { html += ""; } } else { - html += "没有相关数据"; + html += "没有相关数据"; } $("#baseTable tbody").empty().append(html); setNumAndPrice(jjDataArr); @@ -337,8 +338,8 @@ function setNumAndPrice(list) { let inventoryProfit = 0, inventoryDeficit = 0, addPrice = 0; subPrice = 0; $.each(list, function (index, item) { // let price = item.price ? item.price : 2; - inventoryProfit += parseInt(item.inventoryProfit); - inventoryDeficit += parseInt(item.inventoryDeficit); + inventoryProfit += parseInt(item.inventoryProfit ? item.inventoryProfit : 0); + inventoryDeficit += parseInt(item.inventoryDeficit? item.inventoryDeficit : 0); // addPrice += parseInt(item.inventoryProfit) * parseFloat(price); // subPrice += parseInt(item.inventoryDeficit) * parseFloat(price); }); @@ -411,18 +412,69 @@ 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); + let list = getBaseTableData(); + setNumAndPrice(list); }); - let list = getBaseTableData(); - setNumAndPrice(list); +} + +// 删除表格数据 +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 quantityOfThisInventory = $(this).find('td').eq(7).find('input[name="quantityOfThisInventory"]').val(), + inventoryProfit = $(this).find('td').eq(8).html(), + inventoryDeficit = $(this).find('td').eq(9).html(), + remark = $(this).find('td').eq(10).find('input[name="remark"]').val(); + if (!item.quantityOfThisInventory || parseInt(item.quantityOfThisInventory) === 0) { + item.quantityOfThisInventory = quantityOfThisInventory; + } + if (!item.inventoryProfit || parseInt(item.inventoryProfit) === 0) { + item.inventoryProfit = inventoryProfit; + } + if (!item.inventoryDeficit || parseInt(item.inventoryDeficit) === 0) { + item.inventoryDeficit = inventoryDeficit; + } + if (!item.remark) { + item.remark = remark; + } + } + }) + }); + setTableData(jjDataArr); + $('#baseTable tbody tr').each(function (index, item) { + $(this).find('td').eq(1).html(index + 1); + }) + } } // 校验数据 diff --git a/js/aq_settlement/child/choose_plan_code_list.js b/js/aq_settlement/child/choose_plan_code_list.js index 866d86c..f88a8c5 100644 --- a/js/aq_settlement/child/choose_plan_code_list.js +++ b/js/aq_settlement/child/choose_plan_code_list.js @@ -135,6 +135,9 @@ function initTable() { unresize: true, align: "center", sort:true, + templet: function (d) { + return "" + d.planCode + ""; + }, }, { field: "supName", @@ -334,6 +337,14 @@ function saveData2(params) { } } +// 需求计划详情 +function viewPlanDetail(obj) { + console.error(obj); + obj.id = obj.planId,obj.code = obj.planCode; + let content = '../../aq_demand_plan/child/apply_plan_detail.html'; + openIframeByParamObj2("viewPlanDetail4", "需求计划详情", content, "92%", "95%", obj); +} + function closePage(type, params,outIdArr) { let index = parent.layer.getFrameIndex(window.name); // 先得到当前 iframe层的索引 if (type == 1) { diff --git a/js/aq_settlement/child/payment_form.js b/js/aq_settlement/child/payment_form.js index 1f3eeb8..deafc31 100644 --- a/js/aq_settlement/child/payment_form.js +++ b/js/aq_settlement/child/payment_form.js @@ -268,7 +268,7 @@ function initTable() { }, { field: "name", - width: '10%', + width: '8%', title: "名称", unresize: true, align: "center", @@ -292,7 +292,7 @@ function initTable() { }, { field: "price", - width: '8%', + width: '10%', title: "单价（元）", unresize: true, align: "center", @@ -371,6 +371,14 @@ function initTable() { }); } +// 需求计划详情 +function openPlanDetail(obj) { + console.error(obj); + + obj.id = obj.planId; + openIframeByParamObj2("planDetail", "安全工器具需求计划", "../aq_demand_plan/child/apply_plan_detail.html", "92%", "95%", obj); +} + // 关闭页面 function closePage(type) { let index = parent.layer.getFrameIndex(window.name); // 先得到当前 iframe层的索引 diff --git a/js/aq_settlement/child/settlement_detail.js b/js/aq_settlement/child/settlement_detail.js index 1c238ab..634b868 100644 --- a/js/aq_settlement/child/settlement_detail.js +++ b/js/aq_settlement/child/settlement_detail.js @@ -245,6 +245,7 @@ function initTable() { width: '10%', align: "center", unresize: true, + sort:true, templet: function (d) { if (d.remark) { if (d.remark.length > 60) { @@ -263,6 +264,7 @@ function initTable() { width: '10%', align: "center", unresize: true, + sort:true, templet: function (d) { let html = ""; html += "" + d.planCode + ""; @@ -275,6 +277,7 @@ function initTable() { width: '10%', align: "center", unresize: true, + sort:true, }, ], ], diff --git a/page/aq_demand_plan/child/apply_plan_detail.html b/page/aq_demand_plan/child/apply_plan_detail.html index 916870b..972cfc1 100644 --- a/page/aq_demand_plan/child/apply_plan_detail.html +++ b/page/aq_demand_plan/child/apply_plan_detail.html @@ -51,7 +51,7 @@ 计划说明 - +