更改领导本接口，更改人员请假

src/api/grassrootsregistration/bdglarmament.js

@@ -17,10 +17,11 @@ export function getBdglarmament(id) {
   })
 }
 // 查看军械装备登记簿详细
-export function armamentunits(id) {
+export function armamentunits(query) {
   return request({
-    url: '/grassrootsregistration/bdglarmament/armamentunits?unitid=' + id,
-    method: 'get'
+    url: '/grassrootsregistration/bdglarmament/armamentunits',
+    method: 'get',
+    params: query
   })
 }
 

src/api/grassrootsregistration/bdgldrill.js

@@ -10,10 +10,11 @@ export function listBdgldrill(query) {
 }
 
 // 查看军事训练登记簿详细
-export function getInfoByUnitId(id) {
+export function getInfoByUnitId(query) {
   return request({
-    url: '/grassrootsregistration/bdgldrill/getInfoByUnitId?unitId=' + id,
-    method: 'get'
+    url: '/grassrootsregistration/bdgldrill/getInfoByUnitId',
+    method: 'get',
+    params: query
   })
 }
 // 修改军事训练登记簿详细

src/api/grassrootsregistration/bdglequip.js

@@ -18,10 +18,11 @@ export function getBdglequip(id) {
 }
 
 // 查看训练器材/教材登记薄详细
-export function equipuntits(id) {
+export function equipuntits(query) {
   return request({
-    url: '/grassrootsregistration/bdglequip/equipunits?unitid=' + id,
-    method: 'get'
+    url: '/grassrootsregistration/bdglequip/equipunits' ,
+    method: 'get',
+    params: query
   })
 }
 // 预览训练器材/教材登记薄

src/api/grassrootsregistration/bdglfilemanagement.js

@@ -18,10 +18,11 @@ export function getBdglfilemanagement(id) {
 }
 
 // 查看文件管理登计本详细
-export function fileunits(id) {
+export function fileunits(query) {
   return request({
-    url: '/grassrootsregistration/bdglfilemanagement/fileunits?unitid=' + id,
-    method: 'get'
+    url: '/grassrootsregistration/bdglfilemanagement/fileunits',
+    method: 'get',
+    params: query
   })
 }
 

src/api/grassrootsregistration/bdglpublicproperty.js

@@ -18,10 +18,11 @@ export function getBdglpublicproperty(id) {
 }
 
 // 查看营产，公物管理登记簿详细
-export function publiccpropertyunits(id) {
+export function publiccpropertyunits(query) {
   return request({
-    url: '/grassrootsregistration/bdglpublicproperty/publiccpropertyunits?unitid=' + id,
-    method: 'get'
+    url: '/grassrootsregistration/bdglpublicproperty/publiccpropertyunits',
+    method: 'get',
+    params: query
   })
 }
 

src/api/grassrootsregistration/bdglsecrecy.js

@@ -17,10 +17,11 @@ export function getBdglsecrecy(id) {
   })
 }
 // 查看/手机/涉密载体登记本详细
-export function units(unitid, sdate) {
+export function units(query) {
   return request({
-    url: `/grassrootsregistration/bdglsecrecy/units?unitid=${unitid}&sdate=${sdate}`,
-    method: 'get'
+    url: `/grassrootsregistration/bdglsecrecy/units`,
+    method: 'get',
+    params: query
   })
 }
 

src/components/look_word/bdgldiary.vue

@@ -770,15 +770,17 @@ export default {
             Date.parse(new Date(item.returnTime)) -
             Date.parse(new Date(item.endTime));
           if (nums % 1 != 0) {
-            nums = (nums / 3600 / 1000).toFixed(1);
+            // nums = (nums / 3600 / 1000).toFixed(1);
           } else {
-            nums = nums / 3600 / 1000;
+            // nums = nums / 3600 / 1000;
+            nums = (nums / 3600 / 1000).toFixed(1);
           }
           if (chao >= 0) {
             if (chao % 1 != 0) {
-              chao = (chao / 3600 / 1000).toFixed(1);
+              // chao = (chao / 3600 / 1000).toFixed(1);
             } else {
-              chao = chao / 3600 / 1000;
+              // chao = chao / 3600 / 1000;
+              chao = (chao / 3600 / 1000).toFixed(1);
             }
             this.message.bdglLeaveOneList[i].chao = chao;
           }

src/components/look_word/bdglequip.vue

@@ -288,7 +288,9 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{ item.title }}</span>
+              <span align="center" class="JR_right" v-if="message">{{
+                item.title
+              }}</span>
             </td>
             <td
               width="64"
@@ -299,7 +301,9 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{ item.unitName }}</span>
+              <span align="center" class="JR_right" v-if="message">{{
+                item.unitName
+              }}</span>
             </td>
             <td
               width="54"
@@ -323,7 +327,9 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{ item.grantnum }}</span>
+              <span align="center" class="JR_right" v-if="message">{{
+                item.grantnum
+              }}</span>
             </td>
             <td
               width="47"
@@ -334,7 +340,9 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{ item.ownnum }}</span>
+              <span align="center" class="JR_right" v-if="message">{{
+                item.ownnum
+              }}</span>
             </td>
             <td
               width="55"
@@ -345,7 +353,9 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{ item.stocknum }}</span>
+              <span align="center" class="JR_right" v-if="message">{{
+                item.stocknum
+              }}</span>
             </td>
             <td
               width="53"
@@ -356,8 +366,8 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right " v-if="message">{{
-                item.intime | dataFormatyss
+              <span align="center" class="JR_right" v-if="message">{{
+                item.intime
               }}</span>
             </td>
             <td
@@ -369,7 +379,9 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{ item.innum }}</span>
+              <span align="center" class="JR_right" v-if="message">{{
+                item.innum
+              }}</span>
             </td>
             <td
               width="72"
@@ -380,7 +392,9 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{ item.peopleName }}</span>
+              <span align="center" class="JR_right" v-if="message">{{
+                item.peopleName
+              }}</span>
             </td>
             <td
               width="55"
@@ -391,9 +405,12 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{
-                item.outtime | dataFormatyss
-              }}</span>
+              <span
+                align="center"
+                class="JR_right"
+                v-if="message && item.outtime"
+                >{{ item.outtime }}</span
+              >
             </td>
             <td
               width="46"
@@ -404,7 +421,9 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{ item.outnum }}</span>
+              <span align="center" class="JR_right" v-if="message">{{
+                item.outnum
+              }}</span>
             </td>
             <td
               width="75"
@@ -428,7 +447,9 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{ item.quality }}</span>
+              <span align="center" class="JR_right" v-if="message">{{
+                item.quality
+              }}</span>
             </td>
             <td
               width="55"
@@ -439,7 +460,9 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right" v-if="message">{{ item.info }}</span>
+              <span align="center" class="JR_right" v-if="message">{{
+                item.info
+              }}</span>
             </td>
           </tr>
         </tbody>
