Parcourir la source

修改产看导出

liangjiahao il y a 3 ans
Parent
commit
c254f43b9a

+ 1 - 1
src/components/look_word/bdglarmament.vue

@@ -23,7 +23,7 @@
         "
       >
         装备名称:<span style="text-decoration: underline"
-          >QBZ95-1式5.8毫米自动步枪
+          >{{ message.name }}
         </span>
       </p>
       <table

+ 211 - 193
src/components/look_word/bdglcookbook.vue

@@ -2,17 +2,24 @@
   <div>
     <el-button class="box1" @click="daochu">导出</el-button>
     <div class="word" id="contents">
-      <p style="text-align: center; font-size: 20px; color: black">
+      <p
+        style="
+          text-align: center;
+          font-size: 22px;
+          color: black;
+          font-weight: 550;
+        "
+      >
         食堂食谱表
       </p>
-      <p style="margin-left: 10px; color: black">
-        使用时间:2022-03-09—2022-03-13
+      <p style="margin-left: 10px; color: black; font-size: 18px">
+        使用时间:{{ message.startTime }}——{{ message.endTime }}
       </p>
       <table
         border="1"
         style="
           border-collapse: collapse;
-          border: 1px solid black;
+          border: none;
           mso-border-left-alt: 0.5pt solid windowtext;
           mso-border-top-alt: 0.5pt solid windowtext;
           mso-border-right-alt: 0.5pt solid windowtext;
@@ -54,322 +61,328 @@
               style="white-space: normal; height: 45"
               class="JR_right"
             >
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[0].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[6].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[12].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[18].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[24].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[30].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[36].peopleNames }}
             </td>
           </tr>
           <tr height="45" class="JR_tr">
             <td align="center" style="white-space: normal">
               {{ message.cookbookRegistrations[0].cookcategoryNames }}
             </td>
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[6].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[12].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[18].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[24].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[30].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[36].cookcategoryNames }}
+            </td>
           </tr>
           <tr height="45" class="JR_tr">
             <td width="70" rowspan="2" align="center" class="JR_left">副食</td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[1].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[7].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[13].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[19].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[25].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[31].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[37].peopleNames }}
             </td>
           </tr>
           <tr height="45" class="JR_tr">
             <td align="center" style="white-space: normal" class="JR_right">
               {{ message.cookbookRegistrations[1].cookcategoryNames }}
             </td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
             <td align="center" style="white-space: normal" class="JR_right">
-              无
+              {{ message.cookbookRegistrations[7].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[13].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[19].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[25].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[31].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[37].cookcategoryNames }}
             </td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></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>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[2].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[8].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[14].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[20].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[26].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[32].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[38].peopleNames }}
             </td>
           </tr>
           <tr height="45" class="JR_tr">
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[2].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[8].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[14].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[20].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[26].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[32].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[38].cookcategoryNames }}
+            </td>
           </tr>
           <tr height="45" class="JR_tr">
             <td width="70" rowspan="2" align="center" class="JR_left">副食</td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[3].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[9].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[15].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[21].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[27].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[33].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[39].peopleNames }}
             </td>
           </tr>
           <tr height="45" class="JR_tr">
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
-            <td align="center" style="white-space: normal"></td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[3].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[9].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[15].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[21].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[27].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[33].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal">
+              {{ message.cookbookRegistrations[39].cookcategoryNames }}
+            </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>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[4].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[10].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[16].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[22].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[28].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[34].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[40].peopleNames }}
             </td>
           </tr>
           <tr height="45" class="JR_tr">
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[4].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[10].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[16].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[22].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[28].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[34].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[40].cookcategoryNames }}
+            </td>
           </tr>
           <tr height="45" class="JR_tr">
             <td width="70" rowspan="2" align="center" class="JR_left">副食</td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[5].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[11].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[17].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[23].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[29].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[35].peopleNames }}
             </td>
             <td align="center" style="white-space: normal" class="JR_right">
-              炊事员:
+              炊事员:{{ message.cookbookRegistrations[41].peopleNames }}
             </td>
           </tr>
           <tr height="45" class="JR_tr">
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
-            <td
-              align="center"
-              style="white-space: normal"
-              class="JR_right"
-            ></td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[5].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[11].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[17].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[23].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[29].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[35].cookcategoryNames }}
+            </td>
+            <td align="center" style="white-space: normal" class="JR_right">
+              {{ message.cookbookRegistrations[41].cookcategoryNames }}
+            </td>
           </tr>
         </tbody>
+        <tr
+          class="aaa"
+          style="
+            border: none;
+            color: black;
+            font-size: 12pt;
+            font-weight: 700;
+            line-height: 30px;
+            width: 960px;
+          "
+        >
+          <td
+            colspan="4"
+            align="left"
+            style="border: none; line-height: 45px; width: 360px"
+          >
+            单位领导:
+          </td>
+          <td
+            colspan="3"
+            align="left"
+            style="border: none; line-height: 45px; width: 360px"
+          >
+            经委会:
+          </td>
+          <td colspan="3" align="left" style="border: none; line-height: 45px">
+            制表:
+          </td>
+        </tr>
       </table>
