diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/filenum/print.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/filenum/print.html
index 57d007b..10ca3e2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/filenum/print.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/filenum/print.html
@@ -10,15 +10,15 @@
     <meta http-equiv=Content-Type content="text/html; charset=utf-8">
     <meta name=ProgId content=Excel.Sheet>
     <meta name=Generator content="Aspose.Cell ">
-    <link rel=File-List href="avhdt-wgkvj_files/filelist.xml">
-    <link rel=Edit-Time-Data href="avhdt-wgkvj_files/editdata.mso">
-    <link rel=OLE-Object-Data href="avhdt-wgkvj_files/oledata.mso">
+    <link rel=File-List href="al91k-jw2z2_files/filelist.xml">
+    <link rel=Edit-Time-Data href="al91k-jw2z2_files/editdata.mso">
+    <link rel=OLE-Object-Data href="al91k-jw2z2_files/oledata.mso">
     <!--[if gte mso 9]><xml>
     <o:DocumentProperties>
         <o:Author>波强 赵</o:Author>
-        <o:LastPrinted>2024-05-16T19:19:01Z</o:LastPrinted>
-        <o:Created>2024-05-16T00:31:00Z</o:Created>
-        <o:LastSaved>2024-05-16T19:19:07Z</o:LastSaved>
+        <o:LastPrinted>2024-08-21T19:25:47Z</o:LastPrinted>
+        <o:Created>2024-08-21T18:51:29Z</o:Created>
+        <o:LastSaved>2024-08-21T19:26:16Z</o:LastSaved>
     </o:DocumentProperties>
 </xml><![endif]-->
     <style>
@@ -78,8 +78,8 @@
         .font2
         {
             color:#000000;
-            font-size:20pt;
-            font-weight:700;
+            font-size:9pt;
+            font-weight:400;
             font-style:normal;
             font-family:"等线","sans-serif"; }
         .font3
@@ -92,9 +92,30 @@
         .font4
         {
             color:#000000;
-            font-size:9pt;
+            font-size:20pt;
+            font-weight:700;
+            font-style:normal;
+            font-family:"等线","monospace"; }
+        .font5
+        {
+            color:#000000;
+            font-size:12pt;
             font-weight:400;
             font-style:normal;
+            font-family:"等线","sans-serif"; }
+        .font6
+        {
+            color:#000000;
+            font-size:12pt;
+            font-weight:700;
+            font-style:normal;
+            font-family:"等线","monospace"; }
+        .font7
+        {
+            color:#000000;
+            font-size:16pt;
+            font-weight:700;
+            font-style:normal;
             font-family:"等线","monospace"; }
         td
         {mso-style-parent:style0;
@@ -423,7 +444,7 @@
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:left;
+            text-align:general;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
@@ -432,33 +453,27 @@
             font-size:16pt;
             font-weight:400;
             font-style:normal;
-            font-family:"等线","sans-serif";
-            border-top:none;
-            border-right:none;
-            border-bottom:1px solid windowtext;
-            border-left:none;
-            mso-diagonal-down:none;
-            mso-diagonal-up:none;
+            font-family:"等线","monospace";
             mso-protection:locked visible;
         }
         .x22
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:general;
+            text-align:center;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:16pt;
+            font-size:12pt;
             font-weight:400;
             font-style:normal;
             font-family:"等线","sans-serif";
-            border-top:none;
-            border-right:none;
+            border-top:1px solid windowtext;
+            border-right:1px solid windowtext;
             border-bottom:1px solid windowtext;
-            border-left:none;
+            border-left:1px solid windowtext;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
@@ -467,42 +482,36 @@
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:general;
+            text-align:center;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:11pt;
+            font-size:12pt;
             font-weight:400;
             font-style:normal;
             font-family:"等线","sans-serif";
-            border-top:none;
-            border-right:none;
-            border-bottom:1px solid windowtext;
-            border-left:none;
-            mso-diagonal-down:none;
-            mso-diagonal-up:none;
             mso-protection:locked visible;
         }
         .x24
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:right;
+            text-align:center;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:16pt;
-            font-weight:400;
+            font-size:12pt;
+            font-weight:700;
             font-style:normal;
