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-20 14:16:06 +08:00
parent ea151fa20c
commit a349ab51b3
13 changed files with 82 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ function setParams(params) {
let value = $(this).attr('value');
let status = $(this).attr('status');
let type = $(this).attr('type');
if (parseInt(status) === 2 && isPage) {
if (parseInt(status) === 2 && !isPage) {
$('#updateData').remove();
$('#print').before('<button type="button" id="updateData" class="layui-btn layui-bg-orange" onclick="updateData(' + value + ',' + type + ')">修改</button>');
}
@ -84,7 +84,7 @@ function getAllOutList() {
// 设置新的滚动位置
scrollableElement.scrollLeft += delta;
});
if (parseInt(status) === 2 && isPage) {
if (parseInt(status) === 2 && !isPage) {
$('#print').before('<button type="button" id="updateData" class="layui-btn layui-bg-orange" onclick="updateData(' + id + ',' + type + ')">修改</button>');
}
checkNowValue = id;

1
js/car_demand_plan/child/emerg_internal_car_detail.js
View File

@ -41,7 +41,6 @@ function getDetailById() {
// 基本信息
function setPlanBasicTableInfo(obj) {
console.error(obj);
$('#typeName').html(obj.typeName);
$('#code').html(obj.code);

22
js/car_demand_plan/dispatch_car_list.js
View File

@ -156,7 +156,7 @@ function initTable() {
title: "工程名称",
unresize: true,
align: "center",
sort:true,
sort: true,
},
{
field: "planNum",
@ -164,7 +164,7 @@ function initTable() {
title: "计划数",
unresize: true,
align: "center",
sort:true,
sort: true,
templet: function (d) {
return '<span style="color:#409Eff;font-weight:bold;">' + d.planNum + '</span>';
},
@ -175,7 +175,7 @@ function initTable() {
title: "已派车",
unresize: true,
align: "center",
sort:true,
sort: true,
templet: function (d) {
return '<span style="color:#19be6b;font-weight:bold;">' + d.ypcNum + '</span>';
},
@ -186,7 +186,7 @@ function initTable() {
title: "待派车",
unresize: true,
align: "center",
sort:true,
sort: true,
templet: function (d) {
return '<span style="color:#ff9900;font-weight:bold;">' + d.dpcNum + '</span>';
},
@ -197,7 +197,7 @@ function initTable() {
width: '8%',
unresize: true,
align: "center",
sort:true,
sort: true,
templet: function (d) {
return setStatusColor(d.planStatus);
},
@ -208,9 +208,9 @@ function initTable() {
title: "最后派车时间",
unresize: true,
align: "center",
sort:true,
sort: true,
templet: function (d) {
return d.lastDay ? d.lastDay:'';
return d.lastDay ? d.lastDay : '--';
},
},
{
@ -220,7 +220,7 @@ function initTable() {
unresize: true,
align: "center",
templet: schedule,
sort:true,
sort: true,
},
{
field: "needNum",
@ -228,7 +228,7 @@ function initTable() {
width: '10%',
unresize: true,
align: "center",
sort:true,
sort: true,
},
{
field: "dispatchNum",
@ -236,7 +236,7 @@ function initTable() {
width: '9%',
unresize: true,
align: "center",
sort:true,
sort: true,
},
{
field: "noDispatchNum",
@ -244,7 +244,7 @@ function initTable() {
width: '9%',
unresize: true,
align: "center",
sort:true,
sort: true,
},
{
title: "操作",

7
js/car_demand_plan/dispatch_input_list.js
View File

@ -200,7 +200,7 @@ function initTable() {
},
{
field: "status",
width: '7%',
width: '8%',
title: "审核状态",
sort: true,
unresize: true,
@ -211,7 +211,7 @@ function initTable() {
},
{
title: "操作",
width: '10%',
width: '9%',
align: "center",
unresize: true,
templet: function (d) {
@ -221,12 +221,9 @@ function initTable() {
let html = "";
html += "<a onclick='applyPlanDetail(" + JSON.stringify(d) + ")'>详情</a>";
if (parseInt(dispatchNum) > 0 && parseInt(noDispatchNum) > 0) {
html += "<div class='splitLine'>|</div><a onclick='dispatchInput(" + JSON.stringify(d) + ")'>派车录入</a>";
} else if (parseInt(dispatchNum) === 0) {
html += "<div class='splitLine'>|</div><a onclick='dispatchInput(" + JSON.stringify(d) + ")'>派车录入</a>";
} if (parseInt(noDispatchNum) <= 0) {
// html += "<a onclick='applyPlanDetail(" + JSON.stringify(d) + ")'>详情</a>";
}
return html;
},

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

@ -39,7 +39,7 @@ function queryTable(type) {
reloadTable(1);
} else if (type === 2) {
$('#proName').val('');
$('#status').val('');
// $('#status').val('');
layui.form.render();
reloadTable(1);
}
@ -59,7 +59,7 @@ function reloadTable(pageNum) {
where: {
encryptedData: JSON.stringify({
'proName': $('#proName').val(),
'status': $('#status').val(),
// 'status': $('#status').val(),
'bmname': objParam.bmname
}),
},
@ -80,7 +80,7 @@ function initTable() {
where: {
encryptedData: JSON.stringify({
'proName': $('#proName').val(),
'status': $('#status').val(),
// 'status': $('#status').val(),
'bmname': objParam.bmname
}),
},
@ -210,7 +210,7 @@ function initTable() {
function exportExcel() {
let params = {
'proName': $('#proName').val(),
'status': $('#status').val(),
// 'status': $('#status').val(),
'bmname': objParam.bmname
}
let url = dataUrl + "backstage/carStatistics/export2";

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

@ -99,7 +99,7 @@ function initTable() {
cols: [
[
{
width: '6%',
width: '5%',
title: "序号",
align: "center",
templet: function (d) {
@ -108,7 +108,7 @@ function initTable() {
},
{
field: "typeName",
width: '7%',
width: '9%',
title: "计划类型",
unresize: true,
align: "center",
@ -192,7 +192,7 @@ function initTable() {
},
{
title: "操作",
width: '8%',
width: '7%',
align: "center",
unresize: true,
templet: function (d) {

21
js/car_settlement/child/choose_plan_code_list.js
View File

@ -130,11 +130,14 @@ function initTable() {
},
{
field: "code",
width: '10%',
width: '12%',
title: "需求计划编号",
unresize: true,
align: "center",
sort:true,
templet: function (d) {
return "<a style='color:#409eff;' onclick='viewPlanDetail(" + JSON.stringify(d) + ")'>" + d.code + "</a>";
},
},
{
field: "supName",
@ -159,11 +162,14 @@ function initTable() {
unresize: true,
align: "center",
sort:true,
templet: function (d) {
return '<span> ¥ ' + (d.money ? d.money : 0) + '</span>';
},
},
{
field: "userName",
title: "操作人",
width: '10%',
width: '8%',
unresize: true,
align: "center",
sort:true,
@ -332,10 +338,19 @@ function saveData2(params) {
}
}
// 需求计划详情
function viewPlanDetail(obj) {
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';
}
openIframeByParamObj2("viewPlanDetail4", "需求计划详情", content, "92%", "95%", obj);
}
function closePage(type, params,idArr) {
let index = parent.layer.getFrameIndex(window.name); // 先得到当前 iframe层的索引
if (type == 1) {
window.parent.addFitDatas(params,idArr);
}
parent.layer.close(index); // 再执行关闭
}
}

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

@ -24,7 +24,7 @@ function queryTable(type) {
reloadTable(1);
} else if (type === 2) {
$('#keyWord').val('');
$('#isPay').val('');
$('#status').val('');
layui.form.render();
reloadTable(1);
}
@ -44,7 +44,7 @@ function reloadTable(pageNum) {
where: {
encryptedData: JSON.stringify({
'keyWord': $('#keyWord').val(),
'isPay': $('#isPay').val(),
'status': $('#status').val(),
'contractId': objParam.contractId,
'supId': objParam.supId,
}),
@ -66,7 +66,7 @@ function initTable() {
where: {
encryptedData: JSON.stringify({
'keyWord': $('#keyWord').val(),
'isPay': $('#isPay').val(),
'status': $('#status').val(),
'contractId': objParam.contractId,
'supId': objParam.supId,
}),
@ -148,7 +148,7 @@ function initTable() {
},
},
{
field: "payMoney",
field: "status",
width: '10%',
title: "已付金额",
unresize: true,
@ -156,10 +156,10 @@ function initTable() {
sort:true,
templet: function (d) {
let payMoney = d.payMoney || 0;
if (parseInt(payMoney) > 0) {
if (d.status === '已付') {
return ' ￥ ' + payMoney;
} else {
return '<p style="color:#f56c6c;">未付</p>';
return '<p style="color:#f56c6c;">待付</p>';
}
},
@ -199,7 +199,7 @@ function initTable() {
function exportExcel() {
let params = {
'keyWord': $('#keyWord').val(),
'isPay': $('#isPay').val(),
'status': $('#status').val(),
}
let url = dataUrl + "backstage/carBalance/export2";
exportExcelUtil(url, '付款单录入详情', JSON.stringify(params));

11
js/car_settlement/sup_settlement_list.js
View File

@ -185,6 +185,9 @@ function initTable() {
unresize: true,
align: "center",
sort:true,
templet: function (d) {
return d.manager ? d.manager : '--';
},
},
{
field: "jbTime",
@ -193,9 +196,12 @@ function initTable() {
unresize: true,
align: "center",
sort:true,
templet: function (d) {
return d.jbTime ? d.jbTime : '--';
},
},
{
field: "fkTime",
field: "status",
width: '8%',
title: "是否已付款",
unresize: true,
@ -216,6 +222,9 @@ function initTable() {
unresize: true,
align: "center",
sort:true,
templet: function (d) {
return d.fkTime ? d.fkTime : '--';
},
},
{
title: "操作",

16
js/welcome/data_datail_plan_list.js
View File

@ -179,6 +179,9 @@ function initTable() {
unresize: true,
align: "center",
sort: true,
templet: function (d) {
return d.supName ? d.supName : '--'
},
},
{
field: "payStatus",
@ -187,6 +190,19 @@ function initTable() {
unresize: true,
align: "center",
sort: true,
templet: function (d) {
let color = "",name = "";
if (d.payStatus === '1') {
color = "#f56c6c";
name = '待付款';
} else if (d.payStatus === '2') {
color = "#19be6b";
name = '已付款'
}else{
return '--'
}
return '<span style="color:' + color + '"> ● ' + name + "</span>";
}
},
{
field: "companyName",

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

@ -62,7 +62,7 @@
lay-affix="clear" placeholder="输入工程名称" maxlength="30">
</div>
</div>
<div class="layui-inline">
<!-- <div class="layui-inline">
<div class="layui-input-inline">
<select id="status">
<option value="">请选择状态</option>
@ -70,7 +70,7 @@
<option value="1">已派车</option>
</select>
</div>
</div>
</div> -->
<div class="layui-inline">
<button class="layui-btn layui-bg-blue" onclick="queryTable(1)"><i
class="layui-icon"></i> 搜 索</button>

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

@ -34,9 +34,9 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select id="isPay">
<select id="status">
<option value="">请选择付款状态</option>
<option value="0">未付</option>
<option value="0">待付</option>
<option value="1">已付</option>
</select>
</div>

10
page/car_settlement/child/payment_form.html
View File

@ -86,7 +86,7 @@
<div id="dispatch-car-table-box">
<table class="classTable" id="dispatch-car-table" style="display: none;">
<tr>
<th style="width: 7%;">类型</th>
<th style="width: 6%;">类型</th>
<th style="width: 7%;">车型</th>
<th style="width: 7%;">型号</th>
<th style="width: 8%;">车牌</th>
@ -94,25 +94,25 @@
<th style="width: 8%;">货物名称</th>
<th style="width: 8%;">起运地</th>
<th style="width: 8%;">目的地</th>
<th style="width: 7%;">公里数</th>
<th style="width: 6%;">公里数</th>
<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: 10%;">需求计划编号</th>
</tr>
</table>
<table style="display: none;" class="classTable" id="dispatch-car-table2">
<tr>
<th style="width: 10%;">类型</th>
<th style="width: 10%;">车型</th>
<th style="width: 10%;">型号</th>
<th style="width: 8%;">型号</th>
<th style="width: 10%;">车牌</th>
<th style="width: 15%;">使用地</th>
<th style="width: 8%;">计划使用天数</th>
<th style="width: 10%;">租赁单价</th>
<th style="width: 8%;">预估金额</th>
<th style="width: 11%;">操作证/<br>身份证/导航图</th>
<th style="width: 8%;">需求计划编号</th>
<th style="width: 10%;">需求计划编号</th>
</tr>
</table>
</div>