-      <div style="width: 100%; height: 50px; margin-top: 20px; color: black">
+      <!-- <div
+        style="width: 100%; height: 50px; margin-top: 20px; color: black"
+        class="bottom"
+      >
         <span style="margin-left: 30px">单位领导:</span>
         <span style="margin-left: 35%">经委会:</span>
         <span style="margin-left: 318px">制表:</span>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -384,7 +397,7 @@ export default {
     return {
       title: "食堂食谱表",
       style:
-        ".JR_tr {height: 40px;};.JR_left{width: 120px;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}",
+        ".JR_tr {height: 40px;};.JR_left{width: 120px;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}.bottom {font-size: 14px;display: flex;justify-content:center;}",
     };
   },
   methods: {
@@ -410,4 +423,9 @@ tr:last-child {
   border: 1px solid rgb(129, 130, 131);
   border-radius: 5px;
 }
+.bottom {
+  font-size: 14px;
+  display: flex;
+  justify-content: center;
+}
 </style>

+ 119 - 37
src/components/look_word/bdgldiary.vue

@@ -99,14 +99,20 @@
           <td class="JR_left">实到</td>
           <td class="JR_left">到课率</td>
         </tr>
-        <tr class="JR_tr" height="70" align="center">
-          <td class="JR_left">早晨</td>
-          <td colspan="9"></td>
-          <td class="JR_right"></td>
-          <td class="JR_right"></td>
-          <td class="JR_right"></td>
+        <tr
+          class="JR_tr"
+          height="70"
+          align="center"
+          v-for="(items, index) in message.weekworkRegisters"
+          :key="index"
+        >
+          <td class="JR_left">{{ 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>
         </tr>
-        <tr class="JR_tr" height="70" align="center">
+        <!-- <tr class="JR_tr" height="70" align="center">
           <td class="JR_left">上午</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
@@ -126,11 +132,13 @@
           <td class="JR_right"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
-        </tr>
+        </tr> -->
         <!-- 公差勤务 -->
         <tr class="JR_tr">
           <td colspan="2"><p align="center" class="JR_left">公差勤务</p></td>
-          <td colspan="12" class="JR_right"><p></p></td>
+          <td colspan="12" class="JR_right" v-html="message.tolerance">
+            <p></p>
+          </td>
         </tr>
         <tr class="JR_tr">
           <!-- 人员装备变动 -->
@@ -140,7 +148,9 @@
               装备变动
             </p>
           </td>
-          <td colspan="12" class="JR_right"><p></p></td>
+          <td colspan="12" class="JR_right" v-html="message.transfer">
+            <p></p>
+          </td>
         </tr>
         <!-- 武器装备检查情况 -->
         <tr class="JR_tr">
@@ -157,11 +167,13 @@
               记 <br />
             </p>
           </td>
-          <td colspan="12" class="JR_right"><p></p></td>
+          <td colspan="12" class="JR_right" v-html="message.internal">
+            <p></p>
+          </td>
         </tr>
         <!-- 查铺查哨 -->
         <tr class="JR_tr">
-          <td rowspan="4" class="JR_left">
+          <td :rowspan="chapu" class="JR_left">
             <p align="center">
               查 <br />
               铺 <br />
@@ -177,14 +189,29 @@
             <p align="center" style="letter-spacing: 20px">检 查 情 况</p>
           </td>
         </tr>
-        <tr class="JR_tr" height="30">
-          <td class="JR_right"><p align="center"></p></td>
-          <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>
-          <td class="JR_right" colspan="8"><p align="center"></p></td>
+        <tr
+          v-for="(item, i) in message.inspect"
+          :key="i"
+          class="JR_tr"
+          height="30"
+        >
+          <td class="JR_right">
+            <p align="center">{{ item.peopleName }}</p>
+          </td>
+          <td class="JR_right">
+            <p align="center">{{ item.examineDate }}</p>
+          </td>
+          <td class="JR_right">
+            <p align="center">{{ item.foremanName }}</p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ item.sentryName }}</p>
+          </td>
+          <td class="JR_right" colspan="8">
+            <p align="center">{{ item.dialogue }}</p>
+          </td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <!-- <tr class="JR_tr" height="30">
           <td class="JR_right"><p align="center">&nbsp;</p></td>
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right"><p align="center"></p></td>
@@ -197,7 +224,7 @@
           <td class="JR_right"><p align="center"></p></td>
           <td class="JR_right" colspan="2"><p align="center"></p></td>
           <td class="JR_right" colspan="8"><p align="center"></p></td>
-        </tr>
+        </tr> -->
         <!-- 派班情况 -->
         <tr class="JR_tr">
           <td class="JR_left" rowspan="4">
@@ -218,22 +245,38 @@
         </tr>
         <tr class="JR_tr" height="30" align="center">
           <td class="JR_left">值班员</td>
-          <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>
+          <td class="JR_right">
+            <p align="center">{{ message.dutya }}</p>
+          </td>
+          <td class="JR_right">
+            <p align="center">{{ message.dutya }}</p>
+          </td>
+          <td class="JR_right" colspan="2">
+            <p align="center">{{ 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_right"><p align="center"></p></td>
-          <td class="JR_right"><p align="center"></p></td>
-          <td class="JR_left" colspan="2" rowspan="2">交接时间<br /></td>
+          <td class="JR_right">
+            <p align="center">{{ message.dutyc }}</p>
+          </td>
+          <td class="JR_right">
+            <p align="center">{{ message.dutyd }}</p>
+          </td>
+          <td class="JR_left" colspan="2" rowspan="2">
+            {{ message.dutyDate }}<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_right"><p align="center"></p></td>
-          <td class="JR_right"><p align="center"></p></td>
+          <td class="JR_right">
+            <p align="center">{{ message.dutye }}</p>
+          </td>
+          <td class="JR_right">
+            <p align="center">{{ message.dutyf }}</p>
+          </td>
           <td class="JR_right" colspan="8"></td>
         </tr>
         <!-- 临时来队亲属 -->
@@ -269,16 +312,37 @@
         <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_right" height="30" colspan="10" rowspan="3">
+          <td
+            class="JR_right"
+            height="30"
+            colspan="10"
+            rowspan="3"
+            v-html="message.invalid"
+          >
             <p align="left"></p>
           </td>
         </tr>
-        <tr class="JR_tr">
-          <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 class="JR_tr" v-for="(item1, i) in message.inspect" :key="i">
+          <td class="JR_right" height="30">
+            {{ item1.peopleId }}
+            <p align="center"></p>
+          </td>
+          <td class="JR_right" height="30">
+            {{ item1.name }}
+            <p align="center"></p>
+          </td>
+          <td class="JR_right" height="30">
+            {{ item1.relation }}
+            <p align="center"></p>
+          </td>
+          <td class="JR_right" height="30">
+            {{ item1.comeDate }}
+            <p align="center"></p>
+          </td>
+          <td class="JR_right" height="30">
+            {{ item1.leaveDate }}
+            <p align="center"></p>
+          </td>
         </tr>
         <tr class="JR_tr" height="30">
           <td class="JR_right" height="30"><p align="center"></p></td>
@@ -396,7 +460,12 @@
             </p>
           </td>
-          <td class="JR_right" colspan="15" style="white-space: normal"></td>
+          <td
+            class="JR_right"
+            colspan="15"
+            style="white-space: normal"
+            v-html="message.notice"
+          ></td>
         </tr>
       </table>
 
@@ -415,15 +484,28 @@ export default {
   props: ["message"],
   data() {
     return {
-      title: "周工作安排表",
+      title: "连队要事日记",
       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,
     };
   },
+  created() {
+    // this.chapu();
+    // this.chapus();
+    this.chapu = this.chapus();
+    // console.log(this.chapus());
+  },
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);
     },
+    chapus() {
+      return this.message.inspect.length + 1;
+      // if (this.message.inspect.lenght > 3) {
+      //   this.chapu += this.message.inspect.lenght - 3;
+      // }
+    },
   },
 };
 </script>

