sunyanqiang 3 роки тому
батько
коміт
8525d2764b

+ 10 - 0
src/api/medicalhealth/examine.js

@@ -35,6 +35,16 @@ export function updateExamine(data) {
   })
 }
 
+// 新增人员体检信息表
+export function details(data) {
+  return request({
+    url: '/medicalhealth/details',
+    method: 'post',
+    data: data
+  })
+}
+
+
 // 删除人员体检信息
 export function delExamine(id) {
   return request({

+ 7 - 1
src/assets/styles/global.css

@@ -952,7 +952,8 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 .input_xiala:hover {
   color: #000 !important;
 }
-.ren_yuan{
+
+.ren_yuan {
   width: 510px !important;
 }
 
@@ -1271,4 +1272,9 @@ input:-moz-placeholder {
 /* 教案库上传文件弹框样式 */
 #uploadfile .el-dialog__body {
   padding: 30px 0px !important;
+}
+
+/* 树形选择模糊匹输入颜色 */
+.vue-treeselect__input {
+  color: #fff;
 }

+ 173 - 24
src/components/look_word/bdglcookbook.vue

@@ -22,10 +22,12 @@
           font-family: 'fangsong';
         "
       >
-        使用时间:{{ message.startTime }}——{{ message.endTime }}
+        使用时间:{{ message.startTime | dataFormaty }}—{{
+          message.endTime | dataFormaty
+        }}
       </p>
       <table
-      class="b1"
+        class="b1"
         border="1"
         style="
           border-collapse: collapse;
@@ -50,21 +52,93 @@
           <col width="130" />
           <col width="121" span="3" />
         </colgroup>
-        <tbody style="font-size: 15px;font-weight: 500;">
+        <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>
+            <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" 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
+              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"
@@ -115,7 +189,15 @@
             </td>
           </tr>
           <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
+              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>
@@ -163,8 +245,24 @@
           </tr>
 
           <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
+              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>
@@ -211,7 +309,15 @@
             </td>
           </tr>
           <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
+              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>
@@ -259,8 +365,24 @@
           </tr>
 
           <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
+              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>
@@ -307,7 +429,15 @@
             </td>
           </tr>
           <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
+              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>
@@ -363,24 +493,43 @@
             font-weight: 500;
             line-height: 30px;
             width: 930px;
-            font-family: 'fangsong'
+            font-family: 'fangsong';
           "
         >
           <td
             colspan="4"
             align="left"
-            style="border: none; line-height: 45px; width: 360px"
+            style="
+              border: none;
+              line-height: 45px;
+              width: 360px;
+              padding-left: 34px;
+            "
           >
             单位领导:
           </td>
           <td
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px; width: 360px"
+            style="
+              border: none;
+              line-height: 45px;
+              width: 360px;
+              text-align: center;
+            "
           >
             经委会:
           </td>
-          <td colspan="3" align="left" style="border: none; line-height: 45px">
+          <td
+            colspan="3"
+            align="left"
+            style="
+              border: none;
+              line-height: 45px;
+              text-align: center;
+              padding-left: 81px;
+            "
+          >
             制表:
           </td>
         </tr>

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

@@ -858,7 +858,7 @@
               连队首长签字: {{ message.sz }}
             </p>
           </td>
-          <td colspan="10" style="border: none;width:250px" ></td>
+          <td colspan="10" style="border: none; width: 250px"></td>
           <td
             colspan="2"
             style="border: none; font-family: 'songti'; display: inline-block"

+ 65 - 31
src/components/look_word/bdgldrill.vue

@@ -9,12 +9,13 @@
           font-weight: 600;
           margin-botttom: 30px;
           color: black;
-          font-family: 'heiti'
+          font-family: 'heiti';
+          text-align: center;
         "
       >
         《军事训练登记簿》
       </p>
-      <p
+      <!-- <p
         style="
           font-size: 16pt;
           font-weight: 600;
@@ -25,9 +26,9 @@
         "
       >
        军事训练登记表
-      </p>
+      </p> -->
       <table
-      class="b1"
+        class="b1"
         border="1"
         style="
           border-collapse: collapse;
@@ -42,87 +43,120 @@
           mso-border-insidev: 0.5pt solid windowtext;
 
           mso-padding-alt: 0pt 0pt 0pt 0pt;
-          
         "
         width="930"
         bordercolor="black"
       >
-        <tbody style="font-size: 16px;font-weight: 500;">
+        <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;font-family: 'heiti'">训练类别</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;font-family: 'heiti'">训练内容</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;font-family: 'heiti'">训练时间</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;font-family: 'heiti'">训练地点</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;font-family: 'heiti'">参训兵力</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;font-family: 'heiti'">参训率</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;font-family: 'heiti'">效果(成绩)</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;font-family: 'heiti'">消耗</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;font-family: 'heiti'">备注</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" style="font-family: 'heiti'">应训</p>
             </th>
-            <th width="57" class="JR_left"><p align="center" style="font-family: 'heiti'">实训</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;font-family: 'fangsong'">
-                {{ message.name}}
+              <p align="center" style="margin: 10px 0; font-family: 'fangsong'">
+                {{ message.name }}
                 <!-- <span style="display: none">111</span> -->
               </p>
             </td>
             <td width="113" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">{{ message.common }}</p>
+              <p align="center" style="font-family: 'fangsong'">
+                {{ message.common }}
+              </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;font-family: 'fangsong'">
+              <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;font-family: 'fangsong'">{{ 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;font-family: 'fangsong'">{{ message.yingxun }}人</p>
+              <p align="center" style="margin: 10px 0; font-family: 'fangsong'">
+                {{ message.yingxun }}人
+              </p>
             </td>
             <td width="57" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.shixun }}人</p>
+              <p align="center" style="margin: 10px 0; font-family: 'fangsong'">
+                {{ message.shixun }}人
+              </p>
             </td>
             <td width="68" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
+              <p align="center" style="margin: 10px 0; font-family: 'fangsong'">
                 {{ message.participationRate }}
               </p>
             </td>
             <td width="104" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.pass }}</p>
+              <p align="center" style="margin: 10px 0; font-family: 'fangsong'">
+                {{ message.pass }}
+              </p>
             </td>
             <td width="104" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.excellent }}</p>
+              <p align="center" style="margin: 10px 0; font-family: 'fangsong'">
+                {{ message.excellent }}
+              </p>
             </td>
             <td width="83" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.fail }}</p>
+              <p align="center" style="margin: 10px 0; font-family: 'fangsong'">
+                {{ message.fail }}
+              </p>
             </td>
           </tr>
 
@@ -239,10 +273,10 @@
           font-weight: 900;
           margin: 10px 50px 20px 700px;
           color: black;
-          font-family: 'heiti'
+          font-family: 'heiti';
         "
       >
-        军事主管:{{message.peopleId}}
+        军事主管:{{ message.peopleId }}
       </div>
     </div>
   </div>
@@ -261,8 +295,8 @@ export default {
         ".b1{width:860px !important};.JR_tr {height: 40px;};.JR_left{font-size: 1.121em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.311em; font-family: 仿宋_GB2312;};.JR_bottom{ font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right},",
     };
   },
