换个

src/api/barracksManagement/scadred.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询单身干部宿舍列表
 export function listDorm(query) {
     return request({
-        url: '/system/dorm/list',
+        url: '/barracksManagement/scadred/list',
         method: 'get',
         params: query
     })
@@ -12,7 +12,7 @@ export function listDorm(query) {
 // 查询单身干部宿舍详细
 export function getDorm(id) {
     return request({
-        url: '/system/dorm/' + id,
+        url: '/barracksManagement/scadred/' + id,
         method: 'get'
     })
 }
@@ -20,7 +20,7 @@ export function getDorm(id) {
 // 新增单身干部宿舍
 export function addDorm(data) {
     return request({
-        url: '/system/dorm',
+        url: '/barracksManagement/scadred',
         method: 'post',
         data: data
     })
@@ -29,7 +29,7 @@ export function addDorm(data) {
 // 修改单身干部宿舍
 export function updateDorm(data) {
     return request({
-        url: '/system/dorm',
+        url: '/barracksManagement/scadred',
         method: 'put',
         data: data
     })
@@ -38,7 +38,16 @@ export function updateDorm(data) {
 // 删除单身干部宿舍
 export function delDorm(id) {
     return request({
-        url: '/system/dorm/' + id,
+        url: '/barracksManagement/scadred/' + id,
         method: 'delete'
     })
+}
+
+// 导出公寓房档案
+export function exportScadred(query) {
+    return request({
+        url: '/barracksManagement/scadred/export',
+        method: 'get',
+        params: query
+    })
 }

src/api/militaryvehicleManagement/thebusApply.js

@@ -103,11 +103,10 @@ export function exportThebusCar(data) {
   })
 }
 // 查看出车列表
-export function exportThebusCha(params) {
+export function exportThebusCha(id) {
   return request({
-    url: '/militaryvehicleManagement/thebusApply/lookchuchelist',
+    url: '/militaryvehicleManagement/thebusApply/lookchuchelist/' + id,
     method: 'get',
-    params
   })
 }
 

src/components/look_word/bdglfilemanagement.vue

@@ -16,191 +16,273 @@
         《文件管理登记本》
       </p>
       <table
-        class="b1"
         border="1"
         style="
           border-collapse: collapse;
           border: none;
-
           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;
           margin-left: 0px;
         "
-        width="930"
+        width="908"
         align="center"
         bordercolor="black"
       >
-        <!--<p align="center" style="font-size: 14pt;font-weight: bold;">文件管理登记本</p>-->
-
-        <tbody style="font-size: 16px; font-weight: 500">
+        <tbody style="font-size: 19px; font-weight: 500">
           <tr class="JR_tr">
-            <th width="174" valign="center" class="JR_left">
-              <p align="center">
-                <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit; font-family: 'heiti'"
-                    >文件名称</font
-                  ></font
-                >
-              </p>
-            </th>
+            <td
+              valign="center"
+              style="font-family: '黑体'; text-align: center"
+              class="JR_left"
+              width="172"
+              height="66"
+            >
+              <span style="display: block; text-align: center">文件名称</span>
+            </td>
 
-            <th width="125" valign="center" class="JR_left">
-              <p align="center">
-                <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit; font-family: 'heiti'"
-                    >文件编号</font
-                  ></font
-                >
-              </p>
-            </th>
+            <td
+              width="122"
+              valign="center"
+              class="JR_left"
+              style="font-family: '黑体'; text-align: center"
+            >
+              <span style="display: block; text-align: center">文件编号</span>
+            </td>
 
-            <th width="95" valign="center" class="JR_left">
-              <p align="center">
-                <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit; font-family: 'heiti'"
-                    >收文日期</font
-                  ></font
-                >
-              </p>
-            </th>
+            <td
+              width="92"
+              valign="center"
+              class="JR_left"
+              style="font-family: '黑体'; text-align: center"
+            >
+              <span style="display: block; text-align: center">收文日期</span>
+            </td>
 
-            <th width="57" valign="center" class="JR_left">
-              <p align="center">
-                <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit; font-family: 'heiti'"
-                    >密级</font
-                  ></font
-                >
-              </p>
-            </th>
+            <td
+              width="54"
+              valign="center"
+              class="JR_left"
+              style="font-family: '黑体'; text-align: center"
+            >
+              <span style="display: block; text-align: center">密级</span>
+            </td>
 
-            <th width="57" valign="center" class="JR_left">
-              <p align="center">
-                <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit; font-family: 'heiti'"
-                    >份数</font
-                  ></font
-                >
-              </p>
-            </th>
+            <td
+              width="54"
+              valign="center"
+              class="JR_left"
+              style="font-family: '黑体'; text-align: center"
+            >
+              <span style="display: block; text-align: center">份数</span>
+            </td>
 
-            <th width="85" valign="center" class="JR_left">
-              <p align="center">
-                <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit; font-family: 'heiti'"
-                    >签收人</font
-                  ></font
-                >
-              </p>
-            </th>
+            <td
+              width="83"
+              valign="center"
+              class="JR_left"
+              style="font-family: '黑体'; text-align: center"
+            >
+              <span style="display: block; text-align: center">签收人</span>
+            </td>
 
-            <th width="85" valign="center" class="JR_left">
-              <p align="center">
-                <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit; font-family: 'heiti'"
-                    >借阅人</font
-                  ></font
-                >
-              </p>
-            </th>
+            <td
+              width="83"
+              valign="center"
+              class="JR_left"
+              style="font-family: '黑体'; text-align: center"
+            >
+              <span style="display: block; text-align: center">借阅人</span>
+            </td>
 
-            <th width="85" valign="center" class="JR_left">
-              <p align="center">
-                <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit; font-family: 'heiti'">
-                    借阅时间
-                  </font></font
-                >
-              </p>
-            </th>
+            <td
+              width="83"
+              valign="center"
+              class="JR_left"
+              style="font-family: '黑体'; text-align: center"
+            >
+              <span style="display: block; text-align: center"
+                >借阅
+                <div>时间</div>
+              </span>
+            </td>
 
-            <th width="85" valign="center" class="JR_left">
-              <p align="center">
-                <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit; font-family: 'heiti'">
-                    归还时间
-                  </font></font
-                >
-              </p>
-            </th>
+            <td
+              width="83"
+              valign="center"
+              class="JR_left"
+              style="font-family: '黑体'; text-align: center"
+            >
+              <span style="display: block; text-align: center"
+                >归还
+                <div>时间</div>
+              </span>
+            </td>
 
-            <th width="59" valign="center" class="JR_left">
-              <p align="center">
-                <font style="vertical-align: inherit"
-                  ><font style="vertical-align: inherit; font-family: 'heiti'"
-                    >注销</font
-                  ></font
-                >
-              </p>
-            </th>
+            <td
+              width="56"
+              valign="center"
+              class="JR_left"
+              style="font-family: '黑体'; text-align: center"
+            >
+              <span style="display: block; text-align: center">注销</span>
+            </td>
           </tr>
 
           <tr class="JR_tr" v-for="(message, i) in message" :key="i + ' '">
-            <td width="174" valign="center" class="JR_right">
-              <p align="center" style="margin: 20px 0; font-family: 'fangsong'">
+            <td
+              width="172"
+              valign="center"
+              class="JR_right"
+              height="39"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ message.name }}
-              </p>
+              </span>
             </td>
 
-            <td width="125" valign="center" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">
+            <td
+              width="122"
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ message.number }}
-              </p>
+              </span>
             </td>
 
-            <td width="95" valign="center" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">
-                {{ message.incomingDispatchesTime }}
-              </p>
+            <td
+              width="92"
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
+                {{ message.incomingDispatchesTime | dataFormatys }}
+              </span>
             </td>
 
-            <td width="57" valign="center" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">
+            <td
+              width="54"
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ message.confidential }}
-              </p>
+              </span>
             </td>
 