+ 4 - 4
src/components/look_word/bdgldrill.vue

@@ -84,12 +84,12 @@
           <tr class="JR_tr">
             <td width="101" class="JR_right">
               <p align="center" style="margin: 10px 0">
-                {{ message.number }}
+                {{ message.project }}
                 <!-- <span style="display: none">111</span> -->
               </p>
             </td>
             <td width="113" class="JR_right">
-              <p align="center">{{ message.project }}</p>
+              <p align="center">{{ message.contents }}</p>
             </td>
             <!--<td width="85"><p align="center">2021-12-15</p></td>-->
             <td width="85" class="JR_right">
@@ -254,7 +254,7 @@ export default {
     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{ font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
+        ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{ font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right},",
     };
   },
   methods: {
@@ -273,7 +273,7 @@ tr:last-child {
   border-bottom: 1px solid;
 }
 .a1 {
-  margin-right: 30px;
+  margin-right: 50px;
 }
 .box1 {
   position: absolute;

+ 56 - 19
src/components/look_word/bdglequip.vue

@@ -48,13 +48,13 @@
         <tbody>
           <tr class="JR_tr">
             <td width="37" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 0 8px !important">序<br />号</p>
+              <p align="center" style="">序<br />号</p>
             </td>
             <td width="66" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 0 10px">类别</p>
+              <p align="center" style="">类别</p>
             </td>
             <td width="85" valign="center" rowspan="2" class="JR_left">
-              <p align="center" style="margin: 0 15px">名称</p>
+              <p align="center" style="">名称</p>
             </td>
             <td width="274" valign="center" colspan="5" class="JR_left">
               <p align="center">库存情况</p>
@@ -86,19 +86,19 @@
               </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" style="margin: 0 !important" class="JR_left">
+              <p align="center" style="t" class="JR_left">
                 配发<br />
                 数量
               </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" style="margin: 0 !important" class="JR_left">
+              <p align="center" style="" class="JR_left">
                 自筹<br />
                 数量
               </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" style="margin: 0 !important" class="JR_left">
+              <p align="center" style="" class="JR_left">
                 库存<br />
                 数量
               </p>
@@ -123,7 +123,9 @@
             </td>
           </tr>
           <tr class="JR_tr">
-            <td width="37" valign="center"><p align="center">5</p></td>
+            <td width="37" valign="center">
+              <p align="center">{{ message.id }}</p>
+            </td>
             <td width="66" valign="center" rowspan="1" class="JR_right">
               <p align="center">{{ message.type }}</p>
             </td>
@@ -171,7 +173,7 @@
             </td>
           </tr>
           <tr class="JR_tr">
-            <td width="37" valign="center" style="margin: 0">
+            <td width="37" valign="center" style="">
               <p align="center">
                 填<br />
                 写<br />
@@ -179,28 +181,63 @@
                 明 <br />
               </p>
             </td>
-            <td width="897" valign="center" colspan="15">
-              <p>
-                类别栏,区分训练器材(通用训练器材、专用训练器材)、教材填写。
-              </p>
+            <td width="897" valign="center" colspan="15" v-html="message.info">
+              <p></p>
             </td>
           </tr>
         </tbody>
+        <tr
+          class="JR_tr"
+          style="
+            border: none;
+            color: black;
+            font-size: 12pt;
+            font-weight: 700;
+            line-height: 30px;
+          "
+        >
+          <td
+            class="JR_right"
+            colspan="6"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
+            军事主官:
+          </td>
+          <td
+            class="JR_right"
+            colspan="7"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
+            政治主官:
+          </td>
+          <td
+            class="JR_right"
+            colspan="3"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
+            时间:
+          </td>
+        </tr>
       </table>
-      <div
+      <!-- <div
+        class="a1"
         style="
           width: 100%;
           height: 50px;
-          margin-top: 15px;
           font-size: 16px;
           font-weight: 600;
           color: black;
+          display: flex;
+          justify-content: space-between;
         "
       >
-        <span style="margin-left: -10px" class="JR_bottom">军事主官:</span>
-        <span style="margin-left: 30%" class="JR_bottom">政治主官:</span>
-        <span style="margin-left: 360px" class="JR_bottom">时间:</span>
-      </div>
+        <p style="">军事主官:</p>
+        <p class="aa">政治主官:</p>
+        <p style="">时间:</p>
+      </div> -->
     </div>
   </div>
 </template>
@@ -215,7 +252,7 @@ export default {
     return {
       title: "训练器材、教材登记簿",
       style:
-        ".JR_tr {height: 40px;};.JR_left{width: 120px;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}",
+        ".JR_tr {height: 40px;};.JR_left{width: 120px;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: {

+ 6 - 7
src/components/look_word/bdgleven.vue

@@ -98,9 +98,10 @@
             <td
               class="JR_right"
               align="left"
-              style="padding-left: 20px; line-height: 15px"
+              style="line-height: 20px; text-indent: 30px"
+              v-html="message.title"
             >
-              {{ message.title }}
+              <!-- {{ message.title }} -->
             </td>
           </tr>
           <tr class="JR_tr">
@@ -123,7 +124,7 @@
               class="JR_bottom"
               style="border-left: 1px solid black"
             >
-              <p style="text-align: right">主持人:(签字)</p>
+              <p style="text-align: right; padding-right: 80px">主持人:</p>
             </td>
           </tr>
           <tr class="JR_tr">
@@ -132,7 +133,7 @@
               class="JR_bottom"
               style="border-left: 1px solid black"
             >
-              <p style="text-align: right">主持人:(签字)</p>
+              <p style="text-align: right; padding-right: 80px">记录人:</p>
             </td>
           </tr>
           <tr class="JR_tr">
@@ -142,9 +143,7 @@
               style="border-left: 1px solid black"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">    年  月  日</p>-->
-              <p style="text-align: right; padding-right: 10px">
-                2022-01-20 15:05:23
-              </p>
+              <p style="text-align: right; padding-right: 80px">时间:</p>
             </td>
           </tr>
         </tbody>

+ 150 - 80
src/components/look_word/bdglfood.vue

@@ -12,7 +12,7 @@
       >
         《伙食管理登记簿》
       </p>
-      <div
+      <!-- <div
         style="
           width: 100%;
           height: 50px;
@@ -23,10 +23,11 @@
           color: black;
         "
       >
-        <span style="margin-left: 50px; letter-spacing: 25px">月日</span>
-        <span style="margin-left: 7%">星期</span>
+        <span style="margin-left: 50px">时间:{{ message.recordDate }}</span>
+        <span style="margin-left: 7%">星期</span>
         <span style="margin-left: 480px">单位:千克、元</span>
-      </div>
+      </div> -->
+
       <table
         border="1"
         class="table"
@@ -46,10 +47,39 @@
         align="center"
         bordercolor="black"
       >
+        <tr
+          class="aaa"
+          style="border: none; color: black; font-size: 12pt; line-height: 30px"
+        >
+          <td
+            class="JR_right"
+            colspan="5"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
+            日期:{{ message.recordDate }}
+          </td>
+          <td
+            class="JR_right"
+            colspan="8"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
+            星期:
+          </td>
+          <td
+            class="JR_right"
+            colspan="3"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
+            单位:千克、元
+          </td>
+        </tr>
         <tbody>
           <!-- 区分早中晚一日三餐 -->
           <tr style="text-align: center" class="JR_tr">
-            <td colspan="2" class="JR_left">区 分</td>
+            <td colspan="2" class="JR_left" style="widt: 60px">区 分</td>
             <td colspan="3" class="JR_left">
               <p align="center">主食</p>
             </td>
@@ -338,58 +368,12 @@
             </td>
           </tr>
 
-          <!-- <tr class="JR_tr">
-            <td rowspan="" class="JR_left"><p align="center">副食</p></td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
-              <p align="center">{{ message.bdglFoodKinds[1].name }}</p>
-            </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
-              <p align="center">{{ message.bdglFoodKinds[1].distinctions }}</p>
-            </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
-              <p align="center">{{ message.bdglFoodKinds[1].weight }}</p>
-            </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
-              <p align="center">{{ message.bdglFoodKinds[1].money }}</p>
-            </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
-              <p align="center">{{ message.bdglFoodKinds[1].types }}</p>
-            </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
-              <p align="center">{{ message.bdglFoodKinds[1].money }}</p>
-            </td>
-          </tr>
-
-          <tr class="JR_tr">
-            <td width="" rowspan="" class="JR_left">
-              <p align="center">其他</p>
-            </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
-              <p align="center">{{ message.bdglFoodKinds[2].name }}</p>
-            </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
-              <p align="center">{{ message.bdglFoodKinds[2].distinctions }}</p>
-            </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
-              <p align="center"></p>
-            </td>
-            <td width="" style="color: black" colspan="2" class="JR_right">
-              <p align="center"></p>
-            </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
-              <p align="center"></p>
-            </td>
-            <td width="" style="color: black" colspan="3" class="JR_right">
-              <p align="center"></p>
-            </td>
-          </tr> -->
-
           <!-- 退交伙食费----有问题 -->
           <tr class="JR_tr" style="text-align: center">
-            <td width="" colspan="2" rowspan="2" class="JR_left">
+            <td width="" colspan="1" rowspan="2" class="JR_left">
               <p align="center" style="">姓名</p>
             </td>
-            <td width="" colspan="6" class="JR_left">
+            <td width="" colspan="7" class="JR_left">
               <p align="center">交伙食费</p>
             </td>
             <td width="" colspan="2" rowspan="2" class="JR_left">
@@ -401,7 +385,7 @@
           </tr>
 
           <tr class="JR_tr">
-            <td width="" colspan="2" class="JR_left">
+            <td width="" colspan="3" class="JR_left">
               <p align="center">天数</p>
             </td>
             <td width="" colspan="2" class="JR_left">
@@ -422,33 +406,42 @@
           </tr>
 
           <tr
-            class="JR_tr"
-            v-for="(item, i) in message.bdglFoodBoardWagess"
+            v-for="(item, i) in by_reset"
             :key="i"
+            class="JR_tr"
+            style="text-align: center; line-height: 47px"
           >
-            <td width="" colspan="2" class="JR_right">
-              <p align="center">{{ item.peopleName }}</p>
+            <td colspan="1" class="JR_right">
+              {{ item.peopleName }}
             </td>
-            <td width="" colspan="2" class="JR_right">
-              <p align="center">{{ item.name }}</p>
+            <td colspan="3" class="JR_right">{{ item.sky }}</td>
+            <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">
+              {{ reset[i].peopleName }}
             </td>
-            <td width="" colspan="2" class="JR_right">
-              <p align="center">{{ item.peopleId }}</p>
+            <td colspan="2" v-show="isWho" class="JR_right">
+              {{ reset[i].sky }}
             </td>
-            <td width="" colspan="2" class="JR_right">
-              <p align="center" style="">{{ item.type }}</p>
+            <td colspan="2" v-show="isWho" class="JR_right">
+              {{ reset[i].standard }}
             </td>
-            <td width="" colspan="2" class="JR_right">
-              <p align="center" style="">{{ item.sky }}</p>
+            <td colspan="2" v-show="isWho" class="JR_right">
+              {{ reset[i].money }}
             </td>
-            <td width="" colspan="2" class="JR_right">
-              <p align="center">{{ item.standard }}</p>
+
+            <td colspan="2" v-show="!isWho" class="JR_right">
+              {{ by[i].peopleName }}
             </td>
-            <td width="" colspan="2" class="JR_right">
-              <p align="center" style="">{{ item.money }}</p>
+            <td colspan="2" v-show="!isWho" class="JR_right">
+              {{ by[i].sky }}
             </td>
-            <td width="" colspan="2" class="JR_right">
-              <p align="center" style=""></p>
+            <td colspan="2" v-show="!isWho" class="JR_right">
+              {{ by[i].standard }}
+            </td>
+            <td colspan="2" v-show="!isWho" class="JR_right">
+              {{ by[i].money }}
             </td>
           </tr>
 
@@ -458,7 +451,7 @@
               <p align="center">在食堂购物</p>
             </td>
           </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" style="text-align: center; line-height: 47px">
             <td width="" rowspan="2" colspan="2" class="JR_left">
               <p align="center">姓名</p>
             </td>
@@ -581,7 +574,7 @@
               </p>
             </td>
             <td width="" colspan="7" style="" class="JR_right">
-              <p align="center">{{ message.peopleIds }}</p>
+              <p align="center">{{ message.peopleNames }}</p>
             </td>
           </tr>
 
@@ -607,8 +600,37 @@
             </td>
           </tr>
         </tbody>
+        <tr
+          class="aaa"
+          style="border: none; color: black; font-size: 12pt; line-height: 30px"
+        >
+          <td
+            class="JR_right"
+            colspan="6"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
+            单位首长:{{ message.people1Name }}
+          </td>
+          <td
+            class="JR_right"
+            colspan="6"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
+            经委会主任:{{ message.chairmanName }}
+          </td>
+          <td
+            class="JR_right"
+            colspan="3"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
+            值班员:{{ message.peopleName }}
+          </td>
+        </tr>
       </table>
-      <div
+      <!-- <div
         style="
           width: 100%;
           height: 50px;
@@ -618,10 +640,14 @@
           color: black;
         "
       >
-        <span style="margin-left: 10px">单位首长:</span>
-        <span style="margin-left: 30%">经委会主任:</span>
-        <span style="margin-left: 360px">值班员:</span>
-      </div>
+        <span style="margin-left: 10px"
+          >单位首长:{{ message.people1Name }}</span
+        >
+        <span style="margin-left: 30%" class="a1"
+          >经委会主任:{{ message.chairmanName }}</span
+        >
+        <span style="margin-left: 270px">值班员:{{ message.peopleName }}</span>
+      </div> -->
     </div>
   </div>
 </template>
@@ -635,13 +661,57 @@ export default {
     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}",
+        ".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};.a1{margin-left: 300px;};.aaa{height: 40px;font-size: 1.331em; font-family: '楷体_GB2312';border: none;border-color: none;}",
+      isWho: null,
+      result: {
+        money: "",
+        peopleId: "",
+        sky: "",
+        standard: "",
+      },
+      by: [],
+      reset: [],
+      by_reset: null,
     };
   },
+  created() {
+    this.isWhy();
+  },
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);
     },
