修改表格

src/components/look_word/bdglarmament.vue

@@ -155,16 +155,16 @@
           </tr>
           <tr class="JR_tr" style="font-size: 16px;font-weight: 600;font-family: 'fangsong'">
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">01</p>
+              <p align="center">{{message.id}}</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">22</p>
+              <p align="center">{{message.recordDate.split('-')[0]}}</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">03</p>
+              <p align="center">{{message.recordDate.split('-')[1]}}</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">08</p>
+              <p align="center">{{message.recordDate.split('-')[2]}}</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_right">
               <p align="center">{{ message.metering }}</p>
@@ -381,6 +381,7 @@ export default {
         ".JR_tr {height: 40px;};.JR_left{font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
+
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);

src/components/look_word/bdgldiary.vue

@@ -9,7 +9,7 @@
           text-align: center;
           margin-botttom: 30px;
           color: black;
-          font-family: 'kaiti'
+          font-family: 'kaiti';
         "
       >
         《连队要事日记》
@@ -22,7 +22,39 @@
         >
         <span style="margin-left: 380px">值班员:{{ message.peopleName }}</span>
       </div> -->
-
+       
+       <table border="none"
+       style="
+          border-collapse: collapse;
+          mso-border-left-alt: 0.5pt solid windowtext;
+          mso-border-top-alt: 0.5pt solid windowtext;
+          mso-border-right-alt: 0.5pt solid windowtext;
+          mso-border-bottom-alt: 0.5pt solid windowtext;
+          mso-border-insideh: 0.5pt solid windowtext;
+          mso-border-insidev: 0.5pt solid windowtext;
+          mso-padding-alt: 0pt 0pt 0pt 0pt;
+          width: 960px;
+          margin-left: -20px;
+          color: black;
+          font-size: 16px;
+          font-weight: 600;
+          border:none;
+        ">
+         <tr
+          height="30"
+          align="center"
+          style="border: none; font-family: 'kaiti'"
+        >
+          <td colspan="3" height="40" style="border:none">
+            {{ message.blogDate | dataFormat}}
+          </td>
+          <td colspan="2" style="border:none" >{{ week }}</td>
+          <td colspan="6"  style="border:none">天气：{{ message.weather }}</td>
+          <td colspan="3" style="border:none" >
+            值班员:{{ message.peopleName }}
+          </td>
+        </tr>
+       </table>
       <table
         border="1"
         style="
@@ -39,17 +71,18 @@
           margin-left: -20px;
           border-color: black;
           color: black;
-          font-size: 16px;font-weight: 600;
+          font-size: 16px;
+          font-weight: 600;
         "
       >
-        <tr height="30" align="center" style="border:none;font-family: 'kaiti'">
-          <td colspan="3" height="40" style="border:none">{{ message.blogDate }}</td>
-          <td colspan="2" style="border:none">{{ week }}</td>
-          <td colspan="6" style="border:none">天气：{{ message.weather }}</td>
-          <td colspan="3" style="border:none">值班员:{{ message.peopleName }}</td>
-        </tr>
+        
         <!-- 实力 -->
-        <tr class="JR_tr" height="30" align="center" style="font-family: 'kaiti'">
+        <tr
+          class="JR_tr"
+          height="30"
+          align="center"
+          style="font-family: 'kaiti'"
+        >
           <td colspan="2" rowspan="2" class="JR_left">实力</td>
           <td colspan="6" style="letter-spacing: 20px" class="JR_left">
             编制人数
@@ -59,23 +92,31 @@
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td width="68" class="JR_left" style="font-family: 'kaiti'" >干部</td>
-          <td width="68" class="JR_left" style="font-family: 'fangsong'">{{ message.orgcadre }}</td>
+          <td width="68" class="JR_left" style="font-family: 'kaiti'">干部</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">
+            {{ message.orgcadre }}
+          </td>
           <td width="68" class="JR_left" style="font-family: 'kaiti'">战士</td>
-          <td width="68" class="JR_left" style="font-family: 'fangsong'">{{ message.orgsoldier }}</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">
+            {{ message.orgsoldier }}
+          </td>
           <td width="68" class="JR_left" style="font-family: 'kaiti'">合计</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'"></td>
           <td width="68" class="JR_left" style="font-family: 'kaiti'">干部</td>
-          <td width="68" class="JR_left" style="font-family: 'fangsong'">{{ message.nowcadre }}</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">
+            {{ message.nowcadre }}
+          </td>
           <td width="68" class="JR_left" style="font-family: 'kaiti'">战士</td>