-            <td width="57" valign="center" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">
+            <td
+              width="54"
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ message.copies }}
-              </p>
+              </span>
             </td>
 
-            <td width="85" valign="center" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">
+            <td
+              width="83"
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ message.peopleName }}
-              </p>
+              </span>
             </td>
 
-            <td width="85" valign="center" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">
+            <td
+              width="83"
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ message.borrowName }}
-              </p>
+              </span>
             </td>
 
-            <td width="85" valign="center" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">
-                {{ message.loanTime }}
-              </p>
+            <td
+              width="83"
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
+                {{ message.loanTime | dataFormatys }}
+              </span>
             </td>
 
-            <td width="85" valign="center" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">
-                {{ message.returnTime }}
-              </p>
+            <td
+              width="83"
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
+                {{ message.returnTime | dataFormatys }}
+              </span>
             </td>
 
-            <td width="59" valign="center" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">
+            <td
+              width="56"
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ message.logoutName }}
-              </p>
+              </span>
             </td>
           </tr>
 
@@ -210,44 +292,44 @@
             v-for="(item1, i1) in num"
             :key="i1 + ''"
           >
-            <td width="174" valign="center" class="JR_right">
-              <p align="center" style="margin: 20px 0"></p>
+            <td valign="center" class="JR_right" height="39">
+              <span align="center"></span>
             </td>
 
