From 513ae49dd33d2e3fb9c4513ea3be2e501c4a80f2 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 08:48:37 +0800
Subject: [PATCH] 库存明细行内容超出隐藏,默认显示500条数据

---
 src/main/webapp/views/pla/plaDetl.html |  294 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 199 insertions(+), 95 deletions(-)

diff --git a/src/main/webapp/views/pla/plaDetl.html b/src/main/webapp/views/pla/plaDetl.html
index 33e2da4..9058fc7 100644
--- a/src/main/webapp/views/pla/plaDetl.html
+++ b/src/main/webapp/views/pla/plaDetl.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" xmlns="http://www.w3.org/1999/html">
 <head>
     <meta charset="utf-8">
     <title></title>
@@ -91,16 +91,16 @@
             /*display: none;*/
         }
 
-        .layui-table-cell {
-            text-align: center;
-            line-height: 20px !important;
-            vertical-align: middle;
-            height: auto;
-            overflow: visible;
-            text-overflow: inherit;
-            white-space: normal;
+        /*.layui-table-cell {*/
+        /*    text-align: center;*/
+        /*    line-height: 20px !important;*/
+        /*    vertical-align: middle;*/
+        /*    height: auto;*/
+        /*    overflow: visible;*/
+        /*    text-overflow: inherit;*/
+        /*    white-space: normal;*/
 
-        }
+        /*}*/
         .table-header-fixed {
             top: 0;
             position: fixed;
@@ -108,14 +108,18 @@
         }
         /* ------------------------- 鎵撳嵃琛ㄦ牸 -----------------------  */
         .template-preview {
-            height: 200px;
+            height: 400px;
             display: inline-block;
         }
         .contain td {
-            border: 1px solid #000;
+            border: 0px solid #000;
+            white-space:nowrap;
             /*font-family: 榛戜綋;*/
             /*font-weight: bold;*/
-            /*color: #000000;*/
+            color: #000000;
+        }
+        .layui-inline{
+            width: 100px;
         }
     </style>
 </head>
@@ -136,46 +140,88 @@
 <!-- 鎼滅储鏍� -->
 <div id="search-box" >
     <div class="layui-form layui-card-header">
-        <div class="layui-inline">
-            <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+        <div class="layui-inline" style="width: 80px">
+            <div class="layui-input-inline cool-auto-complete">
+                <input id="maktx" class="layui-input" type="text" style="display: none">
+                <input id="maktxV" name="brand" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" placeholder="鐗屽彿" type="text" onfocus=this.blur()>
+                <div class="cool-auto-complete-window">
+                    <input class="cool-auto-complete-window-input" data-key="matMaktxQueryByMaktx" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                    <select class="cool-auto-complete-window-select" data-key="matMaktxQueryByMaktxSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                    </select>
+                </div>
             </div>
         </div>
-        <div class="layui-inline">
+        <div class="layui-inline" style="width: 270px">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="package_no" placeholder="鍖呭彿" autocomplete="off">
+                <div id="mat" name="mat">
+                </div>
             </div>
         </div>
-        <div class="layui-inline">
+        <div class="layui-inline" style="width: 80px">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="brand" placeholder="鐗屽彿" autocomplete="off">
-            </div>
-        </div>
-        <div class="layui-inline">
-            <div class="layui-input-inline">
-<!--                <input class="layui-input" type="text" name="status" placeholder="鐘舵��" autocomplete="off">-->
                 <select name="status">
                     <option value="">閫夋嫨鐘舵��</option>
                     <option value="鏆傚叆搴�">鏆傚叆搴�</option>
                     <option value="寰呭叆搴�">寰呭叆搴�</option>
                     <option value="宸插叆搴�">宸插叆搴�</option>
+                    <option value="寰呭嚭搴�">寰呭嚭搴�</option>
                     <option value="閮ㄥ垎鍑哄簱">閮ㄥ垎鍑哄簱</option>
                     <option value="鍏ㄩ儴鍑哄簱">鍏ㄩ儴鍑哄簱</option>
                 </select>
             </div>
         </div>
