From 74fd6eb7fb0322078f7946f51073f20e90231df1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 01 四月 2025 11:54:00 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/report/locDetl.html |   74 ++++++++++++++++++++++++-------------
 1 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index bfbe620..da8c5be 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -6,9 +6,9 @@
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="/static/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/static/css/cool.css" media="all">
-    <link rel="stylesheet" href="/static/css/common.css" media="all">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+    <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <style>
         .layui-table-body.layui-table-main{
             overflow: auto; !important;
@@ -23,14 +23,28 @@
     </div>
 </div>
 <table class="layui-hide" id="locDetlByMap" lay-filter="locDetlByMap"></table>
+
+<!--<script type="text/html" id="operate">-->
+<!--    <a class="layui-btn layui-btn-xs loc-detl" lay-event="locDetlRullUp">鏌ョ湅鍗蜂俊鎭�</a>-->
+<!--</script>-->
 </body>
-<script type="text/javascript" src="/static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="/static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="/static/js/locMast/locMast.js" charset="utf-8"></script>
-<script type="text/javascript" src="/static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="/static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
 <script type="text/javascript">
     var pageCur;
+    var rollUp;
+    function getCol() {
+        var cols = [
+            {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+        ];
+        cols.push.apply(cols, detlCols);
+        // cols.push.apply(cols, [{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}]);
+
+        return cols;
+    }
     layui.use(['table','laydate', 'form'], function() {
         table = layui.table;
         var $ = layui.jquery;
@@ -42,28 +56,14 @@
         tableIns = table.render({
             elem: '#locDetlByMap',
             headers: {token: localStorage.getItem('token')},
-            url: '/locDetl/list/auth',
+            url: baseUrl+'/locDetl/list/auth',
             page: true,
-            limit: 5,
+            limit: 20,
             skin: 'line',
             where: {loc_no: parent.locNo},
             even: true,
             cellMinWidth: 50,
-            cols: [[
-                // {type: 'checkbox'}
-                {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
-                ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
-                ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
-                ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
-                // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
-                ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
-                ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
-                ,{field: 'werks', align: 'center',title: '宸ュ巶'}
-                ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-                ,{field: 'altme', align: 'center',title: '鍗曚綅'}
-                ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
-                ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
-            ]],
+            cols: [getCol()],
             request: {
                 pageName: 'curr',
                 pageSize: 'limit'
@@ -81,7 +81,7 @@
             },
             done: function(res, curr, count) {
                 if (res.code === 403) {
-                    top.location.href = "/";
+                    top.location.href = baseUrl+"/";
                 }
                 pageCur=curr;
                 form.on('checkbox(tableCheckbox)', function (data) {
@@ -94,6 +94,28 @@
                 });
             }
         });
+
+        // 鐩戝惉琛屽伐鍏蜂簨浠�
+        table.on('tool(locDetlByMap)', function(obj) {
+            var data = obj.data;
+            switch (obj.event) {
+                // 鏌ョ湅鏄庣粏
+                case 'locDetlRullUp':
+                    // layer.msg("姝ゅ簱浣嶇殑鐘舵�佸瓨鍦ㄧ墿鏂�");
+                    rollUp = data.rollUp
+                    layer.open({
+                        type: 2,
+                        title: 'MES宸ヤ綔鍙蜂俊鎭�',
+                        maxmin: true,
+                        area: [top.detailWidth, top.detailHeight],
+                        shadeClose: true,
+                        content: '../locDetlRullUpDetail/locDetlRullUpDetail.html',
+                        success: function(layero, index){
+                        }
+                    });
+                    break;
+            }
+        });
     });
 </script>
 </html>

--
Gitblit v1.9.1