完整代码

src/api/grassrootsregistration/bdgldiary.js

@@ -28,7 +28,6 @@ export function addBdgldiary(data) {
 
 // 修改要事日记
 export function updateBdgldiary(data) {
-  console.log(data);
   return request({
     url: '/grassrootsregistration/bdgldiary',
     method: 'put',
@@ -36,6 +35,15 @@ export function updateBdgldiary(data) {
   })
 }
 
+// 审批
+export function updateBdglShenPi(data) {
+  return request({
+    url: '/grassrootsregistration/bdgldiary/update',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除要事日记
 export function delBdgldiary(id) {
   return request({
@@ -51,4 +59,13 @@ export function exportBdgldiary(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 选择页面时间查询当前数据
+export function exportBdgShuju(query) {
+  return request({
+    url: '/grassrootsregistration/bdgldiary/getNumber',
+    method: 'get',
+    params: { date: query }
+  })
+}

src/components/look_word/bdglarmament.vue

@@ -5,24 +5,26 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 20pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin: 0px 0px 20px -30px;
           color: black;
           text-align: center;
+          font-family: 'heiti'
         "
       >
         军械装备登记表（总表）
       </p>
       <p
         style="
-          font-size: 12pt;
-          font-weight: 100;
+          font-size: 16px;
+          font-weight: 600;
           margin: 0px 0px 3px 0px;
           color: black;
+          font-family: 'songti'
         "
       >
-        装备名称：<span style="text-decoration: underline"
+        装备名称：<span style="text-decoration: underline;font-family: 'fangsong'"
           >{{ message.name }}
         </span>
       </p>
@@ -43,8 +45,8 @@
         width="940"
         bordercolor="black"
       >
-        <tbody>
-          <tr class="JR_tr">
+        <tbody style="font-size: 16px;font-weight: 500;">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'songti'">
             <td
               width="37"
               valign="center"
@@ -52,6 +54,7 @@
               nowrap=""
               rowspan="2"
               class="JR_left"
+              style="font-family: 'songti'"
             >
               序<br />号
             </td>
@@ -62,13 +65,13 @@
               nowrap=""
               colspan="3"
             >
-              <p align="center">登记日期</p>
+              <p align="center" style="font-family: 'songti'">登记日期</p>
             </td>
             <td width="47" valign="center" rowspan="2" class="JR_left">
-              <p align="center">单位</p>
+              <p align="center" style="font-family: 'songti'">单位</p>
             </td>
             <td width="47" valign="center" rowspan="2" class="JR_left">
-              <p align="center">编制数</p>
+              <p align="center" style="font-family: 'songti'">编制数</p>
             </td>
             <td
               width="94"
@@ -77,7 +80,7 @@
               rowspan="2"
               class="JR_left"
             >
-              <p align="center">
+              <p align="center" style="font-family: 'songti'">
                 交接依据<br />
                 来 &nbsp;&nbsp;&nbsp;源
               </p>
@@ -89,7 +92,7 @@
               colspan="4"
               class="JR_left"
             >
-              <p align="center">现有数</p>
+              <p align="center" style="font-family: 'songti'">现有数</p>
             </td>
             <td
               width="217"
@@ -98,7 +101,7 @@
               colspan="3"
               class="JR_left"
             >
-              <p align="center">附品、工具、装护具配套情况</p>
+              <p align="center" style="font-family: 'songti'">附品、工具、装护具配套情况</p>
             </td>
             <td
               width="75"
@@ -107,7 +110,7 @@
               rowspan="2"
               class="JR_left"
             >
-              <p align="center">登记人</p>
+              <p align="center" style="font-family: 'songti'">登记人</p>
             </td>
             <td
               width="75"
@@ -116,53 +119,53 @@
               rowspan="2"
               class="JR_left"
             >
-              <p align="center">核对人</p>
+              <p align="center" style="font-family: 'songti'">核对人</p>
             </td>
           </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'songti'">
             <td width="37" valign="center" nowrap="" class="JR_left">
-              <p align="center">年</p>
+              <p align="center" style="font-family: 'songti'">年</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_left">
-              <p align="center">月</p>
+              <p align="center" style="font-family: 'songti'">月</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_left">
-              <p align="center">日</p>
+              <p align="center" style="font-family: 'songti'">日</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_left">
-              <p align="center">合计</p>
+              <p align="center" style="font-family: 'songti'">合计</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_left">
-              <p align="center">完好数</p>
+              <p align="center" style="font-family: 'songti'">完好数</p>
             </td>
             <td width="56" valign="center" nowrap="" class="JR_left">
-              <p align="center">待修数</p>
+              <p align="center" style="font-family: 'songti'">待修数</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_left">
               <p align="center">送修数</p>
             </td>
             <td width="66" valign="center" nowrap="" class="JR_left">
-              <p align="center">标准（套）</p>
+              <p align="center" style="font-family: 'songti'">标准（套）</p>
             </td>
             <td width="56" valign="center" nowrap="" class="JR_left">
-              <p align="center">现有（套）</p>
+              <p align="center" style="font-family: 'songti'">现有（套）</p>
             </td>
             <td width="94" valign="center" nowrap="" class="JR_left">
-              <p align="center">缺陷种类及数量</p>
+              <p align="center" style="font-family: 'songti'">缺陷种类及数量</p>
             </td>
           </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'fangsong'">
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">01</p>
+              <p align="center">{{message.id}}</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">22</p>
+              <p align="center">{{message.recordDate.split('-')[0]}}</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">03</p>
+              <p align="center">{{message.recordDate.split('-')[1]}}</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">08</p>
+              <p align="center">{{message.recordDate.split('-')[2]}}</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_right">
               <p align="center">{{ message.metering }}</p>
@@ -353,7 +356,7 @@
             </td>
           </tr>
           <tr class="JR_tr">
-            <td width="37" valign="center" nowrap="" class="JR_left">
+            <td width="37" valign="center" nowrap="" class="JR_left" style="font-family: 'songti'">
               <p align="center">备注</p>
             </td>
             <td width="869" valign="top" colspan="15" class="JR_right">
@@ -379,6 +382,7 @@ export default {
         ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
+
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);

src/components/look_word/bdglcookbook.vue

@@ -5,14 +5,23 @@
       <p
         style="
           text-align: center;
-          font-size: 22px;
           color: black;
-          font-weight: 550;
+          font-size: 18pt;
+          font-weight: 600;
+          font-family: 'heiti';
         "
       >
         食堂食谱表
       </p>
-      <p style="margin-left: 10px; color: black; font-size: 18px">
+      <p
+        style="
+          font-size: 16px;
+          font-weight: 500;
+          margin-left: 10px;
+          color: black;
+          font-family: 'fangsong';
+        "
+      >
         使用时间:{{ message.startTime }}——{{ message.endTime }}
       </p>
       <table
@@ -41,21 +50,21 @@
           <col width="130" />
           <col width="121" span="3" />
         </colgroup>
-        <tbody>
-          <tr height="45" class="JR_tr">
-            <td colspan="2" align="center" class="JR_left">时间</td>
-            <td width="111" align="center" class="JR_left">星期一</td>
-            <td width="111" align="center" class="JR_left">星期二</td>
-            <td width="111" align="center" class="JR_left">星期三</td>
-            <td width="111" align="center" class="JR_left">星期四</td>
-            <td width="111" align="center" class="JR_left">星期五</td>
-            <td width="111" align="center" class="JR_left">星期六</td>
-            <td width="111" align="center" class="JR_left">星期天</td>
+        <tbody style="font-size: 15px;font-weight: 500;">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+            <td colspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">时间</td>
+            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期一</td>
+            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期二</td>
+            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期三</td>
+            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期四</td>
+            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期五</td>
+            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期六</td>
+            <td width="111" align="center" class="JR_left" style="font-family: 'fangsong'">星期天</td>
           </tr>
 
-          <tr height="45" class="JR_tr">
-            <td width="99" rowspan="4" align="center" class="JR_left">早餐</td>
-            <td width="70" rowspan="2" align="center" class="JR_left">主食</td>
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+            <td width="99" rowspan="4" align="center" class="JR_left" style="font-family: 'fangsong'">早餐</td>
+            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">主食</td>
             <td
               align="center"
               style="white-space: normal; height: 45"
@@ -82,7 +91,7 @@
               炊事员：{{ message.cookbookRegistrations[36].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal">
               {{ message.cookbookRegistrations[0].cookcategoryNames }}
             </td>
@@ -105,8 +114,8 @@
               {{ message.cookbookRegistrations[36].cookcategoryNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
-            <td width="70" rowspan="2" align="center" class="JR_left">副食</td>
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">副食</td>
             <td align="center" style="white-space: normal" class="JR_right">
               炊事员：{{ message.cookbookRegistrations[1].peopleNames }}
             </td>
@@ -129,7 +138,7 @@
               炊事员：{{ message.cookbookRegistrations[37].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[1].cookcategoryNames }}
             </td>
@@ -153,9 +162,9 @@
             </td>
           </tr>
 
-          <tr height="45" class="JR_tr">
-            <td width="99" rowspan="4" align="center" class="JR_left">午餐</td>
-            <td width="70" rowspan="2" align="center" class="JR_left">主食</td>
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+            <td width="99" rowspan="4" align="center" class="JR_left" style="font-family: 'fangsong'">午餐</td>
+            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">主食</td>
             <td align="center" style="white-space: normal" class="JR_right">
               炊事员：{{ message.cookbookRegistrations[2].peopleNames }}
             </td>
@@ -178,7 +187,7 @@
               炊事员：{{ message.cookbookRegistrations[38].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[2].cookcategoryNames }}
             </td>
@@ -201,8 +210,8 @@
               {{ message.cookbookRegistrations[38].cookcategoryNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
-            <td width="70" rowspan="2" align="center" class="JR_left">副食</td>
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">副食</td>
             <td align="center" style="white-space: normal" class="JR_right">
               炊事员：{{ message.cookbookRegistrations[3].peopleNames }}
             </td>
@@ -225,7 +234,7 @@
               炊事员：{{ message.cookbookRegistrations[39].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal">
               {{ message.cookbookRegistrations[3].cookcategoryNames }}
             </td>
@@ -249,9 +258,9 @@
             </td>
           </tr>
 
-          <tr height="45" class="JR_tr">
-            <td width="99" rowspan="4" align="center" class="JR_left">晚餐</td>
-            <td width="70" rowspan="2" align="center" class="JR_left">主食</td>
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+            <td width="99" rowspan="4" align="center" class="JR_left" style="font-family: 'fangsong'">晚餐</td>
+            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">主食</td>
             <td align="center" style="white-space: normal" class="JR_right">
               炊事员：{{ message.cookbookRegistrations[4].peopleNames }}
             </td>
@@ -274,7 +283,7 @@
               炊事员：{{ message.cookbookRegistrations[40].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[4].cookcategoryNames }}
             </td>
@@ -297,8 +306,8 @@
               {{ message.cookbookRegistrations[40].cookcategoryNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
-            <td width="70" rowspan="2" align="center" class="JR_left">副食</td>
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
+            <td width="70" rowspan="2" align="center" class="JR_left" style="font-family: 'fangsong'">副食</td>
             <td align="center" style="white-space: normal" class="JR_right">
               炊事员：{{ message.cookbookRegistrations[5].peopleNames }}
             </td>
@@ -321,7 +330,7 @@
               炊事员：{{ message.cookbookRegistrations[41].peopleNames }}
             </td>
           </tr>
-          <tr height="45" class="JR_tr">
+          <tr height="45" class="JR_tr" style="font-family: 'fangsong'">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[5].cookcategoryNames }}
             </td>
@@ -350,10 +359,11 @@
           style="
             border: none;
             color: black;
-            font-size: 12pt;
-            font-weight: 700;
+            font-size: 16px;
+            font-weight: 500;
             line-height: 30px;
             width: 960px;
+            font-family: 'fangsong'
           "
         >
           <td

src/components/look_word/bdgldiary.vue

@@ -4,11 +4,12 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 14pt;
+          font-size: 16pt;
           font-weight: 600;
-          text-align: left;
+          text-align: center;
           margin-botttom: 30px;
           color: black;
+          font-family: 'songti';
         "
       >
         《连队要事日记》
@@ -22,6 +23,40 @@
         <span style="margin-left: 380px">值班员:{{ message.peopleName }}</span>
       </div> -->
 
+      <table
+        border="none"
+        style="
+          border-collapse: collapse;
+          mso-border-left-alt: 0.5pt solid windowtext;
+          mso-border-top-alt: 0.5pt solid windowtext;
+          mso-border-right-alt: 0.5pt solid windowtext;
+          mso-border-bottom-alt: 0.5pt solid windowtext;
+          mso-border-insideh: 0.5pt solid windowtext;
+          mso-border-insidev: 0.5pt solid windowtext;
+          mso-padding-alt: 0pt 0pt 0pt 0pt;
+          width: 960px;
+          margin-left: -20px;
+          color: black;
+          font-size: 16px;
+          font-weight: 500;
+          border: none;
+        "
+      >
+        <tr
+          height="30"
+          align="center"
+          style="border: none; font-family: 'songti'"
+        >
+          <td colspan="3" height="40" style="border: none;font-family: 'fangsong'">
+            {{ message.blogDate | dataFormat }}
+          </td>
+          <td colspan="2" style="border: none;font-family: 'songti'"><span style="font-family: 'fangsong'">{{ week }}</span> </td>
+          <td colspan="6" style="border: none;font-family: 'songti'">天气：<span style="font-family: 'fangsong'">{{ message.weather }}</span></td>
+          <td colspan="3" style="border: none;font-family: 'songti'">
+            值班员: <span style="font-family: 'fangsong'">{{ message.peopleName }}</span> 
+          </td>
+        </tr>
+      </table>
       <table
         border="1"
         style="
@@ -38,42 +73,51 @@
           margin-left: -20px;
           border-color: black;
           color: black;
+          font-size: 16px;
+          font-weight: 500;
         "
       >
-        <tr height="30" align="center">
-          <td colspan="3" height="40">{{ message.blogDate }}</td>
-          <td colspan="2">星期</td>
-          <td colspan="6">天气：{{ message.weather }}</td>
-          <td colspan="3">值班员:{{ message.peopleName }}</td>
-        </tr>
         <!-- 实力 -->
-        <tr class="JR_tr" height="30" align="center">
-          <td colspan="2" rowspan="2" class="JR_left">实力</td>
-          <td colspan="6" style="letter-spacing: 20px" class="JR_left">
+        <tr
+          class="JR_tr"
+          height="30"
+          align="center"
+          style="font-family: 'songti'"
+        >
+          <td colspan="2" rowspan="2" class="JR_left" style="font-family: 'songti'">实力</td>
+          <td colspan="6" style="letter-spacing: 20px;font-family: 'songti'" class="JR_left">
             编制人数
           </td>
-          <td colspan="6" style="letter-spacing: 20px" class="JR_left">
+          <td colspan="6" style="letter-spacing: 20px;font-family: 'songti'" class="JR_left">
             现有人数
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td width="68" class="JR_left">干部</td>
-          <td width="68" class="JR_left">{{ message.orgcadre }}</td>
-          <td width="68" class="JR_left">战士</td>
-          <td width="68" class="JR_left">{{ message.orgsoldier }}</td>
-          <td width="68" class="JR_left">合计</td>
-          <td width="68" class="JR_left"></td>
-          <td width="68" class="JR_left">干部</td>
-          <td width="68" class="JR_left">{{ message.nowcadre }}</td>
-          <td width="68" class="JR_left">战士</td>
-          <td width="68" class="JR_left">{{ message.nowsoldier }}</td>
-          <td width="68" class="JR_left">合计</td>
-          <td width="68" class="JR_left"></td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">干部</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">
+            {{ message.orgcadre }}
+          </td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">战士</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">
+            {{ message.orgsoldier }}
+          </td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">合计</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'"></td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">干部</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">
+            {{ message.nowcadre }}
+          </td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">战士</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">
+            {{ message.nowsoldier }}
+          </td>
+          <td width="68" class="JR_left" style="font-family: 'songti'">合计</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'"></td>
         </tr>
         <!-- 训练、教育或者执行其他任务情况 -->
         <tr class="JR_tr" height="20" align="center">
           <td rowspan="6" class="JR_left">
-            <p align="center" style="margin: 0 15px">
+            <p align="center" style="margin: 0 15px; font-family: 'songti'">
               训 <br />
               练 <br />
               、 <br />
@@ -91,79 +135,133 @@
               况
             </p>
           </td>
-          <td rowspan="2" width="68" class="JR_left">区分</td>
+          <td
+            rowspan="2"
+            width="68"
+            class="JR_left"
+            style="font-family: 'songti'"
+          >
+            区分
+          </td>
           <td
             colspan="9"
             rowspan="2"
-            style="letter-spacing: 60px"
+            style="letter-spacing: 60px; font-family: 'fangsong'"
             class="JR_left"
+            align="center"
           >
             内容
           </td>
-          <td colspan="3" class="JR_left">人数</td>
+          <td colspan="3" class="JR_left" style="font-family: 'songti'">人数</td>
         </tr>
-        <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left">应到</td>
-          <td class="JR_left">实到</td>
-          <td class="JR_left">到课率</td>
+        <tr
+          class="JR_tr"
+          height="30"
+          align="center"
+          
+        >
+          <td class="JR_left" style="font-family: 'songti'">应到</td>
+          <td class="JR_left" style="font-family: 'songti'">实到</td>
+          <td class="JR_left" style="font-family: 'songti'">到课率</td>
         </tr>
         <tr
+          style="font-family: 'fangsong'"
           class="JR_tr"
           height="70"
           align="center"
           v-for="(items, index) in message.weekworkRegisters"
           :key="index"
+          v-show="message.weekworkRegisters.length > 0"
         >
-          <td class="JR_left">{{ items.dateline }}</td>
+          <td class="JR_right" height="70">{{ items.dateline }}</td>
           <td colspan="9" v-html="items.contents"></td>
-          <td class="JR_right">{{ items.shouldArrive }}</td>
-          <td class="JR_right">{{ items.realTo }}</td>
-          <td class="JR_right">{{ items.percentage }}</td>
+          <td class="JR_right" height="70">{{ items.shouldArrive }}</td>
+          <td class="JR_right" height="70">{{ items.realTo }}</td>
+          <td class="JR_right" height="70">{{ items.percentage }}</td>
         </tr>
-        <!-- <tr class="JR_tr" height="70" align="center">
-          <td class="JR_left">上午</td>
+        <tr
+          class="JR_tr"
+          height="70"
+          align="center"
+          v-if="message.weekworkRegisters == null"
+        >
+          <td class="JR_left" height="70" style="font-family: 'songti'">早晨</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
         </tr>
-        <tr class="JR_tr" height="70" align="center">
-          <td class="JR_left">下午</td>
+        <tr
+          class="JR_tr"
+          height="70"
+          align="center"
+          v-if="message.weekworkRegisters == null"
+        >
+          <td class="JR_left" height="70" style="font-family: 'songti'">上午</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
         </tr>
-        <tr class="JR_tr" height="70" align="center">
-          <td class="JR_left">晚上</td>
+        <tr
+          class="JR_tr"
+          height="70"
+          align="center"
+          v-if="message.weekworkRegisters == null"
+        >
+          <td class="JR_left" height="70" style="font-family: 'songti'">下午</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
-        </tr> -->
+        </tr>
+        <tr
+          class="JR_tr"
+          height="70"
+          align="center"
+          v-if="message.weekworkRegisters == null"
+        >
+          <td class="JR_left" height="70" style="font-family: 'songti'">晚上</td>
+          <td class="JR_right" colspan="9"></td>
+          <td class="JR_right"></td>
+          <td class="JR_right"></td>
+          <td class="JR_right"></td>
+        </tr>
         <!-- 公差勤务 -->
         <tr class="JR_tr">
-          <td colspan="2"><p align="center" class="JR_left">公差勤务</p></td>
-          <td colspan="12" class="JR_right" v-html="message.tolerance">
-            <p></p>
+          <td colspan="2">
+            <p align="center" class="JR_left" style="font-family: 'songti'">
+              公差勤务
+            </p>
           </td>
+          <td
+            style="font-family: 'fangsong'"
+            colspan="12"
+            class="JR_right"
+            v-html="message.tolerance"
+          ></td>
         </tr>
         <tr class="JR_tr">
           <!-- 人员装备变动 -->
           <td colspan="2" class="JR_left">
-            <p align="center">
+            <p align="center" style="font-family: 'songti'">
               人员或 <br />
               装备变动
             </p>
           </td>
-          <td colspan="12" class="JR_right" v-html="message.transfer">
+          <td
+            style="font-family: 'fangsong'"
+            colspan="12"
+            class="JR_right"
+            v-html="message.transfer"
+          >
             <p></p>
           </td>
         </tr>
         <!-- 武器装备检查情况 -->
         <tr class="JR_tr">
           <td height="150" rowspan=":count($xlian)" colspan="2" class="JR_left">
-            <p align="center">
+            <p align="center" style="font-family: 'songti'">
               武 内 <br />
               器 务 <br />
               装 卫 <br />
@@ -175,39 +273,44 @@
               记 <br />
             </p>
           </td>
-          <td colspan="12" class="JR_right" v-html="message.internal">
+          <td
+            style="font-family: 'fangsong'"
+            colspan="12"
+            class="JR_right"
+            v-html="message.internal"
+          >
             <p></p>
           </td>
         </tr>
         <!-- 查铺查哨 -->
-        <tr class="JR_tr">
+        <tr class="JR_tr" style="font-family: 'songti'" >
           <td :rowspan="chapu" class="JR_left">
-            <p align="center">
+            <p align="center" style="font-family: 'songti'">
               查 <br />
               铺 <br />
               查 <br />
               哨
             </p>
           </td>
-          <td class="JR_left"><p align="center">检查人</p></td>
-          <td class="JR_left"><p align="center">时　间</p></td>
-          <td class="JR_left"><p align="center">领班员</p></td>
-          <td class="JR_left" colspan="2"><p align="center">卫兵姓名</p></td>
+          <td class="JR_left" ><p align="center" style="font-family: 'songti'">检查人</p></td>
+          <td class="JR_left"><p align="center" style="font-family: 'songti'">时　间</p></td>
+          <td class="JR_left"><p align="center" style="font-family: 'songti'">领班员</p></td>
+          <td class="JR_left" colspan="2"><p align="center" style="font-family: 'songti'">卫兵姓名</p></td>
           <td class="JR_left" colspan="8">
-            <p align="center" style="letter-spacing: 20px">检　查　情　况</p>
+            <p align="center" style="letter-spacing: 20px;font-family: 'songti'" >检　查　情　况</p>
           </td>
         </tr>
         <tr
           v-for="(item, i) in message.inspect"
           :key="i"
           class="JR_tr"
-          height="30"
+          style="font-family: 'fangsong'"
         >
           <td class="JR_right">
             <p align="center">{{ item.peopleName }}</p>
           </td>
           <td class="JR_right">
-            <p align="center">{{ item.examineDate }}</p>
+            <p align="center">{{ item.examineDate | dataFormat }}</p>
           </td>
           <td class="JR_right">
             <p align="center">{{ item.foremanName }}</p>
@@ -234,64 +337,83 @@
           <td class="JR_right" colspan="8"><p align="center"></p></td>
         </tr> -->
         <!-- 派班情况 -->
-        <tr class="JR_tr">
+        <tr class="JR_tr" style="font-family: 'songti'">
           <td class="JR_left" rowspan="4">
-            <p align="center">
+            <p align="center" style="font-family: 'songti'">
               派 <br />
               班 <br />
               情 <br />
               况
             </p>
           </td>
-          <td class="JR_left"><p align="center">职务</p></td>
-          <td class="JR_left"><p align="center">交班者</p></td>
-          <td class="JR_left"><p align="center">接班者</p></td>
-          <td class="JR_left" colspan="2"><p align="center">组织者</p></td>
+          <td class="JR_left"><p align="center" style="font-family: 'songti'">职务</p></td>
+          <td class="JR_left"><p align="center" style="font-family: 'songti'">交班者</p></td>
+          <td class="JR_left"><p align="center" style="font-family: 'songti'">接班者</p></td>
+          <td class="JR_left" colspan="2"><p align="center" style="font-family: 'songti'">组织者</p></td>
           <td class="JR_left" colspan="8">
-            <p align="center" style="letter-spacing: 20px">交 接　情　况</p>
+            <p align="center" style="letter-spacing: 20px;font-family: 'songti'" >交 接　情　况</p>
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left">值班员</td>
+          <td class="JR_left" style="font-family: 'songti'">值班员</td>
           <td class="JR_right">
-            <p align="center">{{ message.dutya }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutya }}
+            </p>
           </td>
           <td class="JR_right">
-            <p align="center">{{ message.dutya }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutya }}
+            </p>
           </td>
           <td class="JR_right" colspan="2">
-            <p align="center">{{ message.dutylead }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutylead }}
+            </p>
           </td>
           <td class="JR_right" colspan="8"><p align="center"></p></td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left">值日员</td>
+          <td class="JR_left" style="font-family: 'songti'">值日员</td>
           <td class="JR_right">
-            <p align="center">{{ message.dutyc }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutyc }}
+            </p>
           </td>
           <td class="JR_right">
-            <p align="center">{{ message.dutyd }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutyd }}
+            </p>
           </td>
-          <td class="JR_left" colspan="2" rowspan="2">
-            {{ message.dutyDate }}<br />
+          <td
+            class="JR_left"
+            colspan="2"
+            rowspan="2"
+            style="font-family: 'fangsong'"
+          >
+            {{ message.dutyDate | dataFormat }}<br />
           </td>
           <td class="JR_right" colspan="8"></td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left">厨房值班</td>
+          <td class="JR_left" style="font-family: 'songti'">厨房值班</td>
           <td class="JR_right">
-            <p align="center">{{ message.dutye }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutye }}
+            </p>
           </td>
           <td class="JR_right">
-            <p align="center">{{ message.dutyf }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutyf }}
+            </p>
           </td>
-          <td class="JR_right" colspan="8"></td>
+          <td class="JR_right" colspan="8" style="font-family: 'fangsong'"></td>
         </tr>
 
         <!-- 临时来队亲属 -->
-        <tr class="JR_tr" height="30">
-          <td rowspan="4" class="JR_left">
-            <p align="center" style="margin: 0 15px">
+        <tr class="JR_tr" height="30" style="font-family: 'songti'">
+          <td :rowspan="qinshu" class="JR_left">
+            <p align="center" style="margin: 0 15px;font-family: 'songti'">
               临 <br />
               时 <br />
               来 <br />
@@ -301,55 +423,85 @@
             </p>
           </td>
           <td class="JR_left" height="30" rowspan="2">
-            <p align="center">军人姓名</p>
+            <p align="center" style="font-family: 'songti'">军人姓名</p>
           </td>
           <td class="JR_left" height="30" rowspan="2">
-            <p align="center">亲属姓名</p>
+            <p align="center" style="font-family: 'songti'">亲属姓名</p>
           </td>
           <td class="JR_left" height="30" rowspan="2">
-            <p align="center">关&nbsp; 系</p>
+            <p align="center" style="font-family: 'songti'">关&nbsp; 系</p>
           </td>
           <td class="JR_left" height="30" colspan="2">
-            <p align="center">时　间</p>
+            <p align="center" style="font-family: 'songti'">时　间</p>
           </td>
-          <td class="JR_left" height="30" colspan="10" >
-            <p align="center" style="letter-spacing: 16px">
+          <td class="JR_left" height="30" colspan="8">
+            <p align="center" style="letter-spacing: 10px;font-family: 'songti'">
               病 号 及 处 理 情 况
             </p>
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left" height="30">来队</td>
-          <td class="JR_left" height="30">离队</td>
+          <td class="JR_left" height="30" style="font-family: 'songti'">来队</td>
+          <td class="JR_left" height="30" style="font-family: 'songti'">离队</td>
           <td
+            style="font-family: 'fangsong'"
             class="JR_right"
             height="30"
-            colspan="10"
-            rowspan="3"
+            colspan="8"
+            :rowspan="qinshu2"
             v-html="message.invalid"
           >
-            <p align="left"></p>
+            <p align="left" style="font-family: 'fangsong'"></p>
           </td>
-          
         </tr>
-        <tr class="JR_tr" v-for="(item1, i) in message.kinsfolk" :key="i">
+        <tr
+          style="font-family: 'fangsong'"
+          class="JR_tr"
+          v-for="(item1, i) in message.kinsfolk"
+          :key="i"
+          v-show="message.kinsfolk.length > 0"
+        >
           <td class="JR_right" height="30">
             <p align="center">{{ item1.peopleName }}</p>
           </td>
           <td class="JR_right" height="30">
             <p align="center">{{ item1.name }}</p>
           </td>
+
           <td class="JR_right" height="30">
             <p align="center">{{ item1.relation }}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.comeDate }}</p>
+            <p align="center">{{ item1.comeDate | dataFormat }}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.leaveDate }}</p>
-          </td>    
+            <p align="center">{{ item1.leaveDate | dataFormat }}</p>
+          </td>
         </tr>
-       
+
+        <tr
+          style="font-family: 'fangsong'"
+          class="JR_tr"
+          v-if="message.kinsfolk == null || message.kinsfolk.length == 0"
+        >
+          <td class="JR_right" height="30">
+            <p align="center"></p>
+          </td>
+          <td class="JR_right" height="30">
+            <p align="center"></p>
+          </td>
+
+          <td class="JR_right" height="30">
+            <p align="center"></p>
+          </td>
+          <td class="JR_right" height="30">
+            <p align="center"></p>
+          </td>
+          <td class="JR_right" height="30">
+            <p align="center"></p>
+          </td>
+        </tr>
+
         <tr></tr>
         <!-- <tr class="JR_tr" height="30">
           <td class="JR_right" height="30"><p align="center"></p></td>
@@ -359,9 +511,14 @@
           <td class="JR_right" height="30"><p align="center"></p></td>
         </tr> -->
         <!-- 请假外出休假 -->
-        <tr class="JR_tr" align="center" height="30">
+        <tr
+          class="JR_tr"
+          align="center"
+          height="30"
+          style="font-family: 'songti'"
+        >
           <td rowspan="6" class="JR_left">
-            <p align="center" style="margin: 0 15px">
+            <p align="center" style="margin: 0 15px;font-family: 'songti'">
               请 <br />
               假 <br />
               外 <br />
@@ -373,31 +530,31 @@
               假
             </p>
           </td>
-          <td class="JR_left">姓&nbsp; 名</td>
-          <td class="JR_left">职&nbsp; 务</td>
-          <td class="JR_left" colspan="2">事&nbsp;&nbsp;&nbsp; 由</td>
-          <td class="JR_left" colspan="2">
+          <td class="JR_left" style="font-family: 'songti'">姓&nbsp; 名</td>
+          <td class="JR_left" style="font-family: 'songti'">职&nbsp; 务</td>
+          <td class="JR_left" colspan="2" style="font-family: 'songti'">事&nbsp;&nbsp;&nbsp; 由</td>
+          <td class="JR_left" colspan="2" style="font-family: 'songti'">
             时数或 <br />
             天&nbsp; 数
           </td>
-          <td class="JR_left" colspan="2">
+          <td class="JR_left" colspan="2" style="font-family: 'songti'">
             准假部 <br />
             门(人)
           </td>
-          <td class="JR_left" colspan="2">
+          <td class="JR_left" colspan="2" style="font-family: 'songti'">
             离 队 <br />
             时 间
           </td>
-          <td class="JR_left" colspan="2">
+          <td class="JR_left" colspan="2" style="font-family: 'songti'">
             归 队 <br />
             时 间
           </td>
-          <td class="JR_left" colspan="3">
+          <td class="JR_left" colspan="3" style="font-family: 'songti'">
             超(误)假 <br />
             时(天)数
           </td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -407,7 +564,7 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -417,7 +574,7 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -427,7 +584,7 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -437,7 +594,7 @@
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="3"><p align="center"></p></td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <tr class="JR_tr" height="30" style="font-family: 'fangsong'">
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
@@ -449,8 +606,8 @@
         </tr>
         <!-- 上级通知 -->
         <tr class="JR_tr">
-          <td class="JR_left" width="101">
-            <p align="center" style="margin: 0 15px">
+          <td class="JR_left" width="101" style="font-family: 'songti'">
+            <p align="center" style="margin: 0 15px;font-family: 'songti'">
               上 <br />
               级 <br />
               通 <br />
@@ -470,16 +627,67 @@
           <td
             class="JR_right"
             colspan="15"
-            style="white-space: normal"
+            style="white-space: normal; font-family: 'fangsong'"
             v-html="message.notice"
           ></td>
         </tr>
       </table>
 
-      <span style="margin-left: 48px; color: black">连队首长签字:</span>
-      <span style="margin-left: 615px; color: black; letter-spacing: 15px"
-        >&nbsp;&nbsp;时&nbsp;&nbsp;&nbsp;&nbsp;分</span
+      <table
+        border="none"
+        style="
+          border-collapse: collapse;
+          mso-border-left-alt: 0.5pt solid windowtext;
+          mso-border-top-alt: 0.5pt solid windowtext;
+          mso-border-right-alt: 0.5pt solid windowtext;
+          mso-border-bottom-alt: 0.5pt solid windowtext;
+          mso-border-insideh: 0.5pt solid windowtext;
+          mso-border-insidev: 0.5pt solid windowtext;
+          mso-padding-alt: 0pt 0pt 0pt 0pt;
+          width: 960px;
+          margin-left: -20px;
+          color: black;
+          font-size: 16px;
+          font-weight: 500;
+          border: none;
+        "
+      >
+        <tr
+          height="30"
+          style="border: none; font-family: 'songti'"
+        ><td colspan="3" style="border: none"></td>
+          <td colspan="6" style="border: none"></td>
+          <td colspan="2" height="40" style="border:none">
+           <p style="border: none;font-family: 'songti'">连队首长签字:</p> 
+          </td>
+          
+          <td colspan="3" style="border: none;font-family: 'songti'" >
+            <p style="border: none;font-family: 'songti'">&nbsp;&nbsp;时&nbsp;&nbsp;&nbsp;&nbsp;分</p>
+            
+          </td>
+        </tr>
+      </table>
+      <!-- <span
+        style="
+          margin-left: 48px;
+          color: black;
+          font-family: 'fangsong';
+          font-size: 16px;
+          font-weight: 600;
+        "
+        >连队首长签字:</span
       >
+      <span
+        style="
+          margin-left: 615px;
+          color: black;
+          letter-spacing: 15px;
+          font-family: 'fangsong';
+          font-size: 16px;
+          font-weight: 600;
+        "
+        >&nbsp;&nbsp;时&nbsp;&nbsp;&nbsp;&nbsp;分</span
+      > -->
     </div>
   </div>
 </template>
@@ -495,13 +703,16 @@ export default {
       style:
         ".JR_tr {height: 40px;};.JR_left{text-align:center;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
       chapu: 4,
+      qinshu: 4,
+      week: "",
+      qinshu2: 2,
     };
   },
   created() {
-    // this.chapu();
-    // this.chapus();
     this.chapu = this.chapus();
-    // console.log(this.chapus());
+    this.qinshu = this.qinshus();
+    this.week = this.getWeek(this.message.blogDate);
+    this.qinshu2 = this.qinshus2();
   },
   methods: {
     daochu() {
@@ -509,9 +720,43 @@ export default {
     },
     chapus() {
       return this.message.inspect.length + 1;
-      // if (this.message.inspect.lenght > 3) {
-      //   this.chapu += this.message.inspect.lenght - 3;
-      // }
+    },
+    qinshus() {
+      return this.message.kinsfolk.length + 2;
+    },
+
+    qinshus2() {
+      return this.message.kinsfolk.length + 2;
+    },
+
+    /*
+      获取当前星期几
+     */
+    getWeek(dateString) {
+      var dateArray = dateString.split("-");
+      var date = new Date(
+        dateArray[0],
+        parseInt(dateArray[1] - 1),
+        dateArray[2]
+      );
+      return "星期" + "日一二三四五六".charAt(date.getDay());
+    },
+
+    /*
+      标准时间转换格式
+     */
+    getDate(timesDate) {
+      var date = new Date(timesDate);
+      var y = date.getFullYear();
+      var m = date.getMonth() + 1;
+      m = m < 10 ? "0" + m : m;
+      var d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      var h = date.getHours();
+      var minute = date.getMinutes();
+      minute = minute < 10 ? "0" + minute : minute;
+      let time = y + "-" + m + "-" + d; //这里如果不需要小时 分  后边的可以不需要拼接
+      return time;
     },
   },
 };
@@ -538,4 +783,5 @@ tr:last-child {
   border: 1px solid rgb(129, 130, 131);
   border-radius: 5px;
 }
+
 </style>

src/components/look_word/bdgldrill.vue

@@ -5,21 +5,23 @@
       <!-- <div class="fTitle">大队连务会记录本</div> -->
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin-botttom: 30px;
           color: black;
+          font-family: 'heiti'
         "
       >
         《军事训练登记簿》
       </p>
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           color: black;
           text-align: center;
           margin-bottom: 5px;
+          font-family: 'heiti'
         "
       >
         <span class="a1">月</span> 日军事训练登记表
@@ -44,82 +46,82 @@
         width="960"
         bordercolor="black"
       >
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 500;">
           <tr class="JR_tr">
             <th width="101" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">训练类别</p>
+              <p align="center" style="margin: 20px 0;font-family: 'heiti'">训练类别</p>
             </th>
             <th width="113" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">训练内容</p>
+              <p align="center" style="margin: 20px 0;font-family: 'heiti'">训练内容</p>
             </th>
             <th width="120" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">训练时间</p>
+              <p align="center" style="margin: 20px 0;font-family: 'heiti'">训练时间</p>
             </th>
             <th width="85" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">训练地点</p>
+              <p align="center" style="margin: 20px 0;font-family: 'heiti'">训练地点</p>
             </th>
             <th width="114" nowrap="" colspan="2" class="JR_left">
-              <p align="center" style="margin: 5px 0">参训兵力</p>
+              <p align="center" style="margin: 5px 0;font-family: 'heiti'">参训兵力</p>
             </th>
             <th width="68" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">参训率</p>
+              <p align="center" style="margin: 20px 0;font-family: 'heiti'">参训率</p>
             </th>
             <th width="115" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">效果（成绩）</p>
+              <p align="center" style="margin: 20px 0;font-family: 'heiti'">效果（成绩）</p>
             </th>
             <th width="104" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">消耗</p>
+              <p align="center" style="margin: 20px 0;font-family: 'heiti'">消耗</p>
             </th>
             <th width="70" nowrap="" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 20px 0">备注</p>
+              <p align="center" style="margin: 20px 0;font-family: 'heiti'">备注</p>
             </th>
           </tr>
           <tr class="JR_tr">
             <th width="57" nowrap="" class="JR_left">
-              <p align="center">应训</p>
+              <p align="center" style="font-family: 'heiti'">应训</p>
             </th>
-            <th width="57" class="JR_left"><p align="center">实训</p></th>
+            <th width="57" class="JR_left"><p align="center" style="font-family: 'heiti'">实训</p></th>
           </tr>
 
           <tr class="JR_tr">
             <td width="101" class="JR_right">
-              <p align="center" style="margin: 10px 0">
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
                 {{ message.project }}
                 <!-- <span style="display: none">111</span> -->
               </p>
             </td>
             <td width="113" class="JR_right">
-              <p align="center">{{ message.contents }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.contents }}</p>
             </td>
             <!--<td width="85"><p align="center">2021-12-15</p></td>-->
             <td width="85" class="JR_right">
-              <p align="center" style="margin: 10px 0">
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
                 {{ message.drillTime }}
                 <!-- <span style="display: none"></span> -->
               </p>
             </td>
             <td width="85" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.address }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.address }}</p>
             </td>
             <td width="57" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.oughtTo }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.oughtTo }}</p>
             </td>
             <td width="57" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.actual }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.actual }}</p>
             </td>
             <td width="68" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0">
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
                 {{ message.probability }}
               </p>
             </td>
             <td width="104" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.result }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.result }}</p>
             </td>
             <td width="104" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.expend }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.expend }}</p>
             </td>
             <td width="83" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0">{{ message.remark }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.remark }}</p>
             </td>
           </tr>
 