+    isWhy() {
+      let item;
+      let i;
+      for (item in this.message.bdglFoodBoardWagess) {
+        if (this.message.bdglFoodBoardWagess[item].type === "交") {
+          this.by.push(this.message.bdglFoodBoardWagess[item]);
+        } else {
+          this.reset.push(this.message.bdglFoodBoardWagess[item]);
+        }
+      }
+      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) {
+          this.by_reset = this.by;
+          this.isWho = "by";
+        } else {
+          this.by_reset = this.reset;
+        }
+      }
+      if (this.isWho === "by") {
+        let item = this.by.length - this.reset.length;
+        for (i = 0; i < item; i++) {
+          this.reset.push(this.result);
+        }
+      } else {
+        let item = this.reset.length - this.by.length;
+        for (i = 0; i < item; i++) {
+          this.by.push(this.result);
+        }
+      }
+    },
   },
 };
 </script>

+ 6 - 7
src/components/look_word/bdglmeeting.vue

@@ -134,8 +134,9 @@
               class="JR_right"
               align="left"
               style="border-left: 1px dashed #999; padding-left: 20px"
+              v-html="message.title"
             >
-              <p>{{ message.title }}</p>
+              <!-- <p>{{ message.title }}</p> -->
             </td>
           </tr>
           <tr class="JR_tr">