-            font-family:"等线","sans-serif";
-            border-top:none;
-            border-right:none;
+            font-family:"等线","monospace";
+            border-top:1px solid windowtext;
+            border-right:1px solid windowtext;
             border-bottom:1px solid windowtext;
-            border-left:none;
+            border-left:1px solid windowtext;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
@@ -517,10 +526,10 @@
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:11pt;
-            font-weight:400;
+            font-size:16pt;
+            font-weight:700;
             font-style:normal;
-            font-family:"等线","sans-serif";
+            font-family:"等线","monospace";
             border-top:1px solid windowtext;
             border-right:1px solid windowtext;
             border-bottom:1px solid windowtext;
@@ -530,22 +539,6 @@
             mso-protection:locked visible;
         }
         .x26
-        {
-            mso-style-parent:style0;
-            mso-number-format:General;
-            text-align:center;
-            vertical-align:middle;
-            white-space:nowrap;
-            background:auto;
-            mso-pattern:auto;
-            color:#000000;
-            font-size:20pt;
-            font-weight:700;
-            font-style:normal;
-            font-family:"等线","sans-serif";
-            mso-protection:locked visible;
-        }
-        .x27
         {
             mso-style-parent:style0;
             mso-number-format:General;
@@ -567,51 +560,29 @@
             mso-diagonal-up:none;
             mso-protection:locked visible;
         }
-        .x28
+        .x27
         {
             mso-style-parent:style0;
             mso-number-format:General;
-            text-align:center;
+            text-align:left;
             vertical-align:middle;
             white-space:nowrap;
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:11pt;
+            font-size:16pt;
             font-weight:400;
             font-style:normal;
-            font-family:"等线","sans-serif";
-            border-top:1px solid windowtext;
+            font-family:"等线","monospace";
+            border-top:none;
             border-right:none;
             border-bottom:1px solid windowtext;
-            border-left:1px solid windowtext;
-            mso-diagonal-down:none;
-            mso-diagonal-up:none;
-            mso-protection:locked visible;
-        }
-        .x29
-        {
-            mso-style-parent:style0;
-            mso-number-format:General;
-            text-align:center;
-            vertical-align:middle;
-            white-space:nowrap;
-            background:auto;
-            mso-pattern:auto;
-            color:#000000;
-            font-size:11pt;
-            font-weight:400;
-            font-style:normal;
-            font-family:"等线","sans-serif";
-            border-top:1px solid windowtext;
-            border-right:1px solid windowtext;
-            border-bottom:1px solid windowtext;
             border-left:none;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
         }
-        .x30
+        .x28
         {
             mso-style-parent:style0;
             mso-number-format:General;
@@ -627,7 +598,7 @@
             font-family:"等线","monospace";
             mso-protection:locked visible;
         }
-        .x31
+        .x29
         {
             mso-style-parent:style0;
             mso-number-format:General;
@@ -637,32 +608,32 @@
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:11pt;
-            font-weight:400;
+            font-size:12pt;
+            font-weight:700;
             font-style:normal;
             font-family:"等线","monospace";
             border-top:1px solid windowtext;
-            border-right:none;
+            border-right:1px solid windowtext;
             border-bottom:1px solid windowtext;
             border-left:1px solid windowtext;
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
         }
-        .x32
+        .x30
         {
             mso-style-parent:style0;
             mso-number-format:General;
             text-align:center;
             vertical-align:middle;
-            white-space:nowrap;
+            /*white-space:nowrap;*/
             background:auto;
             mso-pattern:auto;
             color:#000000;
-            font-size:11pt;
+            font-size:12pt;
             font-weight:400;
             font-style:normal;
-            font-family:"等线","monospace";
+            font-family:"等线","sans-serif";
             border-top:1px solid windowtext;
             border-right:1px solid windowtext;
             border-bottom:1px solid windowtext;
@@ -670,6 +641,7 @@
             mso-diagonal-down:none;
             mso-diagonal-up:none;
             mso-protection:locked visible;
+            white-space: normal;
         }
         -->
     </style>
@@ -702,60 +674,158 @@
 </head>
 <body link=blue vlink=purple >
 
