diff --git a/js/demandPlan/child/excess_inventory_list.js b/js/demandPlan/child/excess_inventory_list.js index a5670f4..dd32756 100644 --- a/js/demandPlan/child/excess_inventory_list.js +++ b/js/demandPlan/child/excess_inventory_list.js @@ -184,24 +184,13 @@ function setNumColor(value, type) { // 导出 function exportExcel() { - let encryptedData = JSON.stringify({ - 'proName': $('#proName').val(), - 'status': $('#status').val() - }); - let url = dataUrl + "backstage/planOut/exportExcel?encryptedData=" + encryptedData; - exportExcelUtil(url, '机具公司发货数据'); -} - -// 打印 -function print() { - Print('#body', { - onStart: function () { - console.log('onStart', new Date()) - }, - onEnd: function () { - console.log('onEnd', new Date()) - } - }) + let params = { + 'name': $('#name').val(), + 'module': $('#module').val(), + type: 1 + } + let url = dataUrl + "backstage/export/exportFhList"; + exportExcelUtil(url, '超库存量', JSON.stringify(params)); } // 查看来源 diff --git a/js/demandPlan/child/unplanned_quantity_list.js b/js/demandPlan/child/unplanned_quantity_list.js index 5526239..0f12c7f 100644 --- a/js/demandPlan/child/unplanned_quantity_list.js +++ b/js/demandPlan/child/unplanned_quantity_list.js @@ -172,12 +172,13 @@ function setNumColor(value, type) { // 导出 function exportExcel() { - let encryptedData = JSON.stringify({ - 'proName': $('#proName').val(), - 'status': $('#status').val() - }); - let url = dataUrl + "backstage/planOut/exportExcel?encryptedData=" + encryptedData; - exportExcelUtil(url, '机具公司发货数据'); + let params = { + 'name': $('#name').val(), + 'module': $('#module').val(), + type: 2 + } + let url = dataUrl + "backstage/export/exportFhList"; + exportExcelUtil(url, '计划外量', JSON.stringify(params)); } // 打印 diff --git a/js/demandPlan/child/view_data_list.js b/js/demandPlan/child/view_data_list.js index b4058c8..7a051fd 100644 --- a/js/demandPlan/child/view_data_list.js +++ b/js/demandPlan/child/view_data_list.js @@ -1,4 +1,4 @@ -let form, table, element,tableIns; +let form, table, element, tableIns; let typeParam; let pageNum = 1; function setParams(type) { @@ -126,7 +126,7 @@ function initTable() { unresize: true, align: "center", templet: function (d) { - return setNumColor(d.needNum,1); + return setNumColor(d.needNum, 1); }, }, { @@ -136,7 +136,7 @@ function initTable() { unresize: true, align: "center", templet: function (d) { - return setNumColor(d.fhNum,2); + return setNumColor(d.fhNum, 2); }, }, { @@ -146,7 +146,7 @@ function initTable() { unresize: true, align: "center", templet: function (d) { - return setNumColor(d.diff,3); + return setNumColor(d.diff, 3); }, }, { @@ -198,13 +198,13 @@ function setFontBold(value) { } // 数量状态颜色 1.需要量 2.已发货量 3.待发货量 -function setNumColor(value,type) { +function setNumColor(value, type) { let color = "#409Eff"; if (type === 1) { color = "#409Eff"; } else if (type === 2) { color = "#19be6b"; - }else if (type === 3) { + } else if (type === 3) { color = "#f56c6c"; } return '' + value + ""; @@ -213,11 +213,12 @@ function setNumColor(value,type) { // 导出 function exportExcel() { let params = { - 'proName': $('#proName').val(), - 'status': $('#status').val() + 'name': $('#name').val(), + 'module': $('#module').val(), + 'typeSource': typeParam } - let url = dataUrl + "backstage/export/export"; - exportExcelUtil(url, '机具公司发货数据',JSON.stringify(params)); + let url = dataUrl + "backstage/export/exportDataInfo"; + exportExcelUtil(url, '发货统计', JSON.stringify(params)); } // 打印 diff --git a/page/demandPlan/child/apply_plan_detail.html b/page/demandPlan/child/apply_plan_detail.html index f1a4a39..ecbef65 100644 --- a/page/demandPlan/child/apply_plan_detail.html +++ b/page/demandPlan/child/apply_plan_detail.html @@ -9,7 +9,7 @@ -
+