diff --git a/js/car_demand_plan/arrival_confirm_list.js b/js/car_demand_plan/arrival_confirm_list.js index 44ceb44..3fe1911 100644 --- a/js/car_demand_plan/arrival_confirm_list.js +++ b/js/car_demand_plan/arrival_confirm_list.js @@ -138,6 +138,9 @@ function initTable() { title: "派车状态", unresize: true, align: "center", + templet: function (d) { + return ' ● 已派车'; + }, }, { field: "dispatchNum", diff --git a/js/car_settlement/sup_settlement_list.js b/js/car_settlement/sup_settlement_list.js index 5b723a8..d8e7d11 100644 --- a/js/car_settlement/sup_settlement_list.js +++ b/js/car_settlement/sup_settlement_list.js @@ -41,10 +41,10 @@ function queryTable(type) { $('#supName').val(''); return layer.msg('供应商查询包含特殊字符,请重新输入', { icon: 2 }); } - let planCode = $('#planCode').val(); - let flag2 = checkValue(planCode); + let code = $('#code').val(); + let flag2 = checkValue(code); if (flag2) { - $('#planCode').val(''); + $('#code').val(''); return layer.msg('需求计划编号查询包含特殊字符,请重新输入', { icon: 2 }); } let proName = $('#proName').val(); @@ -56,9 +56,9 @@ function queryTable(type) { reloadTable(1); } else if (type === 2) { $('#supName').val(''); - $('#planCode').val(''); + $('#code').val(''); $('#proName').val(''); - $('#isPay').val(''); + $('#status').val(''); layui.form.render(); reloadTable(1); } @@ -78,9 +78,9 @@ function reloadTable(pageNum) { where: { encryptedData: JSON.stringify({ 'supName': $('#supName').val(), - 'planCode': $('#planCode').val(), + 'code': $('#code').val(), 'proName': $('#proName').val(), - 'isPay': $('#isPay').val() + 'status': $('#status').val() }), }, }, @@ -100,9 +100,9 @@ function initTable() { where: { encryptedData: JSON.stringify({ 'supName': $('#supName').val(), - 'planCode': $('#planCode').val(), + 'code': $('#code').val(), 'proName': $('#proName').val(), - 'isPay': $('#isPay').val() + 'status': $('#status').val() }), }, request: { @@ -251,9 +251,9 @@ function settlementDetail(obj) { function exportExcel() { let params = { 'supName': $('#supName').val(), - 'planCode': $('#planCode').val(), + 'code': $('#code').val(), 'proName': $('#proName').val(), - 'isPay': $('#isPay').val() + 'status': $('#status').val() } let url = dataUrl + "backstage/carStatistics/export"; exportExcelUtil(url, '供应商结算统计', JSON.stringify(params)); diff --git a/page/car_settlement/payment_list.html b/page/car_settlement/payment_list.html index f67aaec..ca70f05 100644 --- a/page/car_settlement/payment_list.html +++ b/page/car_settlement/payment_list.html @@ -23,7 +23,7 @@