-<table border=0 cellpadding=0 cellspacing=0 width=1027 style='border-collapse:
- collapse;table-layout:fixed;width:770pt;margin: auto' id="app">
-    <col width=180 style='mso-width-source:userset;width:135pt'>
-    <col width=113 span=2 style='mso-width-source:userset;width:84.75pt'>
-    <col width=105 style='mso-width-source:userset;width:78.75pt'>
-    <col width=102 style='mso-width-source:userset;width:76.5pt'>
-    <col width=167 style='mso-width-source:userset;width:125.25pt'>
-    <col width=247 style='mso-width-source:userset;width:185.25pt'>
-    <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r0'>
-        <td colspan=7 height=55 class=x30 width=1027 style='height:41.5pt;'>[[${sysuser.dept.deptName}]]国家秘密载体信息表</td>
+<table border=0 cellpadding=0 cellspacing=0 width=1038 style='border-collapse:
+ collapse;table-layout:fixed;width:778pt;margin: auto' id="app">
+    <col width=95 style='mso-width-source:userset;width:71.25pt'>
+    <col width=169 style='mso-width-source:userset;width:126.75pt'>
+    <col width=118 style='mso-width-source:userset;width:88.5pt'>
+    <col width=104 style='mso-width-source:userset;width:78pt'>
+    <col width=118 style='mso-width-source:userset;width:88.5pt'>
+    <col width=66 style='mso-width-source:userset;width:49.5pt'>
+    <col width=118 style='mso-width-source:userset;width:88.5pt'>
+    <col width=65 style='mso-width-source:userset;width:48.75pt'>
+    <col width=118 style='mso-width-source:userset;width:88.5pt'>
+    <col width=67 style='mso-width-source:userset;width:50.25pt'>
+    <tr height=30 style='mso-height-source:userset;height:22.5pt' id='r0'>
+        <td colspan=10 height=30 class=x28 width=1038 style='height:22.5pt;'>[[${sysuser.dept.deptName}]]国家秘密载体信息表</td>
     </tr>
-    <tr height=55 style='mso-height-source:userset;height:41.5pt' id='r1'>
-        <td colspan=2 height=54 class=x27 style='border-bottom:1px solid windowtext;height:40.75pt;'>单位：[[${sysuser.dept.deptName}]]</td>
-        <td class=x22></td>
-        <td class=x23></td>
-        <td class=x23></td>
-        <td class=x24><span style='float:right' id="dqdate"></span></td>
+    <tr height=26 style='mso-height-source:userset;height:19.5pt' id='r1'>
+        <td colspan=4 height=25 class=x26 style='border-bottom:1px solid windowtext;height:18.75pt;'>单位：[[${sysuser.dept.deptName}]]</td>
         <td class=x21></td>
+        <td class=x21></td>
+        <td class=x21></td>
+        <td colspan=3 class=x27 style='border-bottom:1px solid windowtext;' id="dqdate">日期：</td>
+    </tr>
+    <tr height=31 style='mso-height-source:userset;height:23.5pt' id='r2'>
+        <td colspan=2 rowspan=2 height=59 class=x25 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:44.5pt;'>国家秘密载体制作</td>
+        <td colspan=2 rowspan=2 height=59 class=x25 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:44.5pt;'>国家秘密载体收发</td>
+        <td colspan=2 rowspan=2 height=59 class=x25 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:44.5pt;'>国家秘密载体使用</td>
+        <td colspan=2 rowspan=2 height=59 class=x25 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:44.5pt;'>国家秘密载体保存</td>
+        <td colspan=2 rowspan=2 height=59 class=x25 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:44.5pt;'>国家秘密载体销毁</td>
     </tr>
-    <tr height=34 style='mso-height-source:userset;height:26pt' id='r2'>
-        <td colspan=2 height=32 class=x31 style='font-weight:bold;border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:24.5pt;'>所属地市</td>
-        <td colspan=2 class=x31 style='font-weight:bold;border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>所属区县</td>
-        <td colspan=2 class=x31 style='font-weight:bold;border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>载体名称</td>
-        <td class=x32 style="font-weight:bold;">载体数量</td>
+    <tr height=30 style='mso-height-source:userset;height:22.5pt' id='r3'>
     </tr>