@@ -236,9 +238,10 @@
           font-weight: 900;
           margin: 10px 50px 20px 700px;
           color: black;
+          font-family: 'heiti'
         "
       >
-        军事主管：
+        军事主管：{{message.peopleName}}
       </div>
     </div>
   </div>
@@ -273,7 +276,7 @@ tr:last-child {
   border-bottom: 1px solid;
 }
 .a1 {
-  margin-right: 50px;
+  margin-right: 30px;
 }
 .box1 {
   position: absolute;

src/components/look_word/bdglequip.vue

@@ -5,10 +5,11 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin: 0px 0px 20px -30px;
           color: black;
+font-family: 'heiti'
         "
       >
         《训练器材、教材登记簿》
@@ -17,11 +18,12 @@
       <p
         align="left"
         style="
-          font-size: 14pt;
-          font-weight: 400;
+          font-size: 15pt;
+          font-weight: 500;
           color: black;
           margin-left: -20px;
           margin-bottom: 5px;
+          font-family: 'heiti'
         "
       >
         审核：
@@ -45,84 +47,84 @@
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">顶级分类-训练器材、教材登记簿</p>-->
 
-        <tbody>
+        <tbody  style="font-size: 16px;font-weight: 500;">
           <tr class="JR_tr">
             <td width="37" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="">序<br />号</p>
+              <p align="center" style="font-family: 'heiti'">序<br />号</p>
             </td>
             <td width="66" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="">类别</p>
+              <p align="center" style="font-family: 'heiti'">类别</p>
             </td>
             <td width="85" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="">名称</p>
+              <p align="center" style="font-family: 'heiti'">名称</p>
             </td>
             <td width="274" valign="center" colspan="5" class="JR_left">
-              <p align="center">库存情况</p>
+              <p align="center" style="font-family: 'heiti'">库存情况</p>
             </td>
             <td width="179" valign="center" colspan="3" class="JR_left">
-              <p align="center">入库情况</p>
+              <p align="center" style="font-family: 'heiti'">入库情况</p>
             </td>
             <td width="179" valign="center" colspan="3" class="JR_left">
-              <p align="center">出库情况</p>
+              <p align="center" style="font-family: 'heiti'">出库情况</p>
             </td>
             <td width="56" valign="center" rowspan="2" class="JR_left">
-              <p align="center">质量<br />状况</p>
+              <p align="center" style="font-family: 'heiti'">质量<br />状况</p>
             </td>
             <td width="56" valign="center" rowspan="2" class="JR_left">
-              <p align="center">备注</p>
+              <p align="center" style="font-family: 'heiti'">备注</p>
             </td>
           </tr>
           <tr class="JR_tr">
             <td width="66" valign="center" class="JR_left">
-              <p align="center">
+              <p align="center" style="font-family: 'heiti'">
                 配发 <br />
                 单位
               </p>
             </td>
             <td width="56" valign="center" class="JR_left">
-              <p align="center">
+              <p align="center" style="font-family: 'heiti'">
                 配发 <br />
                 时间
               </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" style="t" class="JR_left">
+              <p align="center" style="font-family: 'heiti'" class="JR_left">
                 配发<br />
                 数量
               </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" style="" class="JR_left">
+              <p align="center" style="font-family: 'heiti'" class="JR_left">
                 自筹<br />
                 数量
               </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" style="" class="JR_left">
+              <p align="center" style="font-family: 'heiti'" class="JR_left">
                 库存<br />
                 数量
               </p>
             </td>
             <td width="56" valign="center">
-              <p align="center" class="JR_left">时间</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">时间</p>
             </td>
             <td width="47" valign="center">
-              <p align="center" class="JR_left">数量</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">数量</p>
             </td>
             <td width="75" valign="center">
-              <p align="center" class="JR_left">经手人</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">经手人</p>
             </td>
             <td width="56" valign="center">
-              <p align="center" class="JR_left">时间</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">时间</p>
             </td>
             <td width="47" valign="center">
-              <p align="center" class="JR_left">数量</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">数量</p>
             </td>
             <td width="75" valign="center">
-              <p align="center" class="JR_left">经手人</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">经手人</p>
             </td>
           </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-family: 'fangsong'">
             <td width="37" valign="center">
               <p align="center">{{ message.id }}</p>
             </td>
@@ -172,8 +174,8 @@
               <p align="center" class="JR_right">{{ message.info }}</p>
             </td>
           </tr>
-          <tr class="JR_tr">
-            <td width="37" valign="center" style="">
+          <tr class="JR_bottom">
+            <td width="37" valign="center" style="font-family: 'heiti'">
               <p align="center">
                 填<br />
                 写<br />
@@ -181,7 +183,7 @@
                 明 <br />
               </p>
             </td>
-            <td width="897" valign="center" colspan="15" v-html="message.info">
+            <td width="897" valign="center" colspan="15" v-html="message.info" style="font-family: 'fangsong'">
               <p></p>
             </td>
           </tr>
@@ -200,7 +202,7 @@
             class="JR_right"
             colspan="6"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'heiti'"
           >
             军事主官：
           </td>
@@ -208,7 +210,7 @@
             class="JR_right"
             colspan="7"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'heiti'"
           >
             政治主官：
           </td>
@@ -216,7 +218,7 @@
             class="JR_right"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'heiti'"
           >
             时间：
           </td>

src/components/look_word/bdgleven.vue

@@ -2,12 +2,12 @@
   <div>
     <el-button class="box1" @click="daochu">导出</el-button>
 
-    <div class="word" id="contents" style="font-family: 'fangsong'">
+    <div class="word" id="contents" style="font-family: 'heiti'">
       <!-- <div class="fTitle">大队连务会记录本</div> -->
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin-botttom: 30px;
           color: black;
           text-align: center;
@@ -29,60 +29,61 @@
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
         "
-        width="600"
+        width="500"
         align="center"
         bordercolor="black"
+        
       >
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 500;">
           <tr class="JR_tr">
             <td
               width="80"
               class="JR_left"
-              style="border-right: 1px dashed #999"
+              style="border-right: 1px dashed #999;font-family: 'heiti'"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;&nbsp;&nbsp;&nbsp;间</p>
             </td>
-            <td class="JR_right">
+            <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
                 {{ message.convokeTime }}
               </p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'heiti'">
               <p align="center">&nbsp;&nbsp;地 &nbsp;&nbsp;&nbsp;&nbsp;点</p>
             </td>
-            <td class="JR_right">
+            <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
                 {{ message.address }}
               </p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'heiti'">
               <p align="center">&nbsp;&nbsp;出席人</p>
             </td>
-            <td class="JR_right">
+            <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
                 {{ message.joinId }}
               </p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'heiti'">
               <p align="center">&nbsp;&nbsp;主持人</p>
             </td>
-            <td class="JR_right">
+            <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
                 {{ message.compereRen }}
               </p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'heiti'">
               <p align="center">&nbsp;&nbsp;记录人</p>
             </td>
-            <td class="JR_right">
+            <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
                 {{ message.peopleJiLu }}
               </p>
@@ -90,7 +91,7 @@
           </tr>
 
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'heiti'">
               <p align="right" style="text-align: center; line-height: 20px">
                 议<br />题
               </p>
@@ -98,14 +99,14 @@
             <td
               class="JR_right"
               align="left"
-              style="line-height: 20px; text-indent: 30px"
+              style="line-height: 20px; text-indent: 30px;font-family: 'fangsong'"
               v-html="message.title"
             >
               <!-- {{ message.title }} -->
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left">
+            <td class="JR_left" style="font-family: 'heiti'">
               <p align="right" style="text-align: center; line-height: 20px">
                 会<br />议<br />内<br />容
               </p>
@@ -113,7 +114,7 @@
             <td
               align="left"
               class="JR_right"
-              style="line-height: 20px; text-indent: 30px"
+              style="line-height: 20px; text-indent: 30px;font-family: 'fangsong'"
               v-html="message.contents"
             ></td>
           </tr>
@@ -122,7 +123,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'heiti'"
             >
               <p style="text-align: right; padding-right: 80px">主持人：</p>
             </td>
@@ -131,7 +132,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'heiti'"
             >
               <p style="text-align: right; padding-right: 80px">记录人：</p>
             </td>
@@ -140,7 +141,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'heiti'"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">　　　　年　　月　　日</p>-->
               <p style="text-align: right; padding-right: 80px">时间：</p>

src/components/look_word/bdglfilemanagement.vue

@@ -5,10 +5,11 @@
       <!-- <div class="fTitle">大队连务会记录本</div> -->
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin-botttom: 30px;
           color: black;
+          font-family: 'heiti'
         "
       >
         《文件管理登记本》
@@ -35,12 +36,12 @@
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">文件管理登记本</p>-->
 
-        <tbody>
-          <tr class="JR_tr">
+        <tbody  style="font-size: 16px;font-weight: 500;">
+          <tr class="JR_tr" >
             <th width="174" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">文件名称</font></font
+                  ><font style="vertical-align: inherit;font-family: 'heiti'">文件名称</font></font
                 >
               </p>
             </th>
@@ -48,7 +49,7 @@
             <th width="125" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">文件编号</font></font
+                  ><font style="vertical-align: inherit;font-family: 'heiti'">文件编号</font></font
                 >
               </p>
             </th>
@@ -56,7 +57,7 @@
             <th width="95" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">收文日期</font></font
+                  ><font style="vertical-align: inherit;font-family: 'heiti'">收文日期</font></font
                 >
               </p>
             </th>
@@ -64,7 +65,7 @@
             <th width="57" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">密级</font></font
+                  ><font style="vertical-align: inherit;font-family: 'heiti'">密级</font></font
                 >
               </p>
             </th>
@@ -72,7 +73,7 @@
             <th width="57" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">份数</font></font
+                  ><font style="vertical-align: inherit;font-family: 'heiti'">份数</font></font
                 >
               </p>
             </th>
@@ -80,7 +81,7 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">签收人</font></font
+                  ><font style="vertical-align: inherit;font-family: 'heiti'">签收人</font></font
                 >
               </p>
             </th>
@@ -88,7 +89,7 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">借阅人</font></font
+                  ><font style="vertical-align: inherit;font-family: 'heiti'">借阅人</font></font
                 >
               </p>
             </th>
@@ -96,7 +97,7 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit"> 借阅时间 </font></font
+                  ><font style="vertical-align: inherit;font-family: 'heiti'"> 借阅时间 </font></font
                 >
               </p>
             </th>
@@ -104,7 +105,7 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit"> 归还时间 </font></font
+                  ><font style="vertical-align: inherit;font-family: 'heiti'"> 归还时间 </font></font
                 >
               </p>
             </th>
@@ -112,7 +113,7 @@
             <th width="59" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit">注销</font></font
+                  ><font style="vertical-align: inherit;font-family: 'heiti'">注销</font></font
                 >
               </p>
             </th>
@@ -120,43 +121,43 @@
 
           <tr class="JR_tr">
             <td width="174" valign="center" class="JR_right">
-              <p align="center" style="margin: 20px 0">{{ message.name }}</p>
+              <p align="center" style="margin: 20px 0;font-family: 'fangsong'">{{ message.name }}</p>
             </td>
 
             <td width="125" valign="center" class="JR_right">
-              <p align="center">{{ message.number }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.number }}</p>
             </td>
 
             <td width="95" valign="center" class="JR_right">