-
-        <!--    <div class="layui-inline">-->
-        <!--        <div class="layui-input-inline">-->
-        <!--            <input class="layui-input" type="text" name="row" placeholder="鎺掓暟" autocomplete="off">-->
-        <!--        </div>-->
-        <!--    </div>-->
+        <div class="layui-inline" style="width: 70px">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline" style="width: 70px">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="package_noMax" placeholder="鏈�澶у寘鍙�" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <select name="stock_freeze">
+                    <option value="">鏄惁鍐荤粨</option>
+                    <option value="0">鏄�</option>
+                    <option value="1">鍚�</option>
+                </select>
+            </div>
+        </div>
+<!--        <div class="layui-inline">-->
+<!--            <div class="layui-input-inline">-->
+<!--                <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">-->
+<!--            </div>-->
+<!--        </div>-->
+        <div class="layui-inline" style="width: 80px">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="type" placeholder="鐗╄祫绫诲埆" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline" style="width: 80px">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="package_type" placeholder="鍖呰绫诲瀷" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline" style="width: 80px">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="zpallet_type" placeholder="鎵樼洏绫诲瀷" autocomplete="off">
+            </div>
+        </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
                 <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
             </div>
         </div>
-
+        <div class="layui-inline" style="width: 300px">
+            <!--            <div class="layui-input-inline">-->
+            <!--                <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
+            <!--            </div>-->
+            <div class="layui-input-inline">
+                <input type="text" class="layui-input"  style="width: 290px" name="create_time" id="ID-laydate-range-datetime" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿">
+            </div>
+        </div>
         <!-- 寰呮坊鍔� -->
         <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
             <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -192,6 +238,26 @@
         <div class="layui-inline">
             <div class="layui-input-inline">
                 <input class="layui-input" type="text" name="finger_meltingMax" placeholder="鏈�澶х啍鎸�" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="opacityMin" placeholder="鏈�灏忎笉閫忔槑搴�" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="opacityMax" placeholder="鏈�澶т笉閫忔槑搴�" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="waterMin" placeholder="鏈�灏忔按鍒�" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="waterMax" placeholder="鏈�澶ф按鍒�" autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
@@ -216,12 +282,22 @@
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="opacityMin" placeholder="鏈�灏忎笉閫忔槑搴�" autocomplete="off">
+                <input class="layui-input" type="text" name="vadf1Min" placeholder="鏈�灏忔尌鍙戞" autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="opacityMax" placeholder="鏈�澶т笉閫忔槑搴�" autocomplete="off">
+                <input class="layui-input" type="text" name="vadf1Max" placeholder="鏈�澶ф尌鍙戞" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="vadf2Min" placeholder="鏈�灏忓垎瑙f" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <div class="layui-input-inline">
+                <input class="layui-input" type="text" name="vadf2Max" placeholder="鏈�澶у垎瑙f" autocomplete="off">
             </div>
         </div>
     </div>
@@ -236,7 +312,10 @@
         <button class="layui-btn layui-btn-sm layui-btn-checked " id="btn-disfreeze" lay-event="disFreezeData" style="display: none">瑙e喕</button>
         <button class="layui-btn layui-btn-sm layui-btn-checked " id="btn-printBatch" lay-event="btnPrintBatch" >鎵归噺鎵撳嵃</button>
         <!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
-        <div class="dropdown-menu" style="float: right">
+        <button style="float: right" class="layui-btn layui-btn-sm layui-btn-checked " id="btn-exportMoudle" onclick="excelMouldDownload()" >妯℃澘涓嬭浇</button>
+        <button style="float: right" class="layui-btn layui-btn-sm layui-btn-checked " id="btn-import" onclick="importExcel()" >瀵煎叆excel</button>
+
+        <div class="dropdown-menu" style="float: right; display: none">
             <button id="syncData" style="display: none;" class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm">&nbsp;鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>
             <ul class="dropdown-menu-nav dark">
                 <div class="dropdown-anchor"></div>
@@ -263,12 +342,12 @@
 </script>
 
 <!-- 琛ㄦ牸 -->
-<table class="layui-table" id="plaDetl" lay-filter="plaDetl"></table>
+<table class="layui-table"  id="plaDetl" lay-filter="plaDetl"></table>
 
 <script type="text/html" id="tbLook">
     <span class="layui-text">
         <a href="javascript:;" lay-event="look">
-            <i class="layui-icon" style="font-size: 12px;">&#xe61a;</i> 鏌ョ湅鏄庣粏
+            <i class="layui-icon" style="font-size: 12px;">&#xe61a;</i> 鏌ョ湅
         </a>
     </span>
 </script>