-    <tr height=34 style='mso-height-source:userset;height:26pt' id='r3'>
-        <td colspan=2 height=32 class='x28 frameworkId' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:24.5pt;'>
-            [[${tdCarrier.areaCity}]]
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r4'>
+        <td colspan=2 height=31 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:23.5pt;'>所属地市</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>接收单位</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>使用时间</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>保存地点</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>销毁部门</td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r5'>
+        <td colspan=2 height=31 class='x30 frameworkId' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:23.5pt;'>
+            [[${tdCarrier.areaCity}]]</td>
+        <td colspan=2 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdCarrier.receivingUnits}]]</td>
+        <td colspan=2 class='x30 provideDate' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdCarrier.mentsTime}]]</td>
+        <td colspan=2 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdCarrier.saveLocation}]]</td>
+        <td colspan=2 rowspan=3 height=98 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:73.5pt;'>
+            [[${tdCarrier.destoryDepart}]]
         </td>
-        <td colspan=2 class='x28 areaid' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r6'>
+        <td colspan=2 height=31 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:23.5pt;'>所属区县</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>接收时间</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>使用人员</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>地点要求</td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r7'>
+        <td colspan=2 height=31 class='x30 areaid' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:23.5pt;'>
             [[${tdCarrier.areaDistrict}]]
         </td>
-        <td colspan=2 class=x28 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>
+        <td colspan=2 class='x30 provideDate' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdCarrier.receivingTime}]]</td>
+        <td colspan=2 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdCarrier.usageUser}]]</td>
+        <td colspan=2 rowspan=2 height=64 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:48.5pt;'>
+            [[${tdCarrier.locationRequire}]]
+        </td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r8'>
+        <td colspan=2 height=31 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:23.5pt;'>载体名称</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>接收人员</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>使用要求</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>销毁人员</td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r9'>
+        <td colspan=2 height=31 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:23.5pt;'>
             [[${tdCarrier.carrierName}]]
         </td>
-        <td class=x25>[[${tdCarrier.carrierCount}]]</td>
+        <td colspan=2 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdCarrier.receivingUser}]]</td>
+        <td colspan=2 rowspan=11 height=364 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:273.5pt;'>
+            [[${tdCarrier.mentsUse}]]
+        </td>
+        <td colspan=2 rowspan=2 height=64 class=x25 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:48.5pt;'>国家秘密载体维修</td>
+        <td colspan=2 rowspan=3 height=98 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:73.5pt;'>
+            [[${tdCarrier.destoryUser}]]
+        </td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r10'>
+        <td height=31 class='x24' style='height:23.5pt;'>载体类型</td>
+        <td class='x22  carrierLevel'>[[${tdCarrier.carrierLevel}]]</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>发放单位</td>
     </tr>
-    <tr height=34 style='mso-height-source:userset;height:26pt' id='r4'>
-        <td colspan=2 height=32 class=x31 style='font-weight:bold;border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:24.5pt;'>接收单位</td>
-        <td colspan=2 class=x31 style='font-weight:bold;border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>编号</td>
-        <td colspan=2 class=x31 style='font-weight:bold;border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>发放人员</td>
-        <td class=x32 style="font-weight:bold;">发放时间</td>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r11'>
+        <td height=31 class=x24 style='height:23.5pt;'>载体数量</td>
+        <td class=x22>[[${tdCarrier.carrierCount}]]</td>
+        <td colspan=2 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdCarrier.issuingUnit}]]</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>维护部门</td>
     </tr>
-    <tr height=34 style='mso-height-source:userset;height:26pt' id='r5'>
-        <td colspan=2 height=32 class=x31 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:24.5pt;'>
-            [[${tdCarrier.receivingUnits}]]
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r12'>
+        <td height=31 class=x24 style='height:23.5pt;'>密级</td>
+        <td class='x22 miji'>[[${tdCarrier.carrierSecret}]]</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>发放时间</td>
+        <td colspan=2 rowspan=2 height=64 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:48.5pt;'>
+            [[${tdCarrier.maintainDepart}]]
         </td>