-          <td width="68" class="JR_left" style="font-family: 'fangsong'">{{ message.nowsoldier }}</td>
+          <td width="68" class="JR_left" style="font-family: 'fangsong'">
+            {{ message.nowsoldier }}
+          </td>
           <td width="68" class="JR_left" style="font-family: 'kaiti'">合计</td>
           <td width="68" class="JR_left" style="font-family: 'fangsong'"></td>
         </tr>
         <!-- 训练、教育或者执行其他任务情况 -->
         <tr class="JR_tr" height="20" align="center">
           <td rowspan="6" class="JR_left">
-            <p align="center" style="margin: 0 15px;font-family: 'kaiti'">
+            <p align="center" style="margin: 0 15px; font-family: 'kaiti'">
               训 <br />
               练 <br />
               、 <br />
@@ -93,29 +134,42 @@
               况
             </p>
           </td>
-          <td rowspan="2" width="68" class="JR_left" style="font-family: 'kaiti'">区分</td>
+          <td
+            rowspan="2"
+            width="68"
+            class="JR_left"
+            style="font-family: 'kaiti'"
+          >
+            区分
+          </td>
           <td
             colspan="9"
             rowspan="2"
-            style="letter-spacing: 60px;font-family: 'fangsong'"
+            style="letter-spacing: 60px; font-family: 'fangsong'"
             class="JR_left"
           >
             内容
           </td>
           <td colspan="3" class="JR_left" style="font-family: 'kaiti'">人数</td>
         </tr>
-        <tr class="JR_tr" height="30" align="center" style="font-family: 'kaiti'">
+        <tr
+          class="JR_tr"
+          height="30"
+          align="center"
+          style="font-family: 'kaiti'"
+        >
           <td class="JR_left">应到</td>
           <td class="JR_left">实到</td>
           <td class="JR_left">到课率</td>
         </tr>
         <tr
-        style="font-family: 'fangsong'"
+          style="font-family: 'fangsong'"
           class="JR_tr"
           height="70"
           align="center"
           v-for="(items, index) in message.weekworkRegisters"
           :key="index"
+          v-show="message.weekworkRegisters.length > 0"
         >
           <td class="JR_left">{{ items.dateline }}</td>
           <td colspan="9" v-html="items.contents"></td>
@@ -123,33 +177,67 @@
           <td class="JR_right">{{ items.realTo }}</td>
           <td class="JR_right">{{ items.percentage }}</td>
         </tr>
-        <!-- <tr class="JR_tr" height="70" align="center">
+        <tr
+          class="JR_tr"
+          height="70"
+          align="center"
+          v-show="message.weekworkRegisters == null"
+        >
+          <td class="JR_left">早晨</td>
+          <td class="JR_right" colspan="9"></td>
+          <td class="JR_right"></td>
+          <td class="JR_right"></td>
+          <td class="JR_right"></td>
+        </tr>
+        <tr
+          class="JR_tr"
+          height="70"
+          align="center"
+          v-show="message.weekworkRegisters == null"
+        >
           <td class="JR_left">上午</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
         </tr>
-        <tr class="JR_tr" height="70" align="center">
+        <tr
+          class="JR_tr"
+          height="70"
+          align="center"
+          v-show="message.weekworkRegisters == null"
+        >
           <td class="JR_left">下午</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
         </tr>
-        <tr class="JR_tr" height="70" align="center">
+        <tr
+          class="JR_tr"
+          height="70"
+          align="center"
+          v-show="message.weekworkRegisters == null"
+        >
           <td class="JR_left">晚上</td>
           <td class="JR_right" colspan="9"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
           <td class="JR_right"></td>
-        </tr> -->
+        </tr>
         <!-- 公差勤务 -->
         <tr class="JR_tr">
-          <td colspan="2"><p align="center" class="JR_left" style="font-family: 'kaiti'">公差勤务</p></td>
-          <td style="font-family: 'fangsong'" colspan="12" class="JR_right" v-html="message.tolerance">
-            
+          <td colspan="2">
+            <p align="center" class="JR_left" style="font-family: 'kaiti'">
+              公差勤务
+            </p>
           </td>
+          <td
+            style="font-family: 'fangsong'"
+            colspan="12"
+            class="JR_right"
+            v-html="message.tolerance"
+          ></td>
         </tr>
         <tr class="JR_tr">
           <!-- 人员装备变动 -->
@@ -159,7 +247,12 @@
               装备变动
             </p>
           </td>
