diff --git a/js/car_settlement/child/payment_detail_list.js b/js/car_settlement/child/payment_detail_list.js index 451c2c0..81548c7 100644 --- a/js/car_settlement/child/payment_detail_list.js +++ b/js/car_settlement/child/payment_detail_list.js @@ -200,6 +200,7 @@ function exportExcel() { let params = { 'keyWord': $('#keyWord').val(), 'status': $('#status').val(), + 'supId': objParam.supId } let url = dataUrl + "backstage/carBalance/export2"; exportExcelUtil(url, '付款单录入详情', JSON.stringify(params)); diff --git a/js/welcome/data_datail_dispatch_list.js b/js/welcome/data_datail_dispatch_list.js index 2848abd..cf59827 100644 --- a/js/welcome/data_datail_dispatch_list.js +++ b/js/welcome/data_datail_dispatch_list.js @@ -176,6 +176,19 @@ function initTable() { unresize: true, align: "center", sort:true, + templet: function (d) { + let color = "",name = ""; + if (d.payStatus === '待付款') { + color = "#f56c6c"; + name = '待付款'; + } else if (d.payStatus === '已付款') { + color = "#19be6b"; + name = '已付款' + }else{ + return '--' + } + return ' ● '+name+''; + } }, { field: "code", @@ -253,8 +266,9 @@ function exportExcel() { // 派车详情 function openPlanDetail(obj) { - obj.id = obj.planId; + console.error(obj); obj.pageType = 1; + obj.id = obj.planId; obj.typeName = obj.typeName === 1 ? '车辆' : '吊车'; openIframeByParamObj2("homePlanDetail", "详情", '../welcome/plan_dispatch_detail.html', "92%", "95%", obj); } \ No newline at end of file diff --git a/js/welcome/data_datail_plan_list.js b/js/welcome/data_datail_plan_list.js index 69338a7..8c622db 100644 --- a/js/welcome/data_datail_plan_list.js +++ b/js/welcome/data_datail_plan_list.js @@ -192,16 +192,16 @@ function initTable() { sort: true, templet: function (d) { let color = "",name = ""; - if (d.payStatus === '1') { + if (d.payStatus === '待付款') { color = "#f56c6c"; name = '待付款'; - } else if (d.payStatus === '2') { + } else if (d.payStatus === '已付款') { color = "#19be6b"; name = '已付款' }else{ return '--' } - return ' ● ' + name + ""; + return ' ● '+name+''; } }, { @@ -241,7 +241,7 @@ function setStatusColor(value) { color = "#19be6b"; name = '已派车' } - return ' ● ' + name + ""; + return ' ● '+name+''; } // 导出 diff --git a/js/welcome/data_detail_common.js b/js/welcome/data_detail_common.js index 1b1ef82..4b7b77e 100644 --- a/js/welcome/data_detail_common.js +++ b/js/welcome/data_detail_common.js @@ -51,7 +51,7 @@ function loadMonthData() { // 付款状态 function loadPayStatusData() { - const list = [{ id: 'pay-0', labelName: '全部' }, { id: 'pay-2', labelName: '未付款' }, { id: 'pay-1', labelName: '已付款' }]; + const list = [{ id: 'pay-0', labelName: '全部' }, { id: 'pay-2', labelName: '待付款' }, { id: 'pay-1', labelName: '已付款' }]; setTagData(list, 'demo5'); } diff --git a/js/welcome/pro_list_detail.js b/js/welcome/pro_list_detail.js index 1dfcf64..92f4a22 100644 --- a/js/welcome/pro_list_detail.js +++ b/js/welcome/pro_list_detail.js @@ -39,6 +39,7 @@ function getProPlanDataView() { $('#planNum').html(obj.planNum); $('#carNum').html(obj.carNum); $('#craneNum').html(obj.craneNum); + $('#money').html('¥ ' + objParam.money); $('.layui-progress').remove(); $("#progress").after(`
金额
-0
+¥ 0
进度