This commit is contained in:
cwchen 2024-11-09 16:14:05 +08:00
parent 5980209e48
commit 5d8bc5cb84
11 changed files with 171 additions and 31 deletions

View File

@ -11,7 +11,7 @@
#detail-box { #detail-box {
width: 100%; width: 100%;
height: 60px; height: 50px;
background-color: #fff; background-color: #fff;
border-radius: 5px; border-radius: 5px;
justify-content: start; justify-content: start;
@ -28,14 +28,14 @@
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
background-color: #fff; background-color: #fff;
height: calc(100% - 180px); height: calc(100% - 150px);
} }
.layui-tab-brief { .layui-tab-brief {
border: 1px solid #f2f2f2; border: 1px solid #f2f2f2;
border-radius: 5px; border-radius: 5px;
background-color: #ffffff; background-color: #ffffff;
height: 80px; height: 50px;
overflow-x: auto; overflow-x: auto;
/* 启用横向滚动 */ /* 启用横向滚动 */
white-space: nowrap; white-space: nowrap;
@ -44,13 +44,14 @@
.layui-tab-title { .layui-tab-title {
display: inline-block; display: inline-block;
height: 50px !important;
/* 内联块级元素 */ /* 内联块级元素 */
} }
.layui-tab-brief::-webkit-scrollbar { .layui-tab-brief::-webkit-scrollbar {
width: 0; width: 0;
height: 0; height: 0;
} }
.layui-tab-brief>.layui-tab-title .layui-this { .layui-tab-brief>.layui-tab-title .layui-this {
color: #409eff; color: #409eff;
@ -78,4 +79,15 @@ a:focus {
.layui-tab .layui-tab-title li { .layui-tab .layui-tab-title li {
font-size: 16px; font-size: 16px;
line-height: 20px;
margin-top: 5px;
}
.layui-tab .layui-tab-title li span {
display: block;
}
.li-span {
height: 40px;
line-height: 40px;
} }

View File

View File

@ -12,6 +12,13 @@ function setParams(obj) {
// tab 切换事件 // tab 切换事件
element.on('tab(demo-filter-tab)', function (data) { element.on('tab(demo-filter-tab)', function (data) {
let value = $(this).attr('value'); let value = $(this).attr('value');
if(value === ''){ // 全部
$('#indexIframe').attr('src', 'delivery_all_list.html?obj=' + encodeURIComponent(JSON.stringify(obj)));
}else if(value !== '0'){
$('#indexIframe').attr('src', 'delivery_batch_list.html?obj=' + encodeURIComponent(JSON.stringify(obj)));
}else if(value === '0'){
$('#indexIframe').attr('src', 'delivery_not_send_list.html?obj=' + encodeURIComponent(JSON.stringify(obj)));
}
}); });
getShipmentBatch(); getShipmentBatch();
}); });
@ -25,16 +32,13 @@ function getShipmentBatch() {
{ name: '第10批', value: '10' }, { name: '第11批', value: '11' }, { name: '第12批', value: '12' }, { name: '第13批', value: '13' }, { name: '第14批', value: '14' }, { name: '第10批', value: '10' }, { name: '第11批', value: '11' }, { name: '第12批', value: '12' }, { name: '第13批', value: '13' }, { name: '第14批', value: '14' },
{ name: '第15批', value: '15' }, { name: '第16批', value: '16' }, { name: '第17批', value: '17' }, { name: '第18批', value: '18' }, { name: '待发货', value: '0' } { name: '第15批', value: '15' }, { name: '第16批', value: '16' }, { name: '第17批', value: '17' }, { name: '第18批', value: '18' }, { name: '待发货', value: '0' }
]; ];
/* if(list.length > 16){
} */
$.each(list, function (index, item) { $.each(list, function (index, item) {
if (item.name === '待发货') { if (item.name === '待发货') {
html += '<li value="' + this.value + '" style="color:red">' + this.name + '</li>'; html += '<li value="' + this.value + '" style="color:red"><span class="li-span">' + this.name + '</span></li>';
}else if(item.name === '全部'){ }else if(item.name === '全部'){
html += '<li value="' + this.value + '">' + this.name + '</li>'; html += '<li value="' + this.value + '"><span>' + this.name + '</span></li>';
} else { } else {
html += '<li value="' + this.value + '"><span>'+item.name+'</span></li>'; html += '<li value="' + this.value + '"><span>'+item.name+'</span><span>2024-11-01</span></li>';
} }
}) })
$('.layui-tab-title').empty().append(html); $('.layui-tab-title').empty().append(html);

View File

@ -164,7 +164,7 @@ function initTable() {
cols: [ cols: [
[ [
{ {
width: 80, width: '5%',
title: "序号", title: "序号",
align: "center", align: "center",
templet: function (d) { templet: function (d) {
@ -173,21 +173,21 @@ function initTable() {
}, },
{ {
field: "type", field: "type",
width: 150, width: '10%',
title: "物机类型", title: "物机类型",
unresize: true, unresize: true,
align: "center", align: "center",
}, },
{ {
field: "name", field: "name",
width: 150, width: '10%',
title: "物机名称", title: "物机名称",
unresize: true, unresize: true,
align: "center", align: "center",
}, },
{ {
field: "module", field: "module",
width: 120, width: '10%',
title: "规格", title: "规格",
unresize: true, unresize: true,
align: "center", align: "center",
@ -195,13 +195,13 @@ function initTable() {
{ {
field: "unit", field: "unit",
title: "单位", title: "单位",
width: 120, width: '5%',
unresize: true, unresize: true,
align: "center", align: "center",
}, },
{ {
field: "needNum", field: "needNum",
width: 120, width: '7%',
title: "需要量", title: "需要量",
unresize: true, unresize: true,
align: "center", align: "center",
@ -211,7 +211,7 @@ function initTable() {
}, },
{ {
field: "fhNum", field: "fhNum",
width: 120, width: '7%',
title: "已发货量", title: "已发货量",
unresize: true, unresize: true,
align: "center", align: "center",
@ -221,7 +221,7 @@ function initTable() {
}, },
{ {
field: "diff", field: "diff",
width: 120, width: '7%',
title: "差缺量", title: "差缺量",
unresize: true, unresize: true,
align: "center", align: "center",
@ -231,7 +231,7 @@ function initTable() {
}, },
{ {
field: "num", field: "num",
width: 150, width: '13%',
title: "<span style='color:red'> * </span>本次发货量", title: "<span style='color:red'> * </span>本次发货量",
unresize: true, unresize: true,
align: "center", align: "center",
@ -240,7 +240,7 @@ function initTable() {
}, },
{ {
field: "tzNum", field: "tzNum",
width: 150, width: '13%',
title: "调整量<img id='tips' style='cursor: pointer;' src='../../../images/demandPlan/yw.png'>", title: "调整量<img id='tips' style='cursor: pointer;' src='../../../images/demandPlan/yw.png'>",
unresize: true, unresize: true,
align: "center", align: "center",
@ -249,7 +249,7 @@ function initTable() {
}, },
{ {
field: "outId", field: "outId",
width: 250, width: '13%',
title: "备注", title: "备注",
unresize: true, unresize: true,
align: "center", align: "center",
@ -263,6 +263,7 @@ function initTable() {
limit: 10, limit: 10,
page: true, page: true,
done: function (res, curr, count) { done: function (res, curr, count) {
table.resize("currentTableId");
pageNum = tableIns.config.page.curr; pageNum = tableIns.config.page.curr;
$("#tips").suspensionTips({ "content": "1.如需单个机具进度达到100%请填写不发货的数量2.若填写不发货数量,请填写备注不发货原因及附件说明", position: "top", width: 300 }); $("#tips").suspensionTips({ "content": "1.如需单个机具进度达到100%请填写不发货的数量2.若填写不发货数量,请填写备注不发货原因及附件说明", position: "top", width: 300 });
}, },
@ -337,7 +338,7 @@ function setNumColor(value, type) { // 1.需要量 2.已发货量 3.差缺量
} else if (type === 3) { } else if (type === 3) {
color = '#ff9900'; color = '#ff9900';
} }
return '<span style="color:' + color + ';font-weight:bold;">' + setNullValue(value) + "</span>"; return '<span style="color:' + color + ';font-weight:bold;">' + value + "</span>";
} }

View File

@ -89,7 +89,7 @@ function initTable() {
cols: [ cols: [
[ [
{ {
width: 120, width: '5%',
title: "序号", title: "序号",
align: "center", align: "center",
templet: function (d) { templet: function (d) {
@ -98,14 +98,14 @@ function initTable() {
}, },
{ {
field: "proName", field: "proName",
width: 300, width: '20%',
title: "工程名称", title: "工程名称",
unresize: true, unresize: true,
align: "center", align: "center",
}, },
{ {
field: "planNum", field: "planNum",
width: 180, width: '10%',
title: "需求计划数量", title: "需求计划数量",
unresize: true, unresize: true,
align: "center", align: "center",
@ -115,7 +115,7 @@ function initTable() {
}, },
{ {
field: "recordNum", field: "recordNum",
width: 180, width: '10%',
title: "出库单数量 ", title: "出库单数量 ",
unresize: true, unresize: true,
align: "center", align: "center",
@ -126,7 +126,7 @@ function initTable() {
{ {
field: "status", field: "status",
title: "发货状态", title: "发货状态",
width: 200, width: '10%',
unresize: true, unresize: true,
align: "center", align: "center",
templet: function (d) { templet: function (d) {
@ -135,14 +135,14 @@ function initTable() {
}, },
{ {
field: "lastDay", field: "lastDay",
width: 200, width: '15%',
title: "最后发货时间", title: "最后发货时间",
unresize: true, unresize: true,
align: "center", align: "center",
}, },
{ {
field: "progress", field: "progress",
width: 300, width: '19.85%',
title: "进度", title: "进度",
unresize: true, unresize: true,
align: "center", align: "center",
@ -150,7 +150,7 @@ function initTable() {
}, },
{ {
title: "操作", title: "操作",
minwidth: 180, width: '10%',
align: "center", align: "center",
unresize: true, unresize: true,
templet: function (d) { templet: function (d) {
@ -168,6 +168,7 @@ function initTable() {
done: function (res, curr, count) { done: function (res, curr, count) {
pageNum = tableIns.config.page.curr; pageNum = tableIns.config.page.curr;
element.render(); element.render();
table.resize("currentTableId");
}, },
}); });
} }

View File

@ -0,0 +1,40 @@
<!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">
</head>
<body>
<div id="main-box">
<div id="detail-box" class="layout">
<div class="layout detail" style="margin: 0 20px;">
<p style="font-size: 18px;font-weight: bold;" id="proName"></p>
<p id="status"></p>
</div>
<div class="layout detail" style="margin-left: 10%;">
<p>计划数量</p>
<p style="color: #409EFF;">0</p>
</div>
</div>
<div class="layui-tab layui-tab-brief" id="layui-tab-brief" lay-filter="demo-filter-tab">
<ul class="layui-tab-title">
</ul>
</div>
<div id="iframe-box">
<iframe id="indexIframe2" width="100%" height="100%" frameborder="0" class="layadmin-iframe"
src=""></iframe>
</div>
</div>
</body>
<script src="../../../lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
<script src="../../../js/public.js" charset="utf-8"></script>
<script src="../../../lib/layui-v2.9.18/layui/layui.js" charset="utf-8"></script>
<script src="../../../js/demandPlan/child/delivery_all_list.js" charset="utf-8"></script>
</html>

View File

@ -0,0 +1,41 @@
<!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/demandPlan/delivery_detail_list.css" media="all">
</head>
<body>
<div id="main-box">
<div id="detail-box" class="layout">
<div class="layout detail" style="margin: 0 20px;">
<p style="font-size: 18px;font-weight: bold;" id="proName"></p>
<p id="status"></p>
</div>
<div class="layout detail" style="margin-left: 10%;">
<p>计划数量</p>
<p style="color: #409EFF;">0</p>
</div>
</div>
<div class="layui-tab layui-tab-brief" id="layui-tab-brief" lay-filter="demo-filter-tab">
<ul class="layui-tab-title">
</ul>
</div>
<div id="iframe-box">
<iframe id="indexIframe2" width="100%" height="100%" frameborder="0" class="layadmin-iframe"
src=""></iframe>
</div>
</div>
</body>
<script src="../../../lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
<script src="../../../js/public.js" charset="utf-8"></script>
<script src="../../../lib/layui-v2.9.18/layui/layui.js" charset="utf-8"></script>
<script src="../../../js/demandPlan/child/delivery_batch_list.js" charset="utf-8"></script>
</html>

View File

@ -28,7 +28,7 @@
</ul> </ul>
</div> </div>
<div id="iframe-box"> <div id="iframe-box">
<iframe id="indexIframe2" width="100%" height="100%" frameborder="0" class="layadmin-iframe" <iframe id="indexIframe" width="100%" height="100%" frameborder="0" class="layadmin-iframe"
src=""></iframe> src=""></iframe>
</div> </div>
</div> </div>

View File

@ -0,0 +1,41 @@
<!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/demandPlan/delivery_detail_list.css" media="all">
</head>
<body>
<div id="main-box">
<div id="detail-box" class="layout">
<div class="layout detail" style="margin: 0 20px;">
<p style="font-size: 18px;font-weight: bold;" id="proName"></p>
<p id="status"></p>
</div>
<div class="layout detail" style="margin-left: 10%;">
<p>计划数量</p>
<p style="color: #409EFF;">0</p>
</div>
</div>
<div class="layui-tab layui-tab-brief" id="layui-tab-brief" lay-filter="demo-filter-tab">
<ul class="layui-tab-title">
</ul>
</div>
<div id="iframe-box">
<iframe id="indexIframe2" width="100%" height="100%" frameborder="0" class="layadmin-iframe"
src=""></iframe>
</div>
</div>
</body>
<script src="../../../lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
<script src="../../../js/public.js" charset="utf-8"></script>
<script src="../../../lib/layui-v2.9.18/layui/layui.js" charset="utf-8"></script>
<script src="../../../js/demandPlan/child/delivery_not_send_list.js" charset="utf-8"></script>
</html>