From 5d8bc5cb84590b219912dcc776805ddbd5d10e33 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Sat, 9 Nov 2024 16:14:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/demandPlan/delivery_detail_list.css | 20 +++++++-- js/demandPlan/child/delivery_all_list.js | 0 js/demandPlan/child/delivery_batch_list.js | 0 js/demandPlan/child/delivery_detail_list.js | 16 +++++--- js/demandPlan/child/delivery_not_send_list.js | 0 js/demandPlan/child/send_goods_form.js | 25 +++++------ js/demandPlan/delivery_list.js | 17 ++++---- page/demandPlan/child/delivery_all_list.html | 40 ++++++++++++++++++ .../demandPlan/child/delivery_batch_list.html | 41 +++++++++++++++++++ .../child/delivery_detail_list.html | 2 +- .../child/delivery_not_send_list.html | 41 +++++++++++++++++++ 11 files changed, 171 insertions(+), 31 deletions(-) create mode 100644 js/demandPlan/child/delivery_all_list.js create mode 100644 js/demandPlan/child/delivery_batch_list.js create mode 100644 js/demandPlan/child/delivery_not_send_list.js create mode 100644 page/demandPlan/child/delivery_all_list.html create mode 100644 page/demandPlan/child/delivery_batch_list.html create mode 100644 page/demandPlan/child/delivery_not_send_list.html diff --git a/css/demandPlan/delivery_detail_list.css b/css/demandPlan/delivery_detail_list.css index 19ef01e..ada4cba 100644 --- a/css/demandPlan/delivery_detail_list.css +++ b/css/demandPlan/delivery_detail_list.css @@ -11,7 +11,7 @@ #detail-box { width: 100%; - height: 60px; + height: 50px; background-color: #fff; border-radius: 5px; justify-content: start; @@ -28,14 +28,14 @@ width: 100%; box-sizing: border-box; background-color: #fff; - height: calc(100% - 180px); + height: calc(100% - 150px); } .layui-tab-brief { border: 1px solid #f2f2f2; border-radius: 5px; background-color: #ffffff; - height: 80px; + height: 50px; overflow-x: auto; /* 启用横向滚动 */ white-space: nowrap; @@ -44,13 +44,14 @@ .layui-tab-title { display: inline-block; + height: 50px !important; /* 内联块级元素 */ } .layui-tab-brief::-webkit-scrollbar { width: 0; height: 0; - } +} .layui-tab-brief>.layui-tab-title .layui-this { color: #409eff; @@ -78,4 +79,15 @@ a:focus { .layui-tab .layui-tab-title li { 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; } \ No newline at end of file diff --git a/js/demandPlan/child/delivery_all_list.js b/js/demandPlan/child/delivery_all_list.js new file mode 100644 index 0000000..e69de29 diff --git a/js/demandPlan/child/delivery_batch_list.js b/js/demandPlan/child/delivery_batch_list.js new file mode 100644 index 0000000..e69de29 diff --git a/js/demandPlan/child/delivery_detail_list.js b/js/demandPlan/child/delivery_detail_list.js index 66a0cb4..ed7cec0 100644 --- a/js/demandPlan/child/delivery_detail_list.js +++ b/js/demandPlan/child/delivery_detail_list.js @@ -12,6 +12,13 @@ function setParams(obj) { // tab 切换事件 element.on('tab(demo-filter-tab)', function (data) { 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(); }); @@ -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: '第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) { if (item.name === '待发货') { - html += '
  • ' + this.name + '
    • '; + html += '
  • ' + this.name + '
    • '; }else if(item.name === '全部'){ - html += '
  • ' + this.name + '
    • '; + html += '
  • ' + this.name + '
    • '; } else { - html += '
  • '+item.name+'
    • '; + html += '
  • '+item.name+'2024-11-01
    • '; } }) $('.layui-tab-title').empty().append(html); diff --git a/js/demandPlan/child/delivery_not_send_list.js b/js/demandPlan/child/delivery_not_send_list.js new file mode 100644 index 0000000..e69de29 diff --git a/js/demandPlan/child/send_goods_form.js b/js/demandPlan/child/send_goods_form.js index 2d0da1d..0f8ceb4 100644 --- a/js/demandPlan/child/send_goods_form.js +++ b/js/demandPlan/child/send_goods_form.js @@ -164,7 +164,7 @@ function initTable() { cols: [ [ { - width: 80, + width: '5%', title: "序号", align: "center", templet: function (d) { @@ -173,21 +173,21 @@ function initTable() { }, { field: "type", - width: 150, + width: '10%', title: "物机类型", unresize: true, align: "center", }, { field: "name", - width: 150, + width: '10%', title: "物机名称", unresize: true, align: "center", }, { field: "module", - width: 120, + width: '10%', title: "规格", unresize: true, align: "center", @@ -195,13 +195,13 @@ function initTable() { { field: "unit", title: "单位", - width: 120, + width: '5%', unresize: true, align: "center", }, { field: "needNum", - width: 120, + width: '7%', title: "需要量", unresize: true, align: "center", @@ -211,7 +211,7 @@ function initTable() { }, { field: "fhNum", - width: 120, + width: '7%', title: "已发货量", unresize: true, align: "center", @@ -221,7 +221,7 @@ function initTable() { }, { field: "diff", - width: 120, + width: '7%', title: "差缺量", unresize: true, align: "center", @@ -231,7 +231,7 @@ function initTable() { }, { field: "num", - width: 150, + width: '13%', title: " * 本次发货量", unresize: true, align: "center", @@ -240,7 +240,7 @@ function initTable() { }, { field: "tzNum", - width: 150, + width: '13%', title: "调整量", unresize: true, align: "center", @@ -249,7 +249,7 @@ function initTable() { }, { field: "outId", - width: 250, + width: '13%', title: "备注", unresize: true, align: "center", @@ -263,6 +263,7 @@ function initTable() { limit: 10, page: true, done: function (res, curr, count) { + table.resize("currentTableId"); pageNum = tableIns.config.page.curr; $("#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) { color = '#ff9900'; } - return '' + setNullValue(value) + ""; + return '' + value + ""; } diff --git a/js/demandPlan/delivery_list.js b/js/demandPlan/delivery_list.js index 1d6da9f..29fcfbc 100644 --- a/js/demandPlan/delivery_list.js +++ b/js/demandPlan/delivery_list.js @@ -89,7 +89,7 @@ function initTable() { cols: [ [ { - width: 120, + width: '5%', title: "序号", align: "center", templet: function (d) { @@ -98,14 +98,14 @@ function initTable() { }, { field: "proName", - width: 300, + width: '20%', title: "工程名称", unresize: true, align: "center", }, { field: "planNum", - width: 180, + width: '10%', title: "需求计划数量", unresize: true, align: "center", @@ -115,7 +115,7 @@ function initTable() { }, { field: "recordNum", - width: 180, + width: '10%', title: "出库单数量 ", unresize: true, align: "center", @@ -126,7 +126,7 @@ function initTable() { { field: "status", title: "发货状态", - width: 200, + width: '10%', unresize: true, align: "center", templet: function (d) { @@ -135,14 +135,14 @@ function initTable() { }, { field: "lastDay", - width: 200, + width: '15%', title: "最后发货时间", unresize: true, align: "center", }, { field: "progress", - width: 300, + width: '19.85%', title: "进度", unresize: true, align: "center", @@ -150,7 +150,7 @@ function initTable() { }, { title: "操作", - minwidth: 180, + width: '10%', align: "center", unresize: true, templet: function (d) { @@ -168,6 +168,7 @@ function initTable() { done: function (res, curr, count) { pageNum = tableIns.config.page.curr; element.render(); + table.resize("currentTableId"); }, }); } diff --git a/page/demandPlan/child/delivery_all_list.html b/page/demandPlan/child/delivery_all_list.html new file mode 100644 index 0000000..54a86b0 --- /dev/null +++ b/page/demandPlan/child/delivery_all_list.html @@ -0,0 +1,40 @@ + + + + + + + 发货详情-全部 + + + + + + +
    +
    +
    +

    +

    +
    +
    +

    计划数量

    +

    0

    +
    +
    +
    + +
    +
    + +
    +
    + + + + + + + \ No newline at end of file diff --git a/page/demandPlan/child/delivery_batch_list.html b/page/demandPlan/child/delivery_batch_list.html new file mode 100644 index 0000000..a7190b6 --- /dev/null +++ b/page/demandPlan/child/delivery_batch_list.html @@ -0,0 +1,41 @@ + + + + + + + 发货详情-批次 + + + + + + + +
    +
    +
    +

    +

    +
    +
    +

    计划数量

    +

    0

    +
    +
    +
    + +
    +
    + +
    +
    + + + + + + + \ No newline at end of file diff --git a/page/demandPlan/child/delivery_detail_list.html b/page/demandPlan/child/delivery_detail_list.html index 673d436..537b42e 100644 --- a/page/demandPlan/child/delivery_detail_list.html +++ b/page/demandPlan/child/delivery_detail_list.html @@ -28,7 +28,7 @@
    -
    diff --git a/page/demandPlan/child/delivery_not_send_list.html b/page/demandPlan/child/delivery_not_send_list.html new file mode 100644 index 0000000..7cde9cc --- /dev/null +++ b/page/demandPlan/child/delivery_not_send_list.html @@ -0,0 +1,41 @@ + + + + + + + 发货详情-待发货 + + + + + + + +
    +
    +
    +

    +

    +
    +
    +

    计划数量

    +

    0

    +
    +
    +
    + +
    +
    + +
    +
    + + + + + + + \ No newline at end of file