发货

css/demandPlan/delivery_detail_list.css

@@ -28,7 +28,7 @@
     width: 100%;
     box-sizing: border-box;
     background-color: #fff;
-    height: calc(100% - 150px);
+    height: calc(100% - 125px);
 }
 
 .layui-tab-brief {

js/demandPlan/child/delivery_all_list.js

@@ -0,0 +1,272 @@
+let objParam = JSON.stringify(decodeURIComponent(getUrlParam('obj')));
+let form, table, element,tableIns,layer;
+let pageNum = 1;
+layui.use(["form", "table", 'element','layer'], function () {
+    form = layui.form;
+    table = layui.table;
+    element = layui.element;
+    initTable();
+  });
+
+// 查询/重置
+function queryTable(type) {
+  if (type === 1) {
+    reloadTable(1);
+  } else if (type === 2) {
+    $('#name').val('');
+    $('#module').val('');
+    layui.form.render();
+    reloadTable(1);
+  }
+}
+
+// 刷新页面数据
+function reloadData() {
+  reloadData(pageNum);
+}
+
+// 重载表格
+function reloadTable(pageNum) {
+  table.reload("currentTableId", {
+    page: {
+      curr: pageNum ? pageNum : 1,
+    },
+    where: {
+      encryptedData: JSON.stringify({
+        'name': $('#name').val(),
+        'module': $('#module').val(),
+        'proId': objParam.proId
+      }),
+    },
+  },
+  );
+}
+
+// 初始化表格
+function initTable() {
+  tableIns = table.render({
+    elem: "#currentTableId",
+    id: 'currentTableId',
+    headers: {
+      authorization: sessionStorage.getItem("gz-token"),
+    },
+    height: "full-140",
+    url: dataUrl + "backstage/planOut/getPorInfoDetail2",
+    where: {
+      encryptedData: JSON.stringify({
+        'name': $('#name').val(),
+        'module': $('#module').val(),
+        'proId': objParam.proId
+      }),
+    },
+    request: {
+      pageName: 'pageNum',
+      limitName: 'pageSize'
+    },
+    parseData: function (res) { // res 即为原始返回的数据
+      return {
+        "code": 0, // 解析接口状态
+        "msg": '获取成功', // 解析提示文本
+        "count": res.total, // 解析数据长度
+        "data": res.list // 解析数据列表
+      };
+    },
+    cols: [
+      [
+        {
+          width: '5%',
+          title: "序号",
+          align: "center",
+          templet: function (d) {
+            let color= d.needType === '2' ? '#f56c6c':'#262626';
+            return '<span style="color:'+color+'">'+d.LAY_NUM+'</span>'
+          },
+        },
+        {
+          field: "typeName",
+          width: '7.9%',
+          title: "计划内/计划外 ",
+          unresize: true,
+          align: "center",
+          templet: function (d) {
+            let color= d.needType === '2' ? '#f56c6c':'#262626';
+            return '<span style="color:'+color+'">'+d.typeName+'</span>'
+          }, 
+        },
+        {
+          field: "type",
+          width: '7%',
+          title: "物机类型",
+          unresize: true,
+          align: "center",
+          templet: function (d) {
+            let color= d.needType === '2' ? '#f56c6c':'#262626';
+            return '<span style="color:'+color+'">'+d.type+'</span>'
+          },
+        },
+        {
+          field: "name",
+          width: '9%',
+          title: "物机名称 ",
+          unresize: true,
+          align: "center",
+          templet: function (d) {
+            let color= d.needType === '2' ? '#f56c6c':'#262626';
+            return '<span style="color:'+color+'">'+d.name+'</span>'
+          },
+        },
+        {
+          field: "module",
+          title: "规格",
+          width: '8%',
+          unresize: true,
+          align: "center",
+          templet: function (d) {
+            let color= d.needType === '2' ? '#f56c6c':'#262626';
+            return '<span style="color:'+color+'">'+d.module+'</span>'
+          },
+        },
+        {
+          field: "unit",
+          title: "单位",
+          width: '8%',
+          unresize: true,
+          align: "center",
+          templet: function (d) {
+            let color= d.needType === '2' ? '#f56c6c':'#262626';
+            return '<span style="color:'+color+'">'+d.unit+'</span>'
+          },
+        },
+        {
+          field: "status",
+          title: "进度",
+          width: '13%',
+          unresize: true,
+          align: "center",
+          templet:schedule,
+        },
+        {
+          field: "needNum",
+          title: "需要量",
+          width: '8%',
+          unresize: true,
+          align: "center",
+          templet: function (d) {
+            return setNumColor(d.needNum,1,d.needType);
+          },
+        },
+        {
+          field: "fhNum",
+          width: '8%',
+          title: "已发货量",
+          unresize: true,
+          align: "center",
+          templet: function (d) {
+            return setNumColor(d.fhNum,2,d.needType);
+          },
+        },
+        {
+          field: "diff",
+          width: '8%',
+          title: "待发货量",
+          unresize: true,
+          align: "center",
+          templet: function (d) {
+            return setNumColor(d.diff,3,d.needType);
+          },
+        },
+        {
+          field: "tzNum",
+          width: '8%',
+          title: "调整量",
+          unresize: true,
+          align: "center",
+          templet: function (d) {
+            return setNumColor(d.tzNum,4,d.needType);
+          },
+        },
+        {
+          title: "备注",
+          width: '10%',
+          align: "center",
+          unresize: true,
+        },
+      ],
+    ],
+    limits: [10, 15, 20, 25, 50, 100],
+    limit: 10,
+    page: true,
+    done: function (res, curr, count) {
+      pageNum = tableIns.config.page.curr;
+      element.render();
+      table.resize("currentTableId");
+    },
+  });
+}
+
+// 设置字体加粗
+function setFontBold(value) {
+  return '<span style="font-weight:bold">' + value + "</span>";
+}
+
+function setNumColor(value, type,needType) { // 1.需要量 2.已发货量 3.待发货量 4.调整量
+    let color = '#66b1ff';
+    if (type === 1 && needType == '2') {
+      color = '#66b1ff';
+      value = '/';
+    } else if (type === 2) {
+      color = '#19be6b';
+    } else if (type === 3) {
+      color = '#f56c6c';
+    }else if(type === 4){
+        if(value > 0){
+            color = '#d9001b';
+        }else{
+            color = '#ccc';
+        }
+    }
+    return '<span style="color:' + color + ';font-weight:bold;">' + value + "</span>";
+  }
+
+// 设置进度值
+function schedule(d) {
+    d.progress = parseFloat(d.progress)
+    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 encryptedData = JSON.stringify({
+    'proName': $('#proName').val(),
+    'status': $('#status').val()
+  });
+  let url = dataUrl + "backstage/planOut/exportExcel?encryptedData=" + encryptedData;
+  exportExcelUtil(url, '机具公司发货数据');
+}
+
+// 打印
+function print() {
+  Print('#body', {
+    onStart: function () {
+      console.log('onStart', new Date())
+    },
+    onEnd: function () {
+      console.log('onEnd', new Date())
+    }
+  })
+}

js/demandPlan/child/delivery_batch_list.js

@@ -0,0 +1 @@
+console.log(decodeURIComponent(getUrlParam('obj')));

js/demandPlan/child/delivery_detail_list.js

@@ -2,8 +2,8 @@ let layer, element;
 let objParam;
 function setParams(obj) {
     objParam = JSON.parse(obj);
-    console.log(obj);
     $('#proName').html(objParam.proName);
+    $('#planNum').html(objParam.planNum);
     setStatusColor(objParam.status);
     layui.use(["layer", 'element'], function () {
         form = layui.form;
@@ -15,47 +15,51 @@ function setParams(obj) {
             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)));
+                $('#indexIframe').attr('src', 'delivery_batch_list.html?obj=' + encodeURIComponent(JSON.stringify(obj)) + '&id=' + value);
             } else if (value === '0') {
                 $('#indexIframe').attr('src', 'delivery_not_send_list.html?obj=' + encodeURIComponent(JSON.stringify(obj)));
             }
         });