-          <td style="font-family: 'fangsong'" colspan="12" class="JR_right" v-html="message.transfer">
+          <td
+            style="font-family: 'fangsong'"
+            colspan="12"
+            class="JR_right"
+            v-html="message.transfer"
+          >
             <p></p>
           </td>
         </tr>
@@ -178,7 +271,12 @@
               记 <br />
             </p>
           </td>
-          <td style="font-family: 'fangsong'" colspan="12" class="JR_right" v-html="message.internal">
+          <td
+            style="font-family: 'fangsong'"
+            colspan="12"
+            class="JR_right"
+            v-html="message.internal"
+          >
             <p></p>
           </td>
         </tr>
@@ -211,7 +309,7 @@
             <p align="center">{{ item.peopleName }}</p>
           </td>
           <td class="JR_right">
-            <p align="center">{{ item.examineDate }}</p>
+            <p align="center">{{ item.examineDate | dataFormat }}</p>
           </td>
           <td class="JR_right">
             <p align="center">{{ item.foremanName }}</p>
@@ -258,42 +356,61 @@
         <tr class="JR_tr" height="30" align="center">
           <td class="JR_left" style="font-family: 'kaiti'">值班员</td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">{{ message.dutya }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutya }}
+            </p>
           </td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">{{ message.dutya }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutya }}
+            </p>
           </td>
           <td class="JR_right" colspan="2">
-            <p align="center" style="font-family: 'fangsong'">{{ message.dutylead }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutylead }}
+            </p>
           </td>
           <td class="JR_right" colspan="8"><p align="center"></p></td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
           <td class="JR_left" style="font-family: 'kaiti'">值日员</td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">{{ message.dutyc }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutyc }}
+            </p>
           </td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">{{ message.dutyd }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutyd }}
+            </p>
           </td>
-          <td class="JR_left" colspan="2" rowspan="2" style="font-family: 'fangsong'">
-            {{ message.dutyDate }}<br />
+          <td
+            class="JR_left"
+            colspan="2"
+            rowspan="2"
+            style="font-family: 'fangsong'"
+          >
+            {{ message.dutyDate | dataFormat }}<br />
           </td>
           <td class="JR_right" colspan="8"></td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left"  style="font-family: 'kaiti'">厨房值班</td>
+          <td class="JR_left" style="font-family: 'kaiti'">厨房值班</td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">{{ message.dutye }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutye }}
+            </p>
           </td>
           <td class="JR_right">
-            <p align="center" style="font-family: 'fangsong'">{{ message.dutyf }}</p>
+            <p align="center" style="font-family: 'fangsong'">
+              {{ message.dutyf }}
+            </p>
           </td>
           <td class="JR_right" colspan="8" style="font-family: 'fangsong'"></td>
         </tr>
 
         <!-- 临时来队亲属 -->
-        <tr class="JR_tr" height="30"  style="font-family: 'kaiti'">
+        <tr class="JR_tr" height="30" style="font-family: 'kaiti'">
           <td :rowspan="qinshu" class="JR_left">
             <p align="center" style="margin: 0 15px">
               临 <br />
@@ -323,20 +440,26 @@
           </td>
         </tr>
         <tr class="JR_tr" height="30" align="center">
-          <td class="JR_left" height="30"  style="font-family: 'kaiti'">来队</td>
-          <td class="JR_left" height="30"  style="font-family: 'kaiti'">离队</td>
+          <td class="JR_left" height="30" style="font-family: 'kaiti'">来队</td>
+          <td class="JR_left" height="30" style="font-family: 'kaiti'">离队</td>
           <td
-          style="font-family: 'fangsong'"
+            style="font-family: 'fangsong'"
             class="JR_right"
             height="30"
             colspan="10"
-            rowspan="3"
+            :rowspan="qinshu2"
             v-html="message.invalid"
           >
             <p align="left" style="font-family: 'fangsong'"></p>
           </td>
         </tr>
-        <tr style="font-family: 'fangsong'" class="JR_tr" v-for="(item1, i) in message.kinsfolk" :key="i">
+        <tr
+          style="font-family: 'fangsong'"
+          class="JR_tr"
+          v-for="(item1, i) in message.kinsfolk"
+          :key="i"
+          v-show="message.kinsfolk.length>0"
+        >
           <td class="JR_right" height="30">
             <p align="center">{{ item1.peopleName }}</p>
           </td>
@@ -348,10 +471,33 @@
             <p align="center">{{ item1.relation }}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.comeDate }}</p>
