修改要事日记表格BUG

src/components/look_word/bdglarmament.vue

@@ -377,7 +377,7 @@ export default {
     return {
       title: "军械装备登记表（总表）",
       style:
-        ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
+        ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.231em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
 

src/components/look_word/bdglcookbook.vue

@@ -406,7 +406,7 @@ export default {
     return {
       title: "食堂食谱表",
       style:
-        ".JR_tr {height: 40px;};.JR_left{width: 120px;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}.bottom {font-size: 14px;display: flex;justify-content:center;}",
+        ".JR_tr {height: 40px;};.JR_left{width: 120px;font-size: 1.131em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.131em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.131em; font-family: 仿宋_GB2312; text-align: right}.bottom {font-size: 14px;display: flex;justify-content:center;}",
     };
   },
   methods: {

src/components/look_word/bdgldiary.vue

@@ -142,7 +142,7 @@
         </tr>
         <!-- 训练、教育或者执行其他任务情况 -->
         <tr class="JR_tr" height="20" align="center">
-          <td rowspan="6" class="JR_left">
+          <td :rowspan="number" class="JR_left">
             <p align="center" style="margin: 0 15px; font-family: 'songti'">
               训 <br />
               练 <br />
@@ -211,11 +211,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            message.weekworkRegisters.length == 0
+            (message.weekworkRegisters.length < 4 || message.weekworkRegisters.length == 0)
           "
         >
           <td class="JR_left" height="70" style="font-family: 'songti'">
-            早晨
+            
           </td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
@@ -228,11 +228,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            message.weekworkRegisters.length == 0
+            (message.weekworkRegisters.length < 3 || message.weekworkRegisters.length == 0)
           "
         >
           <td class="JR_left" height="70" style="font-family: 'songti'">
-            上午
+            
           </td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
@@ -245,11 +245,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            message.weekworkRegisters.length == 0
+            (message.weekworkRegisters.length < 2 || message.weekworkRegisters.length == 0)
           "
         >
           <td class="JR_left" height="70" style="font-family: 'songti'">
-            下午
+            
           </td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
@@ -262,11 +262,11 @@
           align="center"
           v-if="
             message.weekworkRegisters == null ||
-            message.weekworkRegisters.length == 0
+            (message.weekworkRegisters.length < 1 || message.weekworkRegisters.length == 0)
           "
         >
           <td class="JR_left" height="70" style="font-family: 'songti'">
-            晚上
+            
           </td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
@@ -360,8 +360,8 @@
           </td>
         </tr>
         <tr
-          v-for="(item, i) in message.inspect"
-          :key="i"
+          v-for="(item, index) in message.inspect"
+          :key="index"
           class="JR_tr"
           style="font-family: 'fangsong'"
         >
@@ -806,6 +806,7 @@ export default {
       qinshu: 4,
       week: "",
       qinshu2: 3,
+      number: 6,
     };
   },
   created() {
@@ -813,6 +814,7 @@ export default {
     this.qinshu = this.qinshus();
     this.week = this.getWeek(this.message.blogDate);
     this.qinshu2 = this.qinshus2();
+    this.xunlian();
   },
   methods: {
     daochu() {
@@ -825,16 +827,21 @@ export default {
       if (this.message.kinsfolk != null) {
         return this.message.kinsfolk.length + 2;
       }
-      return (this.message.kinsfolk.length = 4);
+      return 4;
     },
 
     qinshus2() {
       if (this.message.kinsfolk != null) {
         return this.message.kinsfolk.length + 1;
       }
-      return (this.message.kinsfolk.length = 3);
+      return 3;
+    },
+    xunlian(){
+      if (this.message.weekworkRegisters.length > 4){
+        console.log(123456789);
+        this.number += (this.message.weekworkRegisters.length - 4)
+      }
     },
-
     /*
       获取当前星期几
      */

src/components/look_word/bdgldrill.vue

@@ -257,7 +257,7 @@ export default {
     return {
       title: "军事训练登记簿",
       style:
-        ".JR_tr {height: 40px;};.JR_left{font-size: 1.221em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{ font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right},",
+        ".JR_tr {height: 40px;};.JR_left{font-size: 1.221em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.311em; font-family: 仿宋_GB2312;};.JR_bottom{ font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right},",
     };
   },
   methods: {

src/components/look_word/bdglequip.vue

@@ -253,7 +253,7 @@ export default {
     return {
       title: "训练器材、教材登记簿",
       style:
-        ".JR_tr {height: 40px;};.JR_left{width: 120px;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right};",
+        ".JR_tr {height: 40px;};.JR_left{width: 120px;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.231em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right};",
     };
   },
   methods: {

src/components/look_word/bdglfilemanagement.vue

@@ -227,6 +227,75 @@
 
             <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>
@@ -243,7 +312,7 @@ export default {
     return {
       title: "文件管理登记本",
       style:
-        ".JR_tr {height: 40px;};.JR_left{width: 120px;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{ font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
+        ".JR_tr {height: 40px;};.JR_left{width: 120px;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.231em; font-family: 仿宋_GB2312;};.JR_bottom{ font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
   methods: {

src/components/look_word/bdglfood.vue

@@ -664,7 +664,7 @@ export default {
     return {
       title: "伙食管理登记簿",
       style:
-        ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right};.a1{margin-left: 300px;};.aaa{height: 40px;font-size: 1.331em; font-family: '楷体_GB2312';border: none;border-color: none;}",
+        ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.201em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right};.a1{margin-left: 300px;};.aaa{height: 40px;font-size: 1.331em; font-family: '楷体_GB2312';border: none;border-color: none;}",
       isWho: null,
       result: {
         money: "",

src/components/look_word/bdglpublicproperty.vue

@@ -392,7 +392,7 @@ export default {
     return {
       title: "营产、公物管理登记簿",
       style:
-        ".JR_tr {height: 40px;width:105px};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
+        ".JR_tr {height: 40px;width:105px};.JR_left{font-size: 1.331em; 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}",
     };
   },
   methods: {

src/components/look_word/bdglweekwork.vue

@@ -197,7 +197,7 @@ export default {
     return {
       title: "周工作安排表",
       style:
-        ".JR_tr {height: 40px;};.JR_left{text-align:center;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
+        ".JR_tr {height: 40px;};.JR_left{text-align:center;font-size: 1.231em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.131em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
   methods: {

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -769,6 +769,7 @@
         :title="title"
         append-to-body
         id="chakan"
+        :close-on-click-modal="false"
       >
         <bdgldiary
           v-if="menuRoleVisible"
@@ -1699,6 +1700,7 @@ export default {
   background: #003156;
   color: #fff;
   margin-right: 2px;
+  padding-top: 7px;
 }
 ::v-deep .el-tree-node__content {
   height: 32px !important;

src/views/grassrootsregistration/bdglparty/index.vue

@@ -333,6 +333,7 @@
       append-to-body
       id="chakan"
       :close-on-click-modal="false"
+
     >
       <bdglparty
         v-if="menuRoleVisible"

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -1381,6 +1381,7 @@ export default {
 .el-tree {
   background-color: #00365f;
   color: #fff;
+  padding-top: 7px;
 }
 ::v-deep .el-upload-list--picture-card .el-upload-list__item {
   height: 210px;