-              <p align="center">{{ message.incomingDispatchesTime }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.incomingDispatchesTime }}</p>
             </td>
 
             <td width="57" valign="center" class="JR_right">
-              <p align="center">{{ message.confidential }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.confidential }}</p>
             </td>
 
             <td width="57" valign="center" class="JR_right">
-              <p align="center">{{ message.copies }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.copies }}</p>
             </td>
 
             <td width="85" valign="center" class="JR_right">
-              <p align="center">{{ message.peopleName }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.peopleName }}</p>
             </td>
 
             <td width="85" valign="center" class="JR_right">
-              <p align="center">{{ message.borrowName }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.borrowName }}</p>
             </td>
 
             <td width="85" valign="center" class="JR_right">
-              <p align="center">{{ message.loanTime }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.loanTime }}</p>
             </td>
 
             <td width="85" valign="center" class="JR_right">
-              <p align="center">{{ message.returnTime }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.returnTime }}</p>
             </td>
 
             <td width="59" valign="center" class="JR_right">
-              <p align="center">{{ message.logoutName }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.logoutName }}</p>
             </td>
           </tr>
 

src/components/look_word/bdglfood.vue

@@ -4,10 +4,11 @@
     <div class="word" id="contents" style="margin-top: 10px">
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin-botttom: 30px;
           color: black;
