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

问题修复

This commit is contained in:
cwchen 2025-01-17 12:39:11 +08:00
parent 13a347a461
commit c3a22b34f6
13 changed files with 434 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,11 +55,11 @@ function setParams(obj) {
for (let i = 0; i <= length - 1; i++) {
let layFilterName = $('.formSubmit2').eq(i).attr('lay-filter');
if (i === 0) {
form.on('submit(' + layFilterName + ')', function (data) {
form.on('submit(' + layFilterName + ')', function () {
$('.formSubmit2').eq(i + 1).trigger('click')
});
} else if (i === length - 1) {
form.on('submit(' + layFilterName + ')', function (data) {
form.on('submit(' + layFilterName + ')', function () {
submitApply(data);
});
}

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

@ -54,11 +54,11 @@ function setParams(obj) {
for (let i = 0; i <= length - 1; i++) {
let layFilterName = $('.formSubmit2').eq(i).attr('lay-filter');
if (i === 0) {
form.on('submit(' + layFilterName + ')', function (data) {
form.on('submit(' + layFilterName + ')', function () {
$('.formSubmit2').eq(i + 1).trigger('click')
});
} else if (i === length - 1) {
form.on('submit(' + layFilterName + ')', function (data) {
form.on('submit(' + layFilterName + ')', function () {
submitApply(data);
});
}

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

@ -56,11 +56,11 @@ function setParams(obj) {
for (let i = 0; i <= length - 1; i++) {
let layFilterName = $('.formSubmit2').eq(i).attr('lay-filter');
if (i === 0) {
form.on('submit(' + layFilterName + ')', function (data) {
form.on('submit(' + layFilterName + ')', function () {
$('.formSubmit2').eq(i + 1).trigger('click')
});
} else if (i === length - 1) {
form.on('submit(' + layFilterName + ')', function (data) {
form.on('submit(' + layFilterName + ')', function () {
submitApply(data);
});
}

14
js/car_settlement/child/branch_dispatch_car_detail.js
View File

@ -29,7 +29,7 @@ function setParams(params) {
function getAllOutList() {
let params = {
encryptedData: JSON.stringify({
'planId': objParam.id,
'planId': objParam.planId,
})
};
let url = dataUrl + 'backstage/supDispatchCar/getAllOutList'; // 默认详情所有批次
@ -48,7 +48,7 @@ function getAllOutList() {
}, function (xhr, status, error) {
errorFn(xhr, status, error)
}, null);
// 详情批次数据/待审核批次数据
// 详情批次数据
function setBatchData(dataList) {
let html = '', id = '', status = '', type = '';
$.each(dataList, function (index, item) {
@ -58,9 +58,6 @@ function getAllOutList() {
type = item.type;
}
let batchName = '第' + numToChinese(index + 1) + '批次';
if (objParam.type === 2) { // 待审核批次
batchName = '待审核第' + numToChinese(index + 1) + '批次';
}
html += "<li value=" + item.id + " status=" + item.status + " type=" + item.type + ">" + batchName + "</li>";
})
$('#layui-tab-title').empty().append(html);
@ -400,12 +397,7 @@ function viewFileDetail(obj, type) {
title = '操作证/身份证/导航图'
}
obj.type = type;
openIframeByParamObj("viewFileDetail", title, './view_file_detail.html', "92%", "95%", obj);
}
function checkData() {
objParam.checkType = '1'; // 派车审核
openIframeByParamObj("checkData", "审核", "./audit_form.html", "40%", "50%", objParam);
openIframeByParamObj("viewFileDetail", title, '../../car_demand_plan/child/view_file_detail.html', "92%", "95%", obj);
}
// 打印

8
js/car_settlement/child/branch_settlement_detail.js
View File

@ -112,14 +112,14 @@ function initTable() {
},
{
field: "proName",
width: '9.9%',
width: '14%',
title: "工程名称",
unresize: true,
align: "center",
},
{
field: "planNum",
width: '8%',
width: '10%',
title: "需求计划数量",
unresize: true,
align: "center",
@ -141,13 +141,13 @@ function initTable() {
{
field: "dpcNum",
title: "待派车数量",
width: '8%',
width: '9%',
unresize: true,
align: "center",
},
{
field: "money",
width: '8%',
width: '9%',
title: "应付金额",
unresize: true,
align: "center",

14
js/car_settlement/child/branch_settlement_pro_detail.js
View File

@ -109,14 +109,14 @@ function initTable() {
},
{
field: "typeName",
width: '8%',
width: '7%',
title: "计划类型",
unresize: true,
align: "center",
},
{
field: "code",
width: '8%',
width: '11%',
title: "需求计划编号",
unresize: true,
align: "center",
@ -141,7 +141,7 @@ function initTable() {
{
field: "dpcNum",
title: "待派车数量",
width: '8%',
width: '10%',
unresize: true,
align: "center",
},
@ -158,7 +158,7 @@ function initTable() {
{
field: "payMoney",
title: "已付金额",
width: '7%',
width: '10%',
align: "center",
unresize: true,
templet: function (d) {
@ -168,7 +168,7 @@ function initTable() {
{
field: "noPayMoney",
title: "待付金额 ",
width: '7%',
width: '10%',
align: "center",
unresize: true,
templet: function (d) {
@ -178,7 +178,7 @@ function initTable() {
{
field: "supName",
title: "供应商",
width: '8%',
width: '10%',
align: "center",
unresize: true,
},
@ -224,6 +224,8 @@ function viewPlanDetail(obj) {
// 详情
function dispatchCarDetail(obj, type) {
console.error(obj);
obj.type = type;
obj.typeName = obj.type === '1' ? '车辆':'吊车';
openIframeByParamObj2("dispatchCarDetail", "详情", "../car_settlement/child/branch_dispatch_car_detail.html", "92%", "95%", obj);
}

52
js/car_settlement/child/settlement_detail.js
View File

@ -12,18 +12,20 @@ function setParams(params) {
upload = layui.upload;
layer = layui.layer;
});
function setPayStatus(){
if(objParam.status === '未付'){
function setPayStatus() {
if (objParam.status === '未付') {
return "<span style='color:#FF9900;margin:0 5px 0 5px;font-size:16px'>●</span>待付款";
}else{
} else {
return "<span style='color:#19BE6B;margin:0 5px 0 5px;font-size:16px'>●</span>已付款";
}
}
getSltDetailsInfo();
getPayCarDetails();
}
// 供应商付款记录-详情
function getSltDetailsInfo() {
let encryptedData = { 'id': objParam.id };
let encryptedData = { planId: objParam.planId };
let url = dataUrl + 'backstage/carBalance/getSltDetailsInfo?encryptedData=' + encodeURIComponent(JSON.stringify(encryptedData));
ajaxRequest(url, "GET", null, true, function () {
}, function (result) {
@ -44,19 +46,8 @@ function getSltDetailsInfo() {
$('#money').html(obj.money);
$('#dispatchDay').html(obj.dispatchDay);
$('#remark').html(obj.remark);
// 附件文档
setFileTable(obj.fileList);
// 用车明细
let carList = list.filter(item => {
return item.type === '车辆';
})
let dcList = list.filter(item => {
return item.type === '吊车';
})
setDispatchCarTable(carList);
setDispatchCarTable2(dcList);
}
// 附件文档赋值
@ -97,6 +88,35 @@ function getSltDetailsInfo() {
return '<img width="20px" height="20px" src = "' + src + '" style="margin:0 5px;">'
}
}
// 用车明细
function getPayCarDetails() {
let encryptedData = { planId: objParam.planId };
let url = dataUrl + 'backstage/carBalance/getPayCarDetails?encryptedData=' + encodeURIComponent(JSON.stringify(encryptedData));
ajaxRequest(url, "GET", null, true, function () {
}, function (result) {
console.error(result);
if (result.code === 200) {
setData(result.data);
}
}, function (xhr, status, error) {
errorFn(xhr, status, error)
}, null);
function setData(list) {
// 用车明细
let carList = list.filter(item => {
return item.type === '车辆';
})
let dcList = list.filter(item => {
return item.type === '吊车';
})
setDispatchCarTable(carList);
setDispatchCarTable2(dcList);
}
// 派车明细-车辆
function setDispatchCarTable(list) {
$('#dispatch-car-table tr:not(:first)').remove();
@ -227,7 +247,7 @@ function viewFileDetail(obj, type) {
// 需求计划详情
function viewPlanDetail(obj) {
obj.id = obj.planId;
obj.code = obj.planCode;
obj.code = obj.planCode || obj.code;
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';

36
js/welcome/data_datail_pro_list.js
View File

@ -103,6 +103,11 @@ function initTable() {
title: "工程名称",
unresize: true,
align: "center",
templet: function (d) {
let html = "";
html += "<a onclick='openProDetail(" + JSON.stringify(d) + ")'>" + d.proName + "</a>";
return html;
},
},
{
field: "planNum",
@ -205,28 +210,6 @@ function setStatusColor(value) {
return '<span style="color:' + color + '"> ● ' + name + "</span>";
}
// 设置进度值
function schedule(d) {
d.progress = d.process;
d.progress = parseFloat(d.progress ? d.progress : 0);
d.filter == undefined ? (d.filter = d.LAY_NUM) : d.filter;
d.progress == undefined ? (d.progress = 100) : d.progress;
var color = "layui-bg-orange";
if (d.progress < 100) {
color = "layui-bg-orange";
} else if (d.progress === 100) {
color = "layui-bg-primary";
} else if (d.progress > 100) {
color = "layui-bg-blue";
}
//设置页面进度条
return (
'<div class="layui-progress layui-progress-big" lay-showpercent="true" id="' + d.filter + '" lay-filter="progress' + d.filter + '">' +
'<div class="layui-progress-bar ' + color + '" lay-percent="' + d.progress + '%">' +
"</div></div>"
);
}
// 导出
function exportExcel() {
let params = getFilterParams();
@ -234,7 +217,12 @@ function exportExcel() {
exportExcelUtil(url, '工程详情', JSON.stringify(params));
}
// 工程详情
function dispatchCarProDetail(obj) {
/* function dispatchCarProDetail(obj) {
openIframeByParamObj("dispatchCarProDetail", "工程详情", "./child/dispatch_car_pro_detail.html", "92%", "95%", obj, 1);
} */
// 工程详情
function openProDetail(obj){
openIframeByParamObj2("openProDetail", "工程需求计划详情", "../welcome/pro_list_detail.html", "92%", "95%", obj);
}

267
js/welcome/pro_list_detail.js Normal file
View File

@ -0,0 +1,267 @@
let objParam;
let form, table, tableIns, layer, element;
let pageNum = 1;
function setParams(params) {
objParam = JSON.parse(params);
console.error(objParam);
$('#proName').html(objParam.proName);
$('#bmname').html(objParam.companyName);
layui.use(["form", "table", 'layer', 'element'], function () {
form = layui.form;
table = layui.table;
element = layui.element;
layer = layui.layer;
getProStatisticsDetails();
initTable();
});
}
// 数据概览
function getProStatisticsDetails() {
let params = {
encryptedData: JSON.stringify({
'proId': objParam.proId
})
};
let url = dataUrl + 'backstage/dispatchCar/getProStatisticsDetails';
ajaxRequest(url, "POST", params, true, function () {
}, function (result) {
if (result.code === 200) {
setNum(result.data);
}
}, function (xhr, status, error) {
errorFn(xhr, status, error)
}, null);
// 数据概览赋值
function setNum(obj) {
$('.layui-progress').remove();
$('#planNum').html(obj.planNum);
$('#dispatchNum').html(obj.dispatchNum);
$('#noDispatchNum').html(obj.noDispatchNum);
$('.layui-progress').remove();
$("#progress").after(`
<div class="layui-progress" lay-showpercent="true" lay-filter="demo-filter-progress">
<div class="layui-progress-bar layui-bg-blue" lay-percent="${objParam.process}%"></div>
</div>
`);
element.render();
}
}
// 查询/重置
function queryTable(type) {
if (type === 1) {
let code = $('#code').val();
let flag = checkValue(code);
if (flag) {
$('#code').val('');
return layer.msg('需求计划编号查询包含特殊字符，请重新输入', { icon: 2 });
}
reloadTable(1);
} else if (type === 2) {
$('#code').val('');
$('#status').val('');
layui.form.render();
reloadTable(1);
}
}
// 刷新页面数据
function reloadData() {
reloadTable(pageNum);
}
// 重载表格
function reloadTable(pageNum) {
table.reload("currentTableId", {
page: {
curr: pageNum ? pageNum : 1,
},
where: {
encryptedData: JSON.stringify({
'code': $('#code').val(),
'status': $('#status').val(),
'proId': objParam.proId
}),
},
},
);
}
// 初始化表格
function initTable() {
tableIns = table.render({
elem: "#currentTableId",
id: 'currentTableId',
headers: {
authorization: sessionStorage.getItem("gz-token"),
},
height: "full-250",
url: dataUrl + "backstage/dispatchCar/getNeedPlanList",
where: {
encryptedData: JSON.stringify({
'code': $('#code').val(),
'status': $('#status').val(),
'proId': objParam.proId
}),
},
request: {
pageName: 'pageNum',
limitName: 'pageSize'
},
parseData: function (res) { // res 即为原始返回的数据
if (res.code === 401) {
closeWindowOpen();
}
return {
"code": 0, // 解析接口状态
"msg": '获取成功', // 解析提示文本
"count": res.total, // 解析数据长度
"data": res.list // 解析数据列表
};
},
cols: [
[
{
width: '5.9%',
title: "序号",
align: "center",
templet: function (d) {
return d.LAY_NUM;
},
},
{
field: "typeName",
width: '10%',
title: "计划类型",
unresize: true,
align: "center",
},
{
field: "code",
width: '12%',
title: "需求计划编号",
unresize: true,
align: "center",
templet: function (d) {
return "<a style='color:#409eff;' onclick='viewPlanDetail(" + JSON.stringify(d) + ")'>" + d.code + "</a>";
},
},
{
field: "userName",
width: '10%',
title: "申请人",
unresize: true,
align: "center",
},
{
field: "appLyTime",
title: "申请时间",
width: '10%',
unresize: true,
align: "center",
},
{
field: "remark",
title: "备注",
width: '12%',
unresize: true,
align: "center",
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: "statusName",
title: "派车状态",
width: '10%',
unresize: true,
align: "center",
templet: function (d) {
if (d.statusName === '待派车' || d.statusName === '待审核') {
return '<span style="color:#ff9900;font-weight:bold;"> ● </span>' + d.statusName + '';
} else if (d.statusName === '已派车') {
return '<span style="color:#19be6b;font-weight:bold;"> ● </span>' + d.statusName + '';
} else {
return '';
}
},
},
{
field: "dispatchNum",
width: '10%',
title: "派车数量",
unresize: true,
align: "center",
templet: function (d) {
return "<span style='color:#19be6b'>" + d.dispatchNum + "</span>";
},
},
{
field: "supName",
title: "采购金额",
width: '10%',
align: "center",
unresize: true,
},
{
title: "操作",
width: '10%',
align: "center",
unresize: true,
templet: function (d) {
let html = "";
html += "<a onclick='dispatchCarDetail(" + JSON.stringify(d) + ",1)'>详情</a>";
return html;
},
},
],
],
limits: [10, 15, 20, 25, 50, 100],
limit: 10,
page: true,
done: function (res, curr, count) {
pageNum = tableIns.config.page.curr;
table.resize("currentTableId");
},
});
}
// 导出
function exportExcel() {
let params = {
'planCode': $('#planCode').val(),
'status': $('#status').val(),
'proId': objParam.proId
}
let url = dataUrl + "backstage/purchase/exportDetails";
exportExcelUtil(url, '需求计划详情', JSON.stringify(params));
}
// 详情
function dispatchCarDetail(obj, type) {
let flag = isExistData(type, obj);
if (!flag && type === 1) {
return layer.msg('暂无派车批次数据', { icon: 7 });
} else if (!flag && type === 2) {
return layer.msg('暂无待审核批次数据', { icon: 7 });
}
let title = '详情';
if (type === 2) {
title = '审核';
}
obj.type = type;
openIframeByParamObj2("dispatchCarDetail", title, "../car_demand_plan/child/dispatch_car_detail.html", "92%", "95%", obj, 2);
}

2
page/car_demand_plan/child/dispatch_car_pro_detail.html
View File

@ -60,8 +60,6 @@
<option value="0">待派车</option>
<option value="1">已派车</option>
</select>
</select>
</select>
</div>
</div>
<div class="layui-inline">

2
page/car_settlement/child/branch_settlement_detail.html
View File

@ -69,8 +69,6 @@
<option value="0">待派车</option>
<option value="1">已派车</option>
</select>
</select>
</select>
</div>
</div>
<div class="layui-inline">

4
page/car_settlement/child/settlement_detail.html
View File

@ -119,7 +119,7 @@
<th style="width: 7%;">单价<br>(元/吨*公里)</th>
<th style="width: 7%;">预估金额</th>
<th style="width: 11%;">行驶证/挂靠协议<br>驾驶证/身份证/导航图</th>
<th style="width: 8%;">供应商</th>
<th style="width: 8%;">需求计划编号</th>
</tr>
</table>
<table style="display: none;" class="classTable" id="dispatch-car-table2">
@ -133,7 +133,7 @@
<th style="width: 10%;">租赁单价</th>
<th style="width: 8%;">预估金额</th>
<th style="width: 11%;">操作证/<br>身份证/导航图</th>
<th style="width: 8%;">供应商</th>
<th style="width: 8%;">需求计划编号</th>
</tr>
</table>
</div>

96
page/welcome/pro_list_detail.html Normal file
View File

@ -0,0 +1,96 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>首页-工程详情-计划详情</title>
<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">
<link rel="stylesheet" href="../../css/car_demand_plan/dispatch_car_pro_detail.css" media="all">
</head>
<style>
</style>
<body id="body">
<div id="main-box">
<div class="layout" id="detail-box">
<div class="layout">
<img src="../../images/svg/u273.svg">
<div class="layout" style="flex-direction: column;align-items: start;margin-left: 10px;">
<p style="font-size: 18px;font-weight: bold;" id="proName"></p>
<p id="bmname"></p>
</div>
</div>
<div class="layout num-box">
<p>需求计划数量</p>
<p id="planNum">0</p>
</div>
<div class="layout num-box">
<p>运输车辆数量</p>
<p id="dispatchNum">0</p>
</div>
<div class="layout num-box">
<p>吊车数量</p>
<p id="noDispatchNum">0</p>
</div>
<div class="layout num-box">
<p>金额</p>
<p id="noDispatchNum">0</p>
</div>
<div class="layout progress-box">
<p id="progress" style="margin: 0 0 20px 0;">进度</p>
</div>
</div>
<div class="layuimini-container">
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<legend>搜索信息</legend>
<div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="#" onsubmit="return false;">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline" style="width: 300px;">
<input type="text" name="code" id="code" autocomplete="off" class="layui-input"
lay-affix="clear" placeholder="输入需求计划编号" maxlength="30">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select id="status">
<option value="">请选择状态</option>
<option value="0">待派车</option>
<option value="1">已派车</option>
</select>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-bg-blue" onclick="queryTable(1)"><i
class="layui-icon"></i> 搜 索</button>
<button class="layui-btn layui-btn-primary" onclick="queryTable(2)"><i
class="layui-icon layui-icon-refresh"></i> 重 置</button>
<button class="layui-btn layui-btn-primary" onclick="exportExcel()"><i
class="layui-icon layui-icon-download-circle"></i> 下 载</button>
</div>
</div>
</form>
</div>
</fieldset>
<div class="table-box" table-responsive style="z-index: 1;" id="table-box">
<table class="layui-hide" id="currentTableId" lay-filter="currentTableId2"></table>
</div>
</div>
</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/welcome/pro_list_detail.js" charset="utf-8"></script>
</html>