修改基层登记查看导出页面展示

src/components/look_word/bdgldiary.vue

@@ -114,20 +114,20 @@
         <tr class="JR_tr" align="center">
           <td :rowspan="number" class="JR_left" width="48">
             <p align="center" style="margin: 0 15px; font-family: '宋体'">
-              训 <br />
-              练 <br />
-              、 <br />
-              教 <br />
-              育 <br />
-              或 <br />
-              者 <br />
-              执 <br />
-              行 <br />
-              其 <br />
-              他 <br />
-              任 <br />
-              务 <br />
-              情 <br />
+              训 <br/>
+              练 <br/>
+              、 <br/>
+              教 <br/>
+              育 <br/>
+              或 <br/>
+              者 <br/>
+              执 <br/>
+              行 <br/>
+              其 <br/>
+              他 <br/>
+              任 <br/>
+              务 <br/>
+              情 <br/>
               况
             </p>
           </td>
@@ -137,7 +137,7 @@
             class="JR_left"
             style="font-family: '宋体'"
           >
-            区<br />
+            区<br/>
             分
           </td>
           <td
@@ -164,16 +164,16 @@
           <td class="JR_left" width="52" style="font-family: '宋体'">到课率</td>
         </tr>
         <tr
-          v-for="(item, i) in message.bdglDiaryWeekworkRegisterList"
+          v-for="(item, i) in bdglDiaryWeekworkRegisterList"
           :key="i + '     '"
         >
           <td height="88">{{ item.dateline }}</td>
           <td align="left" colspan="9">
-            <p v-html="aaa(item.contents)" style="margin-left: 7px"></p>
+            <p v-html="item.contents" style="margin-left: 7px"></p>
           </td>
           <td v-html="item.shouldArrive"></td>
           <td v-html="item.realTo"></td>
-          <td v-html="item.percentage"></td>
+          <td v-html="bbb(item.percentage)"></td>
         </tr>
         <tr v-for="(item, i) in meiShuJu" :key="i + '      '">
           <td height="88">{{ item.dateline }}</td>
@@ -203,7 +203,7 @@
         <tr class="JR_tr" height="61">
           <td colspan="2" class="JR_left">
             <p align="center" style="font-family: '宋体'">
-              人员或 <br />
+              人员或 <br/>
               装备变动
             </p>
           </td>
@@ -220,15 +220,15 @@
         <tr class="JR_tr" height="207">
           <td rowspan=":count($xlian)" colspan="2" class="JR_left">
             <p align="center" style="font-family: '宋体'">
-              武 、 <br />
-              器 内 <br />
-              装 务 <br />
-              备 卫 <br />
-              、 生 <br />
-              军 检 <br />
-              容 查 <br />
-              风 情 <br />
-              纪 况<br />
+              武 、 <br/>
+              器 内 <br/>
+              装 务 <br/>
+              备 卫 <br/>
+              、 生 <br/>
+              军 检 <br/>
+              容 查 <br/>
+              风 情 <br/>
+              纪 况<br/>
             </p>
           </td>
           <td
@@ -254,9 +254,9 @@
         <tr class="JR_tr" style="font-family: '宋体'">
           <td :rowspan="chapu.rowspan" class="JR_left" width="57">
             <p align="center" style="font-family: '宋体'">
-              查 <br />
-              铺 <br />
-              查 <br />
+              查 <br/>
+              铺 <br/>
+              查 <br/>
               哨
             </p>
           </td>
@@ -318,15 +318,15 @@
         <tr class="JR_tr" style="font-family: '宋体'">
           <td class="JR_left" rowspan="4">
             <p align="center" style="font-family: '宋体'">
-              派 <br />
-              班 <br />
-              情 <br />
+              派 <br/>
+              班 <br/>
+              情 <br/>
               况
             </p>
           </td>
           <td class="JR_left" height="26">
             <span align="center" style="font-family: '宋体'; height: 20px"
-              >职务</span
+            >职务</span
             >
           </td>
           <td class="JR_left">
@@ -387,8 +387,8 @@
           >
             <div style="margin-bottom: 10px">交接时间</div>
             <span v-if="message.dutyDate">{{
-              message.dutyDate | dataFormatshiF
-            }}</span>
+                message.dutyDate | dataFormatshiF
+              }}</span>
             <span v-else>时 分</span>
           </td>
           <td class="JR_right" colspan="8">