+          font-family: 'heiti'
         "
       >
         《伙食管理登记簿》
@@ -42,6 +43,7 @@
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
           margin-left: -20px;
+          font-size: 16px;font-weight: 500;
         "
         width="960"
         align="center"
@@ -49,359 +51,359 @@
       >
         <tr
           class="aaa"
-          style="border: none; color: black; font-size: 12pt; line-height: 30px"
+          style="border: none; color: black; font-size: 12pt; line-height: 30px;font-family: 'songti'"
         >
           <td
             class="JR_right"
             colspan="5"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'songti'"
           >
-            日期：{{ message.recordDate }}
+            日期：<span style="font-family: 'fangsong'"> {{ message.recordDate }}</span>
           </td>
           <td
             class="JR_right"
             colspan="8"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'songti'"
           >
-            星期：
+            {{ week }}
           </td>
           <td
             class="JR_right"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'songti'"
           >
             单位：千克、元
           </td>
         </tr>
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 500;">
           <!-- 区分早中晚一日三餐 -->
-          <tr style="text-align: center" class="JR_tr">
-            <td colspan="2" class="JR_left" style="widt: 60px">区 分</td>
+          <tr style="text-align: center;font-family: 'songti'" class="JR_tr" >
+            <td colspan="2" class="JR_left" style="widt: 60px;font-family: 'songti'" >区 分</td>
             <td colspan="3" class="JR_left">
-              <p align="center">主食</p>
+              <p align="center" style="font-family: 'songti'">主食</p>
             </td>
             <td colspan="11" class="JR_left">
-              <p align="center">菜谱</p>
+              <p align="center" style="font-family: 'songti'">菜谱</p>
             </td>
           </tr>
 
-          <tr class="JR_tr">
-            <td colspan="2" class="JR_left"><p align="center">早</p></td>
-            <td colspan="3" style="color: black" class="JR_right">
+          <tr class="JR_tr" >
+            <td colspan="2" class="JR_left"><p align="center" style="font-family: 'songti'">早</p></td>
+            <td colspan="3" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].stapleFood }}</p>
             </td>
-            <td colspan="11" style="color: black" class="JR_right">
+            <td colspan="11" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].menu }}</p>
             </td>
           </tr>
 
           <tr class="JR_tr">
-            <td colspan="2" class="JR_left"><p align="center">中</p></td>
-            <td colspan="3" style="color: black" class="JR_right">
+            <td colspan="2" class="JR_left"><p align="center" style="font-family: 'songti'">中</p></td>
+            <td colspan="3" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].stapleFood }}</p>
             </td>
-            <td colspan="11" style="color: v" class="JR_right">
+            <td colspan="11" style="font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].menu }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td colspan="2" class="JR_left"><p align="center">晚</p></td>
-            <td colspan="3" style="color: v" class="JR_right">
+            <td colspan="2" class="JR_left"><p align="center" style="font-family: 'songti'">晚</p></td>
+            <td colspan="3" style="font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].stapleFood }}</p>
             </td>
-            <td colspan="11" style="color: v" class="JR_right">
+            <td colspan="11" style="font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].menu }}</p>
             </td>
           </tr>
 
-          <tr style="text-align: center" class="JR_tr">
+          <tr style="text-align: center;font-family: 'songti'" class="JR_tr">
             <td rowspan="2" colspan="2" class="JR_left">
-              <p align="center" style="">区<br />分</p>
+              <p align="center" style="font-family: 'songti'">区<br />分</p>
             </td>
             <td width="" colspan="3" class="JR_left">
-              <p align="center">就餐人数</p>
+              <p align="center" style="font-family: 'songti'">就餐人数</p>
             </td>
             <td width="" colspan="11" class="JR_left">
-              <p align="center">当日消耗</p>
+              <p align="center" style="font-family: 'songti'">当日消耗</p>
             </td>
           </tr>
 
-          <tr class="JR_tr">
-            <td width="" class="JR_left"><p align="center">总数</p></td>
-            <td width="" class="JR_left"><p align="center">连队</p></td>
-            <td width="" class="JR_left"><p align="center">外来</p></td>
+          <tr class="JR_tr" style="font-family: 'songti'">
+            <td width="" class="JR_left"><p align="center" style="font-family: 'songti'">总数</p></td>
+            <td width="" class="JR_left"><p align="center" style="font-family: 'songti'">连队</p></td>
+            <td width="" class="JR_left"><p align="center" style="font-family: 'songti'">外来</p></td>
             <td width="60px" class="JR_left">
-              <p align="center">面<br />粉</p>
+              <p align="center" style="font-family: 'songti'">面<br />粉</p>
             </td>
             <td width="60px" class="JR_left">
-              <p align="center">大<br />米</p>
+              <p align="center" style="font-family: 'songti'">大<br />米</p>
             </td>
             <td width="60px" class="JR_left">
-              <p align="center">肉<br />类</p>
+              <p align="center" style="font-family: 'songti'">肉<br />类</p>
             </td>
             <td width="60px" colspan="" class="JR_left">
-              <p align="center">鱼禽<br />类</p>
+              <p align="center" style="font-family: 'songti'">鱼禽<br />类</p>
             </td>
             <td width="60px" class="JR_left">
-              <p align="center">食<br />油</p>
+              <p align="center" style="font-family: 'songti'">食<br />油</p>
             </td>
             <td width="60px" colspan="" class="JR_left">
-              <p align="center">黄<br />豆</p>
+              <p align="center" style="font-family: 'songti'">黄<br />豆</p>
             </td>
             <td width="60px" colspan="" class="JR_left">
-              <p align="center">蔬<br />菜</p>
+              <p align="center" style="font-family: 'songti'">蔬<br />菜</p>
             </td>
             <td width="60px" class="JR_left">
-              <p align="center">水果<br />（奶）</p>
+              <p align="center" style="font-family: 'songti'">水果<br />（奶）</p>
             </td>
             <td width="60px" colspan="" class="JR_left">
-              <p align="center">糖</p>
+              <p align="center" style="font-family: 'songti'">糖</p>
             </td>
             <td width="60px">
-              <p align="center" class="JR_left">调<br />料</p>
+              <p align="center" class="JR_left" style="font-family: 'songti'">调<br />料</p>
             </td>
             <td width="60px" colspan="">
-              <p align="center" class="JR_left">燃<br />料</p>
+              <p align="center" class="JR_left" style="font-family: 'songti'">燃<br />料</p>
             </td>
           </tr>
 
           <tr class="JR_tr">
             <td width="" colspan="2" class="JR_left">
-              <p align="center">早</p>
+              <p align="center" style="font-family: 'songti'">早</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].jiucanCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].lianduiCount }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].wailaiCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].mianfen }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].dami }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].rolei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].yulei }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].youlei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].huangdo }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].suchai }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].shuiguo }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].tang }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].tiaoliao }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[0].ranliao }}</p>
             </td>
           </tr>
 
           <tr class="JR_tr">
             <td colspan="2" width="" class="JR_left">
-              <p align="center">中</p>
+              <p align="center" style="font-family: 'songti'">中</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].jiucanCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].lianduiCount }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].wailaiCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].mianfen }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].dami }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].rolei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].yulei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].youlei }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].huangdo }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].suchai }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].shuiguo }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].tang }}</p>
             </td>
 
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].tiaoliao }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[1].ranliao }}</p>
             </td>
           </tr>
 
           <tr class="JR_tr">
             <td colspan="2" width="" class="JR_left">
-              <p align="center">晚</p>
+              <p align="center" style="font-family: 'songti'">晚</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].jiucanCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].lianduiCount }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].wailaiCount }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].mianfen }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].dami }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].rolei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].yulei }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].youlei }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].huangdo }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].suchai }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].shuiguo }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].tang }}</p>
             </td>
-            <td width="" style="color: black" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].tiaoliao }}</p>
             </td>
-            <td width="" style="color: black" colspan="" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="" class="JR_right">
               <p align="center">{{ message.bdglFoodMeal[2].ranliao }}</p>
             </td>
           </tr>
           <!-- 此处实物检验查收 -->
           <tr class="JR_tr">
             <td width="" colspan="16" class="JR_left">
-              <p align="center">实物检查验收</p>
+              <p align="center" style="font-family: 'songti'">实物检查验收</p>
             </td>
           </tr>
-          <tr class="JR_tr">
-            <td width="" class="JR_left"><p align="center">区分</p></td>
+          <tr class="JR_tr" style="font-family: 'songti'">
+            <td width="" class="JR_left"><p align="center" style="font-family: 'songti'">区分</p></td>
             <td width="" colspan="3" class="JR_left">
-              <p align="center">品名</p>
+              <p align="center" style="font-family: 'songti'">品名</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center">重量</p>
+              <p align="center" style="font-family: 'songti'">重量</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center">单价</p>
+              <p align="center" style="font-family: 'songti'">单价</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center">金额</p>
+              <p align="center" style="font-family: 'songti'">金额</p>
             </td>
             <td width="" colspan="3" class="JR_left">
-              <p align="center">购买或自产</p>
+              <p align="center" style="font-family: 'songti'">购买或自产</p>
             </td>
             <td width="" colspan="3" class="JR_left">
-              <p align="center">备注</p>
+              <p align="center" style="font-family: 'songti'">备注</p>
             </td>
           </tr>
 
           <tr class="JR_tr" v-for="(item, i) in message.bdglFoodKinds" :key="i">
             <td width="" rowspan="" class="JR_left">
-              <p align="center">
+              <p align="center" style="font-family: 'songti'">
                 {{ i == 0 ? "主食" : i == 1 ? "副食" : "其他" }}
               </p>
             </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="3" class="JR_right">
               <p align="center">{{ item.name }}</p>
             </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="2" class="JR_right">
               <p align="center">
                 {{ item.distinctions }}
               </p>
             </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="2" class="JR_right">
               <p align="center">{{ item.weight }}</p>
             </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="2" class="JR_right">
               <p align="center">{{ item.money }}</p>
             </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="3" class="JR_right">
               <p align="center">{{ item.types }}</p>
             </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
