liangjiahao 3 жил өмнө
parent
commit
aded8bb9db

+ 17 - 9
src/components/look_word/bdgldiary.vue

@@ -13,12 +13,14 @@
       >
         《连队要事日记》
       </p>
-      <div style="margin-bottom: 5px; color: black">
-        <span class="tTime">00月00日</span>
+      <!-- <div style="margin-bottom: 5px; color: black">
+        <span class="tTime">{{ message.blogDate }}</span>
         <span class="tWeek" style="margin-left: 40px">星期</span>
-        <span class="tWeather" style="margin-left: 50px">天气:45</span>
-        <span style="margin-left: 380px">值班员:</span>
-      </div>
+        <span class="tWeather" style="margin-left: 50px"
+          >天气:{{ message.weather }}</span
+        >
+        <span style="margin-left: 380px">值班员:{{ message.peopleName }}</span>
+      </div> -->
 
       <table
         border="1"
@@ -38,6 +40,12 @@
           color: black;
         "
       >
+        <!-- <tr height="30" align="center">
+          <td colspan="3" height="40">{{ message.blogDate }}</td>
+          <td colspan="2">星期</td>
+          <td colspan="6">天气:{{ message.weather }}</td>
+          <td colspan="3">值班员:{{ message.peopleName }}</td>
+        </tr> -->
         <!-- 实力 -->
         <tr class="JR_tr" height="30" align="center">
           <td colspan="2" rowspan="2" class="JR_left">实力</td>
@@ -322,9 +330,9 @@
             <p align="left"></p>
           </td>
         </tr>
-        <tr class="JR_tr" v-for="(item1, i) in message.inspect" :key="i">
+        <tr class="JR_tr" v-for="(item1, i) in message.kinsfolk" :key="i">
           <td class="JR_right" height="30">
-            {{ item1.peopleId }}
+            {{ item1.peopleName }}
             <p align="center"></p>
           </td>
           <td class="JR_right" height="30">
@@ -344,13 +352,13 @@
             <p align="center"></p>
           </td>
         </tr>
-        <tr class="JR_tr" height="30">
+        <!-- <tr class="JR_tr" height="30">
           <td class="JR_right" height="30"><p align="center"></p></td>
           <td class="JR_right" height="30"><p align="center"></p></td>
           <td class="JR_right" height="30"><p align="center"></p></td>
           <td class="JR_right" height="30"><p align="center"></p></td>
           <td class="JR_right" height="30"><p align="center"></p></td>
-        </tr>
+        </tr> -->
         <!-- 请假外出休假 -->
         <tr class="JR_tr" align="center" height="30">
           <td rowspan="6" class="JR_left">

+ 3 - 2
src/components/look_word/bdglfood.vue

@@ -368,7 +368,7 @@
             </td>
           </tr>
 
-          <!-- 退交伙食费----有问题 -->
+          <!-- 退交伙食费- -->
           <tr class="JR_tr" style="text-align: center">
             <td width="" colspan="1" rowspan="2" class="JR_left">
               <p align="center" style="">姓名</p>
@@ -502,10 +502,11 @@
             class="JR_tr"
             v-for="(item, i) in message.bdglFoodShoppings"
             :key="i"
+            height="50"
           >
             <td width="" colspan="2" class="JR_right">
               <p align="center">
-                {{ item.peopleName }}
+                {{ item.peoplename }}
               </p>
             </td>
             <td width="" colspan="2" class="JR_right">

+ 28 - 28
src/components/look_word/bdglweekwork.vue

@@ -24,33 +24,7 @@
           >{{ message.startTime }}———{{ message.endTime }}</span
         >
       </div> -->
-      <tr
-        style="
-          border: none;
-          color: black;
-          font-size: 12pt;
-          line-height: 30px;
-          width: 940px;
-        "
-      >
-        <td
-          colspan="4"
-          align="left"
-          style="border: none; line-height: 45px; width: 360px"
-        >
-          连值班领导:{{ message.peopleName }}
-        </td>
-        <td
-          colspan="3"
-          align="left"
-          style="border: none; line-height: 45px; width: 360px"
-        >
-          电话:{{ message.phone }}
-        </td>
-        <td colspan="3" align="left" style="border: none; line-height: 45px">
-          {{ message.startTime }}—{{ message.endTime }}
-        </td>
-      </tr>
+
       <table
         border="1"
         style="
@@ -68,6 +42,33 @@
         align="center"
         bordercolor="black"
       >
+        <tr
+          style="
+            border: none;
+            color: black;
+            font-size: 12pt;
+            line-height: 30px;
+            width: 940px;
+          "
+        >
+          <td
+            colspan="4"
+            align="left"
+            style="border: none; line-height: 45px; width: 360px"
+          >
+            连值班领导:{{ message.peopleName }}
+          </td>
+          <td
+            colspan="3"
+            align="left"
+            style="border: none; line-height: 45px; width: 360px"
+          >
+            电话:{{ message.phone }}
+          </td>
+          <td colspan="1" align="left" style="border: none; line-height: 45px">
+            {{ message.startTime }}—{{ message.endTime }}
+          </td>
+        </tr>
         <tbody>
           <tr class="JR_tr">
             <td align="center" valign="center" colspan="3" class="JR_left">
@@ -122,7 +123,6 @@
             </td>
           </tr>
 
-          <tr></tr>
           <tr class="JR_tr">
             <td valign="center" class="JR_left">
               <p align="center">备注</p>