同步合并

src/components/look_word/bdglarmament.vue

@@ -353,10 +353,12 @@
             </td>
           </tr>
           <tr class="JR_tr">
-            <td width="37" valign="center" nowrap="">
+            <td width="37" valign="center" nowrap="" class="JR_left">
               <p align="center">备注</p>
             </td>
-            <td width="869" valign="top" colspan="15"><p></p></td>
+            <td width="869" valign="top" colspan="15" class="JR_right">
+              <p></p>
+            </td>
           </tr>
         </tbody>
       </table>

src/components/look_word/bdgldiary.vue

@@ -40,12 +40,12 @@
           color: black;
         "
       >
-        <!-- <tr height="30" align="center">
+        <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>
         <!-- 实力 -->
         <tr class="JR_tr" height="30" align="center">
           <td colspan="2" rowspan="2" class="JR_left">实力</td>
@@ -287,6 +287,7 @@
           </td>
           <td class="JR_right" colspan="8"></td>
         </tr>
+
         <!-- 临时来队亲属 -->
         <tr class="JR_tr" height="30">
           <td rowspan="4" class="JR_left">
@@ -332,26 +333,22 @@
         </tr>
         <tr class="JR_tr" v-for="(item1, i) in message.kinsfolk" :key="i">
           <td class="JR_right" height="30">
-            {{ item1.peopleName }}
-            <p align="center"></p>
+            <p align="center">{{ item1.peopleName }}</p>
           </td>
           <td class="JR_right" height="30">
-            {{ item1.name }}
-            <p align="center"></p>
+            <p align="center">{{ item1.name }}</p>
           </td>
           <td class="JR_right" height="30">
-            {{ item1.relation }}
-            <p align="center"></p>
+            <p align="center">{{ item1.relation }}</p>
           </td>
           <td class="JR_right" height="30">
-            {{ item1.comeDate }}
-            <p align="center"></p>
+            <p align="center">{{ item1.comeDate }}</p>
           </td>
           <td class="JR_right" height="30">
-            {{ item1.leaveDate }}
-            <p align="center"></p>
+            <p align="center">{{ item1.leaveDate }}</p>
           </td>
         </tr>
+        <tr></tr>
         <!-- <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>

src/components/look_word/bdglweekwork.vue

@@ -43,6 +43,7 @@
         bordercolor="black"
       >
         <tr
+          class="JR_tr"
           style="
             border: none;
             color: black;
@@ -52,20 +53,27 @@
           "
         >
           <td
-            colspan="4"
+            class="JR_left"
+            colspan="3"
             align="left"
             style="border: none; line-height: 45px; width: 360px"
           >
             连值班领导：{{ message.peopleName }}
           </td>
           <td
+            class="JR_left"
             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">
+          <td
+            class="JR_left"
+            colspan="2"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
             {{ message.startTime }}—{{ message.endTime }}
           </td>
         </tr>
@@ -142,62 +150,36 @@
           "
         >
           <td
-            colspan="4"
+            class="JR_left"
+            colspan="3"
             align="left"
             style="border: none; line-height: 45px; width: 360px"
           >
             军事主官：{{ message.people1Name }}
           </td>
           <td
+            colspan="1"
+            style="border: none; line-height: 45px; width: 360px"
+          ></td>
+          <td
+            class="JR_left"
             colspan="3"
             align="left"
             style="border: none; line-height: 45px; width: 360px"
           >
             政治主官：{{ message.people2Name }}
           </td>
-          <td colspan="3" align="left" style="border: none; line-height: 45px">
+          <td
+            class="JR_left"
+            colspan="3"
+            align="left"
+            style="border: none; line-height: 45px"
+          >
             时间：
           </td>
         </tr>
       </table>
-
-      <!-- <div style="width: 100%; height: 50px; margin-top: 10px; color: black">
-        <span style="margin-left: 30px"
-          >军事主官：{{ message.people1Name }} &nbsp;</span
-        >
-        <span style="margin-left: 30%"
-          >政治主官：{{ message.people2Name }}
-        </span>
-        <span style="margin-left: 232px">时间：</span>
-      </div> -->
     </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.people1Name }}
-      </td>
-      <td
-        colspan="3"
-        align="left"
-        style="border: none; line-height: 45px; width: 360px"
-      >
-        政治主官：{{ message.people2Name }}
-      </td>
-      <td colspan="3" align="left" style="border: none; line-height: 45px">
-        时间：
-      </td>
-    </tr> -->
   </div>
 </template>
 <script>

src/views/grassrootsregistration/bdgleven/index.vue

@@ -103,7 +103,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="单位" align="center" prop="unitName" />
-      <el-table-column label="会议议题" align="center" prop="title" />
+      <!-- <el-table-column label="会议议题" align="center" prop="title" /> -->
+      <el-table-column label="会议议题" align="center">
+        <template slot-scope="scope">
+          <span v-html="scope.row.title"></span>
+        </template>
+      </el-table-column>
       <el-table-column label="主持人" align="center" prop="compereRen" />
       <el-table-column label="出席人" align="center" prop="joinId" />
       <!-- <el-table-column label="记录人" align="center" prop="peopleJiLu" /> -->

src/views/grassrootsregistration/bdglparty/index.vue

@@ -101,7 +101,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="单位" align="center" prop="unitName" />
-      <el-table-column label="会议议题" align="center" prop="title" />
+      <el-table-column
+        label="会议议题"
+        align="center"
+        prop="title"
+        show-overflow-tooltip
+      />
 
       <el-table-column label="主持人" align="center" prop="compereRen" />
       <el-table-column label="参加人" align="center" prop="joinId" />
@@ -830,4 +835,12 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
+/* 文字多余部分省略 */
+.el-table__row .el-table_1_column_4 .cell el-tooltip p {
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  white-space: nowrap;
+}
 </style>

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -96,7 +96,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="单位" align="center" prop="deptName" />
-      <el-table-column label="会议议题" align="center" prop="title" />
+      <!-- <el-table-column label="会议议题" align="center" prop="title" /> -->
+      <el-table-column label="会议议题" align="center">
+        <template slot-scope="scope">
+          <span v-html="scope.row.title"></span>
+        </template>
+      </el-table-column>
       <el-table-column label="记录人" align="center" prop="peopleJiLu" />
       <el-table-column label="主持人" align="center" prop="compereRen" />
       <el-table-column label="列席人" align="center" prop="peopleIds" />