From 157abc191c34e57c1b958ae74fc3de6518ca8a30 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 28 二月 2025 11:06:36 +0800
Subject: [PATCH] 修改客户需求

---
 HTML/views/ASNSetting/LabelBoxBuDa.html |   77 ++++++++++++++++++++------------------
 1 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/HTML/views/ASNSetting/LabelBoxBuDa.html b/HTML/views/ASNSetting/LabelBoxBuDa.html
index f97e1b3..2e1990e 100644
--- a/HTML/views/ASNSetting/LabelBoxBuDa.html
+++ b/HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -41,22 +41,25 @@
             display: block;
         }
         .font-size12{
-            font-size: 12px;
+            font-size: 10px;
         }
         .font-size10{
             font-size: 10px;
         }
+        /* .layui-table-cell {
+            word-break: break-all;
+        } */
     </style>
 </head>
 
 <body>
     <div style="width:100%;">
         <div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print" style="width: 100%;height:100%;">
-            <div style="display: flex;justify-content: center;align-items: center;height: 260px;">
-                <table border="1" id="table" style="width: 90%; height:240px; text-align: center;border-collapse: collapse;table-layout: fixed;">
+            <div style="display: flex;align-items: center;justify-content: center; height: 190px;">
+                <table border="1" id="table" style="width: 90%; height:170px; text-align: center;border-collapse: collapse;table-layout: fixed;">
                     <tr> 
                         <td colspan="2">
-                            <img src="../../img/LiNuo.jpg" style="width: 80%; height: 15px;" />
+                            <img src="../../img/LiNuo.jpg" style="width: 80%; height: 13px;" />
                         </td>
                         <td colspan="2" style="padding: 1px 0px;" class="font-size12">SMP-ST002-R08-01</td> 
                     </tr>
@@ -67,32 +70,32 @@
                         <td class="font-size12">鍝佸悕</td>
                         <td colspan="3" id="SkuName" class="font-size10"></td>
                     </tr>
-                    <tr>
+                    <!-- <tr>
                         <td class="font-size12">瑙勬牸/鍨嬪彿</td>
                         <td id="Standard" class="font-size10"></td>
                         <td class="font-size12">鍖呰瑙勬牸</td>
                         <td id="PackageStandard" class="font-size10"></td>
-                    </tr>
+                    </tr> -->
                     <tr>
                         <td class="font-size12">杩涘巶缂栧彿</td>
-                        <td id="LotNo" class="font-size10"></td>
+                        <td id="LotNo" style="overflow-wrap: break-word;" class="font-size10"></td>
                         <td class="font-size12">鐗╂枡浠g爜</td>
                         <td id="SkuNo" class="font-size10"></td>
                     </tr>
                     <tr>
                         <td class="font-size12">鍘熷巶鎵瑰彿</td>
-                        <td id="SupplierLot" class="font-size10"></td> 
+                        <td id="SupplierLot" style="overflow-wrap: break-word;" class="font-size10"></td> 
                         <td class="font-size12">鏁�   閲�</td>
                         <td id="Qty" class="font-size10"></td> 
                     </tr>
-                    <tr>
+                    <!-- <tr>
                         <td class="font-size12">鏈夋晥鏈熻嚦</td>
                         <td id="ExpirationTime" class="font-size10"></td>
                         <td class="font-size12">鍌ㄥ瓨鏈熻嚦</td>
                         <td id="StoreTime" class="font-size10"></td> 
-                    </tr>
+                    </tr> -->
                     <tr> 
-                        <td colspan="4" style="padding: 5px 0px;">
+                        <td colspan="4" style="padding: 2px 0px;">
                             <img id="imgBar" style="width: 90%; height: 20px;" />
                         </td> 
                     </tr>
