From e2ee873b54842127531275a01fcd9960f47f2384 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 14 Jul 2025 18:45:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
js/car_basic/child/driver_re_detail.js | 54 +++++++++++--------
js/car_basic/driver_list.js | 30 ++++++++---
js/car_basic/driver_white_list.js | 2 +-
.../child/choose_car_or_user_list.js | 19 ++++---
page/car_basic/child/driver_re_detail.html | 13 +++--
5 files changed, 77 insertions(+), 41 deletions(-)
diff --git a/js/car_basic/child/driver_re_detail.js b/js/car_basic/child/driver_re_detail.js
index f721a0e..6cf80dd 100644
--- a/js/car_basic/child/driver_re_detail.js
+++ b/js/car_basic/child/driver_re_detail.js
@@ -61,7 +61,7 @@ function initTable() {
headers: {
authorization: sessionStorage.getItem("gz-token"),
},
- height: "full-250",
+ height: "full-30",
url: dataUrl + "backstage/carDriver/getRePlan",
where: {
encryptedData: JSON.stringify({
@@ -95,58 +95,66 @@ function initTable() {
},
{
field: "typeName",
- width: '19%',
+ width: '10%',
title: "计划类型",
unresize: true,
align: "center",
- sort:true,
},
{
field: "code",
- width: '19%',
- title: "需求计划
编号",
+ width: '10%',
+ title: "需求计划编号",
unresize: true,
align: "center",
- sort:true,
templet: function (d) {
return "" + d.code + "";
},
},
+ {
+ field: "proName",
+ width: '20%',
+ title: "工程名称",
+ unresize: true,
+ align: "center",
+ },
{
field: "userName",
- width: '19%',
+ width: '10%',
title: "申请人",
unresize: true,
align: "center",
- sort:true,
},
{
field: "appLyTime",
title: "申请时间",
- width: '19%',
+ width: '10%',
unresize: true,
align: "center",
sort:true,
},
{
- field: "remark",
- title: "备注",
- width: '19%',
+ field: "outTime",
+ title: "派车日期",
+ width: '10%',
unresize: true,
align: "center",
sort:true,
- templet: function (d) {
- if (d.remark) {
- if (d.remark.length > 60) {
- return '' + d.remark.substring(0, 60) + '...'
- } else {
- return '' + d.remark + ''
- }
- } else {
- return '';
- }
- },
},
+ {
+ field: "model",
+ title: "车辆类型",
+ width: '14%',
+ unresize: true,
+ align: "center",
+ },
+ {
+ field: "licensePlate",
+ title: "车牌号",
+ width: '10%',
+ unresize: true,
+ align: "center",
+ },
+
],
],
limits: [10, 15, 20, 25, 50, 100],
diff --git a/js/car_basic/driver_list.js b/js/car_basic/driver_list.js
index 25e036c..54d9717 100644
--- a/js/car_basic/driver_list.js
+++ b/js/car_basic/driver_list.js
@@ -86,7 +86,7 @@ function initTable() {
cols: [
[
{
- width: '6.9%',
+ width: '4.9%',
title: "序号",
align: "center",
templet: function (d) {
@@ -95,7 +95,7 @@ function initTable() {
},
{
field: "name",
- width: '10%',
+ width: '8%',
title: "姓名",
unresize: true,
align: "center",
@@ -111,7 +111,7 @@ function initTable() {
},
{
field: "sfzNum",
- width: '10%',
+ width: '8%',
title: "身份证",
unresize: true,
align: "center",
@@ -122,7 +122,7 @@ function initTable() {
},
{
field: "jszNum",
- width: '10%',
+ width: '8%',
title: "驾驶证",
unresize: true,
align: "center",
@@ -133,7 +133,7 @@ function initTable() {
},
{
field: "otherNum",
- width: '10%',
+ width: '8%',
title: "其他操作证",
unresize: true,
align: "center",
@@ -144,7 +144,7 @@ function initTable() {
},
{
field: "supName",
- width: '20%',
+ width: '22%',
title: "所属供应商",
unresize: true,
align: "center",
@@ -161,6 +161,19 @@ function initTable() {
return (d.isWhiteList===1 ? "是" : "否");
},
},
+ {
+ field: "num",
+ width: '8%',
+ title: "人员履历",
+ unresize: true,
+ align: "center",
+ sort:true,
+ templet: function (d) {
+ let html = "";
+ html += ""+d.num+"";
+ return html;
+ },
+ },
{
title: "操作",
width: '13%',
@@ -186,6 +199,11 @@ function initTable() {
});
}
+// 人员履历
+function reDetail(obj) {
+ openIframeByParamObj("reDetail", "人员履历", "./child/driver_re_detail.html", "92%", "96%", obj);
+}
+
// 导出
function exportExcel() {
let params = {
diff --git a/js/car_basic/driver_white_list.js b/js/car_basic/driver_white_list.js
index 7d79745..8770bbe 100644
--- a/js/car_basic/driver_white_list.js
+++ b/js/car_basic/driver_white_list.js
@@ -190,7 +190,7 @@ function initTable() {
// 关联详情
function reDetail(obj) {
- openIframeByParamObj("reDetail", "关联详情", "./child/driver_re_detail.html", "92%", "95%", obj);
+ openIframeByParamObj("reDetail", "关联详情", "./child/driver_re_detail.html", "92%", "96%", obj);
}
// 导出
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 c6fc618..2738089 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
@@ -208,7 +208,7 @@ function initTable2() {
[
{ type: 'radio', title: '', width: '10%', },
{
- width: '9.9%',
+ width: '5%',
title: "序号",
align: "center",
templet: function (d) {
@@ -217,11 +217,10 @@ function initTable2() {
},
{
field: "name",
- width: '25%',
+ width: '15%',
title: "姓名",
unresize: true,
align: "center",
- sort:true,
},
{
field: "supName",
@@ -229,19 +228,27 @@ function initTable2() {
title: "所属供应商",
unresize: true,
align: "center",
- sort:true,
},
{
field: "isWhiteList",
- width: '25%',
+ width: '20%',
title: "是否为白名单",
unresize: true,
align: "center",
- sort:true,
templet: function (d) {
return (d.isWhiteList===1 ? "是" : "否");
},
},
+ {
+ field: "isDispatch",
+ width: '20%',
+ title: "今日是否派车",
+ unresize: true,
+ align: "center",
+ templet: function (d) {
+ return (d.isDispatch !==null ? "是" : "否");
+ },
+ },
],
],
limits: [10, 15, 20, 25, 50, 100],
diff --git a/page/car_basic/child/driver_re_detail.html b/page/car_basic/child/driver_re_detail.html
index 8fb6610..4a6c0ae 100644
--- a/page/car_basic/child/driver_re_detail.html
+++ b/page/car_basic/child/driver_re_detail.html
@@ -1,10 +1,12 @@
-
+
-
关联详情
+
+
+
@@ -15,15 +17,16 @@
-
-
-
+
+
\ No newline at end of file