@@ -144,7 +145,7 @@
             </td>
             <td
               align="left"
-              style="border-left: none; padding-left: 20px; text-indent: 30px"
+              style="border-left: none; padding-left: 20px"
               class="JR_right"
               v-html="message.contents"
             ></td>
@@ -156,7 +157,7 @@
               class="JR_bottom"
               style="border-left: 1px solid black"
             >
-              <p style="text-align: right">主持人:(签字)</p>
+              <p style="text-align: right; padding-right: 80px">主持人:</p>
             </td>
           </tr>
           <tr class="JR_tr">
@@ -165,7 +166,7 @@
               class="JR_bottom"
               style="border-left: 1px solid black"
             >
-              <p style="text-align: right">主持人:(签字)</p>
+              <p style="text-align: right; padding-right: 80px">主持人:</p>
             </td>
           </tr>
           <tr class="JR_tr">
@@ -175,9 +176,7 @@
               style="border-left: 1px solid black"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">    年  月  日</p>-->
-              <p style="text-align: right; padding-right: 10px">
-                2022-01-20 15:05:23
-              </p>
+              <p style="text-align: right; padding-right: 80px">时间:</p>
             </td>
           </tr>
         </tbody>

+ 6 - 7
src/components/look_word/bdglparty.vue

@@ -144,8 +144,9 @@
               rowspan="2"
               style="border-left: 1px dashed #999; padding: 0px 20px"
               align="left"
+              v-html="message.title"
             >
-              {{ message.title }}
+              <!-- {{ message.title }} -->
             </td>
           </tr>
           <tr class="JR_tr"></tr>
@@ -174,7 +175,7 @@
               class="JR_bottom"
               style="border-left: 1px solid black"
             >
-              <p style="text-align: right">主持人:(签字)</p>
+              <p style="text-align: right; padding-right: 80px">主持人:</p>
             </td>
           </tr>
           <tr class="JR_tr">
@@ -183,7 +184,7 @@
               class="JR_bottom"
               style="border-left: 1px solid black"
             >
-              <p style="text-align: right">主持人:(签字)</p>
+              <p style="text-align: right; padding-right: 80px">主持人:</p>
             </td>
           </tr>
           <tr class="JR_tr">
@@ -193,9 +194,7 @@
               style="border-left: 1px solid black"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">    年  月  日</p>-->
-              <p style="text-align: right; padding-right: 10px">
-                2022-01-20 15:05:23
-              </p>
+              <p style="text-align: right; padding-right: 80px">时间:</p>
             </td>
           </tr>
         </tbody>