@@ -419,11 +419,11 @@
         <tr class="JR_tr" style="font-family: '宋体'">
           <td :rowspan="qinshu.rowspan" class="JR_left">
             <span align="center" style="font-family: '宋体'">
-              临 <br />
-              时 <br />
-              来 <br />
-              队 <br />
-              亲 <br />
+              临 <br/>
+              时 <br/>
+              来 <br/>
+              队 <br/>
+              亲 <br/>
               属
             </span>
           </td>
@@ -512,14 +512,14 @@
         <tr class="JR_tr" align="center" style="font-family: '宋体'">
           <td :rowspan="qingjia.rowspan" class="JR_left">
             <span align="center" style="font-family: '宋体'">
-              请 <br />
-              假 <br />
-              外 <br />
-              出 <br />
-              、 <br />
-              探 <br />
-              亲 <br />
-              休 <br />
+              请 <br/>
+              假 <br/>
+              外 <br/>
+              出 <br/>
+              、 <br/>
+              探 <br/>
+              亲 <br/>
+              休 <br/>
               假
             </span>
           </td>
@@ -531,23 +531,23 @@
             事&nbsp;&nbsp;&nbsp; 由
           </td>
           <td class="JR_left" colspan="1" style="font-family: '宋体'">
-            时数或 <br />
+            时数或 <br/>
             天&nbsp; 数
           </td>
           <td class="JR_left" colspan="2" style="font-family: '宋体'">
-            准假部 <br />
+            准假部 <br/>
             门(人)
           </td>
           <td class="JR_left" colspan="2" style="font-family: '宋体'">
-            离 队 <br />
+            离 队 <br/>
             时 间
           </td>
           <td class="JR_left" colspan="2" style="font-family: '宋体'">
-            归 队 <br />
+            归 队 <br/>
             时 间
           </td>
           <td class="JR_left" colspan="3" style="font-family: '宋体'">
-            超(误)假 <br />
+            超(误)假 <br/>
             时(天)数
           </td>
         </tr>
@@ -613,19 +613,19 @@
             style="font-family: '宋体'"
           >
             <span align="center" style="font-family: '宋体'">
-              上 <br />
-              级 <br />
-              通 <br />
-              知 <br />
-              、 <br />
-              指 <br />
-              示 <br />
-              及 <br />
-              其 <br />
-              他 <br />
-              重 <br />
-              要 <br />
-              事 <br />
+              上 <br/>
+              级 <br/>
+              通 <br/>
+              知 <br/>
+              、 <br/>
+              指 <br/>
+              示 <br/>
+              及 <br/>
+              其 <br/>
+              他 <br/>
+              重 <br/>
+              要 <br/>
+              事 <br/>
               项
             </span>
           </td>
@@ -670,6 +670,7 @@
 <script>
 // import '@/utils/jquery.wordexport.js'
 import exportWord from "@/utils/exportWord.js";
