diff --git a/js/accessory/accessory_return_list.js b/js/accessory/accessory_return_list.js index 6454b53..25a85ee 100644 --- a/js/accessory/accessory_return_list.js +++ b/js/accessory/accessory_return_list.js @@ -176,15 +176,16 @@ function setStatusColor(value) { // 导出 function exportExcel() { let params = { - 'proName': $('#proName').val(), - 'status': $('#status').val() + 'keyWord': $('#keyWord').val(), + 'startDay': $('#startDay').val(), + 'endDay': $('#endDay').val(), } - let url = dataUrl + "backstage/export/exportFhList"; - exportExcelUtil(url, '配件入库数据', JSON.stringify(params)); + let url = dataUrl + "backstage/partBack/export"; + exportExcelUtil(url, '配件退回', JSON.stringify(params)); } // 配件退料入库 -function accessoryReturn(obj){ +function accessoryReturn(obj) { openIframeByParamObj("accessory_return", "配件退料入库", "./child/accessory_return_form.html", "92%", "95%", obj); } diff --git a/js/accessory/inventory_count_list.js b/js/accessory/inventory_count_list.js index 90374dc..cf87ed9 100644 --- a/js/accessory/inventory_count_list.js +++ b/js/accessory/inventory_count_list.js @@ -5,11 +5,6 @@ layui.use(["form", "table", 'laydate'], function () { form = layui.form; table = layui.table; laydate = layui.laydate; - laydate.render({ - elem: '#ID-laydate-rangeLinked', - range: ['#startDay', '#endDay'], - rangeLinked: true - }); initTable(); }); @@ -19,8 +14,6 @@ function queryTable(type) { reloadTable(1); } else if (type === 2) { $('#keyWord').val(''); - $('#startDate').val(''); - $('#endDate').val(''); layui.form.render(); reloadTable(1); } @@ -40,8 +33,6 @@ function reloadTable(pageNum) { where: { encryptedData: JSON.stringify({ 'keyWord': $('#keyWord').val(), - 'startDate': $('#startDate').val(), - 'endDate': $('#endDate').val() }), }, }, @@ -61,8 +52,6 @@ function initTable() { where: { encryptedData: JSON.stringify({ 'keyWord': $('#keyWord').val(), - 'startDate': $('#startDate').val(), - 'endDate': $('#endDate').val() }), }, request: { @@ -102,7 +91,7 @@ function initTable() { align: "center", }, { - field: "inputNum", + field: "startTime", width: '20%', title: "盘点起止时间", unresize: true, @@ -112,7 +101,7 @@ function initTable() { }, }, { - field: "allPrice", + field: "addNum", width: '10%', title: "盘点数量变化", unresize: true, @@ -168,11 +157,10 @@ function setInventory(value, value2) { // 导出 function exportExcel() { let params = { - 'proName': $('#proName').val(), - 'status': $('#status').val() + 'keyWord': $('#keyWord').val(), } - let url = dataUrl + "backstage/export/exportFhList"; - exportExcelUtil(url, '配件入库数据', JSON.stringify(params)); + let url = dataUrl + "backstage/partCheck/export"; + exportExcelUtil(url, '盘点记录', JSON.stringify(params)); } // 库存盘点 diff --git a/page/accessory/inventory_count_list.html b/page/accessory/inventory_count_list.html index 07ba9ec..d58397c 100644 --- a/page/accessory/inventory_count_list.html +++ b/page/accessory/inventory_count_list.html @@ -22,23 +22,10 @@