@@ -213,7 +212,7 @@ export default {
     return {
       title: "党支部会议记录本",
       style:
-        ".JR_tr {height: 40px;};.JR_left{border-right:none;width: 120px;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
+        ".JR_tr {height: 40px;};.JR_left{border-right:none;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
   methods: {

+ 14 - 14
src/components/look_word/bdglsecrecy.vue

@@ -110,7 +110,7 @@
           </tr>
           <tr class="JR_tr">
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0"></p>
+              <p align="center" style="margin: 5px 0; height: 40px"></p>
             </td>
             <td valign="center" class="JR_right">
               <p align="center" style="margin: 5px 0"></p>
@@ -137,39 +137,39 @@
             <td valign="center" class="JR_right">
               <p align="center" style="margin: 5px 0">
                 <br />
-                (移交/出售)
               </p>
             </td>
           </tr>
-
           <tr class="JR_tr">
-            <td valign="center">
-              <p align="center" style="margin: 15px 0; height: 40px"></p>
+            <td valign="center" class="JR_right">
+              <p align="center" style="margin: 5px 0; height: 40px"></p>
             </td>
-            <td valign="center">
+            <td valign="center" class="JR_right">
               <p align="center" style="margin: 5px 0"></p>
             </td>
-            <td valign="center">
+            <td valign="center" class="JR_right">
               <p align="center" style="margin: 5px 0"></p>
             </td>
-            <td valign="center">
+            <td valign="center" class="JR_right">
               <p align="center" style="margin: 5px 0"></p>
             </td>
-            <td valign="center">
+            <td valign="center" class="JR_right">
               <p align="center" style="margin: 5px 0"></p>
             </td>
-            <td valign="center">
+            <td valign="center" class="JR_right">
               <p align="center" style="margin: 5px 0"></p>
             </td>
-            <td valign="center">
+            <td valign="center" class="JR_right">
               <p align="center" style="margin: 5px 0"></p>
             </td>
-            <td valign="center">
+            <td valign="center" class="JR_right">
               <!--<p align="center">2022-01-20<br>2022-01-20</p>-->
               <p align="center" style="margin: 5px 0"></p>
             </td>
-            <td valign="center">
-              <p align="center" style="margin: 5px 0"></p>
+            <td valign="center" class="JR_right">
+              <p align="center" style="margin: 5px 0">
+                <br />
+              </p>
             </td>
           </tr>
         </tbody>

+ 18 - 9
src/components/look_word/bdglsoldier.vue

@@ -101,8 +101,13 @@
             <td class="JR_left" style="border-right: 0">
               <p align="center">&nbsp;&nbsp;&nbsp;议 &nbsp;题:</p>
             </td>
-            <td align="left" class="JR_right" style="border-left: 0">
-              <p>{{ message.title }}</p>
+            <td
+              align="left"
+              class="JR_right"
+              style="border-left: 0"
+              v-html="message.title"
+            >
+              <!-- <p>{{ message.title }}</p> -->
             </td>
           </tr>
 
@@ -127,23 +132,27 @@
 
           <tr class="JR_tr">
             <td colspan="2" class="TableData" style="border: 1px solid black">
-              <p class="JR_bottom" style="text-align: right">
-                主持人:(签字)
+              <p
+                class="JR_bottom"
+                style="text-align: right; padding-right: 80px"
+              >
+                主持人:
               </p>
             </td>
           </tr>
           <tr class="JR_tr">
             <td colspan="2" class="TableData" style="border: 1px solid black">
-              <p class="JR_bottom" style="text-align: right">
-                记录人:(签字)
+              <p
+                class="JR_bottom"
+                style="text-align: right; padding-right: 80px"
+              >
+                记录人:
               </p>
             </td>
           </tr>
           <tr class="JR_tr">
             <td colspan="2" class="" style="border: 1px solid black">
-              <p style="text-align: right; padding-right: 13px">
-                2022-01-18 09:42:24
-              </p>
+              <p style="text-align: right; padding-right: 80px">时间:</p>
             </td>
           </tr>
         </tbody>

+ 108 - 22
src/components/look_word/bdglweekwork.vue

@@ -12,17 +12,45 @@
         "
         id="qTitle"
       >
-        20XX年X月份第X周工作安排表
+        周工作安排表
       </p>
 
-      <div style="width: 100%; height: 30px; margin-top: 10px; color: black">
-        <span style="margin-left: 5%">连值班领导:顶级分类 &nbsp;</span>
-        <span style="margin-left: 25%">电话: &nbsp; </span>
+      <!-- <div style="width: 100%; height: 30px; margin-top: 10px; color: black">
+        <span style="margin-left: 5%"
+          >连值班领导:{{ message.peopleName }} &nbsp;</span
+        >
+        <span style="margin-left: 25%">电话:{{ message.phone }} &nbsp; </span>
         <span style="margin-left: 20%" id="qtime"
-          >(2022年03月09日-2022年03月09日)</span
+          >{{ message.startTime }}———{{ message.endTime }}</span
         >
-      </div>
-
+      </div> -->
+      <tr
+        style="
+          border: none;
+          color: black;
+          font-size: 12pt;
+          line-height: 30px;
+          width: 940px;
+        "
+      >
+        <td
+          colspan="4"
+          align="left"
+          style="border: none; line-height: 45px; width: 360px"
+        >
+          连值班领导:{{ message.peopleName }}
+        </td>
+        <td
+          colspan="3"
+          align="left"
+          style="border: none; line-height: 45px; width: 360px"
+        >
+          电话:{{ message.phone }}
+        </td>
+        <td colspan="3" align="left" style="border: none; line-height: 45px">
+          {{ message.startTime }}—{{ message.endTime }}
+        </td>
+      </tr>
       <table
         border="1"
         style="
@@ -61,37 +89,39 @@
               <p align="center">时间</p>
             </td>
           </tr>
+
           <tr
             class="JR_tr"
             v-for="(item, i) in message.bdglWeekworkRegisterList"
             :key="i"
             style="text-align: center; height: 45px"
           >
-            <td style="text-align: center" rowspan="2" class="JR_right">
+            <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.week }}
             </td>
-            <td style="text-align: center" rowspan="2" class="JR_right">
+            <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.time }}
             </td>
-            <td style="text-align: center" rowspan="2" class="JR_right">
+            <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.dateline }}
             </td>
-            <td style="text-align: center" rowspan="2" class="JR_right">
+            <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.contents }}
             </td>
-            <td style="text-align: center" rowspan="2" class="JR_right">
+            <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.unitId1 }}
             </td>
-            <td style="text-align: center" rowspan="2" class="JR_right">
+            <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.peopleIds }}
             </td>
-            <td style="text-align: center" rowspan="2" class="JR_right">
+            <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.address }}
             </td>
-            <td style="text-align: center" rowspan="2" class="JR_right">
+            <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.startTime }}—{{ item.endTime }}
             </td>
           </tr>
