合并分支 'bug' 到 'master'

dev-union/src/main/resources/htmlTemplate/bill11.html

@@ -116,10 +116,11 @@
         }
 
         table.altrowstable {
-            width: 100%;
+            margin: 1px 0 0 1px;
+            width: 99%;
             font-size: 14px;
             color: #141414;
-            border-width: 2px;
+            border-width: 1px;
             border-color: #000;
             border-collapse: collapse;
             text-align: center;
@@ -311,7 +312,6 @@
         }
 
         .person {
-            color: #4a475b;
             text-align: right;
             font-size: 16px;
         }
@@ -320,7 +320,23 @@
             display: inline-block;
             margin-right: 30pt;
         }
-
+        .footer {
+            width: 99%;
+            display: flex;
+            justify-content: space-between;
+        }
+        .footer_left{
+            font-size: 10px;
+            color: #646464;
+            line-height: 10px;
+        }
+        .underline {
+            text-decoration: underline;
+            text-decoration-thickness: 3px;
+        }
+        .bold{
+            font-weight: bold;
+        }
         /* tr:nth-child(odd) {
             background: #fafafa;
         } */
@@ -341,7 +357,7 @@
                         </div>
                     </p>
                     <div style="height: 530px;overflow:hidden">
-                        <table class="altrowstable" border='0' id="alternatecolor">
+                        <table class="altrowstable" id="alternatecolor">
                             <tr>
                                 <th width="190px">型号</th>
                                 <th width="190px">名称</th>
@@ -513,8 +529,12 @@
         </div>
     </div>
 </div>
-<div>
+<div class="footer">
     <!--<p class="bottomTxt" style="float: left;">注：编号连续使用＂-＂省略</p>-->
+    <div class="footer_left">
+        <p>注1: <span class="underline">00000000</span>样式为非在库装备；</p>
+        <p>注2: <span class="bold">型号加粗表示为装备，</span>非加粗表示为附件。</p>
+    </div>
     <p class="bottomTxt" style="float: right;">第${page}页/共${count}页</p>
 </div>
 </div>