@@ -279,6 +358,7 @@
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
 <script type="text/javascript" src="../../static/js/pla/plaDetl.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
 
 <!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
 <div id="printDataDiv" style="display: none;padding: 20px">
@@ -293,28 +373,45 @@
             <div id="template-container" style="margin: 20px;text-align: center">
                 <!-- 棰勮鍥� 3 -->
                 <div id="template-preview-1" class="template-preview" style="display: block">
-                    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
-                        <tr style="height: 74px">
-                            <td align="center" scope="col" colspan="1">鐗屽彿</td>
-                            <td align="center" scope="col" colspan="1" style="">xxxxxx-xx/xx</td>
-                            <td align="center" scope="col" colspan="2" rowspan="2">
-                                <img class="template-code template-qrcode" src="" width="80%">
-                                <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
-                                    <span>xxxxxx</span>
-                                </div>
-                            </td>
-                        </tr>
-                        <tr style="height: 74px">
-                            <td align="center" colspan="1">閲嶉噺</td>
-                            <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
-                        </tr>
-                        <tr style="height: 74px">
-                            <td align="center" colspan="1">鎵瑰彿</td>
-                            <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
-                            <td align="center" colspan="1">鍖呭彿</td>
-                            <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
-                        </tr>
-                    </table>
+                    <div class="layui-row">
+                        <div class="layui-col-xs4" style="height: auto">
+                            <img src="../../static/image/hneLogo.jpg" style="display: inline-block; width: 40%;height: 30%">
+                        </div>
+                        <div class="layui-col-xs8" style="margin-left: -40px; margin-top: 20px; text-align: left">
+                            娴欐睙鐪佸彴宸炲競鍙板窞婀炬柊鍖哄彴宸炴咕澶ч亾188鍙�</br>
+                            Address锛歂o. 188, Taizhou Bay Avenue, Taizhou Bay New Area, Taizhou City, Zhejiang Province
+                        </div>
+                    </div>
+<!--                    <div class="layui-row" style="font-size: xx-large; text-align: left; margin-left: 40px;">-->
+<!--                        </n>鑱氫钩閰� Polylactic Acid-->
+<!--                    </div>-->
+                    <div class="layui-row" style="alignment: center; margin-left: 65px;">
+                        <table class="contain" width="400" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+                            <tr style="height: 74px" >
+                                <td align="center" scope="col" colspan="4" style="font-size: x-large; font-weight: bold;"><strong style="font-weight: bold;color: black;">鑱氫钩閰� Polylactic Acid</strong></td>
+                            </tr>
+                            <tr style="height: 74px">
+                                <td align="center" scope="col" colspan="1">鐗屽彿</td>
+                                <td align="center" scope="col" colspan="1" style="">xxxxxx-xx/xx</td>
+                                <td align="center" scope="col" colspan="2" rowspan="2">
+                                    <img class="template-code template-qrcode" src="" width="80%">
+                                    <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
+                                        <span>xxxxxx</span>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr style="height: 74px">
+                                <td align="center" colspan="1" style="text-align: left; padding-left: 20px" >閲嶉噺</td>
+                                <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
+                            </tr>
+                            <tr style="height: 74px">
+                                <td align="center" colspan="1">鎵瑰彿</td>
+                                <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
+                                <td align="center" colspan="1">鍖呭彿</td>
+                                <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
+                            </tr>
+                        </table>
+                    </div>
                 </div>
             </div>
         </fieldset>
@@ -334,44 +431,51 @@
 <!-- 妯℃澘寮曟搸 -->
 <!-- 妯℃澘3 -->
 <script type="text/template" id="templatePreview1" class="template-qrcode">