-        getShipmentBatch();
+        getOutTimes();
     });
 }
 
 // 发货批次
-function getShipmentBatch() {
+function getShipmentBatch(list) {
+    let dataList = [];
     let html = '';
-    let list = [{ name: '全部', value: '' }, { name: '第1批', value: '1' }, { name: '第2批', value: '2' }, { name: '第3批', value: '3' }, { name: '第4批', value: '4' },
+    if (list && list.length > 0) {
-    { name: '第5批', value: '5' }, { name: '第6批', value: '6' }, { name: '第7批', value: '7' }, { name: '第8批', value: '8' }, { name: '第9批', value: '9' },
+        dataList.push({ name: '全部', id: '' })
-    { 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' }
-    ];
         $.each(list, function (index, item) {
-        if (item.name === '待发货') {
+            dataList.push({ name: '第' +numToChinese(index + 1)+ '批', id: item.id, tiem: item.createDay })
-            html += '<li value="' + this.value + '" style="color:red"><span class="li-span">' + this.name + '</span></li>';
+        });
-        }else if(item.name === '全部'){
+        dataList.push({ name: '待发货', id: '' })
-            html += '<li value="' + this.value + '"><span>' + this.name + '</span></li>';
     } else {
-            html += '<li value="' + this.value + '"><span>'+item.name+'</span><span>2024-11-01</span></li>';
+        dataList.push({ name: '全部', id: '' })
+        dataList.push({ name: '待发货', id: '' })
+    }
+    $.each(dataList, function (index, item) {
+        if (item.name === '待发货') {
+            html += '<li value="' + this.id + '" style="color:red"><span class="li-span">' + this.name + '</span></li>';
+        } else if (item.name === '全部') {
+            html += '<li value="' + this.id + '"><span class="li-span">' + this.name + '</span></li>';
+        } else {
+            html += '<li value="' + this.id + '"><span>' + item.name + '</span><span>'+item.tiem+'</span></li>';
         }
     })
     $('.layui-tab-title').empty().append(html);
     $('.layui-tab-title li').eq(0).addClass('layui-this');
     var scrollableElement = document.getElementById('layui-tab-brief');
-
     // 添加事件监听器来处理滚轮事件
     scrollableElement.addEventListener('wheel', function (event) {
         // 阻止默认的滚动行为
         event.preventDefault();
-
         // 检查滚动的方向
         var delta = event.deltaY > 0 ? -20 : 20; // 根据需要调整滚动的步长
-
         // 设置新的滚动位置
         scrollableElement.scrollLeft += delta;
     });
+    $('#indexIframe').attr('src', 'delivery_all_list.html?obj=' + encodeURIComponent(JSON.stringify(objParam)));
 }
 
 function setStatusColor(value) {
@@ -74,3 +78,82 @@ function setStatusColor(value) {
     let html = '<span style="color:' + color + ';font-weight:bold;">' + name + "</span>";
     $('#status').html(html);
 }
+
+// 查询批次数量
+function getOutTimes() {
+    let params = {
+        encryptedData: JSON.stringify({
+            'proId': objParam.proId
+        })
+    };
+    let url = dataUrl + 'backstage/planOut/getOutTimes';
+    ajaxRequest(url, "POST", params, true, function () {
+    }, function (result) {
+        console.log(result);
+        if (result.code === 200) {
+            getShipmentBatch(result.data);
+        }
+    }, function (xhr, status, error) {
+        errorFn(xhr, status, error)
+    }, null);
+}
+
+// 数字转大写
+function numToChinese(num) {
+    const chineseNumbers = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十'];
+    if (num >= 1 && num <= 10) {
+        return chineseNumbers[num - 1];
+    } else if (num === 11) {
+        return '十一';
+    } else if (num === 12) {
+        return '十二';
+    } else if (num === 13) {
+        return '十三';
+    } else if (num === 14) {
+        return '十四';
+    } else if (num === 15) {
+        return '十五';
+    } else if (num === 16) {
+        return '十六';
+    } else if (num === 17) {
+        return '十七';
+    } else if (num === 18) {
+        return '十八';
+    } else if (num === 19) {
+        return '十九';
+    } else if (num === 20) {
+        return '二十';
+    } else if (num === 21) {
+        return '二十一';
+    } else if (num === 22) {
+        return '二十二';
+    } else if (num === 23) {
+        return '二十三';
+    } else if (num === 24) {
+        return '二十四';
+    } else if (num === 25) {
+        return '二十五';
+    }else if (num === 26) {
+        return '二十六';
+    } else if (num === 27) {
+        return '二十七';
+    } else if (num === 28) {
+        return '二十八';
+    } else if (num === 29) {
+        return '二十九';
+    } else if (num === 30) {
+        return '三十';
+    } else if (num === 31) {
+        return '三十一';
+    } else if (num === 32) {
+        return '三十二';
+    } else if (num === 33) {
+        return '三十三';
+    } else if (num === 34) {
+        return '三十四';
+    } else if (num === 35) {
+        return '三十五';
+    } else if (num === 36) {
+        return '三十六';
+    }
+}

js/demandPlan/child/delivery_not_send_list.js

@@ -0,0 +1 @@
+console.log(decodeURIComponent(getUrlParam('obj')));

js/public.js

@@ -113,8 +113,26 @@ const getNowDate = () => {
 }
 // 空值赋值
 function setNullValue(value) {
-    if(!value){
+    if (value === 0) {
+        return 0;
+    } else if (!value) {
         return '';
     }
     return value;
 }
+
+function getUrlParam(key) {
+	var href = window.location.href;
+	var url = href.split("?");
+	if(url.length <= 1){
+		return "";
+	}
+	var params = url[1].split("&");
+	
+	for(var i=0; i<params.length; i++){
+		var param = params[i].split("=");
+		if(key == param[0]){
+			return param[1];
+		}
+	}
+}

page/demandPlan/child/delivery_all_list.html

@@ -9,31 +9,57 @@
     <link rel="stylesheet" href="../../../css/font.css" media="all">
     <link rel="stylesheet" href="../../../css/public.css" media="all">
 </head>
+<style>
+    body {
+        margin: 0;
+        padding: 0;
+        height: 100%;
+    }
+</style>
 
 <body>
-    <div id="main-box">
+    <div class="layuimini-container">
-        <div id="detail-box" class="layout">
+        <div class="layuimini-main">
-            <div class="layout detail" style="margin: 0 20px;">
+            <fieldset class="table-search-fieldset">
-                <p style="font-size: 18px;font-weight: bold;" id="proName"></p>
+                <legend>搜索信息</legend>
-                <p id="status"></p>
+                <div style="margin: 10px 10px 10px 10px">
-            </div>
+                    <form class="layui-form layui-form-pane" action="#" onsubmit="return false;">
-            <div class="layout detail" style="margin-left: 10%;">
+                        <div class="layui-form-item">
-                <p>计划数量</p>
+                            <div class="layui-inline">
-                <p style="color: #409EFF;">0</p>
+                                <div class="layui-input-inline" style="width: 300px;">
+                                    <input type="text" name="name" id="name" autocomplete="off"
+                                        class="layui-input" lay-affix="clear" placeholder="输入物机名称" maxlength="30">
                                 </div>
                             </div>
-        <div class="layui-tab layui-tab-brief" id="layui-tab-brief" lay-filter="demo-filter-tab">
+                            <div class="layui-inline">
-            <ul class="layui-tab-title">
+                                <div class="layui-input-inline" style="width: 300px;">
-            </ul>
+                                    <input type="text" name="module" id="module" autocomplete="off"
+                                        class="layui-input" lay-affix="clear" placeholder="输入规格" maxlength="30">
+                                </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>
+                                <button class="layui-btn layui-btn-primary" onclick="print()"><i
+                                        class="layui-icon layui-icon-print"></i> 打 印</button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </fieldset>
+            <div class="table-box" table-responsive style="z-index: 1;">
+                <table class="layui-hide" id="currentTableId" lay-filter="currentTableId2"></table>
             </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="../../../js/Print.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>
 

page/demandPlan/child/delivery_batch_list.html

@@ -13,24 +13,7 @@
 
 <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>

page/demandPlan/child/delivery_detail_list.html

@@ -10,7 +10,11 @@
     <link rel="stylesheet" href="../../../css/public.css" media="all">
     <link rel="stylesheet" href="../../../css/demandPlan/delivery_detail_list.css" media="all">
 </head>
-
+<style>
+    body{
+        margin-top: 0px;
+    }
+</style>
 <body>
     <div id="main-box">
         <div id="detail-box" class="layout">
@@ -20,7 +24,7 @@
             </div>
             <div class="layout detail" style="margin-left: 10%;">
                 <p>计划数量</p>
-                <p style="color: #409EFF;">0</p>
+                <p style="color: #409EFF;" id="planNum">0</p>
             </div>
         </div>
         <div class="layui-tab layui-tab-brief" id="layui-tab-brief" lay-filter="demo-filter-tab">

page/demandPlan/child/delivery_not_send_list.html

@@ -13,24 +13,7 @@
 
 <body>
     <div id="main-box">
-        <div id="detail-box" class="layout">
+        <p>待发货</p>
-            <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>