1、工程详情增加待分配查询

2、车辆,驾驶员增加白名单
This commit is contained in:
hayu 2025-05-14 14:15:02 +08:00
parent 9c6fb35c41
commit 2c3657b18d
16 changed files with 111 additions and 12 deletions

View File

@ -86,7 +86,7 @@ function initTable() {
cols: [
[
{
width: '6.9%',
width: '5%',
title: "序号",
align: "center",
templet: function (d) {
@ -95,7 +95,7 @@ function initTable() {
},
{
field: "carNum",
width: '9%',
width: '7%',
title: "车牌号",
unresize: true,
align: "center",
@ -119,7 +119,7 @@ function initTable() {
},
{
field: "ton",
width: '11%',
width: '10%',
title: "车辆吨位T",
unresize: true,
align: "center",
@ -130,7 +130,7 @@ function initTable() {
},
{
field: "xyNum",
width: '8%',
width: '7%',
title: "挂靠协议",
unresize: true,
align: "center",
@ -141,7 +141,7 @@ function initTable() {
},
{
field: "bxNum",
width: '8%',
width: '7%',
title: "车辆保险",
unresize: true,
sort:true,
@ -152,7 +152,7 @@ function initTable() {
},
{
field: "xszNum",
width: '8%',
width: '7%',
title: "行驶证",
unresize: true,
sort:true,
@ -163,7 +163,7 @@ function initTable() {
},
{
field: "bxDay",
width: '12%',
width: '11%',
title: "车辆保险到期日期",
unresize: true,
align: "center",
@ -177,6 +177,17 @@ function initTable() {
align: "center",
sort:true,
},
{
field: "isWhiteList",
width: '9%',
title: "是否为白名单",
unresize: true,
align: "center",
sort:true,
templet: function (d) {
return (d.isWhiteList===1 ? "是" : "否");
},
},
{
title: "操作",
width: '10%',

View File

@ -38,6 +38,11 @@ function getCarCarDetails() {
$('#ton').html(obj.ton + ' 吨 ');
$('#bxDay').html(obj.bxDay);
$('#supName').html(obj.supName);
if (obj.isWhiteList===1){
$('#isWhiteList').html("是");
} else {
$('#isWhiteList').html("否")
}
setFileTable(obj.fileList);
}
}

View File

@ -1,5 +1,6 @@
let form, layer, laydate, fileList = new Array(), imgListUp = new Array(), delImgIdList = [], delImgTypeList = [];
let objParam; // 是否保存并继续
let isWhiteList=0;
function setParams(obj) {
objParam = JSON.parse(obj);
layui.use(['form', 'layer', 'laydate', 'upload'], function () {
@ -31,6 +32,11 @@ function setParams(obj) {
}
}
});
// 监听radio选择变化
form.on('radio(isWhiteList)', function (data) {
isWhiteList=data.value;
console.log(isWhiteList);
});
form.on('submit(formData)', function (data) {
submitApply(data);
});
@ -198,6 +204,7 @@ function getCarCarDetails() {
// 表单赋值
function setFormData(obj) {
isWhiteList=obj.isWhiteList;
form.val('formInfo', obj);
let fileList = obj.fileList, html = '', cent = '';
for (let i = 0; i < fileList.length; i++) {

View File

@ -1,5 +1,6 @@
let form, layer, laydate, fileList = new Array(), imgListUp = new Array();;
let objParam; // 是否保存并继续
let isWhiteList=0;
function setParams(obj) {
objParam = JSON.parse(obj);
layui.use(['form', 'layer', 'laydate', 'upload'], function () {
@ -31,6 +32,11 @@ function setParams(obj) {
}
}
});
// 监听radio选择变化
form.on('radio(isWhiteList)', function (data) {
isWhiteList=data.value;
console.log(isWhiteList);
});
form.on('submit(formData)', function (data) {
submitApply(data);
});

View File

@ -35,6 +35,11 @@ function getDriverDetails() {
$('#name').html(obj.name);
$('#phone').html(obj.phone);
$('#supName').html(obj.supName);
if (obj.isWhiteList===1){
$('#isWhiteList').html("是");
} else {
$('#isWhiteList').html("否")
}
setFileTable(obj.fileList);
}
}

View File

@ -1,5 +1,6 @@
let form, layer, laydate, fileList = new Array(), imgListUp = new Array(), delImgIdList = [], delImgTypeList = [];
let objParam; // 是否保存并继续
let isWhiteList=0;
function setParams(obj) {
objParam = JSON.parse(obj);
layui.use(['form', 'layer', 'laydate', 'upload'], function () {
@ -17,6 +18,11 @@ function setParams(obj) {
}
},
});
// 监听radio选择变化
form.on('radio(isWhiteList)', function (data) {
isWhiteList=data.value;
console.log(isWhiteList);
});
form.on('submit(formData)', function (data) {
submitApply(data);
});
@ -180,6 +186,7 @@ function getCarCarDetails() {
// 表单赋值
function setFormData(obj) {
isWhiteList=obj.isWhiteList;
form.val('formInfo', obj);
let fileList = obj.fileList, html = '', cent = '';
for (let i = 0; i < fileList.length; i++) {

View File

@ -1,5 +1,6 @@
let form, layer, laydate, fileList = new Array(), imgListUp = new Array();;
let objParam; // 是否保存并继续
let isWhiteList=0;
function setParams(obj) {
objParam = JSON.parse(obj);
layui.use(['form', 'layer', 'laydate', 'upload'], function () {
@ -17,6 +18,11 @@ function setParams(obj) {
}
},
});
// 监听radio选择变化
form.on('radio(isWhiteList)', function (data) {
isWhiteList=data.value;
console.log(isWhiteList);
});
form.on('submit(formData)', function (data) {
submitApply(data);
});

View File

@ -95,7 +95,7 @@ function initTable() {
},
{
field: "name",
width: '15%',
width: '10%',
title: "姓名",
unresize: true,
align: "center",
@ -103,7 +103,7 @@ function initTable() {
},
{
field: "phone",
width: '15%',
width: '10%',
title: "联系方式",
unresize: true,
align: "center",
@ -150,6 +150,17 @@ function initTable() {
align: "center",
sort:true,
},
{
field: "isWhiteList",
width: '10%',
title: "是否为白名单",
unresize: true,
align: "center",
sort:true,
templet: function (d) {
return (d.isWhiteList===1 ? "是" : "否");
},
},
{
title: "操作",
width: '13%',

View File

@ -217,6 +217,9 @@ function setStatusColor(value) {
} else if (value === '3') {
color = "#19be6b";
name = '全部派车'
} else if (value === '4') {
color = "#f56c6c";
name ='待分配'
}
return '<span style="color:' + color + '"> ● </span>'+name+'';
}

View File

@ -23,7 +23,7 @@ function loadCompanyData() {
// 派车状态
function loadDispatchStatusData(type) {
let list = [{ id: 'dispatch-0', labelName: '全部' }, { id: 'dispatch-1', labelName: '部分派车' }, { id: 'dispatch-2', labelName: '待派车' }, { id: 'dispatch-3', labelName: '全部派车' }];
let list = [{ id: 'dispatch-0', labelName: '全部' }, { id: 'dispatch-1', labelName: '部分派车' }, { id: 'dispatch-2', labelName: '待派车' }, { id: 'dispatch-3', labelName: '全部派车' }, { id: 'dispatch-4', labelName: '待分配' }];
if(type){
list = [{ id: 'dispatch-0', labelName: '全部' }, { id: 'dispatch-1', labelName: '待派车' }, { id: 'dispatch-2', labelName: '已派车' }];
}

View File

@ -40,13 +40,13 @@
<tr>
<th>保险到期日期</th>
<th>所属供应商</th>
<th></th>
<th>是否为白名单</th>
<th></th>
</tr>
<tr>
<td id="bxDay"></td>
<td id="supName"></td>
<td></td>
<td id="isWhiteList"></td>
<td></td>
</tr>
</table>

View File

@ -69,6 +69,15 @@
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label required" style="width: 100px !important;">是否为白名单</label>
<div class="layui-input-inline">
<input type="radio" lay-filter="isWhiteList" name="isWhiteList" value=0 title="否">
<input type="radio" lay-filter="isWhiteList" name="isWhiteList" value=1 title="是">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label required" style="width: 100px !important;">保险到期日期</label>

View File

@ -69,6 +69,15 @@
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label required" style="width: 100px !important;">是否为白名单</label>
<div class="layui-input-inline">
<input type="radio" lay-filter="isWhiteList" name="isWhiteList" value=0 title="否" checked>
<input type="radio" lay-filter="isWhiteList" name="isWhiteList" value=1 title="是">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label required" style="width: 100px !important;">保险到期日期</label>

View File

@ -29,11 +29,13 @@
<th>姓名</th>
<th>联系方式</th>
<th>所属供应商</th>
<th>是否为白名单</th>
</tr>
<tr>
<td id="name"></td>
<td id="phone"></td>
<td id="supName"></td>
<td id="isWhiteList"></td>
</tr>
</table>
</div>

View File

@ -57,6 +57,15 @@
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label required" style="width: 100px !important;">是否为白名单</label>
<div class="layui-input-inline">
<input type="radio" lay-filter="isWhiteList" name="isWhiteList" value=0 title="否" checked>
<input type="radio" lay-filter="isWhiteList" name="isWhiteList" value=1 title="是">
</div>
</div>
</div>
<button type="submit" id="formSubmit" class="layui-btn" lay-submit="" lay-filter="formData"
style="display: none;"></button>
</form>

View File

@ -57,6 +57,15 @@
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label required" style="width: 100px !important;">是否为白名单</label>
<div class="layui-input-inline">
<input type="radio" lay-filter="isWhiteList" name="isWhiteList" value=0 title="否" checked>
<input type="radio" lay-filter="isWhiteList" name="isWhiteList" value=1 title="是">
</div>
</div>
</div>
<button type="submit" id="formSubmit" class="layui-btn" lay-submit="" lay-filter="formData"
style="display: none;"></button>
</form>