+    <div class="template-preview">
     {{#each data}}
-    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
-        <tr style="height: 74px" >
-            <td align="center" scope="col" colspan="1" style="font-weight: bold;"><strong style="font-weight: bold;color: black;">鐗屽彿</strong></td>
-            <td align="center" scope="col" colspan="1" style="
-                font-weight: bold;
-                display: inline-block;
-                line-height: 20px;
-                vertical-align: middle;
-                border: none;
-                border-top: 1px solid #000;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                display: -webkit-box;
-                -webkit-line-clamp: 3;
-                -webkit-box-orient: vertical;
-                    ">
-                <strong style="font-weight: bold;color: black;">{{this.brand}}</strong>
-            </td>
-            <td align="center" scope="col" colspan="2" rowspan="2">
-                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
-                <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
-                    <span style="font-weight: bold;color: black;"><strong style="font-weight: bold;color: black;">{{this.brand}}</strong></span>
-                </div>
-            </td>
-        </tr>
-        <tr style="height: 74px">
-            <td align="center" colspan="1" style="font-weight: bold;color: black;"><strong style="font-weight: bold;color: black;">閲嶉噺</strong></td>
-            <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.weightAnfme}}</strong></td>
-        </tr>
-        <tr style="height: 74px">
-            <td align="center" colspan="1" style="font-weight: bold;color: black;"><strong style="font-weight: bold;color: black;">鎵瑰彿</strong></td>
-            <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.batch}}</strong></td>
-            <td align="center" colspan="1" style="font-weight: bold;color: black;"><strong style="font-weight: bold;color: black;">鍖呭彿</strong></td>
-            <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.packageNo}}</strong></td>
-        </tr>
-    </table>
+        <div class="layui-row" style="height: 230px;width: 750px; color:#000; margin-top: 40px">
+            <div class="layui-col-xs6" style="height: auto; margin-top: 25px; margin-left: -20px">
+                <img src="../../static/image/hneLogo.png" style="display: inline-block; width: 40%;height: 30%; margin-left: 30px; color:#000;">
+            </div>
+            <div class="layui-col-xs6" style="margin-left: -185px;margin-right: 30px; margin-top: 80px; text-align: left; font-size: 20px; font-weight:bold">
+                娴欐睙鐪佸彴宸炲競鍙板窞婀炬柊鍖哄彴宸炴咕澶ч亾188鍙�</br>
+                No.188 Taizhou Bay Avenue, Taizhou Bay New Area, Taizhou City, Zhejiang Province. P.R.China
+            </div>
+        </div>
+<!--        <div class="layui-row" style="font-size: xx-large; text-align: left; margin-left: 40px;">-->
+<!--            鑱氫钩閰� Polylactic Acid-->
+<!--        </div>-->
+        <div class="layui-row" style="alignment: center; margin-left: 35px; margin-top: -20px; margin-bottom: 3.7px;">
+            <table class="contain" width="500" style="overflow: hidden;table-layout: fixed; color:#000; font-size: 35px;text-align: left">
+                <tr style="height: 100px;" >
+                    <td align="center" scope="col" colspan="4" style="font-weight: bold; text-align: left; padding-left: 20px"><strong style="font-weight: bold;color: black;">鑱氫钩閰� Polylactic Acid</strong></td>
+                </tr>
+                <tr style="height: 100px; text-align: left" >
+                    <td align="center" scope="col" colspan="2" style="font-weight: bold;color: black; text-align: left; padding-left: 20px"><strong>鐗屽彿: REVODE {{this.brand}}</strong></td>
+<!--                    <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:normal; "><strong style="font-weight: bold;color: black;">REVODE {{this.brand}}</strong></td>-->
+                </tr>
+                <tr style="height: 100px;text-align: left">
+                    <td align="center" colspan="2" style="font-weight: bold;color: black; text-align: left; padding-left: 20px"><strong>鎵瑰彿锛歿{this.batch}}</strong></td>
+                    <!--                    <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.weightAnfme}} KG</strong></td>-->
+                </tr>
+                <tr style="height: 100px;text-align: left">
+                    <td align="center" colspan="2" style="font-weight: bold;color: black; text-align: left; padding-left: 20px"><strong>閲嶉噺锛歿{this.weight}} kg</strong></td>
+                    <!--                    <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.weightAnfme}} KG</strong></td>-->
+                    <td align="center" scope="col" colspan="2" rowspan="2">
+                        <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
+                    </td>
+                </tr>
+                <tr style="height: 100px;text-align: left">
+                    <td align="center" colspan="2" rowspan="1" style="font-weight: bold;color: black; text-align: left; padding-left: 20px"><strong>杩借釜鐮侊細{{this.line}} {{this.packageNo$}}</strong></td>
+                    <!--                    <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.weightAnfme}} KG</strong></td>-->
+                </tr>
+                <tr style="height: 100px;text-align: left">
+                </tr>
+            </table>
+        </div>
+    </br>
     {{/each}}
+    </div>
 </script>
 
 </body>

--
Gitblit v1.9.1