From a349ab51b37ed52fae879ee463096b0971ccfd45 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 20 Jan 2025 14:16:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../child/dispatch_input_detail.js | 4 ++-- .../child/emerg_internal_car_detail.js | 1 - js/car_demand_plan/dispatch_car_list.js | 22 +++++++++---------- js/car_demand_plan/dispatch_input_list.js | 7 ++---- .../child/branch_settlement_detail.js | 8 +++---- .../child/branch_settlement_pro_detail.js | 6 ++--- .../child/choose_plan_code_list.js | 21 +++++++++++++++--- .../child/payment_detail_list.js | 14 ++++++------ js/car_settlement/sup_settlement_list.js | 11 +++++++++- js/welcome/data_datail_plan_list.js | 16 ++++++++++++++ .../child/branch_settlement_detail.html | 4 ++-- .../child/payment_detail_list.html | 4 ++-- page/car_settlement/child/payment_form.html | 10 ++++----- 13 files changed, 82 insertions(+), 46 deletions(-) diff --git a/js/car_demand_plan/child/dispatch_input_detail.js b/js/car_demand_plan/child/dispatch_input_detail.js index d8f3030..47d44eb 100644 --- a/js/car_demand_plan/child/dispatch_input_detail.js +++ b/js/car_demand_plan/child/dispatch_input_detail.js @@ -26,7 +26,7 @@ function setParams(params) { let value = $(this).attr('value'); let status = $(this).attr('status'); let type = $(this).attr('type'); - if (parseInt(status) === 2 && isPage) { + if (parseInt(status) === 2 && !isPage) { $('#updateData').remove(); $('#print').before(''); } @@ -84,7 +84,7 @@ function getAllOutList() { // 设置新的滚动位置 scrollableElement.scrollLeft += delta; }); - if (parseInt(status) === 2 && isPage) { + if (parseInt(status) === 2 && !isPage) { $('#print').before(''); } checkNowValue = id; diff --git a/js/car_demand_plan/child/emerg_internal_car_detail.js b/js/car_demand_plan/child/emerg_internal_car_detail.js index 583ba5a..39557fc 100644 --- a/js/car_demand_plan/child/emerg_internal_car_detail.js +++ b/js/car_demand_plan/child/emerg_internal_car_detail.js @@ -41,7 +41,6 @@ function getDetailById() { // 基本信息 function setPlanBasicTableInfo(obj) { - console.error(obj); $('#typeName').html(obj.typeName); $('#code').html(obj.code); diff --git a/js/car_demand_plan/dispatch_car_list.js b/js/car_demand_plan/dispatch_car_list.js index 4dcc6b4..7c4e46a 100644 --- a/js/car_demand_plan/dispatch_car_list.js +++ b/js/car_demand_plan/dispatch_car_list.js @@ -156,7 +156,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", - sort:true, + sort: true, }, { field: "planNum", @@ -164,7 +164,7 @@ function initTable() { title: "计划数", unresize: true, align: "center", - sort:true, + sort: true, templet: function (d) { return '' + d.planNum + ''; }, @@ -175,7 +175,7 @@ function initTable() { title: "已派车", unresize: true, align: "center", - sort:true, + sort: true, templet: function (d) { return '' + d.ypcNum + ''; }, @@ -186,7 +186,7 @@ function initTable() { title: "待派车", unresize: true, align: "center", - sort:true, + sort: true, templet: function (d) { return '' + d.dpcNum + ''; }, @@ -197,7 +197,7 @@ function initTable() { width: '8%', unresize: true, align: "center", - sort:true, + sort: true, templet: function (d) { return setStatusColor(d.planStatus); }, @@ -208,9 +208,9 @@ function initTable() { title: "最后派车时间", unresize: true, align: "center", - sort:true, + sort: true, templet: function (d) { - return d.lastDay ? d.lastDay:''; + return d.lastDay ? d.lastDay : '--'; }, }, { @@ -220,7 +220,7 @@ function initTable() { unresize: true, align: "center", templet: schedule, - sort:true, + sort: true, }, { field: "needNum", @@ -228,7 +228,7 @@ function initTable() { width: '10%', unresize: true, align: "center", - sort:true, + sort: true, }, { field: "dispatchNum", @@ -236,7 +236,7 @@ function initTable() { width: '9%', unresize: true, align: "center", - sort:true, + sort: true, }, { field: "noDispatchNum", @@ -244,7 +244,7 @@ function initTable() { width: '9%', unresize: true, align: "center", - sort:true, + sort: true, }, { title: "操作", diff --git a/js/car_demand_plan/dispatch_input_list.js b/js/car_demand_plan/dispatch_input_list.js index 6c954dd..d47a496 100644 --- a/js/car_demand_plan/dispatch_input_list.js +++ b/js/car_demand_plan/dispatch_input_list.js @@ -200,7 +200,7 @@ function initTable() { }, { field: "status", - width: '7%', + width: '8%', title: "审核状态", sort: true, unresize: true, @@ -211,7 +211,7 @@ function initTable() { }, { title: "操作", - width: '10%', + width: '9%', align: "center", unresize: true, templet: function (d) { @@ -221,12 +221,9 @@ function initTable() { let html = ""; html += "详情"; if (parseInt(dispatchNum) > 0 && parseInt(noDispatchNum) > 0) { - html += "
|
派车录入"; } else if (parseInt(dispatchNum) === 0) { html += "
|
派车录入"; - } if (parseInt(noDispatchNum) <= 0) { - // html += "详情"; } return html; }, diff --git a/js/car_settlement/child/branch_settlement_detail.js b/js/car_settlement/child/branch_settlement_detail.js index 8047572..45e25b9 100644 --- a/js/car_settlement/child/branch_settlement_detail.js +++ b/js/car_settlement/child/branch_settlement_detail.js @@ -39,7 +39,7 @@ function queryTable(type) { reloadTable(1); } else if (type === 2) { $('#proName').val(''); - $('#status').val(''); + // $('#status').val(''); layui.form.render(); reloadTable(1); } @@ -59,7 +59,7 @@ function reloadTable(pageNum) { where: { encryptedData: JSON.stringify({ 'proName': $('#proName').val(), - 'status': $('#status').val(), + // 'status': $('#status').val(), 'bmname': objParam.bmname }), }, @@ -80,7 +80,7 @@ function initTable() { where: { encryptedData: JSON.stringify({ 'proName': $('#proName').val(), - 'status': $('#status').val(), + // 'status': $('#status').val(), 'bmname': objParam.bmname }), }, @@ -210,7 +210,7 @@ function initTable() { function exportExcel() { let params = { 'proName': $('#proName').val(), - 'status': $('#status').val(), + // 'status': $('#status').val(), 'bmname': objParam.bmname } let url = dataUrl + "backstage/carStatistics/export2"; diff --git a/js/car_settlement/child/branch_settlement_pro_detail.js b/js/car_settlement/child/branch_settlement_pro_detail.js index bae6bf6..2b5f032 100644 --- a/js/car_settlement/child/branch_settlement_pro_detail.js +++ b/js/car_settlement/child/branch_settlement_pro_detail.js @@ -99,7 +99,7 @@ function initTable() { cols: [ [ { - width: '6%', + width: '5%', title: "序号", align: "center", templet: function (d) { @@ -108,7 +108,7 @@ function initTable() { }, { field: "typeName", - width: '7%', + width: '9%', title: "计划类型", unresize: true, align: "center", @@ -192,7 +192,7 @@ function initTable() { }, { title: "操作", - width: '8%', + width: '7%', align: "center", unresize: true, templet: function (d) { diff --git a/js/car_settlement/child/choose_plan_code_list.js b/js/car_settlement/child/choose_plan_code_list.js index a24cba2..409bd07 100644 --- a/js/car_settlement/child/choose_plan_code_list.js +++ b/js/car_settlement/child/choose_plan_code_list.js @@ -130,11 +130,14 @@ function initTable() { }, { field: "code", - width: '10%', + width: '12%', title: "需求计划编号", unresize: true, align: "center", sort:true, + templet: function (d) { + return "" + d.code + ""; + }, }, { field: "supName", @@ -159,11 +162,14 @@ function initTable() { unresize: true, align: "center", sort:true, + templet: function (d) { + return ' ¥ ' + (d.money ? d.money : 0) + ''; + }, }, { field: "userName", title: "操作人", - width: '10%', + width: '8%', unresize: true, align: "center", sort:true, @@ -332,10 +338,19 @@ function saveData2(params) { } } +// 需求计划详情 +function viewPlanDetail(obj) { + let content = '../../car_demand_plan/child/apply_plan_detail.html'; + if (obj.code.indexOf('spec-') > -1) { + content = '../../car_demand_plan/child/emerg_internal_car_detail.html'; + } + openIframeByParamObj2("viewPlanDetail4", "需求计划详情", content, "92%", "95%", obj); +} + function closePage(type, params,idArr) { let index = parent.layer.getFrameIndex(window.name); // 先得到当前 iframe层的索引 if (type == 1) { window.parent.addFitDatas(params,idArr); } parent.layer.close(index); // 再执行关闭 -} \ No newline at end of file +} diff --git a/js/car_settlement/child/payment_detail_list.js b/js/car_settlement/child/payment_detail_list.js index b2db637..451c2c0 100644 --- a/js/car_settlement/child/payment_detail_list.js +++ b/js/car_settlement/child/payment_detail_list.js @@ -24,7 +24,7 @@ function queryTable(type) { reloadTable(1); } else if (type === 2) { $('#keyWord').val(''); - $('#isPay').val(''); + $('#status').val(''); layui.form.render(); reloadTable(1); } @@ -44,7 +44,7 @@ function reloadTable(pageNum) { where: { encryptedData: JSON.stringify({ 'keyWord': $('#keyWord').val(), - 'isPay': $('#isPay').val(), + 'status': $('#status').val(), 'contractId': objParam.contractId, 'supId': objParam.supId, }), @@ -66,7 +66,7 @@ function initTable() { where: { encryptedData: JSON.stringify({ 'keyWord': $('#keyWord').val(), - 'isPay': $('#isPay').val(), + 'status': $('#status').val(), 'contractId': objParam.contractId, 'supId': objParam.supId, }), @@ -148,7 +148,7 @@ function initTable() { }, }, { - field: "payMoney", + field: "status", width: '10%', title: "已付金额", unresize: true, @@ -156,10 +156,10 @@ function initTable() { sort:true, templet: function (d) { let payMoney = d.payMoney || 0; - if (parseInt(payMoney) > 0) { + if (d.status === '已付') { return ' ￥ ' + payMoney; } else { - return '

未付

'; + return '

待付

'; } }, @@ -199,7 +199,7 @@ function initTable() { function exportExcel() { let params = { 'keyWord': $('#keyWord').val(), - 'isPay': $('#isPay').val(), + 'status': $('#status').val(), } let url = dataUrl + "backstage/carBalance/export2"; exportExcelUtil(url, '付款单录入详情', JSON.stringify(params)); diff --git a/js/car_settlement/sup_settlement_list.js b/js/car_settlement/sup_settlement_list.js index 3a488e5..f014b24 100644 --- a/js/car_settlement/sup_settlement_list.js +++ b/js/car_settlement/sup_settlement_list.js @@ -185,6 +185,9 @@ function initTable() { unresize: true, align: "center", sort:true, + templet: function (d) { + return d.manager ? d.manager : '--'; + }, }, { field: "jbTime", @@ -193,9 +196,12 @@ function initTable() { unresize: true, align: "center", sort:true, + templet: function (d) { + return d.jbTime ? d.jbTime : '--'; + }, }, { - field: "fkTime", + field: "status", width: '8%', title: "是否已付款", unresize: true, @@ -216,6 +222,9 @@ function initTable() { unresize: true, align: "center", sort:true, + templet: function (d) { + return d.fkTime ? d.fkTime : '--'; + }, }, { title: "操作", diff --git a/js/welcome/data_datail_plan_list.js b/js/welcome/data_datail_plan_list.js index fd83c26..69338a7 100644 --- a/js/welcome/data_datail_plan_list.js +++ b/js/welcome/data_datail_plan_list.js @@ -179,6 +179,9 @@ function initTable() { unresize: true, align: "center", sort: true, + templet: function (d) { + return d.supName ? d.supName : '--' + }, }, { field: "payStatus", @@ -187,6 +190,19 @@ function initTable() { unresize: true, align: "center", sort: true, + templet: function (d) { + let color = "",name = ""; + if (d.payStatus === '1') { + color = "#f56c6c"; + name = '待付款'; + } else if (d.payStatus === '2') { + color = "#19be6b"; + name = '已付款' + }else{ + return '--' + } + return ' ● ' + name + ""; + } }, { field: "companyName", diff --git a/page/car_settlement/child/branch_settlement_detail.html b/page/car_settlement/child/branch_settlement_detail.html index a47cee3..f5b31f8 100644 --- a/page/car_settlement/child/branch_settlement_detail.html +++ b/page/car_settlement/child/branch_settlement_detail.html @@ -62,7 +62,7 @@ lay-affix="clear" placeholder="输入工程名称" maxlength="30"> -
+
diff --git a/page/car_settlement/child/payment_detail_list.html b/page/car_settlement/child/payment_detail_list.html index d6dd339..7af0514 100644 --- a/page/car_settlement/child/payment_detail_list.html +++ b/page/car_settlement/child/payment_detail_list.html @@ -34,9 +34,9 @@
- - +
diff --git a/page/car_settlement/child/payment_form.html b/page/car_settlement/child/payment_form.html index 7b5d48b..382ddb9 100644 --- a/page/car_settlement/child/payment_form.html +++ b/page/car_settlement/child/payment_form.html @@ -86,7 +86,7 @@
- + @@ -94,25 +94,25 @@ - + - + - + - +