+
           <tr></tr>
           <tr class="JR_tr">
             <td valign="center" class="JR_left">
@@ -102,16 +132,72 @@
             </td>
           </tr>
         </tbody>
+        <tr
+          style="
+            border: none;
+            color: black;
+            font-size: 12pt;
+            line-height: 30px;
+            width: 940px;
+          "
+        >
+          <td
+            colspan="4"
+            align="left"
+            style="border: none; line-height: 45px; width: 360px"
+          >
+            军事主官:{{ message.people1Name }}
+          </td>
+          <td
+            colspan="3"
+            align="left"
+            style="border: none; line-height: 45px; width: 360px"
+          >
+            政治主官:{{ message.people2Name }}
+          </td>
+          <td colspan="3" align="left" style="border: none; line-height: 45px">
+            时间:
+          </td>
+        </tr>
       </table>
 
-      <!-- <p >军事主官:顶级分类                                     政治主官:顶级分类                                      时间:2022-03-09 </p> -->
-
-      <div style="width: 100%; height: 50px; margin-top: 10px; color: black">
-        <span style="margin-left: 30px">军事主官:顶级分类 &nbsp;</span>
-        <span style="margin-left: 30%">政治主官:顶级分类 </span>
-        <span style="margin-left: 232px">时间:2022-03-09</span>
-      </div>
+      <!-- <div style="width: 100%; height: 50px; margin-top: 10px; color: black">
+        <span style="margin-left: 30px"
+          >军事主官:{{ message.people1Name }} &nbsp;</span
+        >
+        <span style="margin-left: 30%"
+          >政治主官:{{ message.people2Name }}
+        </span>
+        <span style="margin-left: 232px">时间:</span>
+      </div> -->
     </div>
+    <!-- <tr
+      style="
+        border: none;
+        color: black;
+        font-size: 12pt;
+        line-height: 30px;
+        width: 940px;
+      "
+    >
+      <td
+        colspan="4"
+        align="left"
+        style="border: none; line-height: 45px; width: 360px"
+      >
+        军事主官:{{ message.people1Name }}
+      </td>
+      <td
+        colspan="3"
+        align="left"
+        style="border: none; line-height: 45px; width: 360px"
+      >
+        政治主官:{{ message.people2Name }}
+      </td>
+      <td colspan="3" align="left" style="border: none; line-height: 45px">
+        时间:
+      </td>
+    </tr> -->
   </div>
 </template>
 <script>

+ 192 - 0
src/components/look_word/personnelRoster.vue

@@ -0,0 +1,192 @@
+<template>
+  <div>
+    <el-button class="box1" @click="daochu">导出</el-button>
+
+    <div class="word" id="contents" style="font-family: 'fangsong'">
+      <p
+        style="
+          font-size: 14pt;
+          font-weight: 900;
+          margin-botttom: 30px;
+          color: black;
+          text-align: center;
+        "
+      >
+        《人员名册》
+      </p>
+
+      <table
+        border="1"
+        style="
+          border-collapse: collapse;
+          border: none;
+          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="900"
+        align="center"
+        bordercolor="black"
+      >
+        <tbody>
+          <tr height="40" align="center">
+            <td rowspan="2">日期</td>
+            <td colspan="3">编制人数</td>
+            <td colspan="3">在位人数</td>
+            <td colspan="3">超(缺)编人员情况</td>
+          </tr>
+          <tr height="40" align="center">
+            <td>干部</td>
+            <td>士官</td>
+            <td>义务兵</td>
+            <td>干部</td>
+            <td>士官</td>
+            <td>义务兵</td>
+            <td>干部</td>
+            <td>士官</td>
+            <td>义务兵</td>
+          </tr>
+          <tr height="40" align="center">
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+
+          <tr height="40" align="center">
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+        </tbody>
+      </table>
+
+      <p
+        align="right"
+        style="margin: 20px 200px 5px 0px; font-size: 16px; color: black"
+      >
+        日期
+      </p>
+      <table
+        border="1"
+        style="
+          border-collapse: collapse;
+          border: none;
+          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="900"
+        align="center"
+        bordercolor="black"
+      >
+        <tbody>
+          <tr height="40" align="center">
+            <td>姓名</td>
+            <td>职务</td>
+            <td>军衔</td>
+            <td>名族</td>
+            <td>籍贯</td>
+            <td>出生<br />年月</td>
+            <td>入伍<br />年月</td>
+            <td>
+              入党(团)<br />
+              时间
+            </td>
+            <td>文化<br />程度</td>
+            <td>婚姻<br />状况</td>
+            <td>家庭住址及联系方式</td>
+            <td>备注</td>
+          </tr>
+          <tr height="40" align="center">
+            <td>{{ message.name }}</td>
+            <td>{{ message.postId }}</td>
+            <td>{{ message.rankId }}</td>
+            <td>{{ message.nationId }}</td>
+            <td>{{ message.origin }}</td>
+            <td>{{ message.birthDate }}</td>
+            <td>{{ message.enlistDate }}</td>
+            <td>{{ message.partyDate }}</td>
+            <td>{{}}</td>
+            <td>{{ message.marryList }}</td>
+            <td>{{ message.live }}{{ message.phone }}</td>
+            <td>{{}}</td>
+          </tr>
+          <tr height="40" align="center">
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</template>
+<script>
+import { lookWord } from "@/utils/look_word.js";
+
+import "@/utils/lodJs.js";
+export default {
+  name: "bdgleven",
+  props: ["message"],
+  data() {
+    return {
+      title: "人员名册",
+      style:
+        ".JR_tr {height: 40px;};.JR_left{border-right:none;width: 120px;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{border-left:0; 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);
+    },
+  },
+};
+</script>
+<style scoped>
+tbody {
+  color: #fff;
+  text-align: center;
+}
+tr:last-child {
+  border-bottom: 1px solid;
+}
+
+.box1 {
+  position: absolute;
+  right: 30px;
+  top: 80px;
+  border: 1px solid rgb(129, 130, 131);
+  border-radius: 5px;
+}
+</style>