-            <td width="125" valign="center" class="JR_right">
-              <p align="center"></p>
+            <td valign="center" class="JR_right">
+              <span align="center"></span>
             </td>
 
-            <td width="95" valign="center" class="JR_right">
-              <p align="center"></p>
+            <td valign="center" class="JR_right">
+              <span align="center"></span>
             </td>
 
-            <td width="57" valign="center" class="JR_right">
-              <p align="center"></p>
+            <td valign="center" class="JR_right">
+              <span align="center"></span>
             </td>
 
-            <td width="57" valign="center" class="JR_right">
-              <p align="center"></p>
+            <td valign="center" class="JR_right">
+              <span align="center"></span>
             </td>
 
-            <td width="85" valign="center" class="JR_right">
-              <p align="center"></p>
+            <td valign="center" class="JR_right">
+              <span align="center"></span>
             </td>
 
-            <td width="85" valign="center" class="JR_right">
-              <p align="center"></p>
+            <td valign="center" class="JR_right">
+              <span align="center"></span>
             </td>
 
-            <td width="85" valign="center" class="JR_right">
-              <p align="center"></p>
+            <td valign="center" class="JR_right">
+              <span align="center"></span>
             </td>
 
-            <td width="85" valign="center" class="JR_right">
-              <p align="center"></p>
+            <td valign="center" class="JR_right">
+              <span align="center"></span>
             </td>
 
-            <td width="59" valign="center" class="JR_right">
-              <p align="center"></p>
+            <td valign="center" class="JR_right">
+              <span align="center"></span>
             </td>
           </tr>
         </tbody>
@@ -256,8 +338,7 @@
   </div>
 </template>
 <script>
