From b881325e4c73ededf5c9e3db8773017cf430b6be Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 17 Jan 2025 15:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/car_basic/car_list.js | 9 +++++++ js/car_basic/child/contract_supplier_list.js | 14 +++++++++++ js/car_basic/driver_list.js | 6 +++++ js/car_basic/framework_contract_list.js | 25 +++++++++++++++++++ js/car_basic/supplier_list.js | 6 +++++ js/car_basic/type_list.js | 6 +++++ js/car_demand_plan/apply_plan_audit_list.js | 10 ++++++-- js/car_demand_plan/apply_plan_list.js | 7 ++++++ js/car_demand_plan/arrival_confirm_list.js | 10 +++++++- js/car_demand_plan/child/apply_plan_detail.js | 7 ++++++ .../child/choose_car_or_user_list.js | 6 +++++ js/car_demand_plan/child/choose_type_list.js | 4 +++ .../child/dispatch_car_pro_detail.js | 10 ++++++++ .../child/emerg_internal_car_detail.js | 7 ++++++ js/car_demand_plan/dispatch_car_list.js | 10 ++++++++ js/car_demand_plan/dispatch_input_list.js | 10 ++++++++ js/car_demand_plan/emerg_internal_car_list.js | 6 +++++ js/car_settlement/branch_settlement_list.js | 9 +++++++ .../child/branch_settlement_detail.js | 8 ++++++ .../child/branch_settlement_pro_detail.js | 9 +++++++ .../child/choose_plan_code_list.js | 8 ++++++ .../child/payment_detail_list.js | 6 +++++ js/car_settlement/payment_list.js | 8 ++++++ js/car_settlement/sup_settlement_list.js | 9 +++++++ js/welcome/data_datail_dispatch_list.js | 14 +++++++++-- js/welcome/data_datail_plan_list.js | 9 +++++++ js/welcome/data_datail_pro_list.js | 10 ++++++++ js/welcome/pro_list_detail.js | 8 ++++++ 28 files changed, 246 insertions(+), 5 deletions(-) diff --git a/js/car_basic/car_list.js b/js/car_basic/car_list.js index 7d13405..ea920e3 100644 --- a/js/car_basic/car_list.js +++ b/js/car_basic/car_list.js @@ -99,6 +99,7 @@ function initTable() { title: "车牌号", unresize: true, align: "center", + sort:true, }, { field: "brand", @@ -106,6 +107,7 @@ function initTable() { title: "车辆品牌", unresize: true, align: "center", + sort:true, }, { field: "type", @@ -113,6 +115,7 @@ function initTable() { title: "车辆类型", unresize: true, align: "center", + sort:true, }, { field: "ton", @@ -120,6 +123,7 @@ function initTable() { title: "车辆吨位（T）", unresize: true, align: "center", + sort:true, templet: function (d) { return (d.ton ? d.ton : 0) + '吨'; }, @@ -130,6 +134,7 @@ function initTable() { title: "挂靠协议", unresize: true, align: "center", + sort:true, templet: function (d) { return ''+d.xyNum+''; }, @@ -139,6 +144,7 @@ function initTable() { width: '8%', title: "车辆保险", unresize: true, + sort:true, align: "center", templet: function (d) { return ''+d.bxNum+''; @@ -149,6 +155,7 @@ function initTable() { width: '8%', title: "行驶证", unresize: true, + sort:true, align: "center", templet: function (d) { return ''+d.xszNum+''; @@ -160,6 +167,7 @@ function initTable() { title: "车辆保险到期日期", unresize: true, align: "center", + sort:true, }, { field: "supName", @@ -167,6 +175,7 @@ function initTable() { title: "所属供应商", unresize: true, align: "center", + sort:true, }, { title: "操作", diff --git a/js/car_basic/child/contract_supplier_list.js b/js/car_basic/child/contract_supplier_list.js index 1d89613..0e8611b 100644 --- a/js/car_basic/child/contract_supplier_list.js +++ b/js/car_basic/child/contract_supplier_list.js @@ -110,6 +110,7 @@ function initTable() { title: "公里数", unresize: true, align: "center", + sort:true, templet: function (d) { return d.glsKs + ' - ' + d.glsJs; } @@ -120,6 +121,7 @@ function initTable() { title: "单项基准费用（元/吨*公里）", unresize: true, align: "center", + sort:true, }, { field: "glXf", @@ -127,6 +129,7 @@ function initTable() { title: "投标下浮率", unresize: true, align: "center", + sort:true, templet: function (d) { return d.glXf + ' % '; } @@ -137,6 +140,7 @@ function initTable() { width: '20%', unresize: true, align: "center", + sort:true, }, ], ], @@ -201,6 +205,7 @@ function initTable2() { title: "名称", unresize: true, align: "center", + sort:true, }, { field: "model", @@ -208,6 +213,7 @@ function initTable2() { title: "规格", unresize: true, align: "center", + sort:true, }, { field: "dayPrice", @@ -215,6 +221,7 @@ function initTable2() { title: "单项基准费用
零星租赁（元/天/台）", unresize: true, align: "center", + sort:true, }, { field: "monthPrice", @@ -222,6 +229,7 @@ function initTable2() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "dcXf", @@ -229,6 +237,7 @@ function initTable2() { width: '10%', unresize: true, align: "center", + sort:true, templet: function (d) { return d.dcXf + ' % '; } @@ -239,6 +248,7 @@ function initTable2() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "monthSjPrice", @@ -246,6 +256,7 @@ function initTable2() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "dayToMonth", @@ -253,6 +264,7 @@ function initTable2() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "isDriverSet", @@ -260,6 +272,7 @@ function initTable2() { width: '8%', unresize: true, align: "center", + sort:true, templet: function (d) { if (d.isDriverSet === '1') { return '是'; @@ -274,6 +287,7 @@ function initTable2() { width: '10%', unresize: true, align: "center", + sort:true, }, ], ], diff --git a/js/car_basic/driver_list.js b/js/car_basic/driver_list.js index b8c9dfe..be96479 100644 --- a/js/car_basic/driver_list.js +++ b/js/car_basic/driver_list.js @@ -99,6 +99,7 @@ function initTable() { title: "姓名", unresize: true, align: "center", + sort:true, }, { field: "phone", @@ -106,6 +107,7 @@ function initTable() { title: "联系方式", unresize: true, align: "center", + sort:true, }, { field: "sfzNum", @@ -113,6 +115,7 @@ function initTable() { title: "身份证", unresize: true, align: "center", + sort:true, templet: function (d) { return ''+d.sfzNum+''; }, @@ -123,6 +126,7 @@ function initTable() { title: "驾驶证", unresize: true, align: "center", + sort:true, templet: function (d) { return ''+d.jszNum+''; }, @@ -133,6 +137,7 @@ function initTable() { title: "其他操作证", unresize: true, align: "center", + sort:true, templet: function (d) { return ''+d.otherNum+''; }, @@ -143,6 +148,7 @@ function initTable() { title: "所属供应商", unresize: true, align: "center", + sort:true, }, { title: "操作", diff --git a/js/car_basic/framework_contract_list.js b/js/car_basic/framework_contract_list.js index ec8a234..b3562bb 100644 --- a/js/car_basic/framework_contract_list.js +++ b/js/car_basic/framework_contract_list.js @@ -94,6 +94,7 @@ function initTable() { title: "合同编号", unresize: true, align: "center", + sort:true, }, { field: "name", @@ -101,6 +102,7 @@ function initTable() { title: "合同名称", unresize: true, align: "center", + sort:true, }, { field: "typeName", @@ -108,6 +110,7 @@ function initTable() { title: "合同类型", unresize: true, align: "center", + sort:true, }, { field: "status", @@ -115,6 +118,7 @@ function initTable() { title: "合同状态", unresize: true, align: "center", + sort:true, templet: function (d) { if (d.status === '已生效') { return "●" + "生效中"; @@ -129,6 +133,7 @@ function initTable() { title: "合同有效期", unresize: true, align: "center", + sort:true, templet: function (d) { return d.startTime + ' ~ ' + d.endTime } @@ -139,11 +144,13 @@ function initTable() { title: "合同金额（元）", unresize: true, align: "center", + sort:true, }, { field: "fileNum", width: '8%', title: "附件", + sort:true, unresize: true, align: "center", templet: function (d) { @@ -155,6 +162,7 @@ function initTable() { width: '20%', title: "供应商", unresize: true, + sort:true, align: "center", templet: function (d) { let supList = d.supList; @@ -170,6 +178,7 @@ function initTable() { title: "占比", unresize: true, align: "center", + sort:true, templet: function (d) { let supList = d.supList; let html = ""; @@ -183,6 +192,7 @@ function initTable() { width: '10%', title: "金额", unresize: true, + sort:true, align: "center", templet: function (d) { let supList = d.supList; @@ -230,6 +240,21 @@ function initTable() { table.resize("currentTableId"); }, }); + table.on('sort(currentTableId2)', function (obj) { + $(".layui-table-main tr").each(function (index, val) { + $($(".layui-table-fixed .layui-table-body tbody tr")[index]).height($(val).height()); + }); + //动态监听表体高度变化，冻结行跟着改变高度 + $(".layui-table-body tr").resize(function () { + $(".layui-table-body tr").each(function (index, val) { + $($(".layui-table-fixed .layui-table-body table tr")[index]).height($(val).height()); + }); + }); + //初始化高度，使得冻结行表体高度一致 + $(".layui-table-body tr").each(function (index, val) { + $($(".layui-table-fixed .layui-table-body table tr")[index]).height($(val).height()); + }); + }) } // 导出 diff --git a/js/car_basic/supplier_list.js b/js/car_basic/supplier_list.js index ffad664..d4ad9b5 100644 --- a/js/car_basic/supplier_list.js +++ b/js/car_basic/supplier_list.js @@ -90,6 +90,7 @@ function initTable() { title: "供应商名称", unresize: true, align: "center", + sort:true, }, { field: "link", @@ -97,6 +98,7 @@ function initTable() { title: "联系人", unresize: true, align: "center", + sort:true, }, { field: "phone", @@ -104,12 +106,14 @@ function initTable() { title: "联系方式", unresize: true, align: "center", + sort:true, }, { field: "expStatus", width: '10%', title: "供应商状态", unresize: true, + sort:true, align: "center", templet: function (d) { if (d.isActive === '1') { @@ -126,6 +130,7 @@ function initTable() { width: '30%', title: "供应商用户", unresize: true, + sort:true, align: "center", templet: function (d) { let html = ""; @@ -139,6 +144,7 @@ function initTable() { width: '15%', align: "center", unresize: true, + sort:true, templet: function (d) { let html = ""; html += "详情"; diff --git a/js/car_basic/type_list.js b/js/car_basic/type_list.js index 00e09e9..3bbac69 100644 --- a/js/car_basic/type_list.js +++ b/js/car_basic/type_list.js @@ -298,6 +298,7 @@ function initTable() { title: "类型", unresize: true, align: "center", + sort:true }, { field: "name", @@ -305,6 +306,7 @@ function initTable() { title: "名称", unresize: true, align: "center", + sort:true }, { field: "title", @@ -312,6 +314,7 @@ function initTable() { title: "规格", unresize: true, align: "center", + sort:true }, { field: "unit", @@ -319,6 +322,7 @@ function initTable() { title: "单位", unresize: true, align: "center", + sort:true }, { field: "isActive", @@ -326,6 +330,7 @@ function initTable() { title: "状态", unresize: true, align: "center", + sort:true, templet: function (d) { if (d.isActive === '1') { return "●" + "启用"; @@ -342,6 +347,7 @@ function initTable() { title: "备注", unresize: true, align: "center", + sort:true, templet: function (d) { if (d.remark) { if (d.remark.length > 60) { diff --git a/js/car_demand_plan/apply_plan_audit_list.js b/js/car_demand_plan/apply_plan_audit_list.js index 71f18fb..063ef42 100644 --- a/js/car_demand_plan/apply_plan_audit_list.js +++ b/js/car_demand_plan/apply_plan_audit_list.js @@ -101,6 +101,7 @@ function initTable() { title: "计划单号", unresize: true, align: "center", + sort:true, }, { field: "proName", @@ -108,6 +109,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, }, { field: "projectPart", @@ -115,13 +117,15 @@ function initTable() { title: "项目部分", unresize: true, align: "center", + sort:true, }, { - field: "allPrice", + field: "status", width: '10%', title: "审核状态", unresize: true, + sort:true, align: "center", templet: function (d) { return getCheckStatus(d.statusType, d.status); @@ -133,7 +137,7 @@ function initTable() { title: "提交人", unresize: true, align: "center", - + sort:true, }, { field: "createTime", @@ -141,6 +145,7 @@ function initTable() { title: "提交时间", unresize: true, align: "center", + sort:true, }, { field: "remark", @@ -148,6 +153,7 @@ function initTable() { title: "备注", unresize: true, align: "center", + sort:true, templet: function (d) { if (d.remark) { if (d.remark.length > 60) { diff --git a/js/car_demand_plan/apply_plan_list.js b/js/car_demand_plan/apply_plan_list.js index ddd16c4..b772a38 100644 --- a/js/car_demand_plan/apply_plan_list.js +++ b/js/car_demand_plan/apply_plan_list.js @@ -98,6 +98,7 @@ function initTable() { title: "计划编号", unresize: true, align: "center", + sort:true, }, { field: "proName", @@ -105,6 +106,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, }, { field: "needTime", @@ -112,6 +114,7 @@ function initTable() { title: "需用日期", unresize: true, align: "center", + sort:true, }, { field: "userName", @@ -119,6 +122,7 @@ function initTable() { title: "申请人", unresize: true, align: "center", + sort:true, }, { field: "appLyTime", @@ -126,12 +130,14 @@ function initTable() { title: "申请时间", unresize: true, align: "center", + sort:true, }, { field: "remark", width: '14%', title: "备注", unresize: true, + sort:true, align: "center", templet: function (d) { if (d.remark) { @@ -149,6 +155,7 @@ function initTable() { field: "auditStatus", width: '10%', title: "审核状态", + sort:true, unresize: true, align: "center", templet: function (d) { diff --git a/js/car_demand_plan/arrival_confirm_list.js b/js/car_demand_plan/arrival_confirm_list.js index b49effe..bde18e2 100644 --- a/js/car_demand_plan/arrival_confirm_list.js +++ b/js/car_demand_plan/arrival_confirm_list.js @@ -96,6 +96,7 @@ function initTable() { title: "需求计划编号", unresize: true, align: "center", + sort:true, templet: function (d) { return "" + d.code + ""; }, @@ -106,6 +107,7 @@ function initTable() { title: "申请人", unresize: true, align: "center", + sort:true, }, { field: "appLyTime", @@ -113,12 +115,14 @@ function initTable() { title: "申请时间", unresize: true, align: "center", + sort:true, }, { field: "remark", width: '15%', title: "备注", unresize: true, + sort:true, align: "center", templet: function (d) { if (d.remark) { @@ -136,6 +140,7 @@ function initTable() { field: "statusName", width: '10%', title: "派车状态", + sort:true, unresize: true, align: "center", templet: function (d) { @@ -148,6 +153,7 @@ function initTable() { title: "派车数量", unresize: true, align: "center", + sort:true, }, { field: "outTime", @@ -155,15 +161,17 @@ function initTable() { title: "派车日期", unresize: true, align: "center", + sort:true, }, { field: "auditStatus", width: '10%', title: "到货确认单", unresize: true, + sort:true, align: "center", templet: function (d) { - return setIsUpload(d.auditStatus); + return setIsUpload(d.fileNum); }, }, { diff --git a/js/car_demand_plan/child/apply_plan_detail.js b/js/car_demand_plan/child/apply_plan_detail.js index 7f6e715..afdf233 100644 --- a/js/car_demand_plan/child/apply_plan_detail.js +++ b/js/car_demand_plan/child/apply_plan_detail.js @@ -142,6 +142,7 @@ function initTable() { title: "类型", unresize: true, align: "center", + sort:true, }, { field: "name", @@ -149,6 +150,7 @@ function initTable() { title: "名称", unresize: true, align: "center", + sort:true, }, { field: "model", @@ -156,6 +158,7 @@ function initTable() { title: "规格", unresize: true, align: "center", + sort:true, }, { field: "unit", @@ -163,6 +166,7 @@ function initTable() { title: "单位", unresize: true, align: "center", + sort:true, templet: function (d) { return setNullValue(d.unit); }, @@ -173,6 +177,7 @@ function initTable() { title: "需用量", unresize: true, align: "center", + sort:true, templet: function (d) { return setNumColor(d.needNum); }, @@ -183,6 +188,7 @@ function initTable() { title: "需用天数", unresize: true, align: "center", + sort:true, templet: function (d) { return setNumColor(d.needDay); }, @@ -192,6 +198,7 @@ function initTable() { field: "remark", width: '15%', title: "备注", + sort:true, unresize: true, align: "center", templet: function (d) { diff --git a/js/car_demand_plan/child/choose_car_or_user_list.js b/js/car_demand_plan/child/choose_car_or_user_list.js index 3095346..e1837ba 100644 --- a/js/car_demand_plan/child/choose_car_or_user_list.js +++ b/js/car_demand_plan/child/choose_car_or_user_list.js @@ -116,6 +116,7 @@ function initTable() { title: "车牌号", unresize: true, align: "center", + sort:true, }, { field: "type", @@ -123,6 +124,7 @@ function initTable() { title: "车辆类型", unresize: true, align: "center", + sort:true, }, { field: "ton", @@ -130,6 +132,7 @@ function initTable() { title: "车辆吨位", unresize: true, align: "center", + sort:true, }, { field: "supName", @@ -137,6 +140,7 @@ function initTable() { width: '30%', unresize: true, align: "center", + sort:true, }, ], ], @@ -198,6 +202,7 @@ function initTable2() { title: "姓名", unresize: true, align: "center", + sort:true, }, { field: "supName", @@ -205,6 +210,7 @@ function initTable2() { title: "所属供应商", unresize: true, align: "center", + sort:true, }, ], ], diff --git a/js/car_demand_plan/child/choose_type_list.js b/js/car_demand_plan/child/choose_type_list.js index 8f64236..2934f70 100644 --- a/js/car_demand_plan/child/choose_type_list.js +++ b/js/car_demand_plan/child/choose_type_list.js @@ -121,6 +121,7 @@ function initTable() { title: "类型", unresize: true, align: "center", + sort:true, }, { field: "name", @@ -128,6 +129,7 @@ function initTable() { title: "名称", unresize: true, align: "center", + sort:true, }, { field: "model", @@ -135,6 +137,7 @@ function initTable() { title: "规格", unresize: true, align: "center", + sort:true, }, { field: "unit", @@ -142,6 +145,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "needNum", diff --git a/js/car_demand_plan/child/dispatch_car_pro_detail.js b/js/car_demand_plan/child/dispatch_car_pro_detail.js index ab5617e..a88a010 100644 --- a/js/car_demand_plan/child/dispatch_car_pro_detail.js +++ b/js/car_demand_plan/child/dispatch_car_pro_detail.js @@ -139,6 +139,7 @@ function initTable() { title: "计划类型", unresize: true, align: "center", + sort:true, }, { field: "code", @@ -146,6 +147,7 @@ function initTable() { title: "需求计划编号", unresize: true, align: "center", + sort:true, templet: function (d) { return "" + d.code + ""; }, @@ -156,6 +158,7 @@ function initTable() { title: "申请人", unresize: true, align: "center", + sort:true, }, { field: "appLyTime", @@ -163,6 +166,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "remark", @@ -170,6 +174,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, templet: function (d) { if (d.remark) { if (d.remark.length > 60) { @@ -188,6 +193,7 @@ function initTable() { width: '7%', unresize: true, align: "center", + sort:true, templet: function (d) { if (d.statusName === '待派车' || d.statusName === '待审核') { return ' ● ' + d.statusName + ''; @@ -204,6 +210,7 @@ function initTable() { title: "已派车数量", unresize: true, align: "center", + sort:true, templet: function (d) { return "" + d.dispatchNum + ""; }, @@ -214,6 +221,7 @@ function initTable() { title: "待派车数量", unresize: true, align: "center", + sort:true, templet: function (d) { return "" + d.noDispatchNum + ""; }, @@ -224,6 +232,7 @@ function initTable() { width: '8.5%', align: "center", unresize: true, + sort:true, }, { field: "dispatchDay", @@ -231,6 +240,7 @@ function initTable() { width: '8.5%', align: "center", unresize: true, + sort:true, templet: function (d) { if (d.dispatchDay) { return d.dispatchDay; 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 d66f9b0..046df70 100644 --- a/js/car_demand_plan/child/emerg_internal_car_detail.js +++ b/js/car_demand_plan/child/emerg_internal_car_detail.js @@ -180,6 +180,7 @@ function initTable() { title: "类型", unresize: true, align: "center", + sort:true, }, { field: "name", @@ -187,6 +188,7 @@ function initTable() { title: "名称", unresize: true, align: "center", + sort:true, }, { field: "model", @@ -194,6 +196,7 @@ function initTable() { title: "规格", unresize: true, align: "center", + sort:true, }, { field: "unit", @@ -201,6 +204,7 @@ function initTable() { title: "单位", unresize: true, align: "center", + sort:true, templet: function (d) { return setNullValue(d.unit); }, @@ -211,6 +215,7 @@ function initTable() { title: "需用量", unresize: true, align: "center", + sort:true, templet: function (d) { return setNumColor(d.needNum); }, @@ -221,6 +226,7 @@ function initTable() { title: "需用天数", unresize: true, align: "center", + sort:true, templet: function (d) { return setNumColor(d.needDay); }, @@ -232,6 +238,7 @@ function initTable() { title: "备注", unresize: true, align: "center", + sort:true, templet: function (d) { if (d.remark) { if (d.remark.length > 60) { diff --git a/js/car_demand_plan/dispatch_car_list.js b/js/car_demand_plan/dispatch_car_list.js index 3e8d5ec..2b9e11c 100644 --- a/js/car_demand_plan/dispatch_car_list.js +++ b/js/car_demand_plan/dispatch_car_list.js @@ -156,6 +156,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, }, { field: "planNum", @@ -163,6 +164,7 @@ function initTable() { title: "计划数", unresize: true, align: "center", + sort:true, templet: function (d) { return '' + d.planNum + ''; }, @@ -173,6 +175,7 @@ function initTable() { title: "已派车", unresize: true, align: "center", + sort:true, templet: function (d) { return '' + d.ypcNum + ''; }, @@ -183,6 +186,7 @@ function initTable() { title: "待派车", unresize: true, align: "center", + sort:true, templet: function (d) { return '' + d.dpcNum + ''; }, @@ -193,6 +197,7 @@ function initTable() { width: '8%', unresize: true, align: "center", + sort:true, templet: function (d) { return setStatusColor(d.planStatus); }, @@ -203,6 +208,7 @@ function initTable() { title: "最后派车时间", unresize: true, align: "center", + sort:true, }, { field: "progress", @@ -211,6 +217,7 @@ function initTable() { unresize: true, align: "center", templet: schedule, + sort:true, }, { field: "needNum", @@ -218,6 +225,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "dispatchNum", @@ -225,6 +233,7 @@ function initTable() { width: '8%', unresize: true, align: "center", + sort:true, }, { field: "noDispatchNum", @@ -232,6 +241,7 @@ function initTable() { width: '8%', unresize: true, align: "center", + sort:true, }, { title: "操作", diff --git a/js/car_demand_plan/dispatch_input_list.js b/js/car_demand_plan/dispatch_input_list.js index dbab8a2..517ff3d 100644 --- a/js/car_demand_plan/dispatch_input_list.js +++ b/js/car_demand_plan/dispatch_input_list.js @@ -96,12 +96,14 @@ function initTable() { title: "计划类型", unresize: true, align: "center", + sort:true, }, { field: "code", width: '9%', title: "需求计划编号", unresize: true, + sort:true, align: "center", templet: function (d) { return "" + d.code + ""; @@ -113,6 +115,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, }, { field: "needTime", @@ -120,12 +123,14 @@ function initTable() { title: "需用日期", unresize: true, align: "center", + sort:true, }, { field: "remark", width: '10%', title: "备注", unresize: true, + sort:true, align: "center", templet: function (d) { if (d.remark) { @@ -144,6 +149,7 @@ function initTable() { width: '8%', title: "派车状态", unresize: true, + sort:true, align: "center", templet: function (d) { if (d.statusName === '待派车' || d.statusName === '待审核') { @@ -159,6 +165,7 @@ function initTable() { field: "dispatchNum", width: '8%', title: "已派车数量", + sort:true, unresize: true, align: "center", templet: function (d) { @@ -169,6 +176,7 @@ function initTable() { field: "noDispatchNum", width: '8%', title: "待派车数量", + sort:true, unresize: true, align: "center", templet: function (d) { @@ -179,6 +187,7 @@ function initTable() { field: "dispatchDay", width: '9%', title: "最新派车日期", + sort:true, unresize: true, align: "center", templet: function (d) { @@ -193,6 +202,7 @@ function initTable() { field: "status", width: '7%', title: "审核状态", + sort:true, unresize: true, align: "center", templet: function (d) { diff --git a/js/car_demand_plan/emerg_internal_car_list.js b/js/car_demand_plan/emerg_internal_car_list.js index 6ee5e7e..cf30bc4 100644 --- a/js/car_demand_plan/emerg_internal_car_list.js +++ b/js/car_demand_plan/emerg_internal_car_list.js @@ -98,6 +98,7 @@ function initTable() { title: "计划编号", unresize: true, align: "center", + sort:true, }, { field: "proName", @@ -105,6 +106,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, }, { field: "needTime", @@ -112,6 +114,7 @@ function initTable() { title: "需用日期", unresize: true, align: "center", + sort:true, }, { field: "userName", @@ -119,6 +122,7 @@ function initTable() { title: "申请人", unresize: true, align: "center", + sort:true, }, { field: "appLyTime", @@ -126,11 +130,13 @@ function initTable() { title: "申请时间", unresize: true, align: "center", + sort:true, }, { field: "remark", width: '14%', title: "备注", + sort:true, unresize: true, align: "center", templet: function (d) { diff --git a/js/car_settlement/branch_settlement_list.js b/js/car_settlement/branch_settlement_list.js index 02ebbc0..231c9e8 100644 --- a/js/car_settlement/branch_settlement_list.js +++ b/js/car_settlement/branch_settlement_list.js @@ -168,6 +168,7 @@ function initTable() { title: "分公司", unresize: true, align: "center", + sort:true, }, { field: "porNum", @@ -175,6 +176,7 @@ function initTable() { title: "工程数量", unresize: true, align: "center", + sort:true, }, { field: "planNum", @@ -182,6 +184,7 @@ function initTable() { title: "需求计划数量", unresize: true, align: "center", + sort:true, }, { field: "needNum", @@ -189,6 +192,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "carNum", @@ -196,6 +200,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "dpcNum", @@ -203,6 +208,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "money", @@ -210,6 +216,7 @@ function initTable() { title: "应付金额", unresize: true, align: "center", + sort:true, templet: function (d) { return ' ￥ ' + (d.money ? d.money : 0); }, @@ -220,6 +227,7 @@ function initTable() { title: "已付金额", unresize: true, align: "center", + sort:true, templet: function (d) { return ' ￥ ' + (d.payMoney ? d.payMoney : 0); }, @@ -230,6 +238,7 @@ function initTable() { title: "待付金额", unresize: true, align: "center", + sort:true, templet: function (d) { return ' ￥ ' + (d.noPayMoney ? d.noPayMoney : 0); }, diff --git a/js/car_settlement/child/branch_settlement_detail.js b/js/car_settlement/child/branch_settlement_detail.js index 15229f2..d892fdf 100644 --- a/js/car_settlement/child/branch_settlement_detail.js +++ b/js/car_settlement/child/branch_settlement_detail.js @@ -116,6 +116,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, }, { field: "planNum", @@ -123,6 +124,7 @@ function initTable() { title: "需求计划数量", unresize: true, align: "center", + sort:true, }, { field: "needNum", @@ -130,6 +132,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "carNum", @@ -137,6 +140,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "dpcNum", @@ -144,12 +148,14 @@ function initTable() { width: '9%', unresize: true, align: "center", + sort:true, }, { field: "money", width: '9%', title: "应付金额", unresize: true, + sort:true, align: "center", templet: function (d) { return " ¥ " + d.money ? d.money : 0; @@ -161,6 +167,7 @@ function initTable() { width: '9.5%', align: "center", unresize: true, + sort:true, templet: function (d) { return " ¥ " + d.payMoney ? d.payMoney : 0; }, @@ -171,6 +178,7 @@ function initTable() { width: '9.5%', align: "center", unresize: true, + sort:true, templet: function (d) { return " ¥ " + d.noPayMoney ? d.noPayMoney : 0; }, diff --git a/js/car_settlement/child/branch_settlement_pro_detail.js b/js/car_settlement/child/branch_settlement_pro_detail.js index 6b76d0a..e4851fa 100644 --- a/js/car_settlement/child/branch_settlement_pro_detail.js +++ b/js/car_settlement/child/branch_settlement_pro_detail.js @@ -113,6 +113,7 @@ function initTable() { title: "计划类型", unresize: true, align: "center", + sort:true, }, { field: "code", @@ -120,6 +121,7 @@ function initTable() { title: "需求计划编号", unresize: true, align: "center", + sort:true, templet: function (d) { return "" + d.code + ""; }, @@ -130,6 +132,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "carNum", @@ -137,6 +140,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "dpcNum", @@ -144,6 +148,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "money", @@ -151,6 +156,7 @@ function initTable() { title: "应付金额", unresize: true, align: "center", + sort:true, templet: function (d) { return " ¥ " + d.money ? d.money : 0; }, @@ -160,6 +166,7 @@ function initTable() { title: "已付金额", width: '10%', align: "center", + sort:true, unresize: true, templet: function (d) { return " ¥ " + d.payMoney ? d.payMoney : 0; @@ -170,6 +177,7 @@ function initTable() { title: "待付金额 ", width: '10%', align: "center", + sort:true, unresize: true, templet: function (d) { return " ¥ " + d.noPayMoney ? d.noPayMoney : 0; @@ -181,6 +189,7 @@ function initTable() { width: '10%', align: "center", unresize: true, + sort:true, }, { title: "操作", diff --git a/js/car_settlement/child/choose_plan_code_list.js b/js/car_settlement/child/choose_plan_code_list.js index b609fd6..a24cba2 100644 --- a/js/car_settlement/child/choose_plan_code_list.js +++ b/js/car_settlement/child/choose_plan_code_list.js @@ -126,6 +126,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, }, { field: "code", @@ -133,6 +134,7 @@ function initTable() { title: "需求计划编号", unresize: true, align: "center", + sort:true, }, { field: "supName", @@ -140,6 +142,7 @@ function initTable() { title: "供应商名称", unresize: true, align: "center", + sort:true, }, { field: "dispatchNum", @@ -147,6 +150,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "money", @@ -154,6 +158,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "userName", @@ -161,6 +166,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "lastDay", @@ -168,6 +174,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "remark", @@ -175,6 +182,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, templet: function (d) { if (d.remark) { if (d.remark.length > 60) { diff --git a/js/car_settlement/child/payment_detail_list.js b/js/car_settlement/child/payment_detail_list.js index 80d53a7..7bc708f 100644 --- a/js/car_settlement/child/payment_detail_list.js +++ b/js/car_settlement/child/payment_detail_list.js @@ -103,6 +103,7 @@ function initTable() { title: "供应商名称", unresize: true, align: "center", + sort:true, }, { field: "code", @@ -110,6 +111,7 @@ function initTable() { title: "需求计划编号", unresize: true, align: "center", + sort:true, templet: function (d) { let html = ""; html += "" + d.code + ""; @@ -122,6 +124,7 @@ function initTable() { title: "用车数量", unresize: true, align: "center", + sort:true, }, { field: "money", @@ -129,6 +132,7 @@ function initTable() { title: "应付金额", unresize: true, align: "center", + sort:true, templet: function (d) { return ' ￥ ' + (d.money ? d.money : 0); }, @@ -139,6 +143,7 @@ function initTable() { title: "已付金额", unresize: true, align: "center", + sort:true, templet: function (d) { let payMoney = d.payMoney || 0; if (parseInt(payMoney) > 0) { @@ -155,6 +160,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, }, { title: "操作", diff --git a/js/car_settlement/payment_list.js b/js/car_settlement/payment_list.js index 82d90ae..6581fb7 100644 --- a/js/car_settlement/payment_list.js +++ b/js/car_settlement/payment_list.js @@ -96,6 +96,7 @@ function initTable() { title: "供应商名称", unresize: true, align: "center", + sort:true, }, { field: "status", @@ -103,6 +104,7 @@ function initTable() { title: "合同状态", unresize: true, align: "center", + sort:true, templet: function (d) { if(d.status === '已生效'){ return "●生效中"; @@ -117,6 +119,7 @@ function initTable() { title: "需求计划数量", unresize: true, align: "center", + sort:true, }, { field: "proNum", @@ -124,6 +127,7 @@ function initTable() { title: "工程数量", unresize: true, align: "center", + sort:true, }, { field: "carNum", @@ -131,12 +135,14 @@ function initTable() { title: "租用车辆、吊车数量", unresize: true, align: "center", + sort:true, }, { field: "money", width: '10%', title: "租赁金额（元） ", unresize: true, + sort:true, align: "center", templet: function (d) { return ' ￥ '+ (d.money ? d.money : 0); @@ -148,6 +154,7 @@ function initTable() { title: "已付金额（元）", unresize: true, align: "center", + sort:true, templet: function (d) { return ' ￥ '+ (d.payMoney ? d.payMoney : 0); }, @@ -158,6 +165,7 @@ function initTable() { title: "待付金额（元）", unresize: true, align: "center", + sort:true, templet: function (d) { return ' ￥ '+ (d.noPayMoney ? d.noPayMoney : 0); }, diff --git a/js/car_settlement/sup_settlement_list.js b/js/car_settlement/sup_settlement_list.js index d8e7d11..3a488e5 100644 --- a/js/car_settlement/sup_settlement_list.js +++ b/js/car_settlement/sup_settlement_list.js @@ -136,6 +136,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, }, { field: "code", @@ -143,6 +144,7 @@ function initTable() { title: "需求计划编号", unresize: true, align: "center", + sort:true, templet: function (d) { let html = ""; html += "" + d.code + ""; @@ -155,6 +157,7 @@ function initTable() { title: "供应商名称", unresize: true, align: "center", + sort:true, }, { field: "carNum", @@ -162,6 +165,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "money", @@ -169,6 +173,7 @@ function initTable() { title: "金额", unresize: true, align: "center", + sort:true, templet: function (d) { return ' ￥ ' + (d.money ? d.money : 0); }, @@ -179,6 +184,7 @@ function initTable() { title: "经办人", unresize: true, align: "center", + sort:true, }, { field: "jbTime", @@ -186,6 +192,7 @@ function initTable() { title: "经办时间", unresize: true, align: "center", + sort:true, }, { field: "fkTime", @@ -193,6 +200,7 @@ function initTable() { title: "是否已付款", unresize: true, align: "center", + sort:true, templet: function (d) { if(d.status !== '未付'){ return "●已付"; @@ -207,6 +215,7 @@ function initTable() { title: "付款时间", unresize: true, align: "center", + sort:true, }, { title: "操作", diff --git a/js/welcome/data_datail_dispatch_list.js b/js/welcome/data_datail_dispatch_list.js index 6d6baf3..6a4bd01 100644 --- a/js/welcome/data_datail_dispatch_list.js +++ b/js/welcome/data_datail_dispatch_list.js @@ -97,7 +97,7 @@ function initTable() { authorization: sessionStorage.getItem("gz-token"), }, height: "full-370", - url: dataUrl + "backstage/dispatchCar/getProStatisticsList", + url: dataUrl + "backstage/homeIndex/getDispatchDetails", where: { encryptedData: JSON.stringify(params), }, @@ -132,13 +132,15 @@ function initTable() { title: "名称", unresize: true, align: "center", + sort:true, }, { field: "model", width: '8%', title: "规格", unresize: true, - align: "center" + align: "center", + sort:true, }, { field: "unit", @@ -146,6 +148,7 @@ function initTable() { title: "单位", unresize: true, align: "center", + sort:true, }, { field: "remark", @@ -153,6 +156,7 @@ function initTable() { title: "说明(根据车辆/吊车自动生成)", unresize: true, align: "center", + sort:true, }, { field: "money", @@ -160,6 +164,7 @@ function initTable() { width: '8%', unresize: true, align: "center", + sort:true, templet: function (d) { return '¥ ' + d.money + '' }, @@ -170,11 +175,13 @@ function initTable() { title: "付款状态", unresize: true, align: "center", + sort:true, }, { field: "code", width: '10%', title: "需求计划编号", + sort:true, unresize: true, align: "center", templet: function (d) { @@ -189,6 +196,7 @@ function initTable() { width: '8%', unresize: true, align: "center", + sort:true, }, { field: "supName", @@ -196,6 +204,7 @@ function initTable() { width: '8%', unresize: true, align: "center", + sort:true, }, { field: "dispatchDay", @@ -203,6 +212,7 @@ function initTable() { width: '8%', unresize: true, align: "center", + sort:true, }, ], ], diff --git a/js/welcome/data_datail_plan_list.js b/js/welcome/data_datail_plan_list.js index 236ff22..50f4c6d 100644 --- a/js/welcome/data_datail_plan_list.js +++ b/js/welcome/data_datail_plan_list.js @@ -118,6 +118,7 @@ function initTable() { width: '10%', title: "需求计划编号", unresize: true, + sort:true, align: "center", templet: function (d) { let html = ""; @@ -131,6 +132,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, }, { field: "dispatchStatus", @@ -138,6 +140,7 @@ function initTable() { title: "派车状态", unresize: true, align: "center", + sort:true, templet: function (d) { return setStatusColor(d.dispatchStatus); }, @@ -148,6 +151,7 @@ function initTable() { title: "车辆数量", unresize: true, align: "center", + sort:true, }, { field: "craneNum", @@ -155,6 +159,7 @@ function initTable() { title: "吊车数量", unresize: true, align: "center", + sort:true, }, { field: "money", @@ -162,6 +167,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, templet: function (d) { return '¥ ' + d.money + '' }, @@ -172,6 +178,7 @@ function initTable() { title: "供应商", unresize: true, align: "center", + sort:true, }, { field: "payStatus", @@ -179,6 +186,7 @@ function initTable() { title: "付款状态", unresize: true, align: "center", + sort:true, }, { field: "companyName", @@ -186,6 +194,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, ], ], diff --git a/js/welcome/data_datail_pro_list.js b/js/welcome/data_datail_pro_list.js index 9d5db21..6ce9180 100644 --- a/js/welcome/data_datail_pro_list.js +++ b/js/welcome/data_datail_pro_list.js @@ -101,6 +101,7 @@ function initTable() { title: "工程名称", unresize: true, align: "center", + sort:true, templet: function (d) { let html = ""; html += "" + d.proName + ""; @@ -113,6 +114,7 @@ function initTable() { title: "计划数", unresize: true, align: "center", + sort:true, }, { field: "dispatchPlanNum", @@ -120,6 +122,7 @@ function initTable() { title: "已派车计划", unresize: true, align: "center", + sort:true, }, { field: "noDispatchPlanNum", @@ -127,6 +130,7 @@ function initTable() { title: "待派车计划", unresize: true, align: "center", + sort:true, }, { field: "dispatchStatus", @@ -134,6 +138,7 @@ function initTable() { width: '8%', unresize: true, align: "center", + sort:true, templet: function (d) { return setStatusColor(d.dispatchStatus); }, @@ -144,6 +149,7 @@ function initTable() { title: "应派车数量", unresize: true, align: "center", + sort:true, }, { field: "dispatchNum", @@ -151,6 +157,7 @@ function initTable() { title: "已派车数量", unresize: true, align: "center", + sort:true, }, { field: "noDispatchNum", @@ -158,6 +165,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "money", @@ -165,6 +173,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "companyName", @@ -172,6 +181,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, ], ], diff --git a/js/welcome/pro_list_detail.js b/js/welcome/pro_list_detail.js index 3b82d25..405a3bd 100644 --- a/js/welcome/pro_list_detail.js +++ b/js/welcome/pro_list_detail.js @@ -139,6 +139,7 @@ function initTable() { title: "计划类型", unresize: true, align: "center", + sort:true, }, { field: "code", @@ -146,6 +147,7 @@ function initTable() { title: "需求计划编号", unresize: true, align: "center", + sort:true, templet: function (d) { return "" + d.code + ""; }, @@ -156,6 +158,7 @@ function initTable() { title: "申请人", unresize: true, align: "center", + sort:true, }, { field: "appLyTime", @@ -163,6 +166,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, }, { field: "remark", @@ -170,6 +174,7 @@ function initTable() { width: '12%', unresize: true, align: "center", + sort:true, templet: function (d) { if (d.remark) { if (d.remark.length > 60) { @@ -188,6 +193,7 @@ function initTable() { width: '10%', unresize: true, align: "center", + sort:true, templet: function (d) { if (d.statusName === '待派车' || d.statusName === '待审核') { return ' ● ' + d.statusName + ''; @@ -204,6 +210,7 @@ function initTable() { title: "派车数量", unresize: true, align: "center", + sort:true, templet: function (d) { return "" + d.dispatchNum + ""; }, @@ -214,6 +221,7 @@ function initTable() { width: '10%', align: "center", unresize: true, + sort:true, }, { title: "操作",