@@ -190,7 +193,7 @@
                 GetImportId();
             });
             form.on('select(Type)', function (data) {
-                console.log(data.value); //寰楀埌琚�変腑鐨勫�� 
+                // console.log(data.value); //寰楀埌琚�変腑鐨勫�� 
                 if (data.value == "1") {
                     $("#LabelStream").removeAttr("readonly")
                     $("#EndBoxCode").removeAttr("readonly")
@@ -226,14 +229,14 @@
                 synData(IP + "/BllAsn/GetBuDaLabelList", param1, 'post', function (res) {
                     if (res.code == 0) { //鎴愬姛    
                         var labels = "";
-                        console.log(res.data);
+                        // console.log(res.data);
                         for (var z = 0; z < res.data.length; z++) {
                             var idd = "";
                             if (z - 1 >= 0) {
                                 idd = (z - 1).toString();
                             }
-                            console.log(res.data[z]);
-                            console.log(z);
+                            // console.log(res.data[z]);
+                            // console.log(z);
                             $("#SkuNo").attr("id", "SkuNo" + z.toString());
                             $("#SkuNo" + z.toString()).html(res.data[z].SkuNo);
                              
@@ -241,14 +244,14 @@
                             $("#SkuName" + z.toString()).html( res.data[z].SkuName);
 
                              
-                            $("#PackageStandard").attr("id", "PackageStandard" + z.toString());
-                            $("#PackageStandard" + z.toString()).html(res.data[z].PackageStandard);
+                            //$("#PackageStandard").attr("id", "PackageStandard" + z.toString());
+                            //$("#PackageStandard" + z.toString()).html(res.data[z].PackageStandard);
 
-                            $("#Standard").attr("id", "Standard" + z.toString());
-                            $("#Standard" + z.toString()).html(res.data[z].Standard);
+                            //$("#Standard").attr("id", "Standard" + z.toString());
+                            //$("#Standard" + z.toString()).html(res.data[z].Standard);
 
                             $("#Qty").attr("id", "Qty" + z.toString());
-                            $("#Qty" + z.toString()).html( res.data[z].Qty);
+                            $("#Qty" + z.toString()).html( res.data[z].Qty+res.data[z].unit);
 
                             $("#SupplierLot").attr("id", "SupplierLot" + z.toString());
                             $("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);
@@ -259,12 +262,12 @@
                             $("#SupplierLot").attr("id", "SupplierLot" + z.toString());
                             $("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);
 
-                            $("#ExpirationTime").attr("id", "ExpirationTime" + z.toString());
-                            $("#ExpirationTime" + z.toString()).html( formatDate2(res.data[z].ExpirationTime));
+                            //$("#ExpirationTime").attr("id", "ExpirationTime" + z.toString());
+                            //$("#ExpirationTime" + z.toString()).html( formatDate2(res.data[z].ExpirationTime));
 
                              
-                            $("#StoreTime").attr("id", "StoreTime" + z.toString());
-                            $("#StoreTime" + z.toString()).html(formatDate2(res.data[z].StoreTime));
+                            //$("#StoreTime").attr("id", "StoreTime" + z.toString());
+                            //$("#StoreTime" + z.toString()).html(formatDate2(res.data[z].StoreTime));
   
                             $("#imgBar").attr("id", "imgBar" + z.toString());
                             $("#imgBar" + z.toString()).attr("src", res.data[z].ImgStr);
@@ -279,14 +282,14 @@
                             $("#SkuName" + z.toString()).attr("id", "SkuName");
                             $("#SkuName").html("");
 
-                            $("#PackageStandard" + z.toString()).attr("id", "PackageStandard");
-                            $("#PackageStandard").html("");
+                            //$("#PackageStandard" + z.toString()).attr("id", "PackageStandard");
+                            //$("#PackageStandard").html("");
 
                             $("#Qty" + z.toString()).attr("id", "Qty");
                             $("#Qty").html("");
 
-                            $("#Standard" + z.toString()).attr("id", "Standard");
-                            $("#Standard").html("");
+                            //$("#Standard" + z.toString()).attr("id", "Standard");
+                            //$("#Standard").html("");
 
                             $("#LotNo" + z.toString()).attr("id", "LotNo");
                             $("#LotNo").html("");
@@ -294,16 +297,16 @@
                             $("#SupplierLot" + z.toString()).attr("id", "SupplierLot");
                             $("#SupplierLot").html("");
 
-                            $("#StoreTime" + z.toString()).attr("id", "StoreTime");
-                            $("#StoreTime").html("");
+                            //$("#StoreTime" + z.toString()).attr("id", "StoreTime");
+                            //$("#StoreTime").html("");
 
-                            $("#ExpirationTime" + z.toString()).attr("id", "ExpirationTime");
-                            $("#ExpirationTime").html("");
+                            //$("#ExpirationTime" + z.toString()).attr("id", "ExpirationTime");
+                            //$("#ExpirationTime").html("");
 
                             $("#imgBar" + z.toString()).attr("id", "imgBar");
                             $("#imgBar").attr("src", "");
                         }
-                        console.log(labels);
+                        // console.log(labels);
                         document.getElementById('print2').innerHTML = "";
                         document.getElementById('print2').innerHTML = labels;
                         $("#print2").removeClass("hideCls");
@@ -312,10 +315,10 @@
                         //$("#button").show();
                         $("#print2").addClass("hideCls");
 
-                        $("#LabelStream").val("");
-                        $("#EndBoxCode").val("");
-                        $("#LabelStream2").val("");
-                        $("#EndBoxCode2").val("");
+                        // $("#LabelStream").val("");
+                        // $("#EndBoxCode").val("");
+                        // $("#LabelStream2").val("");
+                        // $("#EndBoxCode2").val("");
 
                     } else { //涓嶆垚鍔�
                         layer.msg(res.msg, {

--
Gitblit v1.8.0