-import { lookWord } from "@/utils/look_word.js";
-
+import exportWord from "@/utils/exportWord.js";
 import "@/utils/lodJs.js";
 export default {
   name: "bdgleven",
@@ -266,8 +347,16 @@ export default {
     return {
       title: "文件管理登记本",
       num: 0,
-      style:
-        ".b1{width:860px !important};.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}",
+      faith: {
+        fileName: "文件管理登记本", //文档名
+        fileType: ".doc", //文档类型  经测试  可以doc xls html 其他的自己去试
+        // header: "测试页眉", //页眉标题
+        // footer: "测试页脚", //页脚标题
+        direction: "Horizontal", //默认或不填写为纵向，Horizontal 为横向
+        dom: "#contents", // dom节点
+      },
+      // style:
+      //   ".b1{width:860px !important};.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}",
     };
   },
   created() {
@@ -279,7 +368,7 @@ export default {
   },
   methods: {
     daochu() {
-      lookWord(this.title, "#contents", this.style, true);
+      exportWord(this.faith);
     },
   },
 };

src/components/look_word/bdglpublicproperty.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-button class="box1" @click="daochu">导出</el-button>
-    <!-- <div class="word" id="contents" style="margin-top: 61px"> -->
-    <div class="word" id="contents">
-      <!-- <p
+    <div class="word" id="contents" style="margin-top: 61px">
+      <!-- <div class="word" id="contents"> -->
+      <p
         style="
           font-size: 16pt;
           font-weight: 600;
@@ -12,7 +12,10 @@
           float: right;
           writing-mode: vertical-rl;
           padding-top: 51px;
-        " -->
+        "
+      >
+        《营产、公物管理登记簿》
+      </p>
 
       <table
         class="b1"
@@ -149,18 +152,6 @@
               <p align="center">{{ item.remark }}</p>
             </td>
           </tr>
-          <span
-        style="
-          font-size: 16pt;
-          font-weight: 600;
-          color: black;
-          font-family: 'heiti';
-          display: inline-block;
-        "
-      >
-        <!-- 营产、公物管理登记簿 -->
-       营<br/>产</br>、</br>公</br>物</br>管</br>理</br>登</br>记</br>簿
-      </span>
           <tr class="JR_tr" v-for="(item1, i1) in num" :key="i1 + ''">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
@@ -211,6 +202,7 @@
 </template>
 <script>
 import { lookWord } from "@/utils/look_word.js";
+import "@/utils/jquery.wordexport.js";
 import "@/utils/lodJs.js";
 export default {
   name: "bdgleven",
@@ -219,6 +211,12 @@ export default {
     return {
       title: "营产、公物管理登记簿",
       num: 0,
+      faith: {
+        fileName: "测试word", //文档名
+        fileType: ".doc", //文档类型  经测试  可以doc xls html 其他的自己去试
+        isHeader: false, //是否显示页眉  *xls  不要设置页眉页脚  改为false
+        isFooter: false, //是否显示页脚  *xls  不要设置页眉页脚  改为false
+      },
       style:
         ".b1{width:860px !important};.JR_tr {height: 40px;width:105px};.JR_left{font-size: 1.131em; 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}",
     };
@@ -232,7 +230,8 @@ export default {
   },
   methods: {
     daochu() {
-      lookWord(this.title, "#contents", this.style, true);
+      $("#contents").wordExport(this.faith);
+      lookWord(this.title, 1, this.style);
     },
   },
 };

src/components/look_word/bdglsecrecy.vue

@@ -28,160 +28,248 @@
           mso-border-insideh: 0.5pt solid windowtext;
           mso-border-insidev: 0.5pt solid windowtext;
           mso-padding-alt: 0pt 0pt 0pt 0pt;
-          width: 930px;
+          width: 900px;
         "
         bordercolor="black"
         class="size"
       >
-        <!--<p align="center" style="font-size: 14pt;font-weight: bold;">网络/移动电话/涉密载体登记本</p>-->
         <tbody style="font-size: 16px; font-weight: 500">
           <tr class="JR_tr">
             <td
               valign="center"
-              style="width: 90px; font-family: 'heiti'"
+              style="font-family: '黑体'; text-align: center"
               class="JR_left"
+              width="89"
+              height="55"
             >
-              <p align="center" style="margin: 5px 0">种类（名称）</p>
+              <span style="display: block; text-align: center"
+                >种类（名 称）
+              </span>
             </td>
             <td
               valign="center"
-              style="width: 90px; font-family: 'heiti'"
+              style="font-family: '黑体'; text-align: center"
               class="JR_left"
+              width="101"
             >
-              <p align="center" style="margin: 5px 0">型号</p>
+              <span style="display: block; text-align: center">型号</span>
             </td>
             <td
+              width="101"
               valign="center"
-              style="width: 90px; font-family: 'heiti'"
+              style="font-family: '黑体'; text-align: center"
               class="JR_left"
             >
-              <p align="center" style="margin: 5px 0">编号</p>
+              <span style="display: block; text-align: center">编号</span>
             </td>
             <td
+              width="75"
               valign="center"
-              style="width: 90px; font-family: 'heiti'"
+              style="font-family: '黑体'; text-align: center"
               class="JR_left"
             >
-              <p align="center" style="margin: 5px 0">密级</p>
+              <span style="display: block; text-align: center">密级</span>
             </td>
             <td
               valign="center"
-              style="width: 90px; font-family: 'heiti'"
+              width="102"
+              style="font-family: '黑体'; text-align: center"
               class="JR_left"
             >
-              <p align="center" style="margin: 5px 0">责任人</p>
+              <span style="display: block; text-align: center">责任人</span>
             </td>
             <td
               valign="center"
-              style="width: 90px; font-family: 'heiti'"
+              width="102"
+              style="font-family: '黑体'; text-align: center"
               class="JR_left"
             >
-              <p align="center" style="margin: 5px 0">使用人</p>
+              <span style="display: block; text-align: center">使用人</span>
             </td>
             <td
               valign="center"
-              style="width: 90px; font-family: 'heiti'"
+              width="102"
+              style="font-family: '黑体'; text-align: center"
               class="JR_left"
             >
-              <p align="center" style="margin: 5px 0">批准人</p>
+              <span style="display: block; text-align: center">批准人</span>
             </td>
             <td
               valign="center"
-              style="width: 90px; font-family: 'heiti'"
+              width="102"
+              style="font-family: '黑体'; text-align: center"
               class="JR_left"
             >
-              <p align="center" style="margin: 5px 0">
+              <span style="display: block; text-align: center">
                 使用起止 <br />
                 时间
-              </p>
+              </span>
             </td>
             <td
               valign="center"
-              style="width: 106px; font-family: 'heiti'"
+              width="102"
+              style="font-family: '黑体'; text-align: center"
               class="JR_left"
             >
-              <p align="center" style="margin: 5px 0">移交（出借）时间</p>
+              <span style="display: block; text-align: center"
+                >移交（出借）时间</span
+              >
             </td>
           </tr>
+
           <tr class="JR_tr" v-for="(item, i) in message" :key="i + ' '">
-            <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0; font-family: 'fangsong'">
+            <td
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+              height="40"
+            >
+              <span align="center">
                 {{ item.kind }}
-              </p>
+              </span>
             </td>
-            <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0; font-family: 'fangsong'">
+            <td
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ item.version }}
-              </p>
+              </span>
             </td>
