bonus
/
gz_car_ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
jiang 2025-07-15 17:53:33 +08:00
parent 7f14ca723a e2ee873b54
commit e41085ffb9
6 changed files with 79 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
js/car_basic/child/driver_re_detail.js
View File

@ -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: "需求计划<br>编号",
width: '10%',
title: "需求计划编号",
unresize: true,
align: "center",
sort:true,
templet: function (d) {
return "<a style='color:#409eff;' onclick='viewPlanDetail(" + JSON.stringify(d) + ")'>" + d.code + "</a>";
},
},
{
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 '<span title="' + d.remark + '">' + d.remark.substring(0, 60) + '...</span>'
} else {
return '<span title="' + d.remark + '">' + d.remark + '</span>'
}
} 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],

30
js/car_basic/driver_list.js
View File

@ -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 += "<a style='color: #409eff;font-weight: bold;' onclick='reDetail(" + JSON.stringify(d) + ",2)'>"+d.num+"</a>";
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 = {

2
js/car_basic/driver_white_list.js
View File

@ -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);
}
// 导出

19
js/car_demand_plan/child/choose_car_or_user_list.js
View File

@ -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],

4
js/car_demand_plan/child/dispatch_car_detail.js
View File

@ -365,7 +365,7 @@ function getDispatchCarData(id) {
let imgUrl2 = '../../../images/time_icon.png';
$.each(list, function (index, item) {
if (index === 0) {
creator = item.userName;
creator = (item.nikeName ? item.nikeName : item.userName);
}
let remark = setNullValue(item.auditRemark);
let dept = '', operData = '';
@ -396,7 +396,7 @@ function getDispatchCarData(id) {
'</div>' +
'<div class="user-oper layout">' +
'<div style="width: 100%">' +
'<span>' + item.userName + '</span><span>（' + item.phone + '）</span><span>' + dept + '</span>' +
'<span>' + (item.nikeName ? item.nikeName : item.userName) + '</span><span>（' + item.phone + '）</span><span>' + dept + '</span>' +
'</div>' +
'<div style="width: 100%">' +
'<span>' + operData + '</span>' +

13
page/car_basic/child/driver_re_detail.html
View File

@ -1,10 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>关联详情</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../lib/layui-v2.9.18/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../css/font.css" media="all">
<link rel="stylesheet" href="../../../css/public.css" media="all">
@ -15,15 +17,16 @@
<body id="body">
<div class="layuimini-main">
<div class="table-box" table-responsive style="z-index: 1;">
<table class="layui-hide" id="currentTableId" lay-filter="currentTableId2"></table>
</div>
</div>
</body>
<script src="../../../lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
<script src="../../../js/aes.js" charset="utf-8"></script>
<script src="../../../js/public.js" charset="utf-8"></script>
<script src="../../../js/Print.js" charset="utf-8"></script>
<script src="../../../lib/layui-v2.9.18/layui/layui.js" charset="utf-8"></script>
<script src="../../../js/openIframe.js" charset="utf-8"></script>
<script src="../../../js/car_basic/child/driver_re_detail.js" charset="utf-8"></script>
<script src="../../../js/openIframe.js" charset="utf-8"></script>
</html>