@@ -555,53 +578,65 @@ export default {
         // footer: "测试页脚", //页脚标题
         direction: "Horizontal", //默认或不填写为纵向，Horizontal 为横向
         dom: "#contents", // dom节点
-        num:0
+        num: 0,
       },
     };
   },
   mounted() {
-  if(this.message.length>0){
-    this.message.forEach((item, i) => {
-      item.outtime = this.zhuanhuan(item.outtime);
-      item.intime = this.zhuanhuan(item.intime);
-      item.granttime = this.zhuanhuan(item.granttime);
-      item.ids = i + 1;
-    });
-    //循环遍历
-    for (var i = 0; i < this.message.length; i++) {
-      //循环开始行
-      var start_row;
-      //需合并的行数
-      var rowspan = 1;
-      //循环到最后一行时
-      if (i == this.message.length - 1) {
-        //如果最后一行和倒数第二行属性不同，则rowspan=1；否则直接结束循环
-        if (this.message[i].type != this.message[i - 1].type) {
-          this.message[i].rowspan = rowspan;
+    if (this.message.length > 0) {
+      this.message.forEach((item, i) => {
+        if (item.outtime) {
+          item.outtime = this.zhuanhuan(item.outtime);
+        } else {
+          item.outtime = "";
         }
-        break;
-      }
-      //内层循环记录rowspan的数量
-      for (var j = i; j < this.message.length - 1; j++) {
-        //记录循环结束的行数
-        start_row = j;
-        //属性相同则rowspan+1；否则直接结束内循环
-        if (this.message[j].type == this.message[j + 1].type) {
-          rowspan++;
+        if (item.intime) {
+          item.intime = this.zhuanhuan(item.intime);
         } else {
+          item.intime = "";
+        }
+        if (item.granttime) {
+          item.granttime = this.zhuanhuan(item.granttime);
+        } else {
+          item.outtime = "";
+        }
+        item.ids = i + 1;
+      });
+      //循环遍历
+      for (var i = 0; i < this.message.length; i++) {
+        //循环开始行
+        var start_row;
+        //需合并的行数
+        var rowspan = 1;
+        //循环到最后一行时
+        if (i == this.message.length - 1) {
+          //如果最后一行和倒数第二行属性不同，则rowspan=1；否则直接结束循环
+          if (this.message[i].type != this.message[i - 1].type) {
+            this.message[i].rowspan = rowspan;
+          }
           break;
         }
+        //内层循环记录rowspan的数量
+        for (var j = i; j < this.message.length - 1; j++) {
+          //记录循环结束的行数
+          start_row = j;
+          //属性相同则rowspan+1；否则直接结束内循环
+          if (this.message[j].type == this.message[j + 1].type) {
+            rowspan++;
+          } else {
+            break;
+          }
+        }
+        //为数组添加rowspan属性
+        this.message[i].rowspan = rowspan;
+        //控制外循环从内循环结束的行数开始
+        i = start_row;
       }
-      //为数组添加rowspan属性
-      this.message[i].rowspan = rowspan;
-      //控制外循环从内循环结束的行数开始
-      i = start_row;
-    }
-    //页面渲染
-    var tbody = document.getElementById("tbody");
-    var html = ``;
-    for (var i = 0; i < this.message.length; i++) {
-      html += `<tr><td
+      //页面渲染
+      var tbody = document.getElementById("tbody");
+      var html = ``;
+      for (var i = 0; i < this.message.length; i++) {
+        html += `<tr><td
               width="35"
               valign="center"
               style="
@@ -612,11 +647,11 @@ export default {
             >
               <span align="center" class="JR_right" >${this.message[i].ids}</span>
             </td>`;
-      //动态添加rowspan属性
-      if (this.message[i].rowspan != null) {
-        html += `<td width="63" rowspan = '${this.message[i].rowspan}'>${this.message[i].type}</td>`;
-      }
-      html += `
+        //动态添加rowspan属性
+        if (this.message[i].rowspan != null) {
+          html += `<td width="63" rowspan = '${this.message[i].rowspan}'>${this.message[i].type}</td>`;
+        }
+        html += `
       <td
               width="82"
               valign="center"
@@ -774,9 +809,9 @@ export default {
             </td>
           </tr>
 `;
+      }
+      tbody.innerHTML = html;
     }
-    tbody.innerHTML = html;
-  }
   },
   methods: {
     daochu() {

src/views/combatduty/Quantitative/index.vue

@@ -40,7 +40,7 @@
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left">值 班 分 队 一</div>
               <div
-                class="wrap-top-left-top-item-right wrap-top-left-top-item-name"
+                class="wrap-top-left-top-item-right wrap-top-left-top-item-name box1"
                 :title="BaseOnDuty.detachmentoneName"
               >
                 {{ this.BaseOnDuty.detachmentoneName }}
@@ -69,7 +69,7 @@
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left">值 班 分 队 二</div>
               <div
-                class="wrap-top-left-top-item-right wrap-top-left-top-item-name"
+                class="wrap-top-left-top-item-right wrap-top-left-top-item-name box1"
                 :title="BaseOnDuty.detachmentwoName"
               >
                 {{ this.BaseOnDuty.detachmentwoName }}
@@ -137,7 +137,6 @@
             <div class="wrap-top-left-top-item-left">机要值班员</div>
             <div
               class="wrap-top-left-top-item-right wrap-top-left-top-item-name"
-              style="margin-left: 22px"
               :title="GreatDuty1.confidentialName"
             >
               {{ this.GreatDuty1.confidentialName }}
@@ -149,6 +148,7 @@
             <div
               class="wrap-top-left-top-item-right wrap-top-left-top-item-name"
               :title="GreatDuty1.dutyOffierName"
+              style="margin-left: 10px"
             >
               {{ this.GreatDuty1.dutyOffierName }}
             </div>
@@ -399,8 +399,7 @@
               <tr>
                 <th style="font-weight: 500" height="40">序号</th>
                 <th style="font-weight: 500">车牌号码</th>
-                <th style="font-weight: 500">厂牌型号</th>
-                <!-- <th style="font-weight: 500">车属单位</th> -->
+                <!-- <th style="font-weight: 500">厂牌型号</th> -->
                 <th style="font-weight: 500">司机</th>
                 <th style="font-weight: 500">司机位置</th>
               </tr>
@@ -411,16 +410,25 @@
                 :key="item.id"
               >
                 <td style="color: #ccc" height="28">{{ index + 1 }}</td>
-                <td style="color: #ccc">{{ item.numberPlateName }}</td>
-                <td style="color: #ccc">{{ item.modelInfo }}</td>
-                <!-- <el-table-column label="车辆型号" align="center" prop="vehiclemodel"> 
-                  <template slot-scope="scope">
-                     <dict-tag :options="dict.type.brand " :value="scope.row.vehiclemodel"/>
-                      </template> 
-                </el-table-column> -->
-                <!-- <td style="color: #ccc">{{ item.carUnitName }}</td> -->
-                <td style="color: #ccc">{{ item.driverName }}</td>
-                <td style="color: #ccc" class="shiyou">{{ item.adress }}</td>
+                <td
+                  style="
+                    color: #ccc;
+                    display: -webkit-box;
+                    -webkit-box-orient: vertical;
+                    -webkit-line-clamp: 2;
+                    overflow: hidden;
+                  "
+                  :title="item.numberPlateName"
+                >
+                  {{ item.numberPlateName }}
+                </td>
+                <!-- <td style="color: #ccc">{{ item.modelInfo }}</td>   -->
+                <td style="color: #ccc">
+                  {{ item.driverName }}
+                </td>
+                <td style="color: #ccc" class="shiyou">
+                  {{ item.adress }}
+                </td>
               </tr>
             </table>
           </div>
@@ -439,7 +447,6 @@
               <tr v-for="(item, index) in Equipment" :key="item.id">
                 <td style="color: #ccc" height="28">{{ index + 1 }}</td>
                 <td style="color: #ccc">{{ item.equipmentName }}</td>
-                <!-- <td style="color: #ccc">{{ item.unitName }}</td> -->
                 <td style="color: #ccc">
                   <template>
                     <dict-tag
@@ -558,7 +565,7 @@ export default {
     // // 军车值班接口
     militaryDuty().then((res) => {
       this.MilitaryDuty = res.rows;
-
+      console.log(res.rows);
       this.MilitaryDuty.map((item) => {
         this.ziDian.map((items) => {
           if (item.modelInfo == items.dictValue) {
@@ -748,7 +755,7 @@ body {
   justify-content: space-between;
 }
 .wrap-top-left-top-item-right {
-  width: 60%;
+  width: 64%;
   height: 100%;
   font-size: 16px;
   line-height: 35px;
@@ -1035,10 +1042,14 @@ table tr td {
   height: 30px;
 }
 .wrap-top-left-top-item-name {
+
+  font-size: 16px;
+}
+.box1{
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 1;
   overflow: hidden;
-  font-size: 16px;
+  margin-left: 8px;
 }
 </style>

src/views/combatduty/info/index.vue

@@ -285,7 +285,7 @@
         style="color: pink"
         :title="title3"
         :visible.sync="open33"
-        width="850px"
+        width="1200px"
         append-to-body
         id="fileinfodocx"
         class="el-dialog__header"
@@ -303,7 +303,7 @@
       <el-dialog
         :title="title3"
         :visible.sync="previewDialog"
-        width="850px"
+        width="1200px"
         append-to-body
         id="fileinfopdf"
         class="el-dialog__header"
@@ -389,48 +389,6 @@
             label-width="130px"
             :inline="true"
           >
-            <!-- <el-form-item
-              label-width="100px"
-              prop="directory"
-              class="change_plan_type"
-            >
-              <el-select
-                v-model="form.directory"
-                placeholder="请选择目录"
-                clearable
-                size="small"
-                class="choose"
-              >
-                <el-option
-                  v-for="item in directory"
-                  :key="item.id"
-                  :label="item.directory"
-                  :value="item.directory"
-                  @click.native="chooseDirect(item.id)"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item
-              prop="subclassification"
-              class="change_plan_type"
-              id="son"
-            >
-              <el-select
-                v-model="form.subclassification"
-                placeholder="请选择子分类"
-                ref="dict"
-                clearable
-                size="small"
-              >
-                <el-option
-                  v-for="item in subclassification"
-                  :key="item.id"
-                  :label="item.directory"
-                  :value="item.directory"
-                  @click.native="soncategory(item.id)"
-                ></el-option>
-              </el-select>
-            </el-form-item> -->
             <el-form-item style=" margin-top: 10px">
               <FileUpload v-model="moreFile" />
             </el-form-item>
@@ -880,5 +838,7 @@ export default {
   color: #fff !important;
   border: 1px solid #fff !important;
 }
-
+::v-deep .docx p, p.docx_Normal{
+  line-height: 2.00;
+}
 </style>

src/views/combatduty/taskdutyinfo/index.vue

@@ -213,7 +213,7 @@
       </el-table-column>
       <el-table-column label="所在位置" align="center" prop="adress" />
       <el-table-column
-        label="是由"
+        label="事由"
         show-overflow-tooltip
         align="center"
         prop="question"

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -120,7 +120,13 @@
         </template>
       </el-table-column>
       <el-table-column label="计量单位" align="center" prop="metering" />
-      <el-table-column label="交接依据" align="center" prop="gist" width="100"  show-overflow-tooltip/>
+      <el-table-column
+        label="交接依据"
+        align="center"
+        prop="gist"
+        width="100"
+        show-overflow-tooltip
+      />
       <el-table-column label="编制数量" align="center" prop="prepareNumber" />
       <el-table-column label="现有总数" align="center" prop="sum" />
       <el-table-column label="完好数量" align="center" prop="intactNumber" />
@@ -162,7 +168,6 @@
           >
         </template>
       </el-table-column>
-
     </el-table>
 
     <pagination
@@ -273,9 +278,9 @@
         <el-form-item label="缺陷配套" prop="flaw">
           <el-input v-model="form.flaw" placeholder="请输入缺陷配套" />
         </el-form-item>
-        <el-form-item label="登记人" prop="peopleId" >
+        <el-form-item label="登记人" prop="peopleId">
           <!-- <el-input v-model="form.peopleId" placeholder="请输入登记人" /> -->
-          <el-select v-model="form.peopleId" placeholder="请选择人员"  clearable>
+          <el-select v-model="form.peopleId" placeholder="请选择人员" clearable>
             <el-option
               v-for="item in renYuan"
               :key="item.id"
@@ -288,7 +293,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="核对人" prop="peopleId1">
-          <el-select v-model="form.peopleId1" placeholder="请选择人员"  clearable>
+          <el-select
+            v-model="form.peopleId1"
+            placeholder="请选择人员"
+            clearable
+          >
             <el-option
               v-for="item in renYuan"
               :key="item.id"
@@ -410,20 +419,29 @@ export default {
           { required: true, message: "单位名称不能为空", trigger: "blur" },
         ],
         name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-        recordDate:[{ required: true, message: "登记时间不能为空", trigger: "blur" }]
+        recordDate: [
+          { required: true, message: "登记时间不能为空", trigger: "blur" },
+        ],
       },
       //下拉
       options: [],
       // 人员
       renYuan: [],
       roleOptions: [],
+      form1: {},
     };
   },
   created() {
     this.getList();
     this.getdept();
+    this.getYear();
   },
   methods: {
+    getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year = tYear;
+    },
     // 搜索时间触发
     tiem() {
       this.getList();
@@ -572,8 +590,8 @@ export default {
     handleChakan(row) {
       // 是否隐藏按钮
       this.opens = false;
-      const id = row.unitId;
-      armamentunits(id).then((response) => {
+      this.form1.unitid = row.unitId;
+      armamentunits(this.form1).then((response) => {
         this.wordInfo = response.data;
         this.title = "查看军械装备登记簿";
         this.menuRoleVisible = true;

src/views/grassrootsregistration/bdglarmaments/index.vue

@@ -80,15 +80,24 @@ export default {
       form: {},
       year: null,
       status: null,
+      form1:{}
     };
   },
 
   created() {
     this.getSoulist();
+    this.getYear();
   },
   methods: {
+     // 获取当前年
+     getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year = tYear;
+    },
     resetQuery() {
       this.form.year = null;
+      this.getYear();
       armamentList().then((res) => {
         res.rows.forEach((item) => {
           this.status = 1;
@@ -114,8 +123,11 @@ export default {
       }
     },
     chaKan(row) {
-      const unitId = row;
-      armamentunits(unitId).then((response) => {
+      this.form1.unitid = row;
+      if (this.form.year) {
+        this.form1.year = this.form.year;
+      }
+      armamentunits(this.form1).then((response) => {
         if (response.data.length > 0) {
           this.wordInfo = response.data;
           this.title = "查看军械装备登记簿";

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -891,15 +891,22 @@ export default {
       open2: false,
       arr1: [],
       falg: null,
+      form1: {},
     };
   },
   created() {
     this.getList();
+    this.getYear()
     treeselect().then((res) => {
       this.treeselects = res.rows;
     });
   },
   methods: {
+    getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year=tYear
+    },
     // 添加人员确定
     submitForm3() {
       this.open2 = false;
@@ -1031,11 +1038,10 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
-      let unitId = row.unitId;
+      this.form1.unitId= row.unitId;
       // 是否隐藏按钮
       this.reset();
-      // const id = row.id || this.ids;
-      getInfoByUnitId(unitId).then((response) => {
+      getInfoByUnitId(this.form1).then((response) => {
         this.wordInfo = response.rows;
         this.title = "军事训练登记簿";
         this.menuRoleVisible = true;

src/views/grassrootsregistration/bdgldrills/index.vue

@@ -77,16 +77,25 @@ export default {
       title: null,
       form: {},
       year: null,
-      status:null
+      status:null,
+      form1:{}
     };
   },
 
   created() {
     this.getSoulist();
+    this.getYear()
   },
   methods: {
+      // 获取当前年
+      getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year=tYear
+    },
     resetQuery() {
       this.form.year = null;
+      this.getYear()
       drillList(this.year).then((res) => {
           res.rows.forEach((item) => {
            this.status =1
@@ -112,8 +121,11 @@ export default {
       }
     },
     chaKan(row) {
-      const unitId = row;
-      getInfoByUnitId(unitId).then((response) => {
+      this.form1.unitId=row;
+      if (this.form.year) {
+        this.form1.year = this.form.year;
+      }
+      getInfoByUnitId(this.form1).then((response) => {
         if (response.rows.length > 0) {
           this.wordInfo = response.rows;
           this.title = "查看军事训练登记簿";

src/views/grassrootsregistration/bdglequip/index.vue

@@ -445,9 +445,18 @@ export default {
         unitId: [
           { required: true, message: "配发单位不能为空", trigger: "blur" },
         ],
-        title:[
+        title: [
           { required: true, message: "物品名称不能为空", trigger: "blur" },
-        ]
+        ],
+        granttime: [
+          { required: true, message: "配发时间不能为空", trigger: "blur" },
+        ],
+        intime: [
+          { required: true, message: "入库时间不能为空", trigger: "blur" },
+        ],
+        peopleId: [
+          { required: true, message: "入库经手人不能为空", trigger: "blur" },
+        ],
       },
       roleOptions: [],
       //人员
@@ -478,14 +487,21 @@ export default {
       },
       // 时间默认
       times: null,
+      form1: {},
     };
   },
   created() {
     this.getList();
     this.getBumen();
     this.getTiem();
+    this.getYear();
   },
   methods: {
+    getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year = tYear;
+    },
     // 获取当前日期
     getTiem() {
       var today = new Date();
@@ -661,10 +677,10 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
-      const unitId = row.unitId;
+      this.form1.unitid = row.unitId;
       // 是否隐藏按钮
       this.opens = false;
-      equipuntits(unitId).then((response) => {
+      equipuntits(this.form1).then((response) => {
         this.wordInfo = response.data;
         this.title = "查看训练器材/教材登记薄";
         this.menuRoleVisible = true;
@@ -677,29 +693,17 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            // 配发时间
-            if (this.form.granttime == null) {
-              this.form.granttime = this.times;
-            }
-            // 入库时间
-            if (this.form.intime == null) {
-              this.form.intime = this.times;
-            }
-            // 入库经手人
-            if (this.form.peopleId == null) {
-              this.form.peopleName = "无";
-            }
-            // 出库时间
-            if (this.form.outtime == null) {
-              this.form.outtime = this.times;
-            }
+            // // 出库时间
+            // if (this.form.outtime == null) {
+            //   this.form.outtime = "";
+            // }
             // 出库经手人
             if (this.form.peopleId1 == null) {
-              this.form.people1Name = "无";
+              this.form.people1Name = " ";
             }
             // 质量情况
             if (this.form.quality == null) {
-              this.form.quality = "无";
+              this.form.quality = " ";
             }
             updateBdglequip(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -707,29 +711,17 @@ export default {
               this.getList();
             });
           } else {
-            // 配发时间
-            if (this.form.granttime == null) {
-              this.form.granttime = this.times;
-            }
-            // 入库时间
-            if (this.form.intime == null) {
-              this.form.intime = this.times;
-            }
-            // 入库经手人
-            if (this.form.peopleId == null) {
-              this.form.peopleName = "无";
-            }
             // 出库时间
             if (this.form.outtime == null) {
-              this.form.outtime = this.times;
+              this.form.outtime = " ";
             }
             // 出库经手人
             if (this.form.peopleId1 == null) {
-              this.form.people1Name = "无";
+              this.form.people1Name = " ";
             }
             // 质量情况
             if (this.form.quality == null) {
-              this.form.quality = "无";
+              this.form.quality = " ";
             }
             addBdglequip(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");

src/views/grassrootsregistration/bdglequips/index.vue

@@ -78,15 +78,24 @@ export default {
       form: {},
       year: null,
       status: null,
+      form1:{}
     };
   },
 
   created() {
     this.getSoulist();
+    this.getYear()
   },
   methods: {
+     // 获取当前年
+     getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year=tYear
+    },
     resetQuery() {
       this.form.year = null;
+      this.getYear()
       equipList().then((res) => {
         res.rows.forEach((item) => {
           this.status = 1;
@@ -112,8 +121,11 @@ export default {
       }
     },
     chaKan(row) {
-      const unitId = row;
-      equipuntits(unitId).then((response) => {
+      this.form1.unitid=row;
+      if (this.form.year) {
+        this.form1.year = this.form.year;
+      }
+      equipuntits( this.form1).then((response) => {
         if (response.data.length > 0) {
           this.wordInfo = response.data;
           this.title = "查看训练器材/教材登记薄";

src/views/grassrootsregistration/bdglevens/index.vue

@@ -137,7 +137,8 @@
       :before-close="closes"
     >
       <div
-        style=" margin-bottom: 20px;
+        style="
+          margin-bottom: 20px;
           margin-left: 28%;
           font-size: 16px;
           font-weight: 700;
@@ -186,6 +187,10 @@ export default {
       huiYiList: [],
       names: null,
       tiemse: null,
+      form1: {
+        pageNum: 1,
+        pageSize: 10,
+      },
     };
   },
 
@@ -195,10 +200,18 @@ export default {
     this.getDicts("sys_huiyi").then((response) => {
       this.huiYiList = response.data;
     });
+    this.getYear();
   },
   methods: {
+    // 获取当前年
+    getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year = tYear;
+    },
     resetQuery() {
       this.form.year = null;
+      this.getYear();
       getMeetRecordList().then((res) => {
         res.rows.forEach((item) => {
           this.status = 1;
@@ -224,9 +237,11 @@ export default {
       }
     },
     chaKan(row) {
-      this.queryParams.unitId = row;
-      this.unitId = row;
-      getMeetRecordOnUnitList(this.queryParams).then((res) => {
+      this.form1.unitId = row;
+      if (this.form.year) {
+        this.form1.year = this.form.year;
+      }
+      getMeetRecordOnUnitList(this.form1).then((res) => {
         this.bdglevenList = res.rows;
         this.total = res.total;
         this.title = "查看连务会记录本";
@@ -234,6 +249,8 @@ export default {
       });
     },
     chaKan1(row) {
+      this.queryParams.year=this.form1.year;
+      this.queryParams.unitId=this.form1.unitId
       getMeetRecordOnUnitList(this.queryParams).then((res) => {
         this.bdglevenList = res.rows;
         this.total = res.total;

src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -413,13 +413,20 @@ export default {
         children: "children",
         label: "label",
       },
+      form1: {},
     };
   },
   created() {
     this.getList();
     this.getdept();
+    this.getYear()
   },
   methods: {
+    getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year=tYear
+    },
     // 计划编号
     planName() {
       let date = new Date();
@@ -568,10 +575,10 @@ export default {
 
     //查看按钮操作
     handleChakan(row) {
-      const unitId = row.unitId;
+      this.form1.unitId = row.unitId;
       // 是否隐藏按钮
       this.opens = false;
-      listBdglfilemanagement({ unitId: unitId }).then((response) => {
+      listBdglfilemanagement(this.form1).then((response) => {
         // fileunits(unitId).then((response) => {
         this.wordInfo = response.rows;
         this.title = "查看文件管理登计本";

src/views/grassrootsregistration/bdglfilemanagements/index.vue

@@ -77,16 +77,25 @@ export default {
       title: null,
       form: {},
       year: null,
-      status:null
+      status:null,
+      form1: {},
     };
   },
 
   created() {
     this.getSoulist();
+    this.getYear()
   },
   methods: {
+     // 获取当前年
+     getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year=tYear
+    },
     resetQuery() {
       this.form.year = null;
+      this.getYear()
       docList(this.form.year).then((res) => {
           res.rows.forEach((item) => {
            this.status =1
@@ -112,9 +121,11 @@ export default {
       }
     },
     chaKan(row) {
-      const unitId = row;
-      fileunits(unitId).then((response) => {
-
+      this.form1.unitid = row;
+      if (this.form.year) {
+        this.form1.year = this.form.year;
+      }
+      fileunits(this.form1).then((response) => {
         if (response.data.length > 0) {
           this.wordInfo = response.data;
           this.title = "查看文件管理登记本";

src/views/grassrootsregistration/bdglmeetings/index.vue

@@ -212,17 +212,28 @@ export default {
       huiYiList: [],
       names: null,
       tiemse: null,
+      form1: {
+        pageNum: 1,
+        pageSize: 10,
+      },
     };
   },
 
   created() {
     this.getSoulist();
+    this.getYear();
     //会议形式
     this.getDicts("sys_tuan").then((response) => {
       this.huiYiList = response.data;
     });
   },
   methods: {
+    // 获取当前年
+    getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year = tYear;
+    },
     // 翻译
     meetingFormFn(row) {
       var name = null;
@@ -235,6 +246,7 @@ export default {
     },
     resetQuery() {
       this.form.year = null;
+      this.getYear();
       getMeetingList().then((res) => {
         res.rows.forEach((item) => {
           this.status = 1;
@@ -260,9 +272,12 @@ export default {
       }
     },
     chaKan(row) {
-      this.queryParams.unitId = row.deptId;
+      this.form1.unitId = row.deptId;
+      if (this.form.year) {
+        this.form1.year = this.form.year;
+      }
       this.unitId = row.deptId;
-      getMeetingOnUnitList(this.queryParams).then((response) => {
+      getMeetingOnUnitList(this.form1).then((response) => {
         this.bdglpartyList = response.rows;
         this.title = "查看团支部记录本";
         this.tableStatus = true;
@@ -270,6 +285,8 @@ export default {
       });
     },
     chaKan1(row) {
+      this.queryParams.year = this.form1.year;
+      this.queryParams.unitId = this.form1.unitId;
       getMeetingOnUnitList(this.queryParams).then((response) => {
         this.bdglpartyList = response.rows;
         this.title = "查看团支部记录本";

src/views/grassrootsregistration/bdglpartys/index.vue

@@ -202,17 +202,28 @@ export default {
       huiYiList: [],
       names: null,
       tiemse: null,
+      form1: {
+        pageNum: 1,
+        pageSize: 10,
+      },
     };
   },
 
   created() {
     this.getSoulist();
+    this.getYear();
     //会议形式
     this.getDicts("sys_huiyi").then((response) => {
       this.huiYiList = response.data;
     });
   },
   methods: {
+      // 获取当前年
+      getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year = tYear;
+    },
     // 翻译
     meetingFormFn(row) {
       var name = null;
@@ -225,6 +236,7 @@ export default {
     },
     resetQuery() {
       this.form.year = null;
+      this.getYear();
       getPartyList().then((res) => {
         res.rows.forEach((item) => {
           this.status = 1;
@@ -250,9 +262,12 @@ export default {
       }
     },
     chaKan(row) {
-      this.queryParams.unitId = row.deptId;
       this.unitId = row.deptId;
-      getPartyOnUnitList(this.queryParams).then((response) => {
+      this.form1.unitId = row.deptId;
+      if (this.form.year) {
+        this.form1.year = this.form.year;
+      }
+      getPartyOnUnitList(this.form1).then((response) => {
         this.bdglpartyList = response.rows;
         this.total = response.total;
         this.title = "查看党支部记录本";
@@ -260,6 +275,8 @@ export default {
       });
     },
     chaKan1(row) {
+      this.queryParams.year=this.form1.year;
+      this.queryParams.unitId=this.form1.unitId
       getPartyOnUnitList(this.queryParams).then((response) => {
         this.bdglpartyList = response.rows;
         this.total = response.total;
@@ -268,7 +285,6 @@ export default {
       });
     },
     handleChakan(row) {
-      // console.log(row);
       const id = row.id || this.ids;
       getBdglparty(id).then((response) => {
         if (response.data.fileUrl != null) {
@@ -277,13 +293,13 @@ export default {
             this.tiemse = response.data.convokeTime;
             this.huiYiList.map((item) => {
               if (item.dictValue == response.data.meetingForm) {
-                this.names = item.dictLabel;
+                this.names= item.dictLabel;
               }
             });
             this.title = "查看党支部记录本";
             this.menuRoleVisible = true;
             this.tableStatus = false;
-            return names;
+            return this.names;
           }
         }
         // this.wordInfo = response.data;

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -387,13 +387,21 @@ export default {
       roleOptions: [],
       // 获取单位列表
       deptOptionss: [],
+      form1: {},
     };
   },
   created() {
     this.getList();
     this.getdept();
+    this.getYear();
   },
   methods: {
+     // 获取当前年
+     getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year = tYear;
+    },
     // 数量输入完毕失去焦点触发
     shuLiang() {
       if (this.form.price !== null && this.form.quantity !== null) {
@@ -521,10 +529,10 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
-      const unitId = row.unitId;
+      this.form1.unitid=row.unitId
       // 是否隐藏按钮
       this.opens = false;
-      publiccpropertyunits(unitId).then((response) => {
+      publiccpropertyunits(this.form1).then((response) => {
         this.wordInfo = response.data;
         this.title = "查看营产/公物管理登记簿";
         this.menuRoleVisible = true;

src/views/grassrootsregistration/bdglpublicpropertys/index.vue

@@ -2,45 +2,50 @@
 <template>
   <div class="arr_conten">
     <el-form
-    :model="form"
-    ref="form"
-    :inline="true"
-    label-width="68px"
-    style="padding-left: 30px"
-  >
-    <el-form-item prop="year">
-      <el-date-picker
-        v-model="form.year"
-        type="year"
-        placeholder="选择年"
-        @change="getSoulist"
-        value-format="yyyy"
-        :editable="false"
-      >
-      </el-date-picker>
-    </el-form-item>
-    <el-form-item>
-      <el-button size="btr" @click="resetQuery">重置</el-button>
-    </el-form-item>
-  </el-form>
-    <div v-if="status==1">
+      :model="form"
+      ref="form"
+      :inline="true"
+      label-width="68px"
+      style="padding-left: 30px"
+    >
+      <el-form-item prop="year">
+        <el-date-picker
+          v-model="form.year"
+          type="year"
+          placeholder="选择年"
+          @change="getSoulist"
+          value-format="yyyy"
+          :editable="false"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div v-if="status == 1">
       <ul v-for="(item, i) in lieList" :key="i">
-        <li v-for="(item1, i) in item" :key="i+''">
+        <li v-for="(item1, i) in item" :key="i + ''">
           <div class="names">{{ item1.deptName }}</div>
           <div class="btn">
-            <el-button size="btJS" @click="chaKan(item1.deptId)">查看</el-button>
+            <el-button size="btJS" @click="chaKan(item1.deptId)"
+              >查看</el-button
+            >
           </div>
         </li>
       </ul>
     </div>
-    <div v-if="status==0">
+    <div v-if="status == 0">
       <ul>
         <li v-for="(item, i) in lieList" :key="i">
           <div class="names">{{ item.deptName }}</div>
           <div class="btn">
-            <el-button size="btJS" @click="chaKan(item.deptId)"
-            v-hasPermi="['grassrootsregistration:bdglpublicpropertys:query']"
-            >查看</el-button>
+            <el-button
+              size="btJS"
+              @click="chaKan(item.deptId)"
+              v-hasPermi="['grassrootsregistration:bdglpublicpropertys:query']"
+              >查看</el-button
+            >
           </div>
         </li>
       </ul>
@@ -75,46 +80,57 @@ export default {
       //查看页面
       menuRoleVisible: false,
       title: null,
-      form:{},
-      yrar:null,
-      status:null
+      form: {},
+      yrar: null,
+      status: null,
+      form1: {},
     };
   },
 
   created() {
     this.getSoulist();
+    this.getYear();
   },
   methods: {
+    // 获取当前年
+    getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year = tYear;
+    },
     resetQuery() {
       this.form.year = null;
+      this.getYear();
       propertyList().then((res) => {
-          res.rows.forEach((item) => {
-           this.status =1
-          });
-          this.lieList = res.rows;
+        res.rows.forEach((item) => {
+          this.status = 1;
         });
+        this.lieList = res.rows;
+      });
     },
     getSoulist() {
-      if (this.form.year == null||this.form.year=="") {
+      if (this.form.year == null || this.form.year == "") {
         propertyList().then((res) => {
           res.rows.forEach((item) => {
-           this.status =1
+            this.status = 1;
           });
           this.lieList = res.rows;
         });
       } else {
         propertyList(this.form.year).then((res) => {
           res.rows.forEach((item) => {
-           this.status =0
+            this.status = 0;
           });
           this.lieList = res.rows;
         });
       }
     },
     chaKan(row) {
-      const unitId = row;
-      publiccpropertyunits(unitId).then((response) => {
-
+      this.form1.unitid = row;
+      if (this.form.year) {
+        this.form1.year = this.form.year;
+      }
+      publiccpropertyunits(this.form1).then((response) => {
         if (response.data.length > 0) {
           this.wordInfo = response.data;
           this.title = "查看营产/公物管理登记簿";
@@ -178,7 +194,6 @@ li {
   text-align: center;
 }
 
-
 ::v-deep .el-input__inner {
   cursor: pointer !important;
 }

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -450,13 +450,21 @@ export default {
         children: "children",
         label: "label",
       },
+      form1: {},
     };
   },
   created() {
     this.getList();
     this.getdict();
+    this.getYear()
   },
   methods: {
+    // 获取当前年
+    getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year=tYear
+    },
     // 种类选择触发
     // zhongLei() {
     //   this.planName();
@@ -623,15 +631,11 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
-      const unitId = row.unitId;
-        // console.log(row);
-      // var stiem =row.startTime.substring(0,4)
-      var stiem =row.startTime
-      // console.log(stiem);
+      this.form1.unitid=row.unitId;
       // 是否隐藏按钮
       this.opens = false;
       const id = row.id || this.ids;
-      units(unitId,stiem).then((response) => {
+      units(this.form1).then((response) => {
         this.wordInfo = response.data;
         this.title = "查看网络/手机/涉密载体登记本";
         this.menuRoleVisible = true;

src/views/grassrootsregistration/bdglsecrecys/index.vue

@@ -23,20 +23,22 @@
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-     <div v-if="status==1">
-      <ul v-for="(item,i) in lieList " :key="i+''">
+    <div v-if="status == 1">
+      <ul v-for="(item, i) in lieList" :key="i + ''">
         <li v-for="(item1, i) in item" :key="i">
           <div class="names">{{ item1.deptName }}</div>
           <div class="btn">
-            <el-button size="btJS" @click="chaKan(item1.deptId, item1.startTime)"
-            v-hasPermi="['grassrootsregistration:bdglsecrecys:query']"
+            <el-button
+              size="btJS"
+              @click="chaKan(item1.deptId, item1.startTime)"
+              v-hasPermi="['grassrootsregistration:bdglsecrecys:query']"
               >查看</el-button
             >
           </div>
         </li>
       </ul>
-     </div>
-     <div v-if="status==0">
+    </div>
+    <div v-if="status == 0">
       <ul>
         <li v-for="(item, i) in lieList" :key="i">
           <div class="names">{{ item.deptName }}</div>
@@ -47,7 +49,7 @@
           </div>
         </li>
       </ul>
-     </div>
+    </div>
     <!-- 查看 -->
     <el-dialog
       :visible.sync="menuRoleVisible"
@@ -78,47 +80,58 @@ export default {
       //查看页面
       menuRoleVisible: false,
       title: null,
-      form:{},
-      year:null,
-      status:null
+      form: {},
+      year: null,
+      status: null,
+      form1: {},
     };
   },
 
   created() {
-    this.getSoulist()
+    this.getSoulist();
+    this.getYear()
   },
   methods: {
+    // 获取当前年
+    getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year=tYear
+    },
     resetQuery() {
       this.form.year = null;
+      this.form1.year = null;
+      this.getYear()
       getSecrecyStats().then((res) => {
-          res.rows.forEach((item) => {
-           this.status =1
-          });
-          this.lieList = res.rows;
+        res.rows.forEach((item) => {
+          this.status = 1;
         });
+        this.lieList = res.rows;
+      });
     },
     getSoulist() {
-      if (this.form.year == null||this.form.year=="") {
+      if (this.form.year == null || this.form.year == "") {
         getSecrecyStats().then((res) => {
           res.rows.forEach((item) => {
-           this.status =1
+            this.status = 1;
           });
           this.lieList = res.rows;
         });
       } else {
         getSecrecyStats(this.form.year).then((res) => {
           res.rows.forEach((item) => {
-           this.status =0
+            this.status = 0;
           });
           this.lieList = res.rows;
         });
       }
     },
     chaKan(row, tiem) {
-      const unitId = row;
-      const stiem = tiem;
-      units(unitId, stiem).then((response) => {
-
+      this.form1.unitid = row;
+      if (this.form.year) {
+        this.form1.year = this.form.year;
+      }
+      units(this.form1).then((response) => {
         if (response.data.length > 0) {
           this.wordInfo = response.data;
           this.title = "查看网络/手机/涉密载体登记本";

src/views/grassrootsregistration/bdglsoldiers/index.vue

@@ -209,17 +209,28 @@ export default {
       huiYiList: [],
       names: null,
       tiemse: null,
+      form1: {
+        pageNum: 1,
+        pageSize: 10,
+      },
     };
   },
 
   created() {
     this.getSoulist();
+    this.getYear();
     //会议形式
     this.getDicts("sys_wei").then((response) => {
       this.huiYiList = response.data;
     });
   },
   methods: {
+    // 获取当前年
+    getYear() {
+      var myDate = new Date();
+      var tYear = myDate.getFullYear();
+      this.form1.year = tYear;
+    },
     // 翻译
     meetingFormFn(row) {
       var name = null;
@@ -232,9 +243,10 @@ export default {
     },
     resetQuery() {
       this.form.year = null;
-      getSoldierList(this.year).then((res) => {
+      this.getYear();
+      getSoldierList().then((res) => {
         res.rows.forEach((item) => {
-          this.status = 1;
+          this.status = 0;
         });
         this.lieList = res.rows;
       });
@@ -264,9 +276,12 @@ export default {
       });
     },
     chaKan(row) {
-      this.queryParams.unitId = row;
       this.unitId = row;
-      getSoldierOnUnitList(this.queryParams).then((response) => {
+      this.form1.unitId = row;
+      if (this.form.year) {
+        this.form1.year = this.form.year;
+      }
+      getSoldierOnUnitList(this.form1).then((response) => {
         this.bdglpartyList = response.rows;
         this.total = response.total;
         this.title = "查看军人委员会工作记录本";
@@ -274,6 +289,8 @@ export default {
       });
     },
     chaKan1(row) {
+      this.queryParams.year = this.form1.year;
+      this.queryParams.unitId = this.form1.unitId;
       getSoldierOnUnitList(this.queryParams).then((response) => {
         this.bdglpartyList = response.rows;
         this.total = response.total;

src/views/peopleChuRu/bdglLeave/index.vue

@@ -1501,7 +1501,7 @@ import {
   ZhengZhiUSer,
   getBdglList,
   getAllDept,
-  getAll
+  getAll,
 } from "@/api/peopleChuRu/bdglLeave";
 
 import {
@@ -1661,7 +1661,7 @@ export default {
       // 审批单位所有列表
       shenAllList: [],
       // 审批获取所有人
-      shenAllRenList:[]
+      shenAllRenList: [],
     };
   },
   created() {
@@ -1678,10 +1678,10 @@ export default {
   },
   methods: {
     // 获取所有审批人员
-    getShenRen(){
-      getAll().then(res=>{
-        this.shenAllRenList=res.rows
-      })
+    getShenRen() {
+      getAll().then((res) => {
+        this.shenAllRenList = res.rows;
+      });
     },
     // 审批获取所有单位
     getShenAll() {
@@ -1749,7 +1749,7 @@ export default {
     handleUpdatess(row) {
       this.teShu = row;
       this.getShenAll();
-      this.getShenRen()
+      this.getShenRen();
       // 获取字典类型
       this.getdict();
       this.reset();
@@ -1770,7 +1770,7 @@ export default {
     handleUpdates(row) {
       this.shenPis = row;
       this.getShenAll();
-      this.getShenRen()
+      this.getShenRen();
       // 获取字典类型
       this.getdict();
       this.reset();
@@ -2043,8 +2043,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.renYuan = [];
-        // 获取单位树形
-        this.getBuMeng();
+      // 获取单位树形
+      this.getBuMeng();
       // 获取字典类型
       this.getdict();
       this.reset();
@@ -2101,8 +2101,7 @@ export default {
             if (
               this.form.peopleId2 ||
               this.form.peopleId1 ||
-              this.form.peopleId3 ||
-              this.form.peopleId4
+              this.form.peopleId3 
             ) {
               if (this.form.peopleId.length > 0) {
                 this.form.peopleId = this.form.peopleId.join(",");
@@ -2135,7 +2134,7 @@ export default {
         this.thereShenPi = true;
       }
       this.getShenAll();
-      this.getShenRen()
+      this.getShenRen();
       // 获取字典类型
       this.getdict();
       this.reset();

src/views/regulations/fileinfo/index.vue

@@ -433,7 +433,7 @@
         style="color: pink"
         :title="title3"
         :visible.sync="open33"
-        width="850px"
+        width="1001px"
         append-to-body
         id="fileinfodocx"
         class="el-dialog__header"
@@ -451,7 +451,7 @@
       <el-dialog
         :title="title3"
         :visible.sync="previewDialog"
-        width="850px"
+        width="1001px"
         append-to-body
         id="fileinfopdf"
         class="el-dialog__header"

src/views/taishi/index.vue

@@ -2089,7 +2089,7 @@ export default {
 }
 
 .left1-wrap-item b {
-  font-size: 1.2rem;
+  font-size: 0.9rem;
   color: #30fdff;
 }
 

src/views/taishi/tanshi1.vue

@@ -2252,7 +2252,7 @@ export default {
   margin-left: 3%;
 }
 .left1-wrap-item b {
-  font-size: 1.2rem;
+  font-size: 0.9rem;
   color: #30fdff;
 }
 .center1 {

src/views/thought/getready/index.vue

@@ -511,7 +511,7 @@
       style="color: pink"
       :title="title3"
       :visible.sync="open33"
-      width="850px"
+      width="1200px"
       append-to-body
       id="fileinfodocx"
       class="el-dialog__header"
@@ -530,7 +530,7 @@
     <el-dialog
       :title="title3"
       :visible.sync="previewDialog"
-      width="850px"
+      width="1200px"
       append-to-body
       id="fileinfopdf"
       class="el-dialog__header"
@@ -1434,4 +1434,14 @@ export default {
   background-color: #004d86 ;
   color: #fff;
 }
+
+#fileinfodocx ::v-deep .el-dialog__body {
+  padding-right: 29px !important;
+}
+#fileinfopdf ::v-deep .el-dialog__body {
+  padding-right: 29px !important;
+}
+::v-deep .docx p, p.docx_1{
+  line-height: 2;
+}
 </style>

src/views/thought/parliament/index.vue

@@ -127,13 +127,9 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <el-button
-          size="btk"
-          type="text"
-          @click.native="ViewRead(scope.row)"
-        >
-          <a target="_blank">预览</a>
-        </el-button>
+          <el-button size="btk" type="text" @click.native="ViewRead(scope.row)">
+            <a target="_blank">预览</a>
+          </el-button>
           <el-button
             size="btk"
             type="text"
@@ -506,7 +502,7 @@
       style="color: pink"
       :title="title3"
       :visible.sync="open33"
-      width="850px"
+      width="1200px"
       append-to-body
       id="fileinfodocx"
       class="el-dialog__header"
@@ -525,7 +521,7 @@
     <el-dialog
       :title="title3"
       :visible.sync="previewDialog"
-      width="850px"
+      width="1200px"
       append-to-body
       id="fileinfopdf"
       class="el-dialog__header"
@@ -773,22 +769,22 @@ export default {
       var index = path.lastIndexOf(".");
       var str = path.substring(index + 1, path.length);
       console.log(str);
-      if (str == "docx"|| str == "doc") {
-      this.open33 = true;
-      axios({
-        method: "get",
-        responseType: "blob", // 设置响应文件格式
-        url: process.env.VUE_APP_BASE_API + row.filePath,
-      }).then(({ data }) => {
-        $(".docx").attr("id", "printArea");
-        docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
-      });
-    }else if (str == "pdf") {
+      if (str == "docx" || str == "doc") {
+        this.open33 = true;
+        axios({
+          method: "get",
+          responseType: "blob", // 设置响应文件格式
+          url: process.env.VUE_APP_BASE_API + row.filePath,
+        }).then(({ data }) => {
+          $(".docx").attr("id", "printArea");
+          docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
+        });
+      } else if (str == "pdf") {
         this.previewDialog = true;
         this.pdfurl = process.env.VUE_APP_BASE_API + row.filePath;
         this.pageNum = 1;
-      }else{
-        this.$message.error('只能预览Doc,Docx,Pdf格式的文件！')
+      } else {
+        this.$message.error("只能预览Doc,Docx,Pdf格式的文件！");
       }
     },
     // 获取执行人
@@ -1262,9 +1258,17 @@ export default {
   background: #1d96ff;
   color: white;
 }
-::v-deep 
-.el-table .el-table__fixed-header-wrapper th {
-  background-color: #004d86 ;
+::v-deep .el-table .el-table__fixed-header-wrapper th {
+  background-color: #004d86;
   color: #fff;
 }
+#fileinfodocx ::v-deep .el-dialog__body {
+  padding-right: 29px !important;
+}
+#fileinfopdf ::v-deep .el-dialog__body {
+  padding-right: 29px !important;
+}
+::v-deep .docx p, p.docx_1{
+  line-height: 2;
+}
 </style>

src/views/thought/teacherFile/index.vue

@@ -381,7 +381,7 @@
         style="color: pink"
         :title="title3"
         :visible.sync="open33"
-        width="850px"
+        width="1200px"
         append-to-body
         id="fileinfodocx"
         class="el-dialog__header"
@@ -399,7 +399,7 @@
       <el-dialog
         :title="title3"
         :visible.sync="previewDialog"
-        width="850px"
+        width="1200px"
         append-to-body
         id="fileinfopdf"
         class="el-dialog__header"
@@ -1724,4 +1724,13 @@ body,
 ::v-deep .video .el-dialog__body {
   padding: 30px 78px;
 }
+#fileinfodocx ::v-deep .el-dialog__body {
+  padding-right: 29px !important;
+}
+#fileinfopdf ::v-deep .el-dialog__body {
+  padding-right: 29px !important;
+}
+::v-deep .docx p, p.docx_1{
+  line-height: 2;
+}
 </style>