+            <td width="" style="color: black;font-family: 'fangsong'" colspan="3" class="JR_right">
               <p align="center">{{ item.money }}</p>
             </td>
           </tr>
 
           <!-- 退交伙食费- -->
-          <tr class="JR_tr" style="text-align: center">
+          <tr class="JR_tr" style="text-align: center;font-family: 'songti'">
             <td width="" colspan="1" rowspan="2" class="JR_left">
-              <p align="center" style="">姓名</p>
+              <p align="center" style="font-family: 'songti'">姓名</p>
             </td>
             <td width="" colspan="7" class="JR_left">
-              <p align="center">交伙食费</p>
+              <p align="center" style="font-family: 'songti'">交伙食费</p>
             </td>
             <td width="" colspan="2" rowspan="2" class="JR_left">
-              <p align="center" style="">姓名</p>
+              <p align="center" style="font-family: 'songti'">姓名</p>
             </td>
             <td width="" colspan="6" class="JR_left">
-              <p align="center">退伙食费</p>
+              <p align="center" style="font-family: 'songti'">退伙食费</p>
             </td>
           </tr>
 
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-family: 'songti'">
             <td width="" colspan="3" class="JR_left">
-              <p align="center">天数</p>
+              <p align="center" style="font-family: 'songti'">天数</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="">标准</p>
+              <p align="center" style="font-family: 'songti'">标准</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="">金额</p>
+              <p align="center" style="font-family: 'songti'">金额</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center">天数</p>
+              <p align="center" style="font-family: 'songti'">天数</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="">标准</p>
+              <p align="center" style="font-family: 'songti'">标准</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center" style="">金额</p>
+              <p align="center" style="font-family: 'songti'">金额</p>
             </td>
           </tr>
 
@@ -409,7 +411,7 @@
             v-for="(item, i) in by_reset"
             :key="i"
             class="JR_tr"
-            style="text-align: center; line-height: 47px"
+            style="text-align: center; line-height: 47px;font-family: 'fangsong'"
           >
             <td colspan="1" class="JR_right">
               {{ item.peopleName }}
@@ -418,29 +420,29 @@
             <td colspan="2" class="JR_right">{{ item.standard }}</td>
             <td colspan="2" class="JR_right">{{ item.money }}</td>
 
-            <td colspan="2" v-show="isWho" class="JR_right">
+            <td colspan="2" v-if="isWho" class="JR_right">
               {{ reset[i].peopleName }}
             </td>
-            <td colspan="2" v-show="isWho" class="JR_right">
+            <td colspan="2" v-if="isWho" class="JR_right">
               {{ reset[i].sky }}
             </td>
-            <td colspan="2" v-show="isWho" class="JR_right">
+            <td colspan="2" v-if="isWho" class="JR_right">
               {{ reset[i].standard }}
             </td>
-            <td colspan="2" v-show="isWho" class="JR_right">
+            <td colspan="2" v-if="isWho" class="JR_right">
               {{ reset[i].money }}
             </td>
 
-            <td colspan="2" v-show="!isWho" class="JR_right">
+            <td colspan="2" v-if="!isWho" class="JR_right">
               {{ by[i].peopleName }}
             </td>
-            <td colspan="2" v-show="!isWho" class="JR_right">
+            <td colspan="2" v-if="!isWho" class="JR_right">
               {{ by[i].sky }}
             </td>
-            <td colspan="2" v-show="!isWho" class="JR_right">
+            <td colspan="2" v-if="!isWho" class="JR_right">
               {{ by[i].standard }}
             </td>
-            <td colspan="2" v-show="!isWho" class="JR_right">
+            <td colspan="2" v-if="!isWho" class="JR_right">
               {{ by[i].money }}
             </td>
           </tr>
@@ -448,61 +450,62 @@
           <!-- 在食堂购物 -->
           <tr class="JR_tr">
             <td width="" colspan="16" class="JR_left">
-              <p align="center">在食堂购物</p>
+              <p align="center" style="font-family: 'songti'">在食堂购物</p>
             </td>
           </tr>
-          <tr class="JR_tr" style="text-align: center; line-height: 47px">
+          <tr class="JR_tr" style="text-align: center; line-height: 47px;font-family: 'songti'">
             <td width="" rowspan="2" colspan="2" class="JR_left">
-              <p align="center">姓名</p>
+              <p align="center" style="font-family: 'songti'">姓名</p>
             </td>
             <td width="" colspan="4" class="JR_left">
-              <p align="center">主食</p>
+              <p align="center" style="font-family: 'songti'">主食</p>
             </td>
             <td width="" colspan="4" class="JR_left">
-              <p align="center">副食</p>
+              <p align="center" style="font-family: 'songti'">副食</p>
             </td>
             <td width="" colspan="4" class="JR_left">
-              <p align="center">其他</p>
+              <p align="center" style="font-family: 'songti'">其他</p>
             </td>
             <td width="" rowspan="2" colspan="2" class="JR_left">
-              <p align="center">合计</p>
+              <p align="center" style="font-family: 'songti'">合计</p>
             </td>
           </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-family: 'songti'">
             <td width="" colspan="2" class="JR_left">
-              <p align="center">品名</p>
+              <p align="center" style="font-family: 'songti'">品名</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center">重量</p>
+              <p align="center" style="font-family: 'songti'">重量</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center">金额</p>
+              <p align="center" style="font-family: 'songti'">金额</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center">品名</p>
+              <p align="center" style="font-family: 'songti'">品名</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center">重量</p>
+              <p align="center" style="font-family: 'songti'">重量</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center">金额</p>
+              <p align="center" style="font-family: 'songti'">金额</p>
             </td>
             <td width="" colspan="2" class="JR_left">
-              <p align="center">品名</p>
+              <p align="center" style="font-family: 'songti'">品名</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center">重量</p>
+              <p align="center" style="font-family: 'songti'">重量</p>
             </td>
             <td width="" colspan="1" class="JR_left">
-              <p align="center">金额</p>
+              <p align="center" style="font-family: 'songti'">金额</p>
             </td>
           </tr>
 
           <tr
             class="JR_tr"
-            v-for="(item, i) in message.bdglFoodShoppings"
-            :key="i"
+            v-for="(item) in message.bdglFoodShoppings"
+            :key="item.id"
             height="50"
+            style="font-family: 'fangsong'"
           >
             <td width="" colspan="2" class="JR_right">
               <p align="center">
@@ -544,8 +547,8 @@
           </tr>
 
           <tr class="JR_tr">
-            <td width="" colspan="2" class="JR_left">
-              <p align="center">
+            <td width="" colspan="2" class="JR_left" style="font-family: 'songti'">
+              <p align="center" style="font-family: 'songti'">
                 炊<br />
                 事<br />
                 人<br />
@@ -558,30 +561,29 @@
               </p>
             </td>
             <td
-              width=""
+              style="font-family: 'fangsong'"
               colspan="6"
-              style=""
               v-html="message.contents"
               class="JR_right"
             >
               <p></p>
             </td>
             <td width="" style="padding: 48px 5px" class="JR_left">
-              <p align="center">
+              <p align="center" style="font-family: 'songti'">
                 帮<br />
                 厨<br />
                 人<br />
                 员
               </p>
             </td>
-            <td width="" colspan="7" style="" class="JR_right">
+            <td width="" colspan="7" style="font-family: 'fangsong'" class="JR_right">
               <p align="center">{{ message.peopleNames }}</p>
             </td>
           </tr>
 
           <tr class="JR_tr">
             <td width="" colspan="2" class="JR_left">
-              <p align="center">
+              <p align="center" style="font-family: 'songti'">
                 就<br />
                 餐<br />
                 人<br />
@@ -594,7 +596,7 @@
               class="JR_right"
               width=""
               colspan="14"
-              style="text-align: center"
+              style="text-align: center;font-family: 'fangsong'"
               v-html="message.repastContent"
             >
               <p align="center"></p>
@@ -603,31 +605,31 @@
         </tbody>
         <tr
           class="aaa"
-          style="border: none; color: black; font-size: 12pt; line-height: 30px"
+          style="border: none; color: black; font-size: 12pt; line-height: 30px;font-family: 'songti'"
         >
           <td
             class="JR_right"
             colspan="6"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'songti'"
           >
-            单位首长：{{ message.people1Name }}
+            单位首长：<span style="font-family: 'fangsong'">{{ message.people1Name }}</span> 
           </td>
           <td
             class="JR_right"
             colspan="6"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'songti'"
           >
-            经委会主任：{{ message.chairmanName }}
+            经委会主任：<span style="font-family: 'fangsong'">{{ message.chairmanName }}</span> 
           </td>
           <td
             class="JR_right"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'songti'"
           >
-            值班员：{{ message.peopleName }}
+            值班员：<span style="font-family: 'fangsong'"> {{ message.peopleName }}</span>
           </td>
         </tr>
       </table>
@@ -669,6 +671,7 @@ export default {
         peopleId: "",
         sky: "",
         standard: "",
+        weel:"",
       },
       by: [],
       reset: [],
@@ -677,6 +680,7 @@ export default {
   },
   created() {
     this.isWhy();
+    this.week = this.getWeek(this.message.recordDate);
   },
   methods: {
     daochu() {
@@ -692,6 +696,9 @@ export default {
           this.reset.push(this.message.bdglFoodBoardWagess[item]);
         }
       }
+      console.log(this.by,111);
+      console.log(this.reset,222);
+
       if (this.by.length > this.by_reset || this.reset.length > this.by_reset) {
         console.log(this.by.length);
         if (this.by.length >= this.reset.length) {
@@ -713,6 +720,18 @@ export default {
         }
       }
     },
+    /*
+      获取当前星期几
+     */
+    getWeek(dateString) {
+      var dateArray = dateString.split("-");
+      var date = new Date(
+        dateArray[0],
+        parseInt(dateArray[1] - 1),
+        dateArray[2]
+      );
+      return "星期" + "日一二三四五六".charAt(date.getDay());
+    },
   },
 };
 </script>

src/components/look_word/bdglmeeting.vue

@@ -4,11 +4,12 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin-botttom: 30px;
           color: black;
           text-align: center;
+          font-family: 'heiti'
         "
       >
         《团支部工作记录本》
@@ -26,14 +27,14 @@
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
         "
-        width="600"
+        width="500"
         align="center"
         bordercolor="black"
       >
-        <tbody>
+        <tbody  style="font-size: 16px;font-weight: 500;">
           <tr class="JR_tr">
-            <th class="" colspan="2">
-              <h4 align="center" style="text-align: center">
+            <th class="" colspan="2" >
+              <h4 align="center"  style="font-size: 18px;font-weight: 500;font-family: 'kaiti'">
                 团支部委员会会议
               </h4>
             </th>
@@ -42,110 +43,110 @@
             <td
               width="120"
               class="JR_left"
-              style="border-right: 1px dashed #fff"
+              style="border-right: 1px dashed #fff;font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;间：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.convokeTime }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;地 &nbsp;点：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.address }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;主持人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.compereRen }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;参加人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.joinId }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;列席人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.peopleIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;缺席人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.absentIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;记录人：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.peopleJiLu }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #fff">
+            <td class="JR_left" style="border-right: 1px dashed #fff;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;议 &nbsp;题：</p>
             </td>
             <td
               class="JR_right"
               align="left"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
               v-html="message.title"
             >
               <!-- <p>{{ message.title }}</p> -->
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: none">
+            <td class="JR_left" style="border-right: none;font-family: 'kaiti'">
               <p align="center">&nbsp; 内 &nbsp;容：</p>
             </td>
             <td
               align="left"
-              style="border-left: none; padding-left: 20px"
+              style="border-left: none; padding-left: 20px;font-family: 'fangsong'"
               class="JR_right"
               v-html="message.contents"
             ></td>
@@ -155,7 +156,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <p style="text-align: right; padding-right: 80px">主持人：</p>
             </td>
@@ -164,16 +165,16 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
-              <p style="text-align: right; padding-right: 80px">主持人：</p>
+              <p style="text-align: right; padding-right: 80px">记录人：</p>
             </td>
           </tr>
           <tr class="JR_tr">
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">　　　　年　　月　　日</p>-->
               <p style="text-align: right; padding-right: 80px">时间：</p>

src/components/look_word/bdglparty.vue

@@ -2,11 +2,11 @@
   <div>
     <el-button class="box1" @click="daochu">导出</el-button>
 
-    <div class="word" id="contents">
+    <div class="word" id="contents" style="font-family: 'kaiti'">
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin-botttom: 30px;
           color: black;
           text-align: center;
@@ -31,10 +31,10 @@
         align="center"
         bordercolor="black"
       >
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 500;">
           <tr class="JR_tr">
-            <th class="" colspan="2">
-              <h4 align="center" style="text-align: center">
+            <th class="" colspan="2" style="font-family: 'kaiti'">
+              <h4 align="center" style="font-size: 18px;font-weight: 500;font-family: 'kaiti'">
                 党支部委员会议(简称支委会)
               </h4>
             </th>
@@ -43,14 +43,14 @@
             <td
               width="120"
               class="JR_left"
-              style="border-right: 1px dashed #999"
+              style="border-right: 1px dashed #999;font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;间：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.convokeTime }}</p>
             </td>
@@ -59,74 +59,74 @@
             <td
               align="left"
               class="JR_left"
-              style="border-right: 1px dashed #999"
+              style="border-right: 1px dashed #999;font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;地 &nbsp;点：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.address }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999">
+            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;主持人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.compereRen }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999">
+            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;参加人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.joinId }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999">
+            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;列席人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.peopleIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999">
+            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;缺席人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.absentIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 1px dashed #999">
+            <td class="JR_left" style="border-right: 1px dashed #999;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;记录人：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 1px dashed #999; padding-left: 20px"
+              style="border-left: 1px dashed #999; padding-left: 20px;font-family: 'fangsong'"
             >
               <p>{{ message.peopleJiLu }}</p>
             </td>
@@ -136,13 +136,13 @@
             <td
               rowspan="2"
               class="JR_left"
-              style="border-right: 1px dashed #999"
+              style="border-right: 1px dashed #999;font-family: 'kaiti'"
             >
               <p align="center">&nbsp;&nbsp;议 &nbsp;题：</p>
             </td>
             <td
               rowspan="2"
-              style="border-left: 1px dashed #999; padding: 0px 20px"
+              style="border-left: 1px dashed #999; padding: 0px 20px;font-family: 'fangsong'"
               align="left"
               v-html="message.title"
             >
@@ -151,7 +151,7 @@
           </tr>
           <tr class="JR_tr"></tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp; 内 &nbsp;容：</p>
             </td>
             <td class="TableData" style="border-left: 0"></td>
@@ -165,6 +165,7 @@
                 text-indent: 30px;
                 padding: 0px 10px;
                 border: 1px solid black;
+                font-family: 'fangsong'
               "
             ></td>
           </tr>
@@ -173,7 +174,7 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <p style="text-align: right; padding-right: 80px">主持人：</p>
             </td>
@@ -182,16 +183,16 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
-              <p style="text-align: right; padding-right: 80px">主持人：</p>
+              <p style="text-align: right; padding-right: 80px">记录人：</p>
             </td>
           </tr>
           <tr class="JR_tr">
             <td
               colspan="2"
               class="JR_bottom"
-              style="border-left: 1px solid black"
+              style="border-left: 1px solid black;font-family: 'kaiti'"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">　　　　年　　月　　日</p>-->
               <p style="text-align: right; padding-right: 80px">时间：</p>

src/components/look_word/bdglpublicproperty.vue

@@ -4,10 +4,11 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin: 0px 0px 20px -30px;
           color: black;
+          font-family: 'heiti'
         "
       >
         《营产、公物管理登记簿》
@@ -29,54 +30,54 @@
           mso-padding-alt: 0pt 0pt 0pt 0pt;
           margin-left: -10px;
         "