-  created(){
-    console.log(this.message);
+  created() {
+    // console.log(this.message);
   },
   methods: {
     daochu() {

+ 52 - 36
src/components/look_word/bdglequip.vue

@@ -7,9 +7,10 @@
         style="
           font-size: 16pt;
           font-weight: 600;
-          
+
           color: black;
-font-family: 'heiti'
+          font-family: 'heiti';
+          text-align: center;
         "
       >
         《训练器材、教材登记簿》
@@ -21,15 +22,15 @@ font-family: 'heiti'
           font-size: 15pt;
           font-weight: 500;
           color: black;
-          
+
           margin-bottom: 5px;
-          font-family: 'heiti'
+          font-family: 'heiti';
         "
       >
         审核:
       </p>
       <table
-      class="b1"
+        class="b1"
         border="1"
         style="
           border-collapse: collapse;
@@ -47,7 +48,7 @@ font-family: 'heiti'
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">顶级分类-训练器材、教材登记簿</p>-->
 
-        <tbody  style="font-size: 16px;font-weight: 500;">
+        <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="font-family: 'heiti'">序<br />号</p>
@@ -106,31 +107,43 @@ font-family: 'heiti'
               </p>
             </td>
             <td width="56" valign="center">
-              <p align="center" class="JR_left" style="font-family: 'heiti'">时间</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                时间
+              </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" class="JR_left" style="font-family: 'heiti'">数量</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                数量
+              </p>
             </td>
             <td width="75" valign="center">
-              <p align="center" class="JR_left" style="font-family: 'heiti'">经手人</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                经手人
+              </p>
             </td>
             <td width="56" valign="center">
-              <p align="center" class="JR_left" style="font-family: 'heiti'">时间</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                时间
+              </p>
             </td>
             <td width="47" valign="center">
-              <p align="center" class="JR_left" style="font-family: 'heiti'">数量</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                数量
+              </p>
             </td>
             <td width="75" valign="center">
-              <p align="center" class="JR_left" style="font-family: 'heiti'">经手人</p>
+              <p align="center" class="JR_left" style="font-family: 'heiti'">
+                经手人
+              </p>
             </td>
           </tr>
 
-
-
-
-
-
-          <tr class="JR_tr" style="font-family: 'fangsong'" v-for="(item,i) in message" :key="i">
+          <tr
+            class="JR_tr"
+            style="font-family: 'fangsong'"
+            v-for="(item, i) in message"
+            :key="i"
+          >
             <td width="37" valign="center">
               <p align="center">{{ item.id }}</p>
             </td>
@@ -181,8 +194,7 @@ font-family: 'heiti'
             </td>
           </tr>
 
-
-          <tr >
+          <tr>
             <td width="37" valign="center" style="font-family: 'heiti'">
               <p align="center">
                 填<br />
@@ -191,7 +203,13 @@ font-family: 'heiti'
                 明 <br />
               </p>
             </td>
-            <td width="897" valign="center" colspan="15" v-html="message.info" style="font-family: 'fangsong'">
+            <td
+              width="897"
+              valign="center"
+              colspan="15"
+              v-html="message.info"
+              style="font-family: 'fangsong'"
+            >
               <p></p>
             </td>
           </tr>
@@ -210,7 +228,7 @@ font-family: 'heiti'
             class="JR_right"
             colspan="6"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'heiti'"
+            style="border: none; line-height: 45px; font-family: 'heiti'"
           >
             军事主官:
           </td>
@@ -218,7 +236,7 @@ font-family: 'heiti'
             class="JR_right"
             colspan="7"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'heiti'"
+            style="border: none; line-height: 45px; font-family: 'heiti'"
           >
             政治主官:
           </td>
@@ -226,7 +244,7 @@ font-family: 'heiti'
             class="JR_right"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'heiti'"
+            style="border: none; line-height: 45px; font-family: 'heiti'"
           >
             时间:
           </td>
@@ -261,27 +279,25 @@ export default {
   data() {
     return {
       title: "训练器材、教材登记簿",
-      num:[],
+      num: [],
       arr: [],
       style:
         ".b1{width:860px !important};.JR_tr {height: 40px;};.JR_left{width: 120px;font-size: 1.151em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.231em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right};",
     };
   },
-  created(){
-    this.message.forEach((item,i )=> {
-      if (this.num.length <= 0){
-        this.num.push(item.type)
-      } 
-      else if(this.num.indexOf(item.type) == -1){
-        this.num.push(item.type)
-      } 
+  created() {
+    this.message.forEach((item, i) => {
+      if (this.num.length <= 0) {
+        this.num.push(item.type);
+      } else if (this.num.indexOf(item.type) == -1) {
+        this.num.push(item.type);
+      }
     });
     for (let index = 0; index < this.num.length; index++) {
       this.arr[index] = {
-        index: null
-      }
+        index: null,
+      };
     }
-    
   },
   methods: {
     daochu() {

+ 16 - 18
src/components/look_word/bdgleven.vue

@@ -11,6 +11,7 @@
           margin-botttom: 30px;
           color: black;
           text-align: center;
+          margin-top: -12px;
         "
       >
         《连务会记录本》
@@ -39,13 +40,13 @@
             <td
               width="70"
               class="JR_left"
-              style="border-right: 1px dashed #999; font-family: 'heiti'"
+              style="border-right: 1px solid #111; font-family: 'heiti'"
             >
               <p align="center">&nbsp;&nbsp;时 &nbsp;&nbsp;&nbsp;&nbsp;间</p>
             </td>
             <td class="JR_right" style="font-family: 'fangsong'">
               <p align="left" style="padding-left: 20px">
-                {{ message.convokeTime }}
+                {{ message.convokeTime | dataFormaty }}
               </p>
             </td>
           </tr>
@@ -155,11 +156,12 @@
               style="
                 border-top: none;
                 border-left: 1px solid black;
-                font-family: 'heiti';
+                font-family: 'fangsong';
               "
             >
-              <p style="text-align: right;margin-right:20px">主持人: 
-              <!-- {{ message.compereRen }} -->
+              <p style="text-align: right; margin-right: 20px">
+                主持人:
+                {{ message.compereRen }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-top: none; border-left: none"></td> -->
@@ -168,13 +170,11 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="
-                border-left: 1px solid black;
-                font-family: 'heiti';
-              "
+              style="border-left: 1px solid black; font-family: 'fangsong'"
             >
-              <p style="text-align: right;margin-right:20px" >记录人:
-              <!-- {{ message.peopleJiLu }} -->
+              <p style="text-align: right; margin-right: 20px">
+                记录人:
+                {{ message.peopleJiLu }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-left: none"></td> -->
@@ -184,14 +184,12 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="
-                border-left: 1px solid black;
-                font-family: 'heiti';
-              "
+              style="border-left: 1px solid black; font-family: 'fangsong'"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">    年  月  日</p>-->
-              <p style="text-align: right;margin-right:20px">时间:   
-              <!-- {{ message.convokeTime }} -->
+              <p style="text-align: right; margin-right: 20px">
+                时间:
+                {{ message.convokeTime | dataFormaty }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-left: none"></td> -->
@@ -212,7 +210,7 @@ export default {
     return {
       title: "连务会记录本",
       style:
-        ".size{width:99%};.JR_tr {height: 40px;};.JR_left{border-right:none;width: 80px;font-size: 1.131em; font-family: '楷体_GB2312';font-weight: 500;};.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};",
+        ".size{width:99%};.JR_tr {height: 40px;};.JR_left{border-right:1px solid black;;width: 80px;font-size: 1.131em; font-family: '楷体_GB2312';font-weight: 500;};.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: {

+ 80 - 119
src/components/look_word/bdglfilemanagement.vue

@@ -9,13 +9,14 @@
           font-weight: 600;
           margin-botttom: 30px;
           color: black;
-          font-family: 'heiti'
+          font-family: 'heiti';
+          text-align: center;
         "
       >
         《文件管理登记本》
       </p>
       <table
-      class="b1"
+        class="b1"
         border="1"
         style="
           border-collapse: collapse;
@@ -38,12 +39,14 @@
       >
         <!--<p align="center" style="font-size: 14pt;font-weight: bold;">文件管理登记本</p>-->
 
-        <tbody  style="font-size: 16px;font-weight: 500;">
-          <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-family: 'heiti'">文件名称</font></font
+                  ><font style="vertical-align: inherit; font-family: 'heiti'"
+                    >文件名称</font
+                  ></font
                 >
               </p>
             </th>
@@ -51,7 +54,9 @@
             <th width="125" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit;font-family: 'heiti'">文件编号</font></font
+                  ><font style="vertical-align: inherit; font-family: 'heiti'"
+                    >文件编号</font
+                  ></font
                 >
               </p>
             </th>
@@ -59,7 +64,9 @@
             <th width="95" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit;font-family: 'heiti'">收文日期</font></font
+                  ><font style="vertical-align: inherit; font-family: 'heiti'"
+                    >收文日期</font
+                  ></font
                 >
               </p>
             </th>
@@ -67,7 +74,9 @@
             <th width="57" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit;font-family: 'heiti'">密级</font></font
+                  ><font style="vertical-align: inherit; font-family: 'heiti'"
+                    >密级</font
+                  ></font
                 >
               </p>
             </th>
@@ -75,7 +84,9 @@
             <th width="57" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit;font-family: 'heiti'">份数</font></font
+                  ><font style="vertical-align: inherit; font-family: 'heiti'"
+                    >份数</font
+                  ></font
                 >
               </p>
             </th>
@@ -83,7 +94,9 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit;font-family: 'heiti'">签收人</font></font
+                  ><font style="vertical-align: inherit; font-family: 'heiti'"
+                    >签收人</font
+                  ></font
                 >
               </p>
             </th>
@@ -91,7 +104,9 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit;font-family: 'heiti'">借阅人</font></font
+                  ><font style="vertical-align: inherit; font-family: 'heiti'"
+                    >借阅人</font
+                  ></font
                 >
               </p>
             </th>
@@ -99,7 +114,9 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit;font-family: 'heiti'"> 借阅时间 </font></font
+                  ><font style="vertical-align: inherit; font-family: 'heiti'">
+                    借阅时间
+                  </font></font
                 >
               </p>
             </th>
@@ -107,7 +124,9 @@
             <th width="85" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit;font-family: 'heiti'"> 归还时间 </font></font
+                  ><font style="vertical-align: inherit; font-family: 'heiti'">
+                    归还时间
+                  </font></font
                 >
               </p>
             </th>
@@ -115,55 +134,82 @@
             <th width="59" valign="center" class="JR_left">
               <p align="center">
                 <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit;font-family: 'heiti'">注销</font></font
+                  ><font style="vertical-align: inherit; font-family: 'heiti'"
+                    >注销</font
+                  ></font
                 >
               </p>
             </th>
           </tr>
 
-          <tr class="JR_tr">
+          <tr class="JR_tr" v-for="(message, i) in message" :key="i + ' '">
             <td width="174" valign="center" class="JR_right">
-              <p align="center" style="margin: 20px 0;font-family: 'fangsong'">{{ 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" style="font-family: 'fangsong'">{{ 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" style="font-family: 'fangsong'">{{ 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" style="font-family: 'fangsong'">{{ 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" style="font-family: 'fangsong'">{{ 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" style="font-family: 'fangsong'">{{ 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" style="font-family: 'fangsong'">{{ 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" style="font-family: 'fangsong'">{{ 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" style="font-family: 'fangsong'">{{ 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" style="font-family: 'fangsong'">{{ message.logoutName }}</p>
+              <p align="center" style="font-family: 'fangsong'">
+                {{ message.logoutName }}
+              </p>
             </td>
           </tr>
 
-          <tr height="45px" class="JR_tr">
+          <tr
+            height="45px"
+            class="JR_tr"
+            v-for="(item1, i1) in num"
+            :key="i1 + ''"
+          >
             <td width="174" valign="center" class="JR_right">
               <p align="center" style="margin: 20px 0"></p>
             </td>
@@ -204,99 +250,6 @@
               <p align="center"></p>
             </td>
           </tr>
-
-          <tr height="45px" class="JR_tr">
-            <td width="174" valign="center">
-              <p align="center" style="margin: 20px 0"></p>
-            </td>
-
-            <td width="125" valign="center"><p align="center"></p></td>
-
-            <td width="95" valign="center"><p align="center"></p></td>
-
-            <td width="57" valign="center"><p align="center"></p></td>
-
-            <td width="57" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="59" valign="center"><p align="center"></p></td>
-          </tr>
-          <tr height="45px" class="JR_tr">
-            <td width="174" valign="center">
-              <p align="center" style="margin: 20px 0"></p>
-            </td>
-
-            <td width="125" valign="center"><p align="center"></p></td>
-
-            <td width="95" valign="center"><p align="center"></p></td>
-
-            <td width="57" valign="center"><p align="center"></p></td>
-
-            <td width="57" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="59" valign="center"><p align="center"></p></td>
-          </tr>
-          <tr height="45px" class="JR_tr">
-            <td width="174" valign="center">
-              <p align="center" style="margin: 20px 0"></p>
-            </td>
-
-            <td width="125" valign="center"><p align="center"></p></td>
-
-            <td width="95" valign="center"><p align="center"></p></td>
-
-            <td width="57" valign="center"><p align="center"></p></td>
-
-            <td width="57" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="59" valign="center"><p align="center"></p></td>
-          </tr>
-          <tr height="45px" class="JR_tr">
-            <td width="174" valign="center">
-              <p align="center" style="margin: 20px 0"></p>
-            </td>
-
-            <td width="125" valign="center"><p align="center"></p></td>
-
-            <td width="95" valign="center"><p align="center"></p></td>
-
-            <td width="57" valign="center"><p align="center"></p></td>
-
-            <td width="57" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="85" valign="center"><p align="center"></p></td>
-
-            <td width="59" valign="center"><p align="center"></p></td>
-          </tr>
         </tbody>
       </table>
     </div>
@@ -312,10 +265,18 @@ export default {
   data() {
     return {
       title: "文件管理登记本",
+      num: 0,
       style:
         ".b1{width:860px !important};.JR_tr {height: 40px;};.JR_left{width: 120px;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.231em; font-family: 仿宋_GB2312;};.JR_bottom{ font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
+  created() {
+    if (this.message.length >= 6) {
+      this.num = 0;
+    } else {
+      this.num = 6 - this.message.length;
+    }
+  },
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);

+ 408 - 98
src/components/look_word/bdglfood.vue

@@ -8,7 +8,8 @@
           font-weight: 600;
           margin-botttom: 30px;
           color: black;
-          font-family: 'heiti'
+          font-family: 'heiti';
+          text-align: center;
         "
       >
         《伙食管理登记簿》
@@ -42,7 +43,8 @@
           mso-border-insideh: 0.5pt solid windowtext;
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
-          font-size: 16px;font-weight: 500;
+          font-size: 16px;
+          font-weight: 500;
         "
         width="930"
         align="center"
@@ -50,21 +52,29 @@
       >
         <tr
           class="aaa"
-          style="border: none; color: black; font-size: 12pt; line-height: 30px;font-family: 'songti'"
+          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;font-family: 'songti'"
+            style="border: none; line-height: 45px; font-family: 'songti'"
           >
-            日期:<span style="font-family: 'fangsong'"> {{ message.recordDate }}</span>
+            日期:<span style="font-family: 'fangsong'">
+              {{ message.recordDate }}</span
+            >
           </td>
           <td
             class="JR_right"
             colspan="8"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'songti'"
+            style="border: none; line-height: 45px; font-family: 'songti'"
           >
             {{ week }}
           </td>
@@ -72,15 +82,21 @@
             class="JR_right"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'songti'"
+            style="border: none; line-height: 45px; font-family: 'songti'"
           >
-            单位:千克
+            单位:千克/
           </td>
         </tr>
-        <tbody style="font-size: 16px;font-weight: 500;">
+        <tbody style="font-size: 16px; font-weight: 500">
           <!-- 区分早中晚一日三餐 -->
-          <tr style="text-align: center;font-family: 'songti'" class="JR_tr" >
-            <td colspan="2" class="JR_left" style="widt: 60px;font-family: 'songti'" >区 分</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" style="font-family: 'songti'">主食</p>
             </td>
@@ -89,19 +105,35 @@
             </td>
           </tr>
 
-          <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">
+          <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;font-family: 'fangsong'" 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" style="font-family: 'songti'">中</p></td>
-            <td colspan="3" style="color: black;font-family: 'fangsong'" 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="font-family: 'fangsong'" class="JR_right">
@@ -109,7 +141,9 @@
             </td>
           </tr>
           <tr class="JR_tr">
-            <td colspan="2" class="JR_left"><p align="center" style="font-family: 'songti'">晚</p></td>
+            <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>
@@ -118,7 +152,7 @@
             </td>
           </tr>
 
-          <tr style="text-align: center;font-family: 'songti'" 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="font-family: 'songti'">区<br />分</p>
             </td>
@@ -131,9 +165,15 @@
           </tr>
 
           <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="" 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" style="font-family: 'songti'">面<br />粉</p>
             </td>
@@ -156,16 +196,22 @@
               <p align="center" style="font-family: 'songti'">蔬<br />菜</p>
             </td>
             <td width="60px" class="JR_left">
-              <p align="center" style="font-family: 'songti'">水果<br />(奶)</p>
+              <p align="center" style="font-family: 'songti'">
+                水果<br />(奶)
+              </p>
             </td>
             <td width="60px" colspan="" class="JR_left">
               <p align="center" style="font-family: 'songti'">糖</p>
             </td>
             <td width="60px">
-              <p align="center" class="JR_left" style="font-family: 'songti'">调<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" style="font-family: 'songti'">燃<br />料</p>
+              <p align="center" class="JR_left" style="font-family: 'songti'">
+                燃<br />料
+              </p>
             </td>
           </tr>
 
@@ -173,46 +219,108 @@
             <td width="" colspan="2" class="JR_left">
               <p align="center" style="font-family: 'songti'">早</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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>
@@ -221,47 +329,109 @@
             <td colspan="2" width="" class="JR_left">
               <p align="center" style="font-family: 'songti'">中</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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>
@@ -270,46 +440,108 @@
             <td colspan="2" width="" class="JR_left">
               <p align="center" style="font-family: 'songti'">晚</p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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>
@@ -320,7 +552,9 @@
             </td>
           </tr>
           <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="" colspan="3" class="JR_left">
               <p align="center" style="font-family: 'songti'">品名</p>
             </td>
@@ -341,36 +575,70 @@
             </td>
           </tr>
 
-          <tr class="JR_tr" v-for="(item, i) in message.bdglFoodKinds" :key="i">
+          <tr
+            class="JR_tr"
+            v-for="(item, i) in message.bdglFoodKinds"
+            :key="i + ''"
+          >
             <td width="" rowspan="" class="JR_left">
               <p align="center" style="font-family: 'songti'">
                 {{ i == 0 ? "主食" : i == 1 ? "副食" : "其他" }}
               </p>
             </td>
-            <td width="" style="color: black;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'fangsong'" 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;font-family: 'songti'">
+          <tr class="JR_tr" style="text-align: center; font-family: 'songti'">
             <td width="" colspan="1" rowspan="2" class="JR_left">
               <p align="center" style="font-family: 'songti'">姓名</p>
             </td>
@@ -407,18 +675,26 @@
           </tr>
 
           <tr
-          align="center"
+            align="center"
             v-for="(item, i) in by_reset"
-            :key="i"
+            :key="i + ' '"
             class="JR_tr"
-            style="text-align: center; line-height: 47px;font-family: 'fangsong'"
+            style="
+              text-align: center;
+              line-height: 47px;
+              font-family: 'fangsong';
+            "
           >
             <td colspan="1" class="JR_right" align="center">
               {{ item.peopleName }}
             </td>
             <td colspan="3" class="JR_right" align="center">{{ item.sky }}</td>
-            <td colspan="2" class="JR_right" align="center">{{ item.standard }}</td>
-            <td colspan="2" class="JR_right" align="center">{{ item.money }}</td>
+            <td colspan="2" class="JR_right" align="center">
+              {{ item.standard }}
+            </td>
+            <td colspan="2" class="JR_right" align="center">
+              {{ item.money }}
+            </td>
 
             <td colspan="2" v-if="isWho" class="JR_right" align="center">
               {{ reset[i].peopleName }}
@@ -453,7 +729,10 @@
               <p align="center" style="font-family: 'songti'">在食堂购物</p>
             </td>
           </tr>
-          <tr class="JR_tr" style="text-align: center; line-height: 47px;font-family: 'songti'">
+          <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" style="font-family: 'songti'">姓名</p>
             </td>
@@ -502,7 +781,7 @@
 
           <tr
             class="JR_tr"
-            v-for="(item) in message.bdglFoodShoppings"
+            v-for="item in message.bdglFoodShoppings"
             :key="item.id"
             height="50"
             style="font-family: 'fangsong'"
@@ -547,7 +826,12 @@
           </tr>
 
           <tr class="JR_tr">
-            <td width="" colspan="2" class="JR_left" style="font-family: 'songti'">
+            <td
+              width=""
+              colspan="2"
+              class="JR_left"
+              style="font-family: 'songti'"
+            >
               <p align="center" style="font-family: 'songti'">
                 炊<br />
                 事<br />
@@ -576,7 +860,12 @@
               </p>
             </td>
-            <td width="" colspan="7" style="font-family: 'fangsong'" class="JR_right">
+            <td
+              width=""
+              colspan="7"
+              style="font-family: 'fangsong'"
+              class="JR_right"
+            >
               <p align="center">{{ message.peopleNames }}</p>
             </td>
           </tr>
@@ -596,7 +885,7 @@
               class="JR_right"
               width=""
               colspan="14"
-              style="text-align: center;font-family: 'fangsong'"
+              style="text-align: center; font-family: 'fangsong'"
               v-html="message.repastContent"
             >
               <p align="center"></p>
@@ -605,31 +894,48 @@
         </tbody>
         <tr
           class="aaa"
-          style="border: none; color: black; font-size: 12pt; line-height: 30px;font-family: 'songti'"
+          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;font-family: 'songti'"
+            style="
+              border: none;
+              line-height: 45px;
+              font-family: 'songti';
+              padding-left: 10px;
+            "
           >
-            单位首长:<span style="font-family: 'fangsong'">{{ message.people1Name }}</span> 
+            单位首长:<span style="font-family: 'fangsong'">{{
+              message.people1Name
+            }}</span>
           </td>
           <td
             class="JR_right"
             colspan="6"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'songti'"
+            style="border: none; line-height: 45px; font-family: 'songti'"
           >
-            经委会主任:<span style="font-family: 'fangsong'">{{ message.chairmanName }}</span> 
+            经委会主任:<span style="font-family: 'fangsong'">{{
+              message.chairmanName
+            }}</span>
           </td>
           <td
             class="JR_right"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'songti'"
+            style="border: none; line-height: 45px; font-family: 'songti'"
           >
-            值班员:<span style="font-family: 'fangsong'"> {{ message.peopleName }}</span>
+            值班员:<span style="font-family: 'fangsong'">
+              {{ message.peopleName }}</span
+            >
           </td>
         </tr>
       </table>
@@ -671,7 +977,7 @@ export default {
         peopleId: "",
         sky: "",
         standard: "",
-        weel:"",
+        weel: "",
       },
       by: [],
       reset: [],
@@ -684,7 +990,7 @@ export default {
   },
   methods: {
     daochu() {
-      lookWord(this.title, "#contents", this.style, );
+      lookWord(this.title, "#contents", this.style);
     },
     isWhy() {
       let item;
@@ -696,8 +1002,8 @@ export default {
           this.reset.push(this.message.bdglFoodBoardWagess[item]);
         }
       }
-      console.log(this.by,111);
-      console.log(this.reset,222);
+      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);
@@ -735,7 +1041,7 @@ export default {
   },
 };
 </script>
-<style scoped>
+<style scoped media="print">
 tbody {
   border: black;
   color: black;
@@ -751,4 +1057,8 @@ tr:last-child {
   border: 1px solid rgb(129, 130, 131);
   border-radius: 5px;
 }
+@page {
+  size: auto;
+  margin: 0mm;
+}
 </style>

+ 14 - 17
src/components/look_word/bdglmeeting.vue

@@ -60,7 +60,7 @@
                 font-family: 'fangsong';
               "
             >
-              <p>{{ message.convokeTime }}</p>
+              <p>{{ message.convokeTime | dataFormaty }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
@@ -248,8 +248,9 @@
                 font-family: 'heiti';
               "
             >
-              <p style="text-align: right;margin-right:20px">主持人:
-              <!-- {{ message.compereRen }} -->
+              <p style="text-align: right; margin-right: 20px">
+                主持人:
+                {{ message.compereRen }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-top: none; border-left: none"></td> -->
@@ -258,14 +259,12 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="
-                border-left: 1px solid black;
-                font-family: 'heiti';
-              "
+              style="border-left: 1px solid black; font-family: 'heiti'"
             >
-               <!-- border-right: none; -->
-              <p style="text-align: right;margin-right:20px">记录人:
-              <!-- {{ message.peopleJiLu }} -->
+              <!-- border-right: none; -->
+              <p style="text-align: right; margin-right: 20px">
+                记录人:
+                {{ message.peopleJiLu }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-left: none"></td> -->
@@ -275,14 +274,12 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="
-                border-left: 1px solid black;
-                font-family: 'heiti';
-              "
+              style="border-left: 1px solid black; font-family: 'heiti'"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">    年  月  日</p>-->
-              <p style="text-align: right;margin-right:20px">时间:
-              <!-- {{ message.convokeTime }} -->
+              <p style="text-align: right; margin-right: 20px">
+                时间:
+                {{ message.convokeTime | dataFormaty }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-left: none"></td> -->
@@ -302,7 +299,7 @@ export default {
     return {
       title: "团支部工作记录本",
       style:
-        ".b1{width:630px !important};.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}",
+        ".b1{width:630px !important};.JR_tr {height: 40px;};.JR_left{border-right:none!important;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: {

+ 13 - 16
src/components/look_word/bdglparty.vue

@@ -60,7 +60,7 @@
                 font-family: 'fangsong';
               "
             >
-              <p>{{ message.convokeTime }}</p>
+              <p>{{ message.convokeTime | dataFormaty }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
@@ -242,7 +242,7 @@
         class="size"
         border-top="none"
       >
-         <tbody>
+        <tbody>
           <tr class="JR_tr">
             <td
               colspan="2"
@@ -253,8 +253,9 @@
                 font-family: 'heiti';
               "
             >
-              <p style="text-align: right;margin-right:20px">主持人:
-              <!-- {{ message.compereRen }} -->
+              <p style="text-align: right; margin-right: 20px">
+                主持人:
+                {{ message.compereRen }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-top: none; border-left: none"></td> -->
@@ -263,13 +264,11 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="
-                border-left: 1px solid black;
-                font-family: 'heiti';
-              "
+              style="border-left: 1px solid black; font-family: 'heiti'"
             >
-              <p style="text-align: right;margin-right:20px">记录人:
-              <!-- {{ message.peopleJiLu }} -->
+              <p style="text-align: right; margin-right: 20px">
+                记录人:
+                {{ message.peopleJiLu }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-left: none"></td> -->
@@ -279,14 +278,12 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="
-                border-left: 1px solid black;
-                font-family: 'heiti';
-              "
+              style="border-left: 1px solid black; font-family: 'heiti'"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">    年  月  日</p>-->
-              <p style="text-align: right;margin-right:20px">时间:
-              <!-- {{ message.convokeTime }} -->
+              <p style="text-align: right; margin-right: 20px">
+                时间:
+                {{ message.convokeTime | dataFormaty }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-left: none"></td> -->

+ 15 - 9
src/components/look_word/bdglpublicproperty.vue

@@ -8,6 +8,7 @@
           font-weight: 600;
           color: black;
           font-family: 'heiti';
+          text-align: center;
         "
       >
         《营产、公物管理登记簿》
@@ -103,7 +104,12 @@
             </th>
           </tr>
 
-          <tr class="JR_tr" style="font-family: 'fangsong'"  v-for="(item,i) in message" :key='i+"  "'>
+          <tr
+            class="JR_tr"
+            style="font-family: 'fangsong'"
+            v-for="(item, i) in message"
+            :key="i + '  '"
+          >
             <td width="47" valign="center" nowrap="" class="JR_right">
               <p align="center">{{ item.id }}</p>
             </td>
@@ -146,7 +152,7 @@
             </td>
           </tr>
 
-          <tr class="JR_tr" v-for="(item1,i1) in num" :key="i1+''">
+          <tr class="JR_tr" v-for="(item1, i1) in num" :key="i1 + ''">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
                 <span style="display: none"></span>
@@ -203,17 +209,17 @@ export default {
   data() {
     return {
       title: "营产、公物管理登记簿",
-      num:0,
+      num: 0,
       style:
         ".b1{width:860px !important};.JR_tr {height: 40px;width:105px};.JR_left{font-size: 1.131em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.231em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
-  created(){
-     if (this.message.length >= 6){
-          this.num = 0
-        } else {
-          this.num = 6 - this.message.length
-        }
+  created() {
+    if (this.message.length >= 6) {
+      this.num = 0;
+    } else {
+      this.num = 6 - this.message.length;
+    }
   },
   methods: {
     daochu() {

+ 6 - 5
src/components/look_word/bdglsecrecy.vue

@@ -10,6 +10,7 @@
           margin-botttom: 30px;
           color: black;
           font-family: 'heiti';
+          text-align: center;
         "
       >
         《网络、移动电话、涉密载体使用管理登记本》
@@ -102,7 +103,7 @@
               <p align="center" style="margin: 5px 0">移交(出借)时间</p>
             </td>
           </tr>
-          <tr class="JR_tr" v-for="(item, i) in message" :key="i+' '">
+          <tr class="JR_tr" v-for="(item, i) in message" :key="i + ' '">
             <td valign="center" class="JR_right">
               <p align="center" style="margin: 5px 0; font-family: 'fangsong'">
                 {{ item.kind }}
@@ -151,7 +152,7 @@
               </p>
             </td>
           </tr>
-          <tr class="JR_tr" v-for="(item1,i1) in num" :key="i1+''">
+          <tr class="JR_tr" v-for="(item1, i1) in num" :key="i1 + ''">
             <td valign="center" class="JR_right">
               <p align="center" style="margin: 5px 0; height: 40px"></p>
             </td>
@@ -203,10 +204,10 @@ export default {
     };
   },
   created() {
-    if (this.message.length >= 6){
-      this.num = 0
+    if (this.message.length >= 6) {
+      this.num = 0;
     } else {
-      this.num = 6 - this.message.length
+      this.num = 6 - this.message.length;
     }
   },
   methods: {

+ 65 - 37
src/components/look_word/bdglsoldier.vue

@@ -9,7 +9,7 @@
           margin-botttom: 30px;
           color: black;
           text-align: center;
-          font-family: 'heiti'
+          font-family: 'heiti';
         "
       >
         《军人委员会工作记录本》
@@ -32,10 +32,15 @@
         bordercolor="black"
         class="size"
       >
-        <tbody style="font-size: 16px;font-weight: 500;">
+        <tbody style="font-size: 16px; font-weight: 500">
           <tr class="JR_tr">
             <th class="" colspan="2" style="font-family: 'kaiti'">
-              <p align="center" style="font-size: 18px;font-weight: 500;font-family: 'kaiti'">军人委员会会议</p>
+              <p
+                align="center"
+                style="font-size: 18px; font-weight: 500; font-family: 'kaiti'"
+              >
+                军人委员会会议
+              </p>
             </th>
           </tr>
           <tr class="JR_tr">
@@ -43,71 +48,98 @@
               align="center"
               width="110"
               class="JR_left"
-              style="border-right: 0;font-family: 'kaiti'"
-              
+              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;font-family: 'fangsong'">
-              <p>{{ message.convokeTime }}</p>
+            <td
+              align="left"
+              class="JR_right"
+              style="border-left: 0; font-family: 'fangsong'"
+            >
+              <p>{{ message.convokeTime | dataFormaty }}</p>
             </td>
           </tr>
           <tr class="JR_tr">
-            <td class="JR_left" style="border-right: 0;font-family: 'kaiti'">
+            <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;font-family: 'fangsong'">
+            <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;font-family: 'kaiti'">
+            <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;font-family: 'fangsong'">
+            <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;font-family: 'kaiti'">
+            <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;font-family: 'fangsong'">
+            <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;font-family: 'kaiti'">
+            <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;font-family: 'fangsong'">
+            <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;font-family: 'kaiti'">
+            <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;font-family: 'fangsong'">
+            <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;font-family: 'kaiti'">
+            <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;font-family: 'fangsong'">
+            <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;font-family: 'kaiti'">
+            <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;font-family: 'fangsong'"
+              style="border-left: 0; font-family: 'fangsong'"
               v-html="message.title"
             >
               <!-- <p>{{ message.title }}</p> -->
@@ -132,8 +164,7 @@
               "
             ></td>
           </tr>
-
-         </tbody>
+        </tbody>
       </table>
       <table
         border="1"
@@ -165,8 +196,9 @@
                 font-family: 'heiti';
               "
             >
-              <p style="text-align: right;margin-right:20px">主持人:
-              {{ message.compereRen }}
+              <p style="text-align: right; margin-right: 20px">
+                主持人:
+                {{ message.compereRen }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-top: none; border-left: none"></td> -->
@@ -175,13 +207,11 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="
-                border-left: 1px solid black;
-                font-family: 'heiti';
-              "
+              style="border-left: 1px solid black; font-family: 'heiti'"
             >
-              <p style="text-align: right;margin-right:20px">记录人:
-              {{ message.peopleJiLu }}
+              <p style="text-align: right; margin-right: 20px">
+                记录人:
+                {{ message.peopleJiLu }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-left: none"></td> -->
@@ -191,14 +221,12 @@
             <td
               colspan="2"
               class="JR_bottom"
-              style="
-                border-left: 1px solid black;
-                font-family: 'heiti';
-              "
+              style="border-left: 1px solid black; font-family: 'heiti'"
             >
               <!--<p style=" text-align:right;padding-right: 10px;">    年  月  日</p>-->
-              <p style="text-align: right;margin-right:20px">时间:
-              {{ message.convokeTime }}
+              <p style="text-align: right; margin-right: 20px">
+                时间:
+                {{ message.convokeTime | dataFormaty }}
               </p>
             </td>
             <!-- <td style="width: 100px; border-left: none"></td> -->

+ 52 - 23
src/components/look_word/bdglweekwork.vue

@@ -6,14 +6,14 @@
         style="
           text-align: center;
           margin-top: 10px;
-          font-size: 16px;
+          font-size: 16pt;
           font-weight: 600;
           color: black;
-          font-family: 'heiti'
+          font-family: 'heiti';
         "
         id="qTitle"
       >
-        周工作安排表
+        周工作安排表
       </p>
 
       <!-- <div style="width: 100%; height: 30px; margin-top: 10px; color: black">
@@ -49,40 +49,45 @@
           style="
             border: none;
             color: black;
-            font-size: 16px;font-weight: 500;
+            font-size: 16px;
+            font-weight: 500;
             line-height: 30px;
             width: 930px;
-            font-family: 'kaiti'
+            font-family: 'kaiti';
           "
         >
           <td
             class="JR_left"
             colspan="3"
             align="left"
-            
-            style="border: none; line-height: 45px; "
+            style="border: none; line-height: 45px"
           >
             连值班领导:{{ message.peopleName }}
           </td>
           <td
             class="JR_left"
-            colspan="2"
+            colspan="1"
             align="left"
-            style="border: none; line-height: 45px; "
+            style="border: none; line-height: 45px; padding-left: 27px"
           >
             电话:{{ message.phone }}
           </td>
           <td
             class="JR_left"
-            colspan="3"
+            colspan="4"
             align="left"
-            style="border: none; line-height: 45px"
+            style="border: none; line-height: 45px; padding-left: 81px"
           >
-            {{ message.startTime }}—{{ message.endTime }}
+            {{ message.startTime | dataFormaty }}—{{
+              message.endTime | dataFormaty
+            }}
           </td>
         </tr>
-        <tbody style="font-size: 16px;font-weight: 500;">
-          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'heiti'">
+        <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" style="font-family: 'heiti'">日期</p>
             </td>
@@ -107,7 +112,7 @@
             class="JR_tr"
             v-for="(item, i) in message.bdglWeekworkRegisterList"
             :key="i"
-            style="text-align: center; height: 45px;font-family: 'fangsong'"
+            style="text-align: center; height: 45px; font-family: 'fangsong'"
           >
             <td style="text-align: center" rowspan="1" class="JR_right">
               {{ item.week }}
@@ -139,7 +144,12 @@
             <td valign="center" class="JR_left" style="font-family: 'songti'">
               <p align="center">备注</p>
             </td>
-            <td valign="center" colspan="7" class="JR_right" style="font-family: 'fangsong'">
+            <td
+              valign="center"
+              colspan="7"
+              class="JR_right"
+              style="font-family: 'fangsong'"
+            >
               {{ message.remark }}
             </td>
           </tr>
@@ -148,29 +158,46 @@
           style="
             border: none;
             color: black;
-            font-size: 16px;font-weight: 500;
+            font-size: 16px;
+            font-weight: 500;
             line-height: 30px;
             width: 930px;
-            font-family: 'fangsong'
+            font-family: 'fangsong';
           "
         >
           <td
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 70px; width: 360px;font-family: 'fangsong'"
+            style="
+              border: none;
+              line-height: 70px;
+              width: 360px;
+              font-family: 'fangsong';
+              padding-left: 19px;
+            "
           >
             军事主官:{{ message.people1Name }}
           </td>
           <td
             colspan="1"
-            style="border: none; line-height: 45px; width: 360px;font-family: 'fangsong'"
+            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;font-family: 'fangsong'"
+            style="
+              border: none;
+              line-height: 45px;
+              width: 360px;
+              font-family: 'fangsong';
+            "
           >
             政治主官:{{ message.people2Name }}
           </td>
@@ -178,9 +205,11 @@
             class="JR_left"
             colspan="3"
             align="left"
-            style="border: none; line-height: 45px;font-family: 'fangsong'"
+            style="border: none; line-height: 45px; font-family: 'fangsong'"
           >
-            <!-- 时间: -->
+            <!-- 时间: {{ message.startTime | dataFormaty }}—{{
+              message.endTime | dataFormaty
+            }} -->
           </td>
         </tr>
       </table>

+ 12 - 1
src/main.js

@@ -74,7 +74,7 @@ Vue.filter('dataFormat', originVal => {
     const y = dt.getFullYear()
     const m = (dt.getMonth() + 1 + '').padStart(2, '0')
     const d = (dt.getDate() + '').padStart(2, '0')
-    return `${y}-${m}-${d}`
+    return `${y}-${m}-${d}`
   }
 
 })
@@ -87,6 +87,17 @@ Vue.filter('dataFormats', originVal => {
     return `${m}月${d}日`
   }
 
+})
+// originVal 后台返回的中国标准时间
+Vue.filter('dataFormaty', originVal => {
+  const dt = new Date(originVal)
+  if (originVal) {
+    const y = dt.getFullYear()
+    const m = (dt.getMonth() + 1 + '').padStart(2, '0')
+    const d = (dt.getDate() + '').padStart(2, '0')
+    return `${y}年${m}月${d}日`
+  }
+
 })
 
 import dataV from '@jiaminghi/data-view'

+ 9 - 127
src/views/barracksManagement/flat/index.vue

@@ -16,97 +16,6 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item prop="roomNumber">
-        <el-input
-          v-model="queryParams.roomNumber"
-          oninput="value=value.replace(/[^\d]/g,'')"
-          clearable
-          size="small"
-          placeholder="请输入房间号"
-          @input="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="分栋名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入分栋名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="营房用途" prop="behoof">
-        <el-input
-          v-model="queryParams.behoof"
-          placeholder="请输入营房用途"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="利用现状" prop="statusQuo">
-        <el-input
-          v-model="queryParams.statusQuo"
-          placeholder="请输入利用现状"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="建筑年代" prop="period">
-        <el-input
-          v-model="queryParams.period"
-          placeholder="请输入建筑年代"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="建筑面积" prop="area">
-        <el-input
-          v-model="queryParams.area"
-          placeholder="请输入建筑面积"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="录入时间" prop="createtime">
-        <el-input
-          v-model="queryParams.createtime"
-          placeholder="请输入录入时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="楼房层数" prop="tier">
-        <el-input
-          v-model="queryParams.tier"
-          placeholder="请输入楼房层数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="房间号" prop="roomNumber">
-        <el-input
-          v-model="queryParams.roomNumber"
-          placeholder="请输入房间号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单元号" prop="element">
-        <el-input
-          v-model="queryParams.element"
-          placeholder="请输入单元号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item>
         <!-- <el-button size="btn" @click="handleQuery">搜索</el-button> -->
         <el-button size="btr" @click="resetQuery">重置</el-button>
@@ -267,59 +176,32 @@
           <el-input v-model="form.xingMing" />
         </el-form-item>
         <el-form-item label="房间号" prop="roomNumber">
-          <el-input
-            v-model.number="form.roomNumber"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
+          <el-input v-model="form.roomNumber" />
         </el-form-item>
         <el-form-item label="建筑面积" prop="area">
-          <el-input
-            v-model.number="form.area"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
+          <el-input v-model="form.area" />
         </el-form-item>
         <el-form-item label="使用面积" prop="usageArea">
-          <el-input
-            v-model.number="form.usageArea"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
+          <el-input v-model="form.usageArea" />
         </el-form-item>
         <el-form-item label="物业标准" prop="propertyFeeStandard">
-          <el-input
-            v-model.number="form.propertyFeeStandard"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
+          <el-input v-model="form.propertyFeeStandard" />
         </el-form-item>
         <el-form-item label="房租标准" prop="rentStandard">
-          <el-input
-            v-model.number="form.rentStandard"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
+          <el-input v-model="form.rentStandard" />
         </el-form-item>
         <el-form-item label="水电费" prop="waterBil">
-          <el-input
-            v-model.number="form.waterBil"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
+          <el-input v-model="form.waterBil" />
         </el-form-item>
         <el-form-item label="月房租" prop="monthlyRent">
-          <el-input
-            v-model.number="form.monthlyRent"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
+          <el-input v-model="form.monthlyRent" />
         </el-form-item>
         <el-form-item label="月物业费" prop="monthlyPropertyFee">
-          <el-input
-            v-model.number="form.monthlyPropertyFee"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
+          <el-input v-model="form.monthlyPropertyFee" />
         </el-form-item>
 
         <el-form-item label="总金额" prop="totalAmount">
-          <el-input
-            v-model.number="form.totalAmount"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
+          <el-input v-model="form.totalAmount" />
         </el-form-item>
         <div class="jibens">备注</div>
         <el-form-item prop="remark">

+ 16 - 52
src/views/barracksManagement/flats/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <!-- <el-form
+    <el-form
       :model="queryParams"
       ref="queryForm"
       :inline="true"
@@ -8,54 +8,17 @@
       label-width="100px"
     >
       <el-form-item prop="unitId" style="margin-left: -40px" label-width="50px">
-        <treeselect
-          v-model="queryParams.unitId"
-          :options="users"
-          placeholder="请选择到访单位"
-          class="threeselects"
-          @select="selectPeo1"
+        <el-input
+          v-model="queryParams.unitName"
+          placeholder="请选择单位"
+          @input="handleQuery"
         />
       </el-form-item>
-      <el-form-item
-        prop="peopleId"
-        label-width="50px"
-        style="margin-left: -23px"
-      >
-        <el-select
-          v-model="queryParams.peopleName"
-          ref="peoplenames"
-          placeholder="请选择人员"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in executors"
-            :key="item.id"
-            :label="item.name"
-            :value="item.name"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item style="margin-left: 0px" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          placeholder="请选择申请住房类别"
-          @change="leibie"
-        >
-          <el-option
-            v-for="(item, i) in ziDian"
-            :key="i"
-            :label="item.dictLabel"
-            :value="item.dictLabel"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
 
       <el-form-item>
-        <el-button size="btn" @click="handleQuery">搜索</el-button>
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form> -->
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -342,7 +305,7 @@
           <treeselect
             v-model="form.unitId"
             :options="users"
-            placeholder="请选择单位"
+            placeholder=""
             class="threeselects"
             @select="selectPeo"
           />
@@ -350,8 +313,9 @@
         <el-form-item label="人员" prop="peopleId">
           <el-select
             v-model="form.peopleId"
-            placeholder="请选择人员"
+            placeholder=""
             ref="peoplenames"
+            filterable
           >
             <el-option
               v-for="item in executor"
@@ -369,11 +333,7 @@
         <el-form-item label="军衔" prop="rankId">
           <!-- <el-input  v-model="form.rankId" class="zhufnag" :disabled="true" /> -->
           <!-- <el-input v-model="form.rankName" placeholder="请输入军衔" /> -->
-          <el-select
-            v-model="form.rankId"
-            :disabled="true"
-            placeholder="请选择军衔"
-          >
+          <el-select v-model="form.rankId" :disabled="true" placeholder="">
             <!-- <el-option label="请选择字典生成" value="" /> -->
             <el-option
               v-for="(item, i) in ziDian1"
@@ -398,7 +358,7 @@
           label="出生时间"
           style="margin-left: 13px"
           prop="birthDate"
-          placeholder="请选择出生时间"
+          placeholder=""
         >
           <el-date-picker
             clearable
@@ -575,7 +535,7 @@
           prop="type"
           style="margin-left: -13px"
         >
-          <el-select v-model="form.type" placeholder="请选择申请住房类别">
+          <el-select v-model="form.type" placeholder="">
             <!-- <el-option label="请选择字典生成" value="" /> -->
             <el-option
               v-for="(item, i) in ziDian"
@@ -1104,4 +1064,8 @@ export default {
 ::v-deep .dialog-footer {
   margin-right: 34px;
 }
+::v-deep .el-input__inner {
+  background: transparent;
+  color: #fff;
+}
 </style>

+ 12 - 9
src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -7,8 +7,12 @@
       v-show="showSearch"
       label-width="68px"
     >
-       <el-form-item prop="deptName">
-      <el-input placeholder="请输入单位" v-model="queryParams.deptName" @input="handleQuery"/>
+      <el-form-item prop="deptName">
+        <el-input
+          placeholder="请输入单位"
+          v-model="queryParams.deptName"
+          @input="handleQuery"
+        />
       </el-form-item>
       <el-form-item prop="confidential">
         <el-input
@@ -21,9 +25,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button size="btr" @click="resetQuery"  
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -318,7 +320,7 @@ import {
   addBdglfilemanagement,
   updateBdglfilemanagement,
   exportBdglfilemanagement,
-  fileunits
+  fileunits,
 } from "@/api/grassrootsregistration/bdglfilemanagement";
 import {
   getZhuChiRen,
@@ -565,11 +567,12 @@ export default {
 
     //查看按钮操作
     handleChakan(row) {
-      const unitId =row.unitId
+      const unitId = row.unitId;
       // 是否隐藏按钮
       this.opens = false;
-      fileunits(unitId).then((response) => {
-        this.wordInfo = response.data;
+      listBdglfilemanagement({ unitId: unitId }).then((response) => {
+        // fileunits(unitId).then((response) => {
+        this.wordInfo = response.rows;
         this.title = "查看文件管理登计本";
         this.menuRoleVisible = true;
       });

+ 165 - 47
src/views/medicalhealth/examine/index.vue

@@ -47,9 +47,19 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <input class="input" v-model.number="queryParams.minAge" placeholder="输⼊年龄段" type="number"/>
+      <input
+        class="input"
+        v-model.number="queryParams.minAge"
+        placeholder="输⼊年龄段"
+        type="number"
+      />
       <span class="span">----</span>
-      <input class="input1" v-model.number="queryParams.maxAge" placeholder="输⼊年龄段" type="number"/>
+      <input
+        class="input1"
+        v-model.number="queryParams.maxAge"
+        placeholder="输⼊年龄段"
+        type="number"
+      />
       <el-form-item>
         <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
@@ -150,12 +160,10 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <!-- <el-button @click="handleUpdate"> 添加体检信息 </el-button>
-          <el-button @click="chaKan"> 查看 </el-button> -->
           <el-button
             size="btp"
             type="text"
-            @click="handleUpdate(scope.row)"
+            @click="tianJia(scope.row)"
             v-hasPermi="['medicalhealth:examine:edit']"
             >添加体检信息</el-button
           >
@@ -243,12 +251,12 @@
           :inline="true"
           style="margin-left: 30px"
         >
-          <el-form-item label="年份" prop="yeardate">
-            <el-input v-model="form.yeardate" placeholder="请输入年份" />
+          <el-form-item label="年份" prop="year">
+            <el-input v-model="form.year" placeholder="请输入年份" />
           </el-form-item>
           <div class="xiangMu">
-            <el-form-item label="项目" prop="type">
-              <el-select v-model="form.type" placeholder="请选择类型">
+            <el-form-item label="项目" prop="month">
+              <el-select v-model="form.month" placeholder="请选择类型">
                 <el-option
                   v-for="dict in dict.type.project"
                   :key="dict.value"
@@ -258,19 +266,23 @@
               </el-select>
             </el-form-item>
           </div>
+          <div class="jiben">附件</div>
+          <el-form-item>
+            <FileUpload v-model="fuWenList" />
+          </el-form-item>
           <div class="jiben">体检信息</div>
           <el-form-item>
-            <quill-editor
-              class="quill-editor"
-              ref="myTextEditor"
-              v-model="form.checkInformation"
-              style="height: 150px; width: 920px; margin-left: 0px"
-            ></quill-editor>
+            <el-input
+              v-model="form.contents"
+              type="textarea"
+              placeholder=""
+              style="width: 920px"
+            ></el-input>
           </el-form-item>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitFormT">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
@@ -278,26 +290,42 @@
     <!-- 查看体检信息 -->
 
     <el-dialog
-      title="添加体检信息"
+      :title="title"
       :visible.sync="openes"
       width="1016px"
       append-to-body
       :close-on-click-modal="false"
     >
-      <div class="ee">
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          :inline="true"
-          style="margin-left: 30px"
-        >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :inline="true"
+        style="margin-left: 30px"
+      >
+        <div class="jiben">体检人员</div>
+        <el-form-item label="单位" prop="yeardate" style="margin-right: 45px">
+          <el-input v-model="form.unitName" disabled />
+        </el-form-item>
+        <el-form-item label="姓名" prop="yeardate" style="margin-right: 45px">
+          <el-input v-model="form.peopleName" disabled />
+        </el-form-item>
+        <el-form-item label="工作岗位" prop="yeardate">
+          <el-input v-model="form.job" disabled />
+        </el-form-item>
+        <div class="ee" v-for="item in form.examineDetails" :key="item.id">
+          <div class="jiben">
+            体检信息
+            <span style="margin-left: 100px">
+              时间 : {{ item.createTime }}
+            </span>
+          </div>
           <el-form-item label="年份" prop="yeardate">
-            <el-input v-model="form.yeardate" />
+            <el-input v-model="item.year" disabled />
           </el-form-item>
           <div class="xiangMu">
             <el-form-item label="项目" prop="type">
-              <el-select v-model="form.type" placeholder="请选择类型">
+              <el-select v-model="item.month" placeholder="请选择类型" disabled>
                 <el-option
                   v-for="dict in dict.type.project"
                   :key="dict.value"
@@ -307,16 +335,31 @@
               </el-select>
             </el-form-item>
           </div>
-          <div class="jiben">体检信息</div>
+          <div style="margin-bottom: 20px; display: flex; align-items: center">
+            <span class="filename">{{ item.fileName }}</span>
+            <a
+              :href="url + item.filePath"
+              :download="item.fileName"
+              title="下载"
+              style="color: white; margin-left: 10px"
+              class="downloadfile"
+              >下载附件</a
+            >
+          </div>
           <el-form-item>
-            <quill-editor
-              class="quill-editor"
-              ref="myTextEditor"
-              v-model="form.checkInformation"
-              style="height: 150px; width: 920px; margin-left: 0px"
-            ></quill-editor>
+            <el-input
+              v-model="item.contents"
+              type="textarea"
+              placeholder=""
+              disabled
+              style="width: 920px"
+            >
+            </el-input>
           </el-form-item>
-        </el-form>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelss" size="btn">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -332,6 +375,7 @@ import {
   exportExamine,
   getDept,
   getZhuChiRen,
+  details,
 } from "@/api/medicalhealth/examine";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -398,6 +442,12 @@ export default {
       renYuan: [],
       // 人员类别
       renLie: [],
+      // 附件列表
+      fuWenList: [],
+      idss: null,
+      // 查看数据
+      topView: [],
+      url: process.env.VUE_APP_BASE_API,
     };
   },
   created() {
@@ -424,13 +474,18 @@ export default {
       });
     },
     // 点击添加人员体检信息
-    tianJia() {
+    tianJia(row) {
       this.opene = true;
+      this.idss = row.id;
+      this.reset();
     },
     // 点击查看人员体检信息
     chaKan() {
       this.openes = true;
     },
+    cancelss() {
+      this.openes = false;
+    },
     // 点击人员触发
     xingMing(data) {
       console.log(data);
@@ -468,6 +523,7 @@ export default {
         job: null,
         classId: null,
       };
+      this.fuWenList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -477,8 +533,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.minAge=null
-      this.queryParams.maxAge=null
+      this.queryParams.minAge = null;
+      this.queryParams.maxAge = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -522,6 +578,20 @@ export default {
         this.renYuan = res.data;
       });
     },
+    // 体检信息提交
+    submitFormT() {
+      if (this.fuWenList.length > 0) {
+        this.form.fileName = this.fuWenList[0].name;
+        this.form.filePath = this.fuWenList[0].url;
+      }
+      this.form.examineId = this.idss;
+      details(this.form).then((response) => {
+        this.$modal.msgSuccess("新增成功");
+        this.opene = false;
+        this.getList();
+        this.reset();
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
@@ -676,7 +746,7 @@ export default {
   display: inline-block;
 }
 .xiangMu > .el-form-item {
-  margin-left: 124px;
+  margin-left: 35px;
 }
 /* 体检 btp */
 .el-button--btp.is-active,
@@ -710,7 +780,7 @@ export default {
   background-color: transparent;
   color: #fff;
 }
-.input{
+.input {
   width: 150px;
   height: 36px;
   line-height: 36px;
@@ -722,7 +792,7 @@ export default {
   font-size: 14px;
   border-radius: 4px;
 }
-.input1{
+.input1 {
   width: 150px;
   height: 36px;
   line-height: 36px;
@@ -733,16 +803,64 @@ export default {
   padding: 0 20px;
   font-size: 14px;
   margin-right: 10px;
-   border-radius: 4px;
+  border-radius: 4px;
 }
 .span {
   margin: 0 5px;
   color: #fff;
 }
-.input,.input1::-webkit-outer-spin-button,input::-webkit-inner-spin-button{
--webkit-appearance:none;
+.input,
+.input1::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+.input,
+.input1[type="number"] {
+  -moz-appearance: textfield;
+}
+::v-deep .el-upload__tip {
+  color: #fff;
+  margin-top: 0px;
+  margin-left: 0px;
+}
+::v-deep .el-link.el-link--default {
+  color: #fff;
+  padding-left: 19px;
+}
+::v-deep .upload-file-uploader {
+  display: flex;
+  width: 500px;
+}
+::v-deep .el-upload {
+  margin-right: 13px;
+}
+::v-deep .upload-file-list .el-upload-list .el-upload-list--text {
+  width: 442px;
+}
+/* 附件名称样式 */
+.filename {
+  display: inline-block;
+  color: white;
+  width: 700px;
+  height: 30px;
+  border: 1px solid white;
+  line-height: 30px;
+  text-indent: 1em;
+}
+/* 下载按钮 */
+.downloadfile {
+  border: 1px solid white;
+  display: inline-block;
+  width: 100px;
+  height: 33px;
+  border-radius: 5px;
+  line-height: 33px;
+  text-align: center;
+}
+::v-deep .el-textarea__inner {
+  min-height: 145px !important;
+}
+::v-deep .upload-file-list {
+  width: 500px;
 }
- .input,.input1[type="number"]{
--moz-appearance: textfield;
- }
 </style>

+ 29 - 185
src/views/militaryvehicleManagement/thebus/index.vue

@@ -7,181 +7,6 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="车牌号" prop="vehiclenumber">
-        <el-input
-          v-model="queryParams.vehiclenumber"
-          placeholder="请输入车牌号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车辆型号" prop="vehiclemodel">
-        <el-input
-          v-model="queryParams.vehiclemodel"
-          placeholder="请输入车辆型号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车辆颜色" prop="vehiclecolor">
-        <el-input
-          v-model="queryParams.vehiclecolor"
-          placeholder="请输入车辆颜色"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车位号" prop="parkingspacenumber">
-        <el-input
-          v-model="queryParams.parkingspacenumber"
-          placeholder="请输入车位号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系方式" prop="contactnumber">
-        <el-input
-          v-model="queryParams.contactnumber"
-          placeholder="请输入联系方式"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人ID" prop="adminId">
-        <el-input
-          v-model="queryParams.adminId"
-          placeholder="请输入创建人ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createtime">
-        <el-input
-          v-model="queryParams.createtime"
-          placeholder="请输入创建时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改时间" prop="updatetime">
-        <el-input
-          v-model="queryParams.updatetime"
-          placeholder="请输入修改时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车辆在位情况1:在位,2:值班,3:出车,4待修" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择车辆在位情况1:在位,2:值班,3:出车,4待修" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属单位" prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入所属单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车辆负责人" prop="peopleId">
-        <el-input
-          v-model="queryParams.peopleId"
-          placeholder="请输入车辆负责人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="发动机号" prop="engineNumber">
-        <el-input
-          v-model="queryParams.engineNumber"
-          placeholder="请输入发动机号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车架号" prop="frameNumber">
-        <el-input
-          v-model="queryParams.frameNumber"
-          placeholder="请输入车架号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车辆来源" prop="source">
-        <el-input
-          v-model="queryParams.source"
-          placeholder="请输入车辆来源"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出厂日期" prop="date1">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.date1"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择出厂日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="ETC品牌" prop="etcBrand">
-        <el-input
-          v-model="queryParams.etcBrand"
-          placeholder="请输入ETC品牌"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="ETC编码" prop="etcNumber">
-        <el-input
-          v-model="queryParams.etcNumber"
-          placeholder="请输入ETC编码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所在位置" prop="position">
-        <el-input
-          v-model="queryParams.position"
-          placeholder="请输入所在位置"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否上牌" prop="isListing">
-        <el-input
-          v-model="queryParams.isListing"
-          placeholder="请输入是否上牌"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="固定座位数" prop="seatCount">
-        <el-input
-          v-model="queryParams.seatCount"
-          placeholder="请输入固定座位数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item prop="unitName">
         <el-input
           v-model="queryParams.unitName"
@@ -192,13 +17,6 @@
         />
       </el-form-item>
       <el-form-item>
-        <!-- <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        > -->
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -320,13 +138,14 @@
         align="center"
         prop="status"
         width="100"
+        :formatter="zaiWei"
       >
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <span v-if="scope.row.status == 1" style="color: #13ce66">在位</span>
           <span v-if="scope.row.status == 2" style="colo: #00eaff">值班</span>
           <span v-if="scope.row.status == 3" style="color: #ff4949">出车</span>
           <span v-if="scope.row.status == 4" style="color: #ffba00">待修</span>
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column label="所在位置" align="center" prop="position" />
       <el-table-column
@@ -521,7 +340,11 @@
           <el-input v-model="form.shenhejieguo" placeholder="请输入审查结果" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" placeholder="请输入是否在位">
+          <el-select
+            v-model="form.status"
+            placeholder="请输入是否在位"
+            :disabled="chuF"
+          >
             <el-option
               v-for="(item, i) in military"
               :key="i"
@@ -639,6 +462,7 @@ export default {
       military: [],
       // 车牌型号
       brand: [],
+      chuF: false,
     };
   },
   created() {
@@ -652,6 +476,16 @@ export default {
     });
   },
   methods: {
+    // 翻译
+    zaiWei(rows) {
+      var name = "";
+      this.military.map((item) => {
+        if (item.dictValue == rows.status) {
+          name = item.dictLabel;
+        }
+      });
+      return name;
+    },
     // 厂牌型号
     getCatPai() {
       getDicts("brand").then((response) => {
@@ -781,6 +615,7 @@ export default {
       this.getTreeList();
       this.renYuan = [];
       this.open = true;
+      this.chuF = false;
       this.title = "添加军车管理";
     },
     /** 修改按钮操作 */
@@ -791,6 +626,11 @@ export default {
       getThebus(id).then((response) => {
         this.form = response.data;
         this.getRen(this.form.unitId);
+        if (this.form.status == "3") {
+          this.chuF = true;
+        } else {
+          this.chuF = false;
+        }
         this.open = true;
         this.title = "修改军车管理";
       });
@@ -1013,4 +853,8 @@ export default {
 .box {
   background-color: #ffba00 !important;
 }
+::v-deep .el-input.is-disabled .el-input__inner {
+  background: transparent;
+  color: #fff;
+}
 </style>

+ 0 - 134
src/views/thought/parliament/index.vue

@@ -1,139 +1,5 @@
 <template>
   <div class="app-container">
-    <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item  prop="unitName" > -->
-    <!-- <el-select v-model="queryParams.unitName" placeholder="请选择单位名称" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select> -->
-    <!-- <treeselect
-          v-model="queryParams.unitName"
-          :options="userss"
-          placeholder="请选择到访单位"
-          class="threeselects waibudaofang"
-          @select="selectPeo"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item label="单位id" prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择结束时间">
-        </el-date-picker>
-      </el-form-item> -->
-    <!-- <el-form-item prop="createName">
-        <el-input
-          v-model="queryParams.createName"
-          placeholder="请输入创建人姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item label="创建人id" prop="createId">
-        <el-input
-          v-model="queryParams.createId"
-          placeholder="请输入创建人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item  prop="filePath">
-        <el-input
-          v-model="queryParams.filePath"
-          placeholder="请输入文件路径"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item  prop="fileName">
-        <el-input
-          v-model="queryParams.fileName"
-          placeholder="请输入文件名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item  prop="recorder">
-        <el-input
-          v-model="queryParams.recorder"
-          placeholder="请输入记录人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item label="记录人id" prop="recorderId">
-        <el-input
-          v-model="queryParams.recorderId"
-          placeholder="请输入记录人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item  prop="participants">
-        <el-input
-          v-model="queryParams.participants"
-          placeholder="请输入参加人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item label="参加人id" prop="participantsId">
-        <el-input
-          v-model="queryParams.participantsId"
-          placeholder="请输入参加人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item  prop="organizer">
-        <el-input
-          v-model="queryParams.organizer"
-          placeholder="请输入组织人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item label="组织人id" prop="organizerId">
-        <el-input
-          v-model="queryParams.organizerId"
-          placeholder="请输入组织人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-    <!-- <el-form-item> -->
-    <!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> -->
-    <!-- <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form> -->
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button

+ 1 - 0
src/views/thought/thoughtPlan/index.vue

@@ -1215,6 +1215,7 @@ export default {
             if (this.checkShops[0].planContent != null) {
               this.form.planFus = this.checkShops;
               this.form.planFujians = this.planResponsefus;
+              console.log(this.form);
               addThoughtPlan(this.form).then((response) => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;