-        <td colspan=2 class=x31 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>
-            [[${tdCarrier.carrierNumber}]]
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>销毁日期</td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r13'>
+        <td height=31 class=x24 style='height:23.5pt;'>紧急程度</td>
+        <td class='x22 jinji'>[[${tdCarrier.carrierExtent}]]</td>
+        <td colspan=2 class='x30 provideDate' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdCarrier.issuingTime}]]</td>
+        <td colspan=2 rowspan=3 height=98 class='x30 provideDate' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:73.5pt;'>
+            [[${tdCarrier.destoryDate}]]
+        </td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r14'>
+        <td height=31 class=x24 style='height:23.5pt;'>编号</td>
+        <td class=x22>[[${tdCarrier.carrierNumber}]]</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>发放人员</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>维护人员</td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r15'>
+        <td height=31 class=x24 style='height:23.5pt;'>保密期限</td>
+        <td class=x22>[[${tdCarrier.carrierTerm}]]</td>
+        <td colspan=2 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdCarrier.issuingUser}]]</td>
+        <td colspan=2 rowspan=2 height=64 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:48.5pt;'>
+            [[${tdCarrier.maintainUser}]]
         </td>
-        <td colspan=2 class=x31 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>
-            [[${tdCarrier.issuingUser}]]
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r16'>
+        <td height=31 class=x24 style='height:23.5pt;'>发放范围</td>
+        <td class=x22>[[${tdCarrier.carrierContent}]]</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>传递方式</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>销毁方式</td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r17'>
+        <td colspan=2 height=31 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:23.5pt;'>定密依据</td>
+        <td colspan=2 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>[[${tdCarrier.deliveryMethod}]]</td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>维护日期</td>
+        <td colspan=2 rowspan=3 height=98 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:73.5pt;'>
+            [[${tdCarrier.destoryManner}]]
+        </td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r18'>
+        <td colspan=2 rowspan=2 height=64 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:48.5pt;'>
+            [[${tdCarrier.carrierAlliance}]]
+        </td>
+        <td colspan=2 class=x29 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>交通工具</td>
+        <td colspan=2 rowspan=2 height=64 class='x30 provideDate' style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;height:48.5pt;'>
+            [[${tdCarrier.maintainDate}]]
+        </td>
+    </tr>
+    <tr height=33 class=x23 style='mso-height-source:userset;height:25pt' id='r19'>
+        <td colspan=2 class=x30 style='border-right:1px solid windowtext;border-bottom:1px solid windowtext;'>
+            [[${tdCarrier.carrierVehicle}]]
         </td>
-        <td class="x32 provideDate">[[${tdCarrier.issuingTime}]]</td>
     </tr>
     <tr>
         <!-- 打印网页时通过hidden-print隐藏元素 -->
@@ -763,7 +833,6 @@
             <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
         </div>
     </tr>
-    <![endif]>
 </table>
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
@@ -795,6 +864,43 @@
             element.innerHTML = conversionDate(new Date(document.querySelector('.provideDate').innerHTML))
         });
     });
+    var carrierLevelData = [[${@dict.getType('sys_provide_level')}]]
+    selectDictLabel(carrierLevelData,'carrierLevel')
+    var mijiData = [[${@dict.getType('sys_file_miji')}]]
+    selectDictLabel(mijiData,'miji')
+    var jinjiData = [[${@dict.getType('sys_file_jinjichengdu')}]]
+    selectDictLabel(jinjiData,'jinji')
+    //字典数据格式化
+    function selectDictLabel(datas, className) {
+        var examinestateToFind = [];
+        document.querySelectorAll(`.${className}`).forEach(function(element) {
+            examinestateToFind.push(element.innerHTML);
+        });
+        examinestateToFind.forEach(function(value) {
+            const foundObject = datas.find(obj => obj.dictValue === value);
+            document.querySelectorAll(`.${className}`).forEach(function(element) {
+                if (element.innerHTML === value) {
+                    element.innerHTML = foundObject ? foundObject.dictLabel : "";
+                }
+            });
+        });
+    }
+</script>
+<script language = 'javascript' type='text/javascript'>
+    function ChangeRowspanHiddenData()
+    {
+        var node;
+        var params=["r2","r5","r7","r9","r12","r13","r15","r17","r18"];
+        for (var i = 0;i < params.length; i++)
+        {
+            node = document.getElementById(params[i]);
+            if (node != null)
+            {
+                node.style.display = "";
+            }
+        }
+    }
+    ChangeRowspanHiddenData();
 </script>
 </body>