-        width="940"
+        width="960"
         bordercolor="black"
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">营产，公物管理登记簿</p>-->
-        <tbody>
-          <tr class="JR_tr">
+        <tbody style="font-size: 15px;font-weight: 500;">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 600;font-family: 'heiti'">
             <th width="47" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">序号</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">序号</p>
             </th>
             <th width="66" valign="center" class="JR_left">
-              <p align="center" style="margin: 10px 0">名称</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">名称</p>
             </th>
             <th width="94" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">规格型号</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">规格型号</p>
             </th>
             <th width="56" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">数量</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">数量</p>
             </th>
             <th width="66" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">单 价</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">单 价</p>
             </th>
             <th width="66" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">总价值</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">总价值</p>
             </th>
             <th width="122" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">装备时间</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">装备时间</p>
             </th>
             <th width="94" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">保管人</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">保管人</p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">取得方式</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">取得方式</p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">质量状况</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">质量状况</p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">固定资产负责人</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">固定资产负责人</p>
             </th>
             <th width="75" valign="center" nowrap="" class="JR_left">
-              <p align="center" style="margin: 10px 0">放置地点</p>
+              <p align="center" style="margin: 10px 0;font-family: 'heiti'">放置地点</p>
             </th>
             <th width="56" valign="center" nowrap="" class="JR_left">
-              <p align="center">备注</p>
+              <p align="center" style=";font-family: 'heiti'">备注</p>
             </th>
           </tr>
 
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="font-family: 'fangsong'">
             <td width="47" valign="center" nowrap="" class="JR_right">
               <p align="center">{{ message.id }}</p>
             </td>
@@ -122,7 +123,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none">111</span>
+                <span style="display: none"></span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">
@@ -166,7 +167,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none">111</span>
+                <span style="display: none"></span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">
@@ -209,7 +210,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none">111</span>
+                <span style="display: none"></span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">
@@ -252,7 +253,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none">111</span>
+                <span style="display: none"></span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">
@@ -295,7 +296,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none">111</span>
+                <span style="display: none"></span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">
@@ -338,7 +339,7 @@
           <tr class="JR_tr">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
-                <span style="display: none">111</span>
+                <span style="display: none"></span>
               </p>
             </td>
             <td width="66" height="45px" valign="center">

src/components/look_word/bdglsecrecy.vue

@@ -5,10 +5,11 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin-botttom: 30px;
           color: black;
+          font-family: 'heiti'
         "
       >
         《网络、移动电话、涉密载体使用管理登记本》
@@ -32,77 +33,77 @@
         bordercolor="black"
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">网络/移动电话/涉密载体登记本</p>-->
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 500;">
           <tr class="JR_tr">
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">种类（名称）</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">型号</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">编号</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">密级</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">责任人</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">使用人</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">批准人</p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">
                 使用起止 <br />
                 时间
               </p>
             </td>
-            <td valign="center" style="width: 106px" class="JR_left">
+            <td valign="center" style="width: 106px;font-family: 'heiti'" class="JR_left">
               <p align="center" style="margin: 5px 0">移交（出借）时间</p>
             </td>
           </tr>
           <tr class="JR_tr">
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">{{ message.kind }}</p>
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">{{ message.kind }}</p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">{{ message.number }}</p>
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">{{ message.number }}</p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">{{ message.version }}</p>
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">{{ message.version }}</p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.confidential }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.peopleName }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.people1Name }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.people2Name }}
               </p>
             </td>
             <td valign="center" class="JR_right">
               <!--<p align="center">2022-01-18<br>2022-01-18</p>-->
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.startTime }}
               </p>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <p align="center" style="margin: 5px 0;font-family: 'fangsong'">
                 {{ message.hindOverTime }}<br />
                 (移交/出售)
               </p>

src/components/look_word/bdglsoldier.vue

@@ -4,11 +4,12 @@
     <div class="word" id="contents">
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin-botttom: 30px;
           color: black;
           text-align: center;
+          font-family: 'heiti'
         "
       >
         《军人委员会工作记录本》
@@ -26,14 +27,14 @@
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
         "
-        width="600"
+        width="500"
         align="center"
         bordercolor="black"
       >
-        <tbody>
+        <tbody style="font-size: 16px;font-weight: 500;">
           <tr class="JR_tr">
-            <th class="" colspan="2">
-              <h4 align="center" style="text-align: center">军人委员会会议</h4>
+            <th class="" colspan="2" style="font-family: 'kaiti'">
+              <p align="center" style="font-size: 18px;font-weight: 500;font-family: 'kaiti'">军人委员会会议</p>
             </th>
           </tr>
           <tr class="JR_tr">
@@ -41,70 +42,71 @@
               align="center"
               width="120"
               class="JR_left"
-              style="border-right: 0"
+              style="border-right: 0;font-family: 'kaiti'"
+              
             >
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;时 &nbsp;间：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.convokeTime }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;地 &nbsp;点：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.address }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;主持人：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.compereRen }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;参加人：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.joinId }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;列席人：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.peopleIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;缺席人：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.absentIds }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;&nbsp;记录人：</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
+            <td align="left" class="JR_right" style="border-left: 0;font-family: 'fangsong'">
               <p>{{ message.peopleJiLu }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp;&nbsp;议 &nbsp;题：</p>
             </td>
             <td
               align="left"
               class="JR_right"
-              style="border-left: 0"
+              style="border-left: 0;font-family: 'fangsong'"
               v-html="message.title"
             >
               <!-- <p>{{ message.title }}</p> -->
@@ -112,7 +114,7 @@
           </tr>
 
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0">
+            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
               <p align="center">&nbsp;&nbsp; 内 &nbsp;容：</p>
             </td>
             <td class="TableData" style="border-left: 0"></td>
@@ -126,6 +128,7 @@
                 text-indent: 30px;
                 padding: 0px 10px;
                 border: 1px solid black;
+                font-family: 'fangsong'
               "
             ></td>
           </tr>
@@ -134,7 +137,7 @@
             <td colspan="2" class="TableData" style="border: 1px solid black">
               <p
                 class="JR_bottom"
-                style="text-align: right; padding-right: 80px"
+                style="text-align: right; padding-right: 80px;font-family: 'fangsong'"
               >
                 主持人：
               </p>
@@ -144,7 +147,7 @@
             <td colspan="2" class="TableData" style="border: 1px solid black">
               <p
                 class="JR_bottom"
-                style="text-align: right; padding-right: 80px"
+                style="text-align: right; padding-right: 80px;font-family: 'fangsong'"
               >
                 记录人：
               </p>
@@ -152,7 +155,7 @@
           </tr>
           <tr class="JR_tr">
             <td colspan="2" class="" style="border: 1px solid black">
-              <p style="text-align: right; padding-right: 80px">时间：</p>
+              <p style="text-align: right; padding-right: 80px;font-family: 'fangsong'">时间：</p>
             </td>
           </tr>
         </tbody>

src/components/look_word/bdglweekwork.vue

@@ -6,9 +6,10 @@
         style="
           text-align: center;
           margin-top: 10px;
-          font-size: 20px;
+          font-size: 16px;
           font-weight: 600;
           color: black;
+          font-family: 'heiti'
         "
         id="qTitle"
       >
@@ -38,7 +39,7 @@
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
         "
-        width="940"
+        width="960"
         align="center"
         bordercolor="black"
       >
@@ -47,22 +48,24 @@
           style="
             border: none;
             color: black;
-            font-size: 12pt;
+            font-size: 16px;font-weight: 500;
             line-height: 30px;
-            width: 940px;
+            width: 960px;
+            font-family: 'kaiti'
           "
         >
           <td
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px; width: 360px"
+            
+            style="border: none; line-height: 45px; width: 500px;"
           >
             连值班领导：{{ message.peopleName }}
           </td>
           <td
             class="JR_left"
-            colspan="3"
+            colspan="2"
             align="left"
             style="border: none; line-height: 45px; width: 360px"
           >
@@ -70,32 +73,32 @@
           </td>
           <td
             class="JR_left"
-            colspan="2"
+            colspan="3"
             align="left"
             style="border: none; line-height: 45px"
           >
             {{ message.startTime }}—{{ message.endTime }}
           </td>
         </tr>
-        <tbody>
-          <tr class="JR_tr">
+        <tbody style="font-size: 16px;font-weight: 500;">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'heiti'">
             <td align="center" valign="center" colspan="3" class="JR_left">
-              <p align="center">日期</p>
+              <p align="center" style="font-family: 'heiti'">日期</p>
             </td>
             <td valign="center" class="JR_left">
-              <p align="center">内容</p>
+              <p align="center" style="font-family: 'heiti'">内容</p>
             </td>
             <td valign="center" class="JR_left">
-              <p align="center">负责单位</p>
+              <p align="center" style="font-family: 'heiti'">负责单位</p>
             </td>
             <td valign="center" class="JR_left">
-              <p align="center">参加人员</p>
+              <p align="center" style="font-family: 'heiti'">参加人员</p>
             </td>
             <td valign="center" class="JR_left">
-              <p align="center">地点</p>
+              <p align="center" style="font-family: 'heiti'">地点</p>
             </td>
             <td valign="center" class="JR_left">
-              <p align="center">时间</p>
+              <p align="center" style="font-family: 'heiti'">时间</p>
             </td>
           </tr>
 
@@ -103,7 +106,7 @@
             class="JR_tr"
             v-for="(item, i) in message.bdglWeekworkRegisterList"
             :key="i"
-            style="text-align: center; height: 45px"
+            style="text-align: center; height: 45px;font-family: 'fangsong'"
           >
             <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.week }}
@@ -132,10 +135,10 @@
           </tr>
 
           <tr class="JR_tr">
-            <td valign="center" class="JR_left">
+            <td valign="center" class="JR_left" style="font-family: 'songti'">
               <p align="center">备注</p>
             </td>
-            <td valign="center" colspan="7" class="JR_right">
+            <td valign="center" colspan="7" class="JR_right" style="font-family: 'fangsong'">
               {{ message.remark }}
             </td>
           </tr>
@@ -144,28 +147,29 @@
           style="
             border: none;
             color: black;
-            font-size: 12pt;
+            font-size: 16px;font-weight: 500;
             line-height: 30px;
-            width: 940px;
+            width: 960px;
+            font-family: 'fangsong'
           "
         >
           <td
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px; width: 360px"
+            style="border: none; line-height: 45px; width: 360px;font-family: 'fangsong'"
           >
             军事主官：{{ message.people1Name }}
           </td>
           <td
             colspan="1"
-            style="border: none; line-height: 45px; width: 360px"
+            style="border: none; line-height: 45px; width: 360px;font-family: 'fangsong'"
           ></td>
           <td
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px; width: 360px"
+            style="border: none; line-height: 45px; width: 360px;font-family: 'fangsong'"
           >
             政治主官：{{ message.people2Name }}
           </td>
@@ -173,7 +177,7 @@
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px;font-family: 'fangsong'"
           >
             时间：
           </td>

src/components/look_word/personnelRoster.vue

@@ -5,11 +5,12 @@
     <div class="word" id="contents" style="font-family: 'fangsong'">
       <p
         style="
-          font-size: 14pt;
-          font-weight: 900;
+          font-size: 16pt;
+          font-weight: 600;
           margin-botttom: 30px;
           color: black;
           text-align: center;
+          font-family: 'geiti';
         "
       >
         《人员名册》
@@ -32,35 +33,50 @@
         align="center"
         bordercolor="black"
       >
-        <tbody>
-          <tr class="JR_tr" height="40" align="center">
-            <td class="JR_left" rowspan="2">日期</td>
-            <td class="JR_left" colspan="3">编制人数</td>
-            <td class="JR_left" colspan="3">在位人数</td>
-            <td class="JR_left" colspan="3">超（缺）编人员情况</td>
+        <tbody style="font-size: 16px; font-weight: 500">
+          <tr
+            class="JR_tr"
+            height="40"
+            align="center"
+            style="font-family: 'heiti'"
+          >
+            <td class="JR_left" rowspan="2" style="font-family: 'heiti'">日期</td>
+            <td class="JR_left" colspan="3" style="font-family: 'heiti'">编制人数</td>
+            <td class="JR_left" colspan="3" style="font-family: 'heiti'">在位人数</td>
+            <td class="JR_left" colspan="3" style="font-family: 'heiti'">超（缺）编人员情况</td>
           </tr>
-          <tr class="JR_tr" height="40" align="center">
-            <td class="JR_left">干部</td>
-            <td class="JR_left">士官</td>
-            <td class="JR_left">义务兵</td>
-            <td class="JR_left">干部</td>
-            <td class="JR_left">士官</td>
-            <td class="JR_left">义务兵</td>
-            <td class="JR_left">干部</td>
-            <td class="JR_left">士官</td>
-            <td class="JR_left">义务兵</td>
+          <tr
+            class="JR_tr"
+            height="40"
+            align="center"
+            style="font-family: 'heiti'"
+          >
+            <td class="JR_left" style="font-family: 'heiti'">干部</td>
+            <td class="JR_left" style="font-family: 'heiti'">士官</td>
+            <td class="JR_left" style="font-family: 'heiti'">义务兵</td>
+            <td class="JR_left" style="font-family: 'heiti'">干部</td>
+            <td class="JR_left" style="font-family: 'heiti'">士官</td>
+            <td class="JR_left" style="font-family: 'heiti'">义务兵</td>
+            <td class="JR_left" style="font-family: 'heiti'">干部</td>
+            <td class="JR_left" style="font-family: 'heiti'">士官</td>
+            <td class="JR_left" style="font-family: 'heiti'">义务兵</td>
           </tr>
-          <tr class="JR_tr" height="40" align="center">
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
-            <td class="JR_right"></td>
+          <tr
+            class="JR_tr"
+            height="40"
+            align="center"
+            style="font-family: 'fangsong'"
+          >
             <td class="JR_right"></td>
+            <td class="JR_right">{{ renshu.bzwgb }}</td>
+            <td class="JR_right">{{ renshu.bzwsb }}</td>
+            <td class="JR_right">{{ renshu.bzwyw }}</td>
+            <td class="JR_right">{{ renshu.zbgb }}</td>
+            <td class="JR_right">{{ renshu.zbsb }}</td>
+            <td class="JR_right">{{ renshu.zbyw }}</td>
+            <td class="JR_right">{{ renshu.zwgb }}</td>
+            <td class="JR_right">{{ renshu.zwsb }}</td>
+            <td class="JR_right">{{ renshu.zwyw }}</td>
           </tr>
 
           <tr class="JR_tr" height="40" align="center">
@@ -80,7 +96,14 @@
 
       <p
         align="right"
-        style="margin: 20px 200px 5px 0px; font-size: 16px; color: black"
+        style="
+          margin: 20px 200px 5px 0px;
+          font-size: 16px;
+          color: black;
+          font-family: 'fangsong';
+          font-size: 18px;
+          font-weight: 500;
+        "
       >
         日期
       </p>
@@ -101,35 +124,69 @@
         align="center"
         bordercolor="black"
       >
-        <tbody>
-          <tr class="JR_tr" height="40" align="center">
-            <td class="JR_left">姓名</td>
-            <td class="JR_left">职务</td>
-            <td class="JR_left">军衔</td>
-            <td class="JR_left">名族</td>
-            <td class="JR_left">籍贯</td>
-            <td class="JR_left">出生<br />年月</td>
-            <td class="JR_left">入伍<br />年月</td>
-            <td class="JR_left">
+        <tbody style="font-size: 16px; font-weight: 500">
+          <tr
+            class="JR_tr"
+            height="40"
+            align="center"
+            style="font-family: 'heiti'"
+          >
+            <td class="JR_left" style="font-family: 'heiti'">姓名</td>
+            <td class="JR_left" style="font-family: 'heiti'">职务</td>
+            <td class="JR_left" style="font-family: 'heiti'">军衔</td>
+            <td class="JR_left" style="font-family: 'heiti'">名族</td>
+            <td class="JR_left" style="font-family: 'heiti'">籍贯</td>
+            <td class="JR_left" style="font-family: 'heiti'">出生<br />年月</td>
+            <td class="JR_left" style="font-family: 'heiti'">入伍<br />年月</td>
+            <td class="JR_left" style="font-family: 'heiti'">
               入党（团）<br />
               时间
             </td>