+
 export default {
   name: "bdgdiarys",
   props: ["message"],
@@ -720,7 +721,7 @@ export default {
                   padding: 0;
                   border-bottom: 1px solid !important;
                 }
-                
+
                 .JR_left{font-size: 1em; font-family: '楷体_GB2312';}
                 .JR_right{ font-size: 1em; font-family: 仿宋_GB2312_GB2312;}
                 `,
@@ -730,10 +731,8 @@ export default {
       shang: [],
       xia: [],
       wan: [],
-      zao1: {},
-      shang1: {},
-      xia1: {},
-      wan1: {},
+      bdglDiaryWeekworkRegisterList: [],
+      typeTime: ["早上", "上午", "下午", "晚上"]
     };
   },
   created() {
@@ -755,121 +754,33 @@ export default {
       this.num = 7;
     }
   },
-  mounted() {},
+  mounted() {
+  },
 
   methods: {
-    xunlianRen(a, b, c, d) {
-      var a1 = a;
-      if (a1.length > 1) {
-        for (let i = 0; i < a1.length; i++) {
-          this.zao1.percentage +=
-            a1[i].percentage + "<br/>".replaceAll(".00", "");
-          this.zao1.shouldArrive += a1[i].shouldArrive + "<br/>";
-          this.zao1.contents += a1[i].contents + "<br/>";
-          this.zao1.realTo += a1[i].realTo + "<br/>";
-          //  this.zao1.percentage+=
-          // a1[i].realTo + "<br/>"
-          //  [0].percentage = (
-          //     this.message.bdglDiaryWeekworkRegisterList[i].percentage + "<br/>"
-          //   ).replaceAll(".00", "");
-          //   this.message.bdglDiaryWeekworkRegisterList[0].shouldArrive =
-          //     this.message.bdglDiaryWeekworkRegisterList[i].shouldArrive +
-          //     "<br/>";
-          //   this.message.bdglDiaryWeekworkRegisterList[0].percentage += (
-          //     ta + "<br/>"
-          //   ).replaceAll(".00", "");
-          //   this.message.bdglDiaryWeekworkRegisterList[0].shouldArrive +=
-          //     a +
-          //     "<br/>";
-        }
-        this.zao1.percentage = this.zao1.percentage.substring(9);
-        this.zao1.shouldArrive = this.zao1.percentage.substring(7);
-        this.zao1.contents = this.zao1.percentage.substring(9);
-        this.zao1.realTo = this.zao1.percentage.substring(8);
-        this.message.bdglDiaryWeekworkRegisterList[0].percentage =
-          this.zao1.percentage;
-        this.message.bdglDiaryWeekworkRegisterList[0].shouldArrive =
-          this.zao1.shouldArrive;
-          this.message.bdglDiaryWeekworkRegisterList[0].contents =
-          this.zao1.contents;
-          this.message.bdglDiaryWeekworkRegisterList[0].realTo =
-          this.zao1.realTo;
-        console.log(this.message.bdglDiaryWeekworkRegisterList);
-      } else {
-        this.message.bdglDiaryWeekworkRegisterList[0].percentage =
-          a1[0].percentage;
+    xunlianRen(...args) {
+      for (let i = 0; i < args.length; i++) {
+        this.bdglDiaryWeekworkRegisterList.push(this.tool(args[i]))
       }
-      // if (this.message.bdglDiaryWeekworkRegisterList) {
-      //   this.formattingFn();
-      //   for (
-      //     let i = 0;
-      //     i < this.message.bdglDiaryWeekworkRegisterList.length;
-      //     i++
-      //   ) {
-      //     if (
-      //       this.message.bdglDiaryWeekworkRegisterList[i].dateline == "早晨" &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].percentage != null &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].realTo != null &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].shouldArrive != null
-      //     ) {
-      //       console.log(this.message.bdglDiaryWeekworkRegisterList[0].realTo);
-      //       this.message.bdglDiaryWeekworkRegisterList[0].realTo =
-      //         this.message.bdglDiaryWeekworkRegisterList[i].realTo + "<br/>";
-      //       this.message.bdglDiaryWeekworkRegisterList[0].percentage = (
-      //         this.message.bdglDiaryWeekworkRegisterList[i].percentage + "<br/>"
-      //       ).replaceAll(".00", "");
-      //       this.message.bdglDiaryWeekworkRegisterList[0].shouldArrive =
-      //         this.message.bdglDiaryWeekworkRegisterList[i].shouldArrive +
-      //         "<br/>";
-      //     }
-      //     if (
-      //       this.message.bdglDiaryWeekworkRegisterList[i].dateline == "上午" &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].percentage != null &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].realTo != null &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].shouldArrive != null
-      //     ) {
-      //       this.message.bdglDiaryWeekworkRegisterList[1].realTo +=
-      //         this.message.bdglDiaryWeekworkRegisterList[i].realTo + "<br/>";
-      //       this.message.bdglDiaryWeekworkRegisterList[1].percentage += (
-      //         this.message.bdglDiaryWeekworkRegisterList[i].percentage + "<br/>"
-      //       ).replaceAll(".00", "");
-      //       this.message.bdglDiaryWeekworkRegisterList[1].shouldArrive +=
-      //         this.message.bdglDiaryWeekworkRegisterList[i].shouldArrive +
-      //         "<br/>";
-      //     }
-      //     if (
-      //       this.message.bdglDiaryWeekworkRegisterList[i].dateline == "下午" &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].percentage != null &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].realTo != null &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].shouldArrive != null
-      //     ) {
-      //       this.message.bdglDiaryWeekworkRegisterList[2].realTo +=
-      //         this.message.bdglDiaryWeekworkRegisterList[i].realTo + "<br/>";
-      //       this.message.bdglDiaryWeekworkRegisterList[2].percentage += (
-      //         this.message.bdglDiaryWeekworkRegisterList[i].percentage + "<br/>"
-      //       ).replaceAll(".00", "");
-      //       this.message.bdglDiaryWeekworkRegisterList[2].shouldArrive +=
-      //         this.message.bdglDiaryWeekworkRegisterList[i].shouldArrive +
-      //         "<br/>";
-      //     }
-      //     if (
-      //       this.message.bdglDiaryWeekworkRegisterList[i].dateline == "晚上" &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].percentage != null &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].realTo != null &&
-      //       this.message.bdglDiaryWeekworkRegisterList[i].shouldArrive != null
-      //     ) {
-      //       this.message.bdglDiaryWeekworkRegisterList[3].realTo +=
-      //         this.message.bdglDiaryWeekworkRegisterList[i].realTo + "<br/>";
-      //       this.message.bdglDiaryWeekworkRegisterList[3].percentage += (
-      //         this.message.bdglDiaryWeekworkRegisterList[i].percentage + "<br/>"
-      //       ).replaceAll(".00", "");
-      //       this.message.bdglDiaryWeekworkRegisterList[3].shouldArrive +=
-      //         this.message.bdglDiaryWeekworkRegisterList[i].shouldArrive +
-      //         "<br/>";
-      //     }
-      //   }
-      // }
     },
+
+    tool(i) {
+      let dateline = "",
+        contents = "",
+        realTo = "",
+        shouldArrive = "",
+        percentage = "";
+      i.forEach((item) => {
+        dateline = item.dateline
+        contents += (item.contents + "<br/>")
+        realTo += (item.realTo + "<br/>")
+        shouldArrive += (item.shouldArrive + "<br/>")
+        percentage += (item.percentage + "<br/>")
+      })
+      console.log({dateline,contents, realTo, shouldArrive, percentage})
+      return {dateline,contents, realTo, shouldArrive, percentage}
+    },
+
     daochu() {
       exportWord(this.faith);
     },
@@ -889,16 +800,6 @@ export default {
         return (raw = null);
       }
     },
-    // 格式化数据
-    formattingFn() {
-      if (this.message.bdglDiaryWeekworkRegisterList) {
-        this.message.bdglDiaryWeekworkRegisterList.forEach((item) => {
-          item.percentage = "";
-          item.realTo = "";
-          item.shouldArrive = "";
-        });
-      }
-    },
     xunlians() {
       if (this.message.bdglDiaryWeekworkRegisterList) {
         for (
@@ -915,6 +816,8 @@ export default {
             dateline: "早晨",
             contents: "",
             percentage: "",
+            realTo: "",
+            shouldArrive: "",
           });
         }
         if (this.faith1.indexOf("上午") == -1) {
@@ -922,6 +825,8 @@ export default {
             dateline: "上午",
             contents: "",
             percentage: "",
+            realTo: "",
+            shouldArrive: "",
           });
         }
         if (this.faith1.indexOf("下午") == -1) {
@@ -929,6 +834,8 @@ export default {
             dateline: "下午",
             contents: "",
             percentage: "",
+            realTo: "",
+            shouldArrive: "",
           });
         }
         if (this.faith1.indexOf("晚上") == -1) {
@@ -936,6 +843,8 @@ export default {
             dateline: "晚上",
             contents: "",
             percentage: "",
+            realTo: "",
+            shouldArrive: "",
           });
         }
         for (
@@ -967,7 +876,7 @@ export default {
             this.wan.push(this.message.bdglDiaryWeekworkRegisterList[index]);
           }
         }
-        this.xunlianRen(this.zao);
+        this.xunlianRen(this.zao, this.shang, this.xia, this.wan);
         // this.faith2 = [...this.zao, ...this.shang, ...this.xia, ...this.wan];
         this.message.bdglDiaryWeekworkRegisterList = this.faith2;
       } else {
@@ -1135,6 +1044,7 @@ export default {
   padding: 0;
   border-bottom: 1px solid !important;
 }
+
 #b1 td {
   padding: 0;
   border: 0 !important;
@@ -1154,4 +1064,4 @@ export default {
   margin: 4px auto 0px;
   letter-spacing: 9px;
 }
-</style>
+</style>