+ 0 - 1
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -1230,7 +1230,6 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getBdgldiary(id).then((response) => {
-        console.log(response, 11111111111111111111111);
         this.wordInfo = response.data;
         this.title = "查看要事日记";
         this.menuRoleVisible = true;

+ 7 - 5
src/views/grassrootsregistration/bdgldrill/index.vue

@@ -174,16 +174,18 @@
         <el-form-item label="单位" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入单位" />
         </el-form-item>
-        <el-form-item label="训练项目" prop="project">
+
+        <el-form-item label="训练类别" prop="project">
           <el-input v-model="form.project" placeholder="请输入训练项目" />
         </el-form-item>
-        <!-- <el-form-item label="训练内容" prop="contents">
-          <el-input
+        <el-form-item label="训练内容" prop="contents">
+          <el-input v-model="form.contents" placeholder="请输入内容" />
+          <!-- <el-input
             v-model="form.contents"
             type="textarea"
             placeholder="请输入内容"
-          />
-        </el-form-item> -->
+          /> -->
+        </el-form-item>
         <el-form-item label="训练时间" prop="drillTime">
           <el-date-picker
             clearable

+ 11 - 2
src/views/grassrootsregistration/bdgleven/index.vue

@@ -219,9 +219,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会议议题" prop="title">
+        <!-- <el-form-item label="会议议题" prop="title">
           <el-input v-model="form.title" placeholder="请输入会议议题" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="出席人" prop="joinId" class="joinId">
           <el-select
             ref="abc"
@@ -239,6 +239,15 @@
           </el-select>
         </el-form-item>
 
+        <div class="jiben">会议议题</div>
+        <quill-editor
+          class="quill-editor"
+          ref="myTextEditor"
+          v-model="form.title"
+          style="height: 150px; width: 920px; 
+           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
+        ></quill-editor>
+
         <div class="jiben">会议内容</div>
         <quill-editor
           class="quill-editor"

+ 1 - 0
src/views/grassrootsregistration/bdglfood/index.vue

@@ -1606,6 +1606,7 @@ export default {
       this.opens = false;
       const id = row.id || this.ids;
       getBdglfood(id).then((response) => {
+        console.log(response);
         this.wordInfo = response.data;
         this.title = "查看伙食管理登记薄";
         this.menuRoleVisible = true;

+ 11 - 2
src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -242,9 +242,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会议议题" prop="title">
+        <!-- <el-form-item label="会议议题" prop="title">
           <el-input v-model="form.title" placeholder="请输入会议议题" />
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="参加人" prop="joinId" class="joinId">
           <el-select
@@ -298,6 +298,15 @@
           </el-select>
         </el-form-item>
 
+        <div class="jiben">会议议题</div>
+        <quill-editor
+          class="quill-editor"
+          ref="myTextEditor"
+          v-model="form.title"
+          style="height: 150px; width: 920px; 
+           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
+        ></quill-editor>
+
         <div class="jiben">会议内容</div>
         <quill-editor
           class="quill-editor"

+ 11 - 2
src/views/grassrootsregistration/bdglparty/index.vue

@@ -216,9 +216,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会议议题" prop="title">
+        <!-- <el-form-item label="会议议题" prop="title">
           <el-input v-model="form.title" placeholder="请输入会议议题" />
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="参加人" prop="joinId" class="joinId">
           <el-select
@@ -269,6 +269,15 @@
           </el-select>
         </el-form-item>
 
+        <div class="jiben">会议议题</div>
+        <quill-editor
+          class="quill-editor"
+          ref="myTextEditor"
+          style="height: 150px; width: 920px; 
+           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
+          v-model="form.title"
+        ></quill-editor>
+
         <div class="jiben">会议内容</div>
         <quill-editor
           class="quill-editor"

+ 11 - 2
src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -211,9 +211,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会议议题" prop="title">
+        <!-- <el-form-item label="会议议题" prop="title">
           <el-input v-model="form.title" placeholder="请输入会议议题" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="参加人" prop="joinId" class="joinId">
           <el-select
             ref="bb"
@@ -263,6 +263,15 @@
           </el-select>
         </el-form-item>
 
+        <div class="jiben">会议议题</div>
+        <quill-editor
+          class="quill-editor"
+          ref="myTextEditor"
+          v-model="form.title"
+          style="height: 150px; width: 920px; 
+           margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
+        ></quill-editor>
+
         <div class="jiben">会议内容</div>
         <quill-editor
           class="quill-editor"

+ 46 - 2
src/views/grassrootsregistration/personnelRoster/index.vue

@@ -595,7 +595,12 @@
             </template>
           </el-table-column>
           <el-table-column label="入伍地点" align="center" prop="enlistaddress" />-->
-          <el-table-column label="军衔" align="center" prop="rankId">
+          <el-table-column
+            label="军衔"
+            align="center"
+            prop="rankId"
+            width="60px"
+          >
             <template slot-scope="scope">
               <dict-tag
                 :options="dict.type.sys_user_rank"
@@ -744,9 +749,16 @@
             label="操作"
             align="center"
             class-name="small-padding fixed-width"
-            width="200px"
+            width="60px"
           >
             <template slot-scope="scope">
+              <el-button
+                size="btk"
+                type="text"
+                @click="handleChakan(scope.row)"
+                v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
+                ><span class="chakan">查看</span></el-button
+              >
               <el-button
                 size="btu"
                 type="text"
@@ -1200,10 +1212,25 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <div class="fff">
+      <el-dialog
+        :visible.sync="menuRoleVisible"
+        :title="title"
+        append-to-body
+        id="chakan"
+      >
+        <personnelRoster
+          v-if="menuRoleVisible"
+          ref="menuRole"
+          :message="wordInfo"
+        ></personnelRoster>
+      </el-dialog>
+    </div>
   </div>
 </template>
 
 <script>
+import personnelRoster from "@/components/look_word/personnelRoster.vue";
 import {
   listPeople,
   getPeople,
@@ -1218,6 +1245,9 @@ import {
 
 export default {
   name: "People",
+  components: {
+    personnelRoster,
+  },
   dicts: [
     "sys_user_sex",
     "post_Level",
@@ -1235,6 +1265,9 @@ export default {
   ],
   data() {
     return {
+      //查看页面
+      menuRoleVisible: false,
+      wordInfo: {},
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -1667,6 +1700,17 @@ export default {
         }
       });
     },
+    //查看按钮操作
+    handleChakan(row) {
+      // 是否隐藏按钮
+      this.opens = false;
+      const id = row.id || this.ids;
+      getPeople(id).then((response) => {
+        this.wordInfo = response.data;
+        this.title = "查看人员名册";
+        this.menuRoleVisible = true;
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;