-            <td class="JR_left">文化<br />程度</td>
-            <td class="JR_left">婚姻<br />状况</td>
-            <td class="JR_left">家庭住址及联系方式</td>
-            <td class="JR_left">备注</td>
+            <td class="JR_left" style="font-family: 'heiti'">文化<br />程度</td>
+            <td class="JR_left" style="font-family: 'heiti'">婚姻<br />状况</td>
+            <td class="JR_left" style="font-family: 'heiti'">家庭住址及联系方式</td>
+            <td class="JR_left" style="font-family: 'heiti'">备注</td>
           </tr>
-          <tr class="JR_tr" height="40" align="center">
+          <tr
+            class="JR_tr"
+            height="40"
+            align="center"
+            style="font-family: 'fangsong'"
+          >
             <td class="JR_right">{{ message.name }}</td>
-            <td class="JR_right">{{ message.postId }}</td>
-            <td class="JR_right">{{ message.rankId }}</td>
-            <td class="JR_right">{{ message.nationId }}</td>
+            <td class="JR_right">
+              <dict-tag
+                :options="dict.type.post_Level"
+                :value="message.postId"
+              />
+            </td>
+            <td class="JR_right">
+              <dict-tag
+                :options="dict.type.post_Level"
+                :value="message.rankId"
+              />
+            </td>
+            <td class="JR_right">
+              <dict-tag
+                :options="dict.type.sys_familyName"
+                :value="message.nationId"
+              />
+            </td>
             <td class="JR_right">{{ message.origin }}</td>
             <td class="JR_right">{{ message.birthDate }}</td>
             <td class="JR_right">{{ message.enlistDate }}</td>
             <td class="JR_right">{{ message.partyDate }}</td>
-            <td class="JR_right">{{ message.educationId }}</td>
-            <td class="JR_right">{{ message.marryList }}</td>
+            <td class="JR_right">
+              <dict-tag
+                :options="dict.type.Degree_level"
+                :value="message.educationId"
+              />
+            </td>
+            <td class="JR_right">
+              <dict-tag
+                :options="dict.type.marryList"
+                :value="message.marryList"
+              /></td>
             <td class="JR_right">{{ message.live }}{{ message.phone }}</td>
             <td class="JR_right"></td>
           </tr>