-            <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0; font-family: 'fangsong'">
+            <td
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ item.number }}
-              </p>
+              </span>
             </td>
-            <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0; font-family: 'fangsong'">
+            <td
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ item.confidential }}
-              </p>
+              </span>
             </td>
-            <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0; font-family: 'fangsong'">
+            <td
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ item.peopleName }}
-              </p>
+              </span>
             </td>
-            <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0; font-family: 'fangsong'">
+            <td
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ item.people1Name }}
-              </p>
+              </span>
             </td>
-            <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0; font-family: 'fangsong'">
+            <td
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ item.people2Name }}
-              </p>
+              </span>
             </td>
-            <td valign="center" class="JR_right">
+            <td
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
               <!--<p align="center">2022-01-18<br>2022-01-18</p>-->
-              <p align="center" style="margin: 5px 0; font-family: 'fangsong'">
+              <span align="center">
                 {{ item.startTime }}
-              </p>
+              </span>
             </td>
-            <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0; font-family: 'fangsong'">
+            <td
+              valign="center"
+              class="JR_right"
+              style="
+                font-family: '仿宋_GB2312';
+                text-align: center;
+                font-size: 1em;
+              "
+            >
+              <span align="center">
                 {{ item.hindOverTime }}<br />
                 (移交/出售)
-              </p>
+              </span>
             </td>
           </tr>
+
           <tr class="JR_tr" v-for="(item1, i1) in num" :key="i1 + ''">
-            <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0; height: 40px"></p>
+            <td valign="center" class="JR_right" height="40">
+              <span align="center"></span>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0"></p>
+              <span align="center"></span>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0"></p>
+              <span align="center"></span>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0"></p>
+              <span align="center"></span>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0"></p>
+              <span align="center"></span>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0"></p>
+              <span align="center"></span>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0"></p>
+              <span align="center"></span>
             </td>
             <td valign="center" class="JR_right">
               <!--<p align="center">2022-01-20<br>2022-01-20</p>-->
-              <p align="center" style="margin: 5px 0"></p>
+              <span align="center"></span>
             </td>
             <td valign="center" class="JR_right">
-              <p align="center" style="margin: 5px 0">
+              <span align="center">
                 <br />
-              </p>
+              </span>
             </td>
           </tr>
         </tbody>
@@ -190,17 +278,25 @@
   </div>
 </template>
 <script>
-import { lookWord } from "@/utils/look_word.js";
 import "@/utils/lodJs.js";