+            <p align="center">{{ item1.comeDate | dataFormat}}</p>
+          </td>
+          <td class="JR_right" height="30">
+            <p align="center">{{ item1.leaveDate | dataFormat}}</p>
+          </td>
+        </tr>
+
+         <tr
+          style="font-family: 'fangsong'"
+          class="JR_tr"
+          v-if="message.kinsfolk==null || message.kinsfolk.length==0"
+        >
+          <td class="JR_right" height="30">
+            <p align="center"></p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.leaveDate }}</p>
+            <p align="center"></p>
+          </td>
+
+          <td class="JR_right" height="30">
+            <p align="center"></p>
+          </td>
+          <td class="JR_right" height="30">
+            <p align="center"></p>
+          </td>
+          <td class="JR_right" height="30">
+            <p align="center"></p>
           </td>
         </tr>
 
@@ -364,7 +510,12 @@
           <td class="JR_right" height="30"><p align="center"></p></td>
         </tr> -->
         <!-- 请假外出休假 -->
-        <tr class="JR_tr" align="center" height="30" style="font-family: 'kaiti'">
+        <tr
+          class="JR_tr"
+          align="center"
+          height="30"
+          style="font-family: 'kaiti'"
+        >
           <td rowspan="6" class="JR_left">
             <p align="center" style="margin: 0 15px">
               请 <br />
@@ -475,14 +626,31 @@
           <td
             class="JR_right"
             colspan="15"
-            style="white-space: normal;font-family: 'fangsong'"
+            style="white-space: normal; font-family: 'fangsong'"
             v-html="message.notice"
           ></td>
         </tr>
       </table>
 
-      <span style="margin-left: 48px; color: black;font-family: 'fangsong';font-size: 16px;font-weight: 600;">连队首长签字:</span>
-      <span style="margin-left: 615px; color: black; letter-spacing: 15px;font-family: 'fangsong';font-size: 16px;font-weight: 600;"
+      <span
+        style="
+          margin-left: 48px;
+          color: black;
+          font-family: 'fangsong';
+          font-size: 16px;
+          font-weight: 600;
+        "
+        >连队首长签字:</span
+      >
+      <span
+        style="
+          margin-left: 615px;
+          color: black;
+          letter-spacing: 15px;
+          font-family: 'fangsong';
+          font-size: 16px;
+          font-weight: 600;
+        "
         >&nbsp;&nbsp;时&nbsp;&nbsp;&nbsp;&nbsp;分</span
       >
     </div>
@@ -502,12 +670,15 @@ export default {
       chapu: 4,
       qinshu: 4,
       week: "",
+      qinshu2:""
     };
   },
   created() {
     this.chapu = this.chapus();
     this.qinshu = this.qinshus();
     this.week = this.getWeek(this.message.blogDate);
+    this.qinshu2 = this.qinshus2()
+
   },
   methods: {
     daochu() {
@@ -520,6 +691,10 @@ export default {
       return this.message.kinsfolk.length + 2;
     },
 
+    qinshus2() {
+      return this.message.kinsfolk.length + 2;
+    },
+
     /*
       获取当前星期几
      */
@@ -532,6 +707,23 @@ export default {
       );
       return "星期" + "日一二三四五六".charAt(date.getDay());
     },
+    
+    /*
+      标准时间转换格式
+     */
+    getDate(timesDate) {
+      var date = new Date(timesDate);
+      var y = date.getFullYear();
+      var m = date.getMonth() + 1;
+      m = m < 10 ? "0" + m : m;
+      var d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      var h = date.getHours();
+      var minute = date.getMinutes();
+      minute = minute < 10 ? "0" + minute : minute;
+      let time = y + "-" + m + "-" + d ; //这里如果不需要小时 分  后边的可以不需要拼接
+      return time
+    },
   },
 };
 </script>

src/utils/supervision.js

@@ -48,11 +48,6 @@ export function parseTime(time, pattern) {
  * 获取当前星期几
  */
  export function getNowWeek(now) {
-	//    var ssdate = new Date(now[0], parseInt(now[1] - 1), now[2]);
-    //    var  week1=String(ssdate.getDay()).replace("0","日").replace("1","一").replace("2","二").replace("3","三").replace("4","四").replace("5","五").replace("6","六")//就是你要的星期几
-    //    var week="星期"+week1
-	//    return week;
-
 	   var dateArray = now.split("-");
 	   var date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
 	   return "星期" + "日一二三四五六".charAt(date.getDay());