@@ -158,14 +215,54 @@ import { lookWord } from "@/utils/look_word.js";
 import "@/utils/lodJs.js";
 export default {
   name: "bdgleven",
-  props: ["message"],
+  props: ["message", "renshu"],
+  dicts: [
+    "post_Level",
+    "sys_user_rank",
+    "sys_familyName",
+    "Degree_level",
+    "marryList",
+  ],
   data() {
     return {
       title: "人员名册",
       style:
         ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
+      //学历
+      educationId: [],
+      //军衔
+      rankIds: [],
+      //民族
+      nationIds: [],
+      //职务层级
+      postIds: [],
+      //婚姻情况
+      marryList: [],
+      xueLi: "",
     };
   },
+  created() {
+    //学历
+    this.getDicts("Degree_level").then((response) => {
+      this.educationId = response.data;
+    });
+    //婚姻情况
+    this.getDicts("marryList").then((response) => {
+      this.marryList = response.data;
+    });
+    //职务层级
+    this.getDicts("post_Level").then((response) => {
+      this.postIds = response.data;
+    });
+    //军衔
+    this.getDicts("sys_user_rank").then((response) => {
+      this.rankIds = response.data;
+    });
+    //民族
+    this.getDicts("sys_familyName").then((response) => {
+      this.nationIds = response.data;
+    });
+  },
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -102,10 +102,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column
@@ -327,7 +329,10 @@ import {
   updateBdglarmament,
   exportBdglarmament,
 } from "@/api/grassrootsregistration/bdglarmament";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 import { getDept } from "@/api/grassrootsregistration/bdgleven";
 
 // 导入树形结构
@@ -445,8 +450,8 @@ export default {
     },
     // //获取部门列表
     getdept() {
-      getDept().then((response) => {
-        this.deptOptions = response.data;
+      getShouBu().then((res) => {
+        this.deptOptions = res.data;
       });
     },
     /** 查询部门下拉树结构 */
@@ -590,7 +595,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-      .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         // .confirm('是否确认删除军械装备登记簿编号为"' + ids + '"的数据项？')
         .then(function () {
           return delBdglarmament(ids);

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -106,10 +106,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitName" />
       <!-- <el-table-column label="更新时间" align="center" prop="id" /> -->
       <el-table-column label="食谱标题" align="center" prop="title" />
@@ -1699,7 +1701,10 @@ import {
   exportBdglcookbook,
   getThings,
 } from "@/api/grassrootsregistration/bdglcookbook";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -1928,8 +1933,15 @@ export default {
   },
   created() {
     this.getList();
+    this.getdept();
   },
   methods: {
+    // //获取部门列表
+    getdept() {
+      getShouBu().then((res) => {
+        this.deptOptionss = res.data;
+      });
+    },
     // 获取人员
     getRen(id) {
       getZhuChiRen(id).then((res) => {
@@ -4158,7 +4170,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除一周食谱编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglcookbook(ids);
         })

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -11,8 +11,7 @@
           placeholder="选择日期"
           value-format="yyyy-MM-dd"
           @change="shiJian"
-        > 
-
+        >
         </el-date-picker>
       </div>
       <div class="dadui">
@@ -53,7 +52,7 @@
             >新增</el-button
           >
         </el-col>
-        <div class="shuJu" @click="dengJI">
+        <div class="shuJu">
           <span class="box44 public"> 当前数据为 : {{ DataTime }}</span>
           <span class="box5 public">
             已登记部门 : {{ registrationData.yiShenPi }}</span
@@ -134,14 +133,6 @@
         <el-table-column label="编制干部" align="center" prop="orgcadre" />
         <el-table-column label="编制战士" align="center" prop="orgsoldier" />
         <el-table-column label="编制文职" align="center" prop="orgcivilian" />
-        <el-table-column label="审批" align="center" prop="orgcivilian">
-          <template slot-scope="scope">
-            <span v-if="scope.row.examine == '1'" style="color: #13ce66"
-              >已审批</span
-            >
-            <span v-else style="color: #ff4949">未审批</span>
-          </template>
-        </el-table-column>
         <el-table-column
           width="250"
           label="操作"
@@ -626,6 +617,7 @@
                     v-model="item1.examineDate"
                     type="datetime"
                     placeholder="选择日期时间"
+                    @change="chenge"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -742,20 +734,6 @@
           <el-button type="primary" @click="queDing">通过</el-button>
         </div>
       </el-dialog>
-
-      <!-- <div id="dialoges">
-        <el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
-        </el-dialog>
-      </div> -->
-      <!-- 数据查看弹出层 -->
-      <el-dialog
-        :visible.sync="dialogVisible"
-        title="提示"
-        append-to-body
-        id="dialoges"
-      >
-        <div class="jiben">已登记部门</div>
-      </el-dialog>
     </div>
   </div>
 </template>
@@ -971,10 +949,8 @@ export default {
       DataTime: "",
       //  右边登记数据
       registrationData: {},
-      // 搜索时间的保存
+
       timeDate: "",
-      // 数据查看的弹出层
-      dialogVisible: false,
     };
   },
 
@@ -989,9 +965,8 @@ export default {
     this.getShuJu();
   },
   methods: {
-    // 点击数据盒子
-    dengJI() {
-      this.dialogVisible = true;
+    chenge(data) {
+      console.log(data);
     },
     //审批按钮操作
     handleChakans(row) {
@@ -1007,7 +982,7 @@ export default {
     },
     // 审批页面确定
     queDing() {
-      this.wordInfo.x = "1";
+      this.wordInfo.examine = "1";
       if (this.wordInfo.id != null) {
         updateBdglShenPi(this.wordInfo).then((response) => {
           this.menuRoleVisible = false;
@@ -1477,7 +1452,7 @@ export default {
 }
 /* 表单背景 */
 ::v-deep .el-input__inner {
-  background-color: none;
+  background-color: transparent;
   color: #fff;
   /* border: 1px solid white !important; */
 }

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -667,4 +667,8 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/bdglequip/index.vue

@@ -7,9 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="" prop="unitId1">
+      <el-form-item label="" prop="unitId">
         <el-select
-          v-model="queryParams.unitId1"
+          v-model="queryParams.unitId"
           placeholder="请输入单位"
           @change="company"
         >
@@ -102,10 +102,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="类型" align="center" prop="type" />
       <el-table-column label="物品名称" align="center" prop="title" />
@@ -351,7 +353,10 @@ import {
   exportBdglequip,
   getList,
 } from "@/api/grassrootsregistration/bdglequip";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 import { getDicts } from "@/api/system/dict/data";
 import { getDept, getDept2 } from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
@@ -492,7 +497,7 @@ export default {
     },
     // 查询搜索单位
     getBumen() {
-      getDept().then((res) => {
+      getShouBu().then((res) => {
         this.BuMeng = res.data;
       });
     },
@@ -656,7 +661,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除训练器材/教材登记薄编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglequip(ids);
         })
@@ -741,10 +746,9 @@ export default {
   padding: 30px 50px;
 }
 ::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 50px;
+  margin: 10px 35px 20px 44px;
   padding-top: 20px !important;
   box-sizing: border-box;
-  /* padding: 30px 12px 30px 28px; */
 }
 .contents {
   padding: 0px 40px !important;
@@ -847,4 +851,8 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/bdgleven/index.vue

@@ -28,6 +28,7 @@
           v-model="queryParams.compereId"
           placeholder="请选择主持人"
           @change="Renyuan"
+          filterable
         >
           <el-option
             v-for="item in renYuans"
@@ -103,12 +104,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitName" />
-      <el-table-column label="会议议题" align="center" prop="title" show-overflow-tooltip/>
+      <el-table-column
+        label="会议议题"
+        align="center"
+        prop="title"
+        show-overflow-tooltip
+      />
       <!-- <el-table-column label="会议议题" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span v-html="scope.row.title"></span>
@@ -303,7 +311,11 @@ import {
   exportBdgleven,
   getDept,
 } from "@/api/grassrootsregistration/bdgleven";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+  getAll,
+} from "@/api/grassrootsregistration/bdglmeeting";
 // 富文本
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
@@ -407,13 +419,39 @@ export default {
       result: {},
       // 外面的人员
       renYuans: [],
+      // 文本显示数字
+      str: "",
     };
   },
   created() {
     this.getList();
-    this.getdept();
+    this.getBuMen();
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
+    // 获取搜索下拉部门
+    getBuMen() {
+      getShouBu().then((res) => {
+        this.buMens = res.data;
+      });
+    },
+    // 转义视图不加标签
+    onEditor(str) {
+      //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
+      var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+      str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+      //str = str.replace(/\n[\s| | ]*\r/g,'\n'); //去除多余空行
+      str = str.replace(/ /gi, ""); //去掉
+      // this.bdglevenList[0].title = str;
+      // console.log(this.bdglevenList[0].title);
+      this.str = str;
+    },
     // 重置表单人员
     ChongZhiRen() {
       (this.form.compereId = null),
@@ -432,7 +470,6 @@ export default {
     },
     // 新增选择单位触发
     selectPeo(val) {
-      console.log(11);
       this.ChongZhiRen();
       this.form.unitId = val.id;
       // 选中单位触发获取人员
@@ -510,6 +547,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.getSuo();
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -545,7 +583,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       // 人员
-      (this.renYuan = []), this.reset();
+      this.renYuan = [];
+      this.reset();
       this.getTreeselect();
       this.open = true;
       this.opens = true;
@@ -597,6 +636,11 @@ export default {
               this.getList();
             });
           } else {
+            // var str = this.form.title;
+            // str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+            // str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+            // str = str.replace(/\n[\s| | ]*\r/g, "\n"); //去除多余空行
+            // this.form.title = str.replace(/ /gi, ""); //去掉
             (this.form.joinId = this.form.joinId.join(",")),
               addBdgleven(this.form).then((response) => {
                 this.$modal.msgSuccess("新增成功");
@@ -612,7 +656,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除连务会记录本编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdgleven(ids);
         })
@@ -637,12 +681,6 @@ export default {
         })
         .catch(() => {});
     },
-    // //获取部门列表
-    getdept() {
-      getDept().then((response) => {
-        this.buMens = response.data;
-      });
-    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       getDept().then((response) => {

src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -99,10 +99,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="deptName" />
       <el-table-column label="借阅人" align="center" prop="borrowName" />
       <el-table-column label="文件名称" align="center" prop="name" />
@@ -195,11 +197,7 @@
           />
         </el-form-item>
         <el-form-item label="文件编号" prop="number">
-          <el-input
-            v-model="form.number"
-            placeholder="输入文件编号"
-            disabled
-          />
+          <el-input v-model="form.number" placeholder="输入文件编号" disabled />
         </el-form-item>
         <el-form-item label="文件名称" prop="name">
           <el-input v-model="form.name" placeholder="输入文件名称" />
@@ -320,7 +318,10 @@ import {
   updateBdglfilemanagement,
   exportBdglfilemanagement,
 } from "@/api/grassrootsregistration/bdglfilemanagement";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -455,10 +456,10 @@ export default {
     host() {
       this.getList();
     },
-    // //获取部门列表
+    // //获取搜索部门列表
     getdept() {
-      getDept().then((response) => {
-        this.deptOption = response.data;
+      getShouBu().then((res) => {
+        this.deptOption = res.data;
       });
     },
     // 注销人选中触发
@@ -597,7 +598,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-      .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         // .confirm('是否确认删除文件管理登计本编号为"' + ids + '"的数据项？')
         .then(function () {
           return delBdglfilemanagement(ids);
@@ -672,7 +673,7 @@ export default {
   line-height: 32px;
 }
 ::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 30px;
+  margin: 10px 30px 20px 44px;
   padding-top: 20px !important;
   box-sizing: border-box;
   /* padding: 30px 12px 30px 28px; */

src/views/grassrootsregistration/bdglfood/index.vue

@@ -8,13 +8,19 @@
       label-width="68px"
     >
       <el-form-item label="" prop="unitId">
-        <el-input
+        <el-select
           v-model="queryParams.unitId"
-          placeholder="请输入单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          placeholder="请选择单位"
+          @change="host"
+        >
+          <el-option
+            v-for="(item, i) in deptOptionss"
+            :key="i"
+            :label="item.deptName"
+            :value="item.deptId"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button size="btr" @click="resetQuery" icon="el-icon-refresh"
@@ -86,10 +92,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="值班员" align="center" prop="peopleName" />
       <!-- <el-table-column label="更新时间" align="center" prop="id" /> -->
@@ -1060,7 +1068,10 @@ import {
   exportBdglfood,
 } from "@/api/grassrootsregistration/bdglfood";
 import { getDept } from "@/api/grassrootsregistration/bdglparty";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -1275,12 +1286,25 @@ export default {
       // 定义一个数组用来放对象提交
       Arr: [],
       arr: [],
+      // 获取搜索单位列表
+      deptOptionss: [],
     };
   },
   created() {
     this.getList();
+    this.getdept();
   },
   methods: {
+    // //获取部门列表
+    getdept() {
+      getShouBu().then((res) => {
+        this.deptOptionss = res.data;
+      });
+    },
+    // 搜索单位触发
+    host() {
+      this.getList();
+    },
     //增加实物检查验收表单
     tianJia() {
       this.acceptance.push({
@@ -1677,7 +1701,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除伙食管理登记薄编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglfood(ids);
         })
@@ -1978,14 +2002,16 @@ table td {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
-::v-deep :-ms-input-placeholder{
+::v-deep :-ms-input-placeholder {
   color: #bdbdbd4f !important;
 }
-::v-deep ::-moz-placeholder{
+::v-deep ::-moz-placeholder {
   color: #bdbdbd4f !important;
 }
 .box2 tr td span {
   font-size: 0.1em;
 }
-::v-deep ::-webkit-input-placeholder{  color: #bdbdbd4f !important;}
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -14,7 +14,7 @@
           @change="company"
         >
           <el-option
-            v-for="item in bumeng"
+            v-for="item in buMeng"
             :key="item.deptId"
             :label="item.deptName"
             :value="item.deptId"
@@ -115,10 +115,12 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="deptName" />
       <el-table-column
         label="召开时间"
@@ -136,7 +138,12 @@
       <el-table-column label="列席人" align="center" prop="peopleIds" />
       <el-table-column label="缺席人" align="center" prop="absentIds" />
       <el-table-column label="记录人" align="center" prop="peopleJiLu" />
-      <el-table-column label="会议议题" align="center" prop="title" show-overflow-tooltip/>
+      <el-table-column
+        label="会议议题"
+        align="center"
+        prop="title"
+        show-overflow-tooltip
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -353,6 +360,8 @@ import {
   updateBdglmeeting,
   exportBdglmeeting,
   getDept,
+  getShouBu,
+  getAll,
 } from "@/api/grassrootsregistration/bdglmeeting";
 
 // 富文本
@@ -364,7 +373,6 @@ import { quillEditor } from "vue-quill-editor";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Bdglmeeting",
   components: {
@@ -452,7 +460,7 @@ export default {
       //下拉菜单
       options: [],
       // 外面的部门
-      bumeng: [],
+      buMeng: [],
       // 主持人 人员
       renYuan: [],
       // 外面的人员
@@ -472,9 +480,22 @@ export default {
   },
   created() {
     this.getList();
-    this.getdept();
+    this.getBuMen();
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
+    // 获取搜索下拉部门
+    getBuMen() {
+      getShouBu().then((res) => {
+        this.buMeng = res.data;
+      });
+    },
     // 重置表单人员
     ChongZhiRen() {
       // 主持人
@@ -572,6 +593,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.getSuo();
       this.reset();
       this.resetForm("queryForm");
       this.handleQuery();
@@ -682,7 +704,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除团支部会议登记本编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglmeeting(ids);
         })
@@ -707,12 +729,6 @@ export default {
         })
         .catch(() => {});
     },
-    //获取部门列表
-    async getdept() {
-      const res = await getDept();
-      // //判断是否成功
-      this.bumeng = res.data;
-    },
   },
 };
 </script>

src/views/grassrootsregistration/bdglparty/index.vue

@@ -27,9 +27,10 @@
           v-model="queryParams.compereId"
           placeholder="请选择主持人"
           @change="compere"
+          filterable
         >
           <el-option
-            v-for="item in renYuan"
+            v-for="item in personnel"
             :key="item.id"
             :label="item.name"
             :value="item.id"
@@ -101,10 +102,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column
         label="会议议题"
@@ -339,10 +342,11 @@ import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
 import "quill/dist/quill.bubble.css";
 import { quillEditor } from "vue-quill-editor";
+// 树形
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import loginVue from "../../login.vue";
-
+import { getShouBu, getAll } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Bdglparty",
   components: {
@@ -446,9 +450,22 @@ export default {
   },
   created() {
     this.getList();
-    this.getdept();
+    this.getBuMen();
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.personnel = res.rows;
+      });
+    },
+    // 获取搜索下拉部门
+    getBuMen() {
+      getShouBu().then((res) => {
+        this.buMeng = res.data;
+      });
+    },
     // 重置表单人员
     ChongZhiRen() {
       (this.form.compereId = null),
@@ -476,7 +493,7 @@ export default {
       this.getList();
       var url = "/grassrootsregistration/common/getZhuChiRen";
       getDeptId(url, this.queryParams.unitId).then((res) => {
-        this.renYuan = res.data;
+        this.personnel = res.data;
       });
     },
     // 搜索主持人触发
@@ -532,6 +549,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.getSuo();
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -637,7 +655,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除党支部会议登记本编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglparty(ids);
         })
@@ -662,12 +680,6 @@ export default {
         })
         .catch(() => {});
     },
-    //获取部门列表
-    getdept() {
-      getDept().then((response) => {
-        this.buMeng = response.data;
-      });
-    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       getDept().then((response) => {

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -89,10 +89,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="规格型号" align="center" prop="version" />
@@ -284,7 +286,10 @@ import {
   updateBdglpublicproperty,
   exportBdglpublicproperty,
 } from "@/api/grassrootsregistration/bdglpublicproperty";
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -386,8 +391,8 @@ export default {
     },
     // //获取部门列表
     getdept() {
-      getDept().then((response) => {
-        this.deptOptionss = response.data;
+      getShouBu().then((res) => {
+        this.deptOptionss = res.data;
       });
     },
     // 选中保管人触发
@@ -532,7 +537,7 @@ export default {
         // .confirm(
         //   '是否确认删除营产，公物管理登记簿编号为"' + ids + '"的数据项？'
         // )
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglpublicproperty(ids);
         })
@@ -726,4 +731,8 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -8,9 +8,13 @@
       label-width="68px"
     >
       <el-form-item label="" prop="unitId">
-        <el-select v-model="queryParams.unitId" placeholder="请选择单位">
+        <el-select
+          v-model="queryParams.unitId"
+          placeholder="请选择单位"
+          @change="company"
+        >
           <el-option
-            v-for="item in bumeng"
+            v-for="item in buMeng"
             :key="item.deptId"
             :label="item.deptName"
             :value="item.deptId"
@@ -19,13 +23,17 @@
         </el-select>
       </el-form-item>
       <el-form-item label="" prop="compereId">
-        <el-select v-model="form.compereId" placeholder="请选择主持人">
+        <el-select
+          v-model="queryParams.compereId"
+          placeholder="请选择主持人"
+          @change="Renyuan"
+          filterable
+        >
           <el-option
-            v-for="item in arr"
+            v-for="item in renYuans"
             :key="item.id"
             :label="item.name"
             :value="item.id"
-            @change="Renyuan"
           >
           </el-option>
         </el-select>
@@ -96,12 +104,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="deptName" />
-      <el-table-column label="会议议题" align="center" prop="title" show-overflow-tooltip/>
+      <el-table-column
+        label="会议议题"
+        align="center"
+        prop="title"
+        show-overflow-tooltip
+      />
       <!-- <el-table-column label="会议议题" align="center" >
         <template slot-scope="scope">
           <span v-html="scope.row.title"></span>
@@ -324,7 +339,11 @@ import {
   exportBdglsoldier,
 } from "@/api/grassrootsregistration/bdglsoldier";
 
-import { getZhuChiRen } from "@/api/grassrootsregistration/bdglmeeting";
+import {
+  getZhuChiRen,
+  getShouBu,
+  getAll,
+} from "@/api/grassrootsregistration/bdglmeeting";
 import { getDept } from "@/api/grassrootsregistration/bdglparty";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -424,15 +443,41 @@ export default {
       // 修改拿到的数据
       result: {},
       // 外面部门
-      bumeng: [],
+      buMeng: [],
       // 外面人员
-      arr: [],
+      renYuans: [],
     };
   },
   created() {
     this.getList();
+    this.getBuMen();
+    this.getSuo();
   },
   methods: {
+    // 获取搜索所有人
+    getSuo() {
+      getAll().then((res) => {
+        this.renYuans = res.rows;
+      });
+    },
+    // 搜索单位触发
+    company() {
+      this.getList();
+      // 联动人员
+      getZhuChiRen(this.queryParams.unitId).then((res) => {
+        this.renYuans = res.data;
+      });
+    },
+    // 搜索主持人选中触发
+    Renyuan() {
+      this.getList();
+    },
+    // 获取搜索下拉部门
+    getBuMen() {
+      getShouBu().then((res) => {
+        this.buMeng = res.data;
+      });
+    },
     // 重置表单人员
     ChongZhiRen() {
       // 主持人
@@ -518,6 +563,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.getSuo();
+      this.reset();
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -622,7 +669,7 @@ export default {
         // .confirm(
         //   '是否确认删除军人委员会会议登记本编号为"' + ids + '"的数据项？'
         // )
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglsoldier(ids);
         })

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -14,7 +14,7 @@
           @change="host"
         >
           <el-option
-            v-for="(item, i) in dept"
+            v-for="(item, i) in deptOptionss"
             :key="i"
             :label="item.deptName"
             :value="item.deptId"
@@ -26,7 +26,7 @@
         <el-date-picker
           clearable
           size="small"
-          v-model="queryParams.time"
+          v-model="queryParams.startTime"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择时间"
@@ -107,10 +107,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="工作标题" align="center" prop="name" />
       <el-table-column
@@ -257,18 +259,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="时间" prop="time">
-          <el-date-picker
-            clearable
-            size="small"
-            :editable="false"
-            v-model="form.time"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择时间"
-          >
-          </el-date-picker>
-        </el-form-item> -->
         <el-form-item label="工作标题" prop="name">
           <el-input v-model="form.name" placeholder="请输入工作标题" />
         </el-form-item>
@@ -281,6 +271,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择开始时间"
+            @change="startTimes"
           >
           </el-date-picker>
         </el-form-item>
@@ -293,6 +284,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择结束时间"
+            @change="endTimes"
           >
           </el-date-picker>
         </el-form-item>
@@ -463,6 +455,7 @@ import {
   addBdglweekwork,
   updateBdglweekwork,
   exportBdglweekwork,
+  exportBdglgetWeekWork,
 } from "@/api/grassrootsregistration/bdglweekwork";
 
 import Treeselect from "@riophae/vue-treeselect";
@@ -470,6 +463,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {
   getZhuChiRen,
   getDept,
+  getShouBu,
 } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Bdglweekwork",
@@ -598,7 +592,9 @@ export default {
         },
       ],
       // 搜索单位列表
-      dept: [],
+      deptOptionss: [],
+      // 已有时间不能发送
+      msg: 1,
     };
   },
   created() {
@@ -640,9 +636,10 @@ export default {
       this.getList();
     },
     // 查询单位列表
-    async getDept() {
-      const res = await getDept();
-      this.dept = res.data;
+    getDept() {
+      getShouBu().then((res) => {
+        this.deptOptionss = res.data;
+      });
     },
     // 政治人员选中触发
     zhengZhi(name) {
@@ -675,9 +672,51 @@ export default {
       this.form.unitName = data.label;
       this.ZhuChiRen(this.form.unitId);
       this.tomList.forEach((item, i) => {
-        console.log(item);
         this.tomList[i].unitId1 = data.label;
       });
+      if (
+        this.form.unitId != null &&
+        this.form.startTime != null &&
+        this.form.endTime != null
+      ) {
+        exportBdglgetWeekWork(this.form).then((res) => {
+          if (res.msg) {
+            this.$modal.msgWarning(res.msg);
+            this.msg = null;
+          }
+        });
+      }
+    },
+    // 开始时间触发
+    startTimes() {
+      if (
+        this.form.unitId != null &&
+        this.form.startTime != null &&
+        this.form.endTime != null
+      ) {
+        exportBdglgetWeekWork(this.form).then((res) => {
+          if (res.msg) {
+            this.$modal.msgWarning(res.msg);
+            this.msg = null;
+          }
+        });
+      }
+    },
+    // 结束时间触发
+    endTimes() {
+      if (
+        this.form.unitId != null &&
+        this.form.startTime != null &&
+        this.form.endTime != null
+      ) {
+        this.form.unitName = null;
+        exportBdglgetWeekWork(this.form).then((res) => {
+          if (res.msg) {
+            this.$modal.msgWarning(res.msg);
+            this.msg = null;
+          }
+        });
+      }
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
@@ -752,6 +791,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.startTime = null;
       this.handleQuery();
     },
     /** 对话框重置按钮操作 */
@@ -816,11 +856,13 @@ export default {
             });
           } else {
             this.form.bdglWeekworkRegisterList = this.tomList;
-            addBdglweekwork(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+            if (this.msg) {
+              addBdglweekwork(this.form).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
           }
         }
       });
@@ -830,7 +872,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         // .confirm('是否确认删除一周工作安排编号为"' + ids + '"的数据项？')
-        .confirm('是否确认删除该数据？')
+        .confirm("是否确认删除该数据？")
         .then(function () {
           return delBdglweekwork(ids);
         })
@@ -1046,7 +1088,6 @@ export default {
 ::v-deep .el-dialog__body {
   padding: none !important;
 }
-
 /* 调整输入框提示文字颜色 */
 ::v-deep .vue-treeselect__placeholder {
   color: #bdbdbd4f !important;
@@ -1057,4 +1098,8 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -27,10 +27,14 @@
           <el-table-column type="selection" width="55" align="center" />
           <!-- <el-table-column label="序号" align="center" type="index" /> -->
           <el-table-column label="序号" type="index" width="50" align="center">
-          <template scope="scope">
-            <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
+            <template scope="scope">
+              <span>{{
+                (queryParams.pageNum - 1) * queryParams.pageSize +
+                scope.$index +
+                1
+              }}</span>
+            </template>
+          </el-table-column>
           <!-- <el-table-column label="备用手机号" align="center" prop="id" /> -->
           <el-table-column label="姓名" align="center" prop="name" />
           <el-table-column label="性别" align="center" prop="sex">
@@ -167,7 +171,7 @@
                 v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
                 ><span class="chakan">查看</span></el-button
               >
-              <el-button
+              <!-- <el-button
                 size="btu"
                 type="text"
                 @click="handleUpdate(scope.row)"
@@ -180,7 +184,7 @@
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['peopleManage:people:remove']"
                 >删除</el-button
-              >
+              > -->
             </template>
           </el-table-column>
         </el-table>
@@ -631,6 +635,7 @@
           v-if="menuRoleVisible"
           ref="menuRole"
           :message="wordInfo"
+          :renshu='renshu'
         ></personnelRoster>
       </el-dialog>
     </div>
@@ -647,9 +652,9 @@ import {
   updatePeople,
   exportPeople,
   getDept,
-  listDept,
   treeselect,
 } from "@/api/peopleManage/people";
+import { getXiangQi } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "People",
@@ -676,6 +681,7 @@ export default {
       //查看页面
       menuRoleVisible: false,
       wordInfo: {},
+      renshu:{},
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -963,6 +969,14 @@ export default {
     });
   },
   methods: {
+    // 查询人员名册
+    xiangQi(id) {
+      // console.log(id);
+      getXiangQi(id).then((res) => {
+        // console.log(res.data[0]);
+       this.renshu=res.data[0]
+      });
+    },
     /** 查询人员管理列表 */
     getList() {
       this.loading = true;
@@ -1076,6 +1090,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getPeople(id).then((response) => {
+        console.log(response);
         this.form = response.data;
         this.jtlist = response.data.familyInformation;
         this.bdglPeopleList = response.data.bdglPeopleList;
@@ -1110,6 +1125,7 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
+      this.xiangQi(row.deptId);
       // 是否隐藏按钮
       this.opens = false;
       const id = row.id || this.ids;
@@ -1442,4 +1458,13 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
 </style>

src/views/grassrootsregistration/statistics/index.vue

@@ -451,4 +451,18 @@ export default {
     height: 36px;
     line-height: 36px;
 }
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
+/* 文本域提示文字颜色 */
+::v-deep ::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
 </style>