+import exportWord from "@/utils/exportWord.js";
 export default {
   name: "bdgleven",
   props: ["message"],
   data() {
     return {
       title: "网络、移动电话、涉密载体使用管理登记本",
-      style:
-        "font-weight: 550;.size{width:860px !important};.JR_tr {height: 40px;};.JR_left{font-size: 1.211em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.1em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
+      // style:
+      //   "font-weight: 550;.size{width:860px !important};.JR_tr {height: 40px;};.JR_left{font-size: 1em; font-family: '楷体_GB2312';};.JR_right{};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
       num: 0,
+      faith: {
+        fileName: "网络、移动电话、涉密载体使用管理登记本", //文档名
+        fileType: ".doc", //文档类型  经测试  可以doc xls html 其他的自己去试
+        // header: "测试页眉", //页眉标题
+        // footer: "测试页脚", //页脚标题
+        direction: "Horizontal", //默认或不填写为纵向，Horizontal 为横向
+        dom: "#contents", // dom节点
+      },
     };
   },
   created() {
@@ -212,7 +308,7 @@ export default {
   },
   methods: {
     daochu() {
-      lookWord(this.title, "#contents", this.style, true);
+      exportWord(this.faith);
     },
   },
 };

src/views/barracksManagement/flat/index.vue

@@ -115,11 +115,9 @@
         width="150px"
       >
         <template slot-scope="scope">
-          <!-- <span>{{ parseTime(scope.row.arriveTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>     -->
           <span>{{
             dateFormat("YYYY-mm-dd HH:MM:SS", scope.row.createtime)
           }}</span>
-          <!-- rTime -->
         </template>
       </el-table-column>
       <!-- <el-table-column label="楼房层数" align="center" prop="tier" />

src/views/barracksManagement/scadred/index.vue

@@ -3,21 +3,20 @@
     <el-form
       :model="queryParams"
       ref="queryForm"
+      size="small"
       :inline="true"
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item prop="xingMing">
+      <el-form-item label="" prop="xingMing">
         <el-input
-          v-model.number="queryParams.xingMing"
-          clearable
-          size="small"
+          v-model="queryParams.xingMing"
           placeholder="请输入姓名"
+          clearable
           @input="handleQuery"
         />
       </el-form-item>
       <el-form-item>
-        <!-- <el-button size="btn" @click="handleQuery">搜索</el-button> -->
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -30,7 +29,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['barracksManagement:flat:add']"
+          v-hasPermi="['barracksManagement:scadre:add']"
           >新增</el-button
         >
       </el-col>
@@ -42,7 +41,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['barracksManagement:flat:edit']"
+          v-hasPermi="['barracksManagement:scadre:edit']"
           >修改</el-button
         >
       </el-col>
@@ -54,7 +53,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['barracksManagement:flat:remove']"
+          v-hasPermi="['barracksManagement:scadre:remove']"
           >删除</el-button
         >
       </el-col>
@@ -67,7 +66,7 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['barracksManagement:flat:export']"
+          v-hasPermi="['barracksManagement:scadre:export']"
           >导出</el-button
         >
       </el-col>
@@ -76,13 +75,20 @@
         @queryTable="getList"
       ></right-toolbar> -->
     </el-row>
+
     <el-table
       v-loading="loading"
-      :data="flatList"
+      :data="dormList"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="50"> </el-table-column>
+      <el-table-column label="序号" type="index" width="50">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="姓名" align="center" prop="xingMing" />
       <el-table-column label="房间号" align="center" prop="roomNumber" />
       <el-table-column label="建筑面积" align="center" prop="area" />
@@ -91,6 +97,7 @@
         align="center"
         prop="propertyFeeStandard"
       />
+
       <el-table-column label="房租标准" align="center" prop="rentStandard" />
       <el-table-column label="月水费" align="center" prop="waterBil" />
       <el-table-column label="月房租" align="center" prop="monthlyRent" />
@@ -100,13 +107,6 @@
         prop="monthlyPropertyFee"
       />
       <el-table-column label="总金额" align="center" prop="totalAmount" />
-
-      <el-table-column
-        label="备注"
-        align="center"
-        prop="remark"
-        show-overflow-tooltip
-      />
       <el-table-column
         label="录入时间"
         align="center"
@@ -114,34 +114,29 @@
         width="150px"
       >
         <template slot-scope="scope">
-          <!-- <span>{{ parseTime(scope.row.arriveTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>     -->
           <span>{{
             dateFormat("YYYY-mm-dd HH:MM:SS", scope.row.createtime)
           }}</span>
-          <!-- rTime -->
         </template>
       </el-table-column>
-      <!-- <el-table-column label="楼房层数" align="center" prop="tier" />
-      <el-table-column label="单元号" align="center" prop="element" /> -->
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="150px"
       >
         <template slot-scope="scope">
           <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['barracksManagement:flat:edit']"
+            v-hasPermi="['barracksManagement:scadre:edit']"
             >修改</el-button
           >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['barracksManagement:flat:remove']"
+            v-hasPermi="['barracksManagement:scadre:remove']"
             >删除</el-button
           >
         </template>
@@ -172,43 +167,42 @@
         :inline="true"
       >
         <el-form-item label="姓名" prop="xingMing">
-          <el-input v-model="form.xingMing" />
+          <el-input v-model="form.xingMing" placeholder="" />
         </el-form-item>
         <el-form-item label="房间号" prop="roomNumber">
-          <el-input v-model="form.roomNumber" />
+          <el-input v-model="form.roomNumber" placeholder="" />
         </el-form-item>
         <el-form-item label="建筑面积" prop="area">
-          <el-input v-model="form.area" />
+          <el-input v-model="form.area" placeholder="" />
         </el-form-item>
         <el-form-item label="使用面积" prop="usageArea">
-          <el-input v-model="form.usageArea" />
+          <el-input v-model="form.usageArea" placeholder="" />
         </el-form-item>
         <el-form-item label="物业标准" prop="propertyFeeStandard">
-          <el-input v-model="form.propertyFeeStandard" />
+          <el-input v-model="form.propertyFeeStandard" placeholder="" />
         </el-form-item>
         <el-form-item label="房租标准" prop="rentStandard">
-          <el-input v-model="form.rentStandard" />
+          <el-input v-model="form.rentStandard" placeholder="" />
         </el-form-item>
         <el-form-item label="水电费" prop="waterBil">
-          <el-input v-model="form.waterBil" />
+          <el-input v-model="form.waterBil" placeholder="" />
         </el-form-item>
         <el-form-item label="月房租" prop="monthlyRent">
-          <el-input v-model="form.monthlyRent" />
+          <el-input v-model="form.monthlyRent" placeholder="" />
         </el-form-item>
         <el-form-item label="月物业费" prop="monthlyPropertyFee">
-          <el-input v-model="form.monthlyPropertyFee" />
+          <el-input v-model="form.monthlyPropertyFee" placeholder="" />
         </el-form-item>
-
         <el-form-item label="总金额" prop="totalAmount">
-          <el-input v-model="form.totalAmount" />
+          <el-input v-model="form.totalAmount" placeholder="" />
         </el-form-item>
         <div class="jibens">备注</div>
-        <el-form-item prop="remark">
+        <el-form-item label="" prop="remark">
           <el-input
             v-model="form.remark"
             type="textarea"
             autosize
-            placeholder="请输入内容"
+            placeholder="请输入备注"
           />
         </el-form-item>
       </el-form>
@@ -227,6 +221,7 @@ import {
   delDorm,
   addDorm,
   updateDorm,
+  exportScadred,
 } from "@/api/barracksManagement/scadred";
 
 export default {
@@ -247,8 +242,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 公寓房档案表格数据
-      flatList: [],
+      // 单身干部宿舍表格数据
+      dormList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -269,6 +264,14 @@ export default {
         tier: null,
         roomNumber: null,
         element: null,
+        xingMing: null,
+        usageArea: null,
+        propertyFeeStandard: null,
+        rentStandard: null,
+        waterBil: null,
+        monthlyRent: null,
+        monthlyPropertyFee: null,
+        totalAmount: null,
       },
       // 表单参数
       form: {},
@@ -311,6 +314,29 @@ export default {
     this.getList();
   },
   methods: {
+    dateFormat(fmt, date) {
+      let ret = "";
+      date = new Date(date);
+      const opt = {
+        "Y+": date.getFullYear().toString(), // 年
+        "m+": (date.getMonth() + 1).toString(), // 月
+        "d+": date.getDate().toString(), // 日
+        "H+": date.getHours().toString(), // 时
+        "M+": date.getMinutes().toString(), // 分
+        "S+": date.getSeconds().toString(), // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      };
+      for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, "0")
+          );
+        }
+      }
+      return fmt;
+    },
     /** 查询单身干部宿舍列表 */
     getList() {
       this.loading = true;
@@ -409,7 +435,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm("是否确认删除单身干部宿舍的数据项？")
+        .confirm('是否确认删除单身干部宿舍编号为"' + ids + '"的数据项？')
         .then(function () {
           return delDorm(ids);
         })
@@ -421,18 +447,22 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download(
-        "system/dorm/export",
-        {
-          ...this.queryParams,
-        },
-        `dorm_${new Date().getTime()}.xlsx`
-      );
+      const queryParams = this.queryParams;
+      this.$modal
+        .confirm("是否确认导出所有公寓房档案数据项？")
+        .then(() => {
+          this.exportLoading = true;
+          return exportScadred(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
     },
   },
 };
 </script>
-
 <style scoped>
 ::v-deep .el-dialog {
   background-color: #004d86 !important;

src/views/militaryvehicleManagement/thebus/index.vue

@@ -355,6 +355,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="用途" prop="carUse">
+          <el-input v-model="form.carUse" placeholder="请输入用途" />
+        </el-form-item>
         <div class="jiben">备注</div>
         <el-form-item prop="remarks">
           <el-input

src/views/militaryvehicleManagement/thebusList/index.vue

@@ -112,11 +112,14 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="流程" align="center" prop="placeState">
+      <el-table-column label="是否归队" align="center" prop="placeState">
         <template slot-scope="scope">
           <span v-if="scope.row.placeState == '1'" style="color: #13ce66"
             >已归队</span
           >
+          <span v-if="scope.row.placeState != '1'" style="color: red"
+            >未归队</span
+          >
         </template>
       </el-table-column>
       <el-table-column
@@ -237,7 +240,7 @@
           </el-date-picker>
         </el-form-item>
         <div class="box3">
-          <el-form v-for="(item1, e) in checkShop" :key="e">
+          <el-form v-for="(item1, e) in checkShops" :key="e">
             <el-form-item label="" prop="bdglThebusId">
               <el-select
                 v-model="item1.bdglThebusId"
@@ -273,7 +276,7 @@
                 type="primary"
                 icon="el-icon-plus"
                 size="btc"
-                @click="addForms"
+                @click="addFormss"
                 v-if="e == checkShop.length - 1"
               ></el-button>
               <el-button
@@ -281,7 +284,7 @@
                 icon="el-icon-delete"
                 size="btd"
                 v-if="e > 0"
-                @click="delForms(e)"
+                @click="delFormss(e)"
               ></el-button>
             </el-form-item>
           </el-form>
@@ -375,7 +378,7 @@
               <el-select
                 placeholder="请选择车辆车牌"
                 filterable
-                v-model="item1.vehiclemodel"
+                v-model="item1.bdglThebusId"
                 disabled
               >
                 <el-option
@@ -387,7 +390,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="" prop="twoshenpirenid">
+            <el-form-item label="" prop="driverId">
               <el-select
                 placeholder="请选择司机"
                 filterable
@@ -424,9 +427,9 @@
                 @input="treeselectss"
               />
             </el-form-item>
-            <el-form-item label="" prop="vehiclemodel">
+            <el-form-item label="" prop="bdglThebusId">
               <el-select
-                v-model="item1.vehiclemodel"
+                v-model="item1.bdglThebusId"
                 placeholder="请选择车辆车牌"
                 filterable
               >
@@ -439,7 +442,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="" prop="twoshenpirenid">
+            <el-form-item label="" prop="driverId">
               <el-select
                 v-model="item1.driverId"
                 placeholder="请选择司机"
@@ -643,11 +646,18 @@ export default {
       //出车对话框司机
       checkShop: [
         {
-          vehiclemodel: null,
+          bdglThebusId: null,
           driverId: null,
           carUnitId: null,
         },
       ],
+      // 新增出车对话框
+      checkShops: [
+        {
+          bdglThebusId: null,
+          driverId: null,
+        },
+      ],
       // 车牌型号
       brand: [],
       // 司机
@@ -770,11 +780,18 @@ export default {
         }
       });
     },
+    // 翻译车信息
     vehiclecolor(row) {
       var vehiclecolor = "";
       this.brand.map((item) => {
-        if (item.dictValue == row.vehiclecolor) {
-          vehiclecolor = item.dictLabel;
+        if (row.bdglDepartureInfos) {
+          row.bdglDepartureInfos.forEach((items, index) => {
+            if (item.dictValue == items.vehiclemodel) {
+              vehiclecolor += item.dictLabel + " ";
+            }
+          });
+        } else {
+          vehiclecolor = "";
         }
       });
       return vehiclecolor;
@@ -787,8 +804,8 @@ export default {
     },
     // 查看
     singles(row) {
-      this.form = row;
-      exportThebusCha(this.form).then((res) => {
+      let id = row.id;
+      exportThebusCha(id).then((res) => {
         this.forms = res.data;
         this.opens = true;
         this.chaCarLists = res.data.bdglDepartureInfos;
@@ -807,22 +824,33 @@ export default {
       });
     },
 
-    // 删除对话框选择司机
+    // 删除出车对话框选择司机
     delForms(i) {
       this.chuchEList.splice(i, 1);
     },
+    // 删除出车对话框选择司机
+    delFormss(i) {
+      this.checkShops.splice(i, 1);
+    },
 
-    // 增加对话框选择司机
+    // 出车对话框选择司机
     addForms() {
       this.chuchEList.push(this.checkShop[0]);
       this.checkShop = [
         {
           driverId: null,
-          vehiclemodel: null,
+          bdglThebusId: null,
           carUnitId: null,
         },
       ];
     },
+    // 增加对话框选择司机
+    addFormss() {
+      this.checkShops.push({
+        driverId: null,
+        bdglThebusId: null,
+      });
+    },
     /** 查询出车申请列表 */
     getList() {
       this.loading = true;
@@ -840,11 +868,12 @@ export default {
     },
     // 表单重置
     reset() {
+      this.form.remarkInfo = null;
       this.form = {};
       this.form1 = {};
       this.checkShop = [
         {
-          vehiclemodel: null,
+          bdglThebusId: null,
           driverId: null,
           carUnitId: null,
         },
@@ -952,8 +981,8 @@ export default {
       this.$refs["form1"].validate((valid) => {
         if (valid) {
           if (this.checkShop.length) {
-            this.fomr1.bdglDepartureInfos = this.checkShop;
-            this.checkShop.forEach((item) => {
+            this.fomr1.bdglDepartureInfos = this.checkShops;
+            this.checkShops.forEach((item) => {
               this.arr.push(item.bdglThebusId);
             });
           }