sunyanqiang 2 жил өмнө
parent
commit
a527b0a178
25 өөрчлөгдсөн 570 нэмэгдсэн , 302 устгасан
  1. 2 1
      src/api/grassrootsregistration/bdglarmament.js
  2. 2 1
      src/api/grassrootsregistration/bdgldrill.js
  3. 2 1
      src/api/grassrootsregistration/bdglequip.js
  4. 2 1
      src/api/grassrootsregistration/bdgleven.js
  5. 2 1
      src/api/grassrootsregistration/bdglfilemanagement.js
  6. 2 1
      src/api/grassrootsregistration/bdglmeeting.js
  7. 2 1
      src/api/grassrootsregistration/bdglparty.js
  8. 2 1
      src/api/grassrootsregistration/bdglpublicproperty.js
  9. 2 1
      src/api/grassrootsregistration/bdglsecrecy.js
  10. 2 1
      src/api/grassrootsregistration/bdglsoldier.js
  11. 17 16
      src/components/look_word/bdglarmament.vue
  12. 19 16
      src/components/look_word/bdglequip.vue
  13. 71 45
      src/views/grassrootsregistration/bdglarmaments/index.vue
  14. 1 1
      src/views/grassrootsregistration/bdgldiary/index.vue
  15. 37 15
      src/views/grassrootsregistration/bdgldrills/index.vue
  16. 48 27
      src/views/grassrootsregistration/bdglequips/index.vue
  17. 76 43
      src/views/grassrootsregistration/bdglevens/index.vue
  18. 47 24
      src/views/grassrootsregistration/bdglfilemanagements/index.vue
  19. 42 16
      src/views/grassrootsregistration/bdglmeetings/index.vue
  20. 43 17
      src/views/grassrootsregistration/bdglpartys/index.vue
  21. 48 25
      src/views/grassrootsregistration/bdglpublicpropertys/index.vue
  22. 51 26
      src/views/grassrootsregistration/bdglsecrecys/index.vue
  23. 48 20
      src/views/grassrootsregistration/bdglsoldiers/index.vue
  24. 1 1
      src/views/pt.vue
  25. 1 0
      src/views/workingArrangements/worktaskplan/index.vue

+ 2 - 1
src/api/grassrootsregistration/bdglarmament.js

@@ -63,7 +63,8 @@ export function exportBdglarmament(query) {
 // 领导列表
 export function armamentList(year) {
   return request({
-    url: `/grassrootsregistration/bdglarmament/armamentList?year=${year}`,
+    url: `/grassrootsregistration/bdglarmament/armamentList`,
     method: 'get',
+    params:{year:year}
   })
 }

+ 2 - 1
src/api/grassrootsregistration/bdgldrill.js

@@ -93,7 +93,8 @@ export function treeselects(id) {
 // 领导列表查看
 export function drillList(year) {
   return request({
-    url: `/grassrootsregistration/bdgldrill/drillList?year=${year}`,
+    url: `/grassrootsregistration/bdgldrill/drillList`,
     method: 'get',
+    params:{year:year}
   })
 }

+ 2 - 1
src/api/grassrootsregistration/bdglequip.js

@@ -79,7 +79,8 @@ export function getList(query) {
 // 查看领导列表
 export function equipList(year) {
   return request({
-    url: `/grassrootsregistration/bdglequip/equipList?year=${year}`,
+    url: `/grassrootsregistration/bdglequip/equipList`,
     method: 'get',
+    params:{year:year}
   })
 }

+ 2 - 1
src/api/grassrootsregistration/bdgleven.js

@@ -74,8 +74,9 @@ export function getDept(query) {
     // 领导本
     export function getMeetRecordList(year) {
       return request({
-       url: `/grassrootsregistration/bdgleven/getMeetRecordList?year=${year}`,
+       url: `/grassrootsregistration/bdgleven/getMeetRecordList`,
        method: 'get',
+       params:{year:year}
       })
      }
 

+ 2 - 1
src/api/grassrootsregistration/bdglfilemanagement.js

@@ -63,7 +63,8 @@ export function exportBdglfilemanagement(query) {
 // 列表
 export function docList(year) {
   return request({
-    url: `/grassrootsregistration/bdglfilemanagement/docList?year=${year}`,
+    url: `/grassrootsregistration/bdglfilemanagement/docList`,
     method: 'get',
+    params:{year:year}
   })
 }

+ 2 - 1
src/api/grassrootsregistration/bdglmeeting.js

@@ -210,8 +210,9 @@ export function getRenYuanXiangQing(query) {
 // 领导本列表
 export function getMeetingList(year) {
   return request({
-    url: `/grassrootsregistration/bdglmeeting/getMeetingList?year=${year}`,
+    url: `/grassrootsregistration/bdglmeeting/getMeetingList`,
     method: 'get',
+    params:{year:year}
   })
 }
 

+ 2 - 1
src/api/grassrootsregistration/bdglparty.js

@@ -71,8 +71,9 @@ export function getZhuChiRen(data) {
 //领导查看
 export function getPartyList(year) {
   return request({
-    url: `/grassrootsregistration/bdglparty/getPartyList?year=${year}`,
+    url: `/grassrootsregistration/bdglparty/getPartyList`,
     method: 'get',
+    params:{year:year}
   })
 }
 

+ 2 - 1
src/api/grassrootsregistration/bdglpublicproperty.js

@@ -63,7 +63,8 @@ export function exportBdglpublicproperty(query) {
 // 领导列表
 export function propertyList(year) {
   return request({
-    url: `/grassrootsregistration/bdglpublicproperty/propertyList?year=${year}`,
+    url: `/grassrootsregistration/bdglpublicproperty/propertyList`,
     method: 'get',
+    params:{year:year}
   })
 }

+ 2 - 1
src/api/grassrootsregistration/bdglsecrecy.js

@@ -62,7 +62,8 @@ export function exportBdglsecrecy(query) {
 // 领导列表
 export function getSecrecyStats(year) {
   return request({
-    url: `/grassrootsregistration/bdglsecrecy/getSecrecyStats?year=${year}`,
+    url: `/grassrootsregistration/bdglsecrecy/getSecrecyStats`,
     method: 'get',
+    params:{year:year}
   })
 }

+ 2 - 1
src/api/grassrootsregistration/bdglsoldier.js

@@ -55,8 +55,9 @@ export function exportBdglsoldier(query) {
 // 领导查询军人委员会会议登记本
 export function getSoldierList(year) {
   return request({
-    url: `/grassrootsregistration/bdglsoldier/getSoldierList?year=${year}`,
+    url: `/grassrootsregistration/bdglsoldier/getSoldierList`,
     method: 'get',
+    params:{year:year}
   })
 }
 

+ 17 - 16
src/components/look_word/bdglarmament.vue

@@ -22,6 +22,7 @@
           color: black;
           font-family: '宋体';
         "
+        v-if="message.length>0 "
       >
         装备名称:<span style="font-family: '仿宋_GB2312'"
           >{{ message[0].name }}
@@ -197,59 +198,59 @@
             align="center"
           >
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ i + 1 }}</span>
+              <span align="center" v-if="message">{{ i + 1 }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center" v-if="item.recordDate != null">
+              <span align="center" v-if="item.recordDate != null&&message">
                 {{ item.recordDate.split("-")[0] }}
               </span>
             </td>
             <td w valign="center" nowrap="" class="JR_right">
-              <span align="center" v-if="item.recordDate != null">
+              <span align="center" v-if="item.recordDate != null&&message">
                 {{ item.recordDate.split("-")[1] }}
               </span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center" v-if="item.recordDate != null">
+              <span align="center" v-if="item.recordDate != null&&message">
                 {{ item.recordDate.split("-")[2] }}
               </span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.metering }}</span>
+              <span align="center" v-if="message">{{ item.metering }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.prepareNumber }}</span>
+              <span align="center" v-if="message">{{ item.prepareNumber }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.gist }}</span>
+              <span align="center" v-if="message">{{ item.gist }}</span>
             </td>
 
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.sum }}</span>
+              <span align="center" v-if="message">{{ item.sum }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.intactNumber }}</span>
+              <span align="center" v-if="message">{{ item.intactNumber }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.repairNumber }}</span>
+              <span align="center" v-if="message">{{ item.repairNumber }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.sendNumber }}</span>
+              <span align="center" v-if="message">{{ item.sendNumber }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.standard }}</span>
+              <span align="center" v-if="message">{{ item.standard }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.existing }}</span>
+              <span align="center" v-if="message">{{ item.existing }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.flaw }}</span>
+              <span align="center" v-if="message">{{ item.flaw }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.peopleName }}</span>
+              <span align="center" v-if="message">{{ item.peopleName }}</span>
             </td>
             <td valign="center" nowrap="" class="JR_right">
-              <span align="center">{{ item.people1Name }}</span>
+              <span align="center" v-if="message">{{ item.people1Name }}</span>
             </td>
           </tr>
           <tr

+ 19 - 16
src/components/look_word/bdglequip.vue

@@ -266,7 +266,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center">{{ item.id }}</span>
+              <span align="center" v-if="message">{{ item.id }}</span>
             </td>
             <td
               width="63"
@@ -277,7 +277,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center">{{ item.type }}</span>
+              <span align="center" v-if="message">{{ item.type }}</span>
             </td>
             <td
               width="82"
@@ -288,7 +288,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{ item.title }}</span>
+              <span align="center" class="JR_right" v-if="message">{{ item.title }}</span>
             </td>
             <td
               width="64"
@@ -299,7 +299,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{ item.unitName }}</span>
+              <span align="center" class="JR_right" v-if="message">{{ item.unitName }}</span>
             </td>
             <td
               width="54"
@@ -310,7 +310,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{
+              <span align="center" class="JR_right" v-if="message">{{
                 item.granttime | dataFormatyss
               }}</span>
             </td>
@@ -323,7 +323,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{ item.grantnum }}</span>
+              <span align="center" class="JR_right" v-if="message">{{ item.grantnum }}</span>
             </td>
             <td
               width="47"
@@ -334,7 +334,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{ item.ownnum }}</span>
+              <span align="center" class="JR_right" v-if="message">{{ item.ownnum }}</span>
             </td>
             <td
               width="55"
@@ -345,7 +345,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{ item.stocknum }}</span>
+              <span align="center" class="JR_right" v-if="message">{{ item.stocknum }}</span>
             </td>
             <td
               width="53"
@@ -356,7 +356,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{
+              <span align="center" class="JR_right " v-if="message">{{
                 item.intime | dataFormatyss
               }}</span>
             </td>
@@ -369,7 +369,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{ item.innum }}</span>
+              <span align="center" class="JR_right" v-if="message">{{ item.innum }}</span>
             </td>
             <td
               width="72"
@@ -380,7 +380,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{ item.peopleName }}</span>
+              <span align="center" class="JR_right" v-if="message">{{ item.peopleName }}</span>
             </td>
             <td
               width="55"
@@ -391,7 +391,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{
+              <span align="center" class="JR_right" v-if="message">{{
                 item.outtime | dataFormatyss
               }}</span>
             </td>
@@ -404,7 +404,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{ item.outnum }}</span>
+              <span align="center" class="JR_right" v-if="message">{{ item.outnum }}</span>
             </td>
             <td
               width="75"
@@ -415,7 +415,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{
+              <span align="center" class="JR_right" v-if="message">{{
                 item.people1Name
               }}</span>
             </td>
@@ -428,7 +428,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{ item.quality }}</span>
+              <span align="center" class="JR_right" v-if="message">{{ item.quality }}</span>
             </td>
             <td
               width="55"
@@ -439,7 +439,7 @@
                 font-size: 16px;
               "
             >
-              <span align="center" class="JR_right">{{ item.info }}</span>
+              <span align="center" class="JR_right" v-if="message">{{ item.info }}</span>
             </td>
           </tr>
         </tbody>
@@ -555,10 +555,12 @@ export default {
         // footer: "测试页脚", //页脚标题
         direction: "Horizontal", //默认或不填写为纵向,Horizontal 为横向
         dom: "#contents", // dom节点
+        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);
@@ -775,6 +777,7 @@ export default {
 `;
     }
     tbody.innerHTML = html;
+  }
   },
   methods: {
     daochu() {

+ 71 - 45
src/views/grassrootsregistration/bdglarmaments/index.vue

@@ -2,35 +2,51 @@
 <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>
-    <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)">查看</el-button>
-        </div>
-      </li>
-    </ul>
+      :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">
+          <div class="names">{{ item1.deptName }}</div>
+          <div class="btn">
+            <el-button size="btJS" @click="chaKan(item1.deptId)"
+              >查看</el-button
+            >
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div v-if="status == 0">
+      <ul>
+        <li v-for="(item1, i) in lieList" :key="i">
+          <div class="names">{{ item1.deptName }}</div>
+          <div class="btn">
+            <el-button size="btJS" @click="chaKan(item1.deptId)"
+              >查看</el-button
+            >
+          </div>
+        </li>
+      </ul>
+    </div>
     <!-- 查看 -->
     <el-dialog
       :visible.sync="menuRoleVisible"
@@ -61,32 +77,38 @@ export default {
       //查看页面
       menuRoleVisible: false,
       title: null,
-      form:{},
-      year:null
+      form: {},
+      year: null,
+      status: null,
     };
   },
 
   created() {
-    this.getTime();
+    this.getSoulist();
   },
   methods: {
     resetQuery() {
       this.form.year = null;
-      this.getTime();
-    },
-    getTime() {
-      var myDate = new Date();
-      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
-      armamentList(this.year).then((res) => {
+      armamentList().then((res) => {
+        res.rows.forEach((item) => {
+          this.status = 1;
+        });
         this.lieList = res.rows;
       });
     },
     getSoulist() {
-      this.year = this.form.year;
-      if (this.year == null) {
-        this.getTime();
+      if (this.form.year == null || this.form.year == "") {
+        armamentList().then((res) => {
+          res.rows.forEach((item) => {
+            this.status = 1;
+          });
+          this.lieList = res.rows;
+        });
       } else {
-        armamentList(this.year).then((res) => {
+        armamentList(this.form.year).then((res) => {
+          res.rows.forEach((item) => {
+            this.status = 0;
+          });
           this.lieList = res.rows;
         });
       }
@@ -94,9 +116,13 @@ export default {
     chaKan(row) {
       const unitId = row;
       armamentunits(unitId).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看军械装备登记簿";
-        this.menuRoleVisible = true;
+        if (response.data.length > 0) {
+          this.wordInfo = response.data;
+          this.title = "查看军械装备登记簿";
+          this.menuRoleVisible = true;
+        } else {
+          this.$message.success("当前没有数据");
+        }
       });
     },
   },

+ 1 - 1
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -1360,7 +1360,7 @@ export default {
       this.getShiLiRen(this.form.deptId);
       this.getRenYuan(this.form.unitId);
       this.getShou(this.form.unitId);
-      this.getTimes();
+      // this.getTimes();
       // 判断是否全部选择
       if (this.form.unitId !== null && this.form.blogDate) {
         this.XunLian(this.form.unitId, this.form.blogDate);

+ 37 - 15
src/views/grassrootsregistration/bdgldrills/index.vue

@@ -23,6 +23,17 @@
         <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+' '">
+        <div class="names">{{ item1.deptName }}</div>
+        <div class="btn">
+          <el-button size="btJS" @click="chaKan(item1.deptId)">查看</el-button>
+        </div>
+      </li>
+    </ul>
+   </div>
+   <div v-if="status==0">
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -31,6 +42,7 @@
         </div>
       </li>
     </ul>
+   </div>
     <!-- 查看 -->
     <el-dialog
       :visible.sync="menuRoleVisible"
@@ -63,30 +75,36 @@ export default {
       title: null,
       form: {},
       year: null,
+      status:null
     };
   },
 
   created() {
-    this.getTime();
+    this.getSoulist();
   },
   methods: {
     resetQuery() {
       this.form.year = null;
-      this.getTime();
-    },
-    getTime() {
-      var myDate = new Date();
-      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
       drillList(this.year).then((res) => {
-        this.lieList = res.rows;
-      });
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
     },
     getSoulist() {
-      this.year = this.form.year;
-      if (this.year == null) {
-        this.getTime();
+      if (this.form.year == null||this.form.year=="") {
+        drillList().then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
       } else {
-        drillList(this.year).then((res) => {
+        drillList(this.form.year).then((res) => {
+          res.rows.forEach((item) => {
+           this.status =0
+          });
           this.lieList = res.rows;
         });
       }
@@ -94,9 +112,13 @@ export default {
     chaKan(row) {
       const unitId = row;
       getInfoByUnitId(unitId).then((response) => {
-        this.wordInfo = response.rows;
-        this.title = "查看军事训练登记簿";
-        this.menuRoleVisible = true;
+        if (response.rows.length > 0) {
+          this.wordInfo = response.rows;
+          this.title = "查看军事训练登记簿";
+          this.menuRoleVisible = true;
+        } else {
+          this.$message.success("当前没有数据");
+        }
       });
     },
   },

+ 48 - 27
src/views/grassrootsregistration/bdglequips/index.vue

@@ -23,14 +23,28 @@
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <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)">查看</el-button>
-        </div>
-      </li>
-    </ul>
+    <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)"
+              >查看</el-button
+            >
+          </div>
+        </li>
+      </ul>
+    </div>
+    <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)">查看</el-button>
+          </div>
+        </li>
+      </ul>
+    </div>
     <!-- 查看 -->
     <el-dialog
       :visible.sync="menuRoleVisible"
@@ -60,32 +74,38 @@ export default {
       menuRoleVisible: false,
       wordInfo: [],
       title: null,
-      form:{},
-      year:null
+      form: {},
+      year: null,
+      status: null,
     };
   },
 
   created() {
-    this.getTime();
+    this.getSoulist();
   },
   methods: {
     resetQuery() {
       this.form.year = null;
-      this.getTime();
-    },
-    getTime() {
-      var myDate = new Date();
-      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
-      equipList(this.year).then((res) => {
+      equipList().then((res) => {
+        res.rows.forEach((item) => {
+          this.status = 1;
+        });
         this.lieList = res.rows;
       });
     },
     getSoulist() {
-      this.year = this.form.year;
-      if (this.year == null) {
-        this.getTime();
+      if (this.form.year == null || this.form.year == "") {
+        equipList().then((res) => {
+          res.rows.forEach((item) => {
+            this.status = 1;
+          });
+          this.lieList = res.rows;
+        });
       } else {
-        equipList(this.year).then((res) => {
+        equipList(this.form.year).then((res) => {
+          res.rows.forEach((item) => {
+            this.status = 0;
+          });
           this.lieList = res.rows;
         });
       }
@@ -93,10 +113,13 @@ export default {
     chaKan(row) {
       const unitId = row;
       equipuntits(unitId).then((response) => {
-        // console.log(response);
-        this.wordInfo = response.data;
-        this.title = "查看训练器材/教材登记薄";
-        this.menuRoleVisible = true;
+        if (response.data.length > 0) {
+          this.wordInfo = response.data;
+          this.title = "查看训练器材/教材登记薄";
+          this.menuRoleVisible = true;
+        } else {
+          this.$message.success("当前没有数据");
+        }
       });
     },
   },
@@ -153,8 +176,6 @@ li {
   text-align: center;
 }
 
-
-
 ::v-deep .el-input__inner {
   cursor: pointer !important;
 }

+ 76 - 43
src/views/grassrootsregistration/bdglevens/index.vue

@@ -2,35 +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>
-    <ul>
+      :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, i1) in item" :key="i1">
+            <div class="names">{{ item1.deptName }}</div>
+            <div class="btn">
+              <el-button size="btJS" @click="chaKan(item1.deptId)"
+                >查看</el-button
+              >
+            </div>
+          </li>
+      </ul>
+     </div>
+     <!-- 搜索的时候列表 -->
+     <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)">查看</el-button>
         </div>
       </li>
-    </ul>
+      </ul>
+     </div>
 
     <!-- 查看第一次 -->
     <el-dialog
@@ -88,7 +103,7 @@
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        @pagination="chaKan1"
       />
     </el-dialog>
 
@@ -120,7 +135,8 @@ import bdgleven from "@/components/look_word/bdgleven.vue";
 export default {
   data() {
     return {
-      lieList: [],
+      lieList: [
+      ],
       //查看页面
       menuRoleVisible: false,
       title: null,
@@ -134,32 +150,38 @@ export default {
       loading: false,
       total: 0,
       unitId: undefined,
-      form:{},
-      year:null
+      form: {},
+      year: null,
+      status:null
     };
   },
 
   created() {
-    this.getTime();
+    this.getSoulist();
   },
   methods: {
     resetQuery() {
-      this.form.year = null;
-      this.getTime();
-    },
-    getTime() {
-      var myDate = new Date();
-      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
-      getMeetRecordList(this.year).then((res) => {
-        this.lieList = res.rows;
-      });
+      this.form.year=null;
+      getMeetRecordList().then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
     },
     getSoulist() {
-      this.year = this.form.year;
-      if (this.year == null) {
-        this.getTime();
+      if (this.form.year == null || this.form.year == "") {
+        getMeetRecordList().then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
       } else {
-        getMeetRecordList(this.year).then((res) => {
+        getMeetRecordList(this.form.year).then((res) => {
+          res.rows.forEach(item=>{
+            this.status=0
+          })
           this.lieList = res.rows;
         });
       }
@@ -174,6 +196,14 @@ export default {
         this.tableStatus = true;
       });
     },
+    chaKan1(row) {
+      getMeetRecordOnUnitList(this.queryParams).then((res) => {
+        this.bdglevenList = res.rows;
+        this.total = res.total;
+        this.title = "查看连务会记录本";
+        this.tableStatus = true;
+      });
+    },
     handleChakan(row) {
       this.tableStatus = false;
       // console.log(row);
@@ -228,9 +258,13 @@ export default {
 }
 
 ul {
-  display: flex;
   /* justify-content: space-between; */
   padding: 0 22px;
+  display: flex;
+  flex-wrap: wrap;
+}
+.span {
+  display: flex;
   flex-wrap: wrap;
 }
 
@@ -310,7 +344,6 @@ li {
   background: #00365f;
 }
 
-
 ::v-deep .el-input__inner {
   cursor: pointer !important;
 }

+ 47 - 24
src/views/grassrootsregistration/bdglfilemanagements/index.vue

@@ -23,14 +23,26 @@
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <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)">查看</el-button>
-        </div>
-      </li>
-    </ul>
+     <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)">查看</el-button>
+          </div>
+        </li>
+      </ul>
+     </div>
+     <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)">查看</el-button>
+          </div>
+        </li>
+      </ul>
+     </div>
     <!-- 查看 -->
     <el-dialog
       :visible.sync="menuRoleVisible"
@@ -63,30 +75,36 @@ export default {
       title: null,
       form: {},
       year: null,
+      status:null
     };
   },
 
   created() {
-    this.getTime();
+    this.getSoulist();
   },
   methods: {
     resetQuery() {
       this.form.year = null;
-      this.getTime();
-    },
-    getTime() {
-      var myDate = new Date();
-      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
-      docList(this.year).then((res) => {
-        this.lieList = res.rows;
-      });
+      docList(this.form.year).then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
     },
     getSoulist() {
-      this.year = this.form.year;
-      if (this.year == null) {
-        this.getTime();
+      if (this.form.year == null||this.form.year=="") {
+        docList().then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
       } else {
-        docList(this.year).then((res) => {
+        docList(this.form.year).then((res) => {
+          res.rows.forEach((item) => {
+           this.status =0
+          });
           this.lieList = res.rows;
         });
       }
@@ -94,9 +112,14 @@ export default {
     chaKan(row) {
       const unitId = row;
       fileunits(unitId).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看文件管理登记本";
-        this.menuRoleVisible = true;
+
+        if (response.data.length > 0) {
+          this.wordInfo = response.data;
+          this.title = "查看文件管理登记本";
+          this.menuRoleVisible = true;
+        } else {
+          this.$message.success("当前没有数据");
+        }
       });
     },
   },

+ 42 - 16
src/views/grassrootsregistration/bdglmeetings/index.vue

@@ -23,6 +23,17 @@
       <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+' '">
+        <div class="names">{{ item1.deptName }}</div>
+        <div class="btn">
+          <el-button size="btJS" @click="chaKan(item1)">查看</el-button>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div v-if="status==0">
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -31,6 +42,7 @@
         </div>
       </li>
     </ul>
+  </div>
 
     <!-- 查看第一次 -->
     <el-dialog :visible.sync="tableStatus" :title="title" append-to-body id="list" :close-on-click-modal="false"
@@ -70,7 +82,7 @@
       </el-table>
 
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
+        @pagination="chaKan1" />
     </el-dialog>
 
     <!-- 查看 -->
@@ -107,31 +119,37 @@ export default {
       total: 0,
       unitId: undefined,
       form:{},
-      year:null
+      year:null,
+      status:null
     };
   },
 
   created() {
-    this.getTime();
+    this.getSoulist();
   },
   methods: {
     resetQuery() {
-      this.form.year = null;
-      this.getTime();
-    },
-    getTime() {
-      var myDate = new Date();
-      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
-      getMeetingList(this.year).then((res) => {
-        this.lieList = res.rows;
-      });
+      this.form.year=null;
+      getMeetingList().then((res) => {
+        res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
     },
     getSoulist() {
-      this.year = this.form.year;
-      if (this.year == null) {
-        this.getTime();
+      if (this.form.year == null||this.form.year=="") {
+        getMeetingList().then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
       } else {
-        getMeetingList(this.year).then((res) => {
+        getMeetingList(this.form.year).then((res) => {
+          res.rows.forEach((item) => {
+           this.status =0
+          });
           this.lieList = res.rows;
         });
       }
@@ -146,6 +164,14 @@ export default {
         this.total = response.total;
       });
     },
+    chaKan1(row) {
+      getMeetingOnUnitList(this.queryParams).then((response) => {
+        this.bdglpartyList = response.rows;
+        this.title = "查看团支部记录本";
+        this.tableStatus = true;
+        this.total = response.total;
+      });
+    },
     handleChakan(row) {
       this.tableStatus = false;
       const id = row.id || this.ids;

+ 43 - 17
src/views/grassrootsregistration/bdglpartys/index.vue

@@ -23,6 +23,17 @@
       <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">
+        <div class="names">{{ item1.deptName }}</div>
+        <div class="btn">
+          <el-button size="btJS" @click="chaKan(item1)">查看</el-button>
+        </div>
+      </li>
+  </ul>
+   </div>
+   <div v-if="status ==0">
     <ul>
       <li v-for="(item, i) in lieList" :key="i">
         <div class="names">{{ item.deptName }}</div>
@@ -30,7 +41,8 @@
           <el-button size="btJS" @click="chaKan(item)">查看</el-button>
         </div>
       </li>
-    </ul>
+  </ul>
+   </div>
 
     <!-- 查看第一次 -->
     <el-dialog
@@ -101,7 +113,7 @@
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        @pagination="chaKan1"
       />
     </el-dialog>
 
@@ -149,31 +161,37 @@ export default {
       total: 0,
       unitId: undefined,
       form:{},
-      year:null
+      year:null,
+      status:null
     };
   },
 
   created() {
-    this.getTime();
+    this.getSoulist();
   },
   methods: {
     resetQuery() {
-      this.form.year = null;
-      this.getTime();
-    },
-    getTime() {
-      var myDate = new Date();
-      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
-      getPartyList(this.year).then((res) => {
-        this.lieList = res.rows;
-      });
+      this.form.year=null;
+      getPartyList().then((res) => {
+        res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
     },
     getSoulist() {
-      this.year = this.form.year;
-      if (this.year == null) {
-        this.getTime();
+      if (this.form.year == null ||this.form.year=="") {
+        getPartyList().then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
       } else {
-        getPartyList(this.year).then((res) => {
+        getPartyList(this.form.year).then((res) => {
+          res.rows.forEach((item) => {
+           this.status =0
+          });
           this.lieList = res.rows;
         });
       }
@@ -188,6 +206,14 @@ export default {
         this.tableStatus = true;
       });
     },
+    chaKan1(row) {
+      getPartyOnUnitList(this.queryParams).then((response) => {
+        this.bdglpartyList = response.rows;
+        this.total = response.total;
+        this.title = "查看党支部记录本";
+        this.tableStatus = true;
+      });
+    },
     handleChakan(row) {
       this.tableStatus = false;
       // console.log(row);

+ 48 - 25
src/views/grassrootsregistration/bdglpublicpropertys/index.vue

@@ -23,14 +23,26 @@
       <el-button size="btr" @click="resetQuery">重置</el-button>
     </el-form-item>
   </el-form>
-    <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)">查看</el-button>
-        </div>
-      </li>
-    </ul>
+    <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)">查看</el-button>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <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)">查看</el-button>
+          </div>
+        </li>
+      </ul>
+    </div>
     <!-- 查看 -->
     <el-dialog
       :visible.sync="menuRoleVisible"
@@ -62,31 +74,37 @@ export default {
       menuRoleVisible: false,
       title: null,
       form:{},
-      yrar:null
+      yrar:null,
+      status:null
     };
   },
 
   created() {
-    this.getTime();
+    this.getSoulist();
   },
   methods: {
     resetQuery() {
       this.form.year = null;
-      this.getTime();
-    },
-    getTime() {
-      var myDate = new Date();
-      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
-      propertyList(this.year).then((res) => {
-        this.lieList = res.rows;
-      });
+      propertyList().then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
     },
     getSoulist() {
-      this.year = this.form.year;
-      if (this.year == null) {
-        this.getTime();
+      if (this.form.year == null||this.form.year=="") {
+        propertyList().then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
       } else {
-        propertyList(this.year).then((res) => {
+        propertyList(this.form.year).then((res) => {
+          res.rows.forEach((item) => {
+           this.status =0
+          });
           this.lieList = res.rows;
         });
       }
@@ -94,9 +112,14 @@ export default {
     chaKan(row) {
       const unitId = row;
       publiccpropertyunits(unitId).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看营产/公物管理登记簿";
-        this.menuRoleVisible = true;
+
+        if (response.data.length > 0) {
+          this.wordInfo = response.data;
+          this.title = "查看营产/公物管理登记簿";
+          this.menuRoleVisible = true;
+        } else {
+          this.$message.success("当前没有数据");
+        }
       });
     },
   },

+ 51 - 26
src/views/grassrootsregistration/bdglsecrecys/index.vue

@@ -23,16 +23,30 @@
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <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, item.startTime)"
-            >查看</el-button
-          >
-        </div>
-      </li>
-    </ul>
+     <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)"
+              >查看</el-button
+            >
+          </div>
+        </li>
+      </ul>
+     </div>
+     <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, item.startTime)"
+              >查看</el-button
+            >
+          </div>
+        </li>
+      </ul>
+     </div>
     <!-- 查看 -->
     <el-dialog
       :visible.sync="menuRoleVisible"
@@ -65,30 +79,36 @@ export default {
       title: null,
       form:{},
       year:null,
+      status:null
     };
   },
 
   created() {
-   this.getTime()
+    this.getSoulist()
   },
   methods: {
     resetQuery() {
       this.form.year = null;
-      this.getTime();
-    },
-    getTime() {
-      var myDate = new Date();
-      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
-      getSecrecyStats(this.year).then((res) => {
-        this.lieList = res.rows;
-      });
+      getSecrecyStats().then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
     },
     getSoulist() {
-      this.year = this.form.year;
-      if (this.year == null) {
-       this.getTime()
+      if (this.form.year == null||this.form.year=="") {
+        getSecrecyStats().then((res) => {
+          res.rows.forEach((item) => {
+           this.status =1
+          });
+          this.lieList = res.rows;
+        });
       } else {
-        getSecrecyStats(this.year).then((res) => {
+        getSecrecyStats(this.form.year).then((res) => {
+          res.rows.forEach((item) => {
+           this.status =0
+          });
           this.lieList = res.rows;
         });
       }
@@ -97,9 +117,14 @@ export default {
       const unitId = row;
       const stiem = tiem;
       units(unitId, stiem).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看网络/手机/涉密载体登记本";
-        this.menuRoleVisible = true;
+
+        if (response.data.length > 0) {
+          this.wordInfo = response.data;
+          this.title = "查看网络/手机/涉密载体登记本";
+          this.menuRoleVisible = true;
+        } else {
+          this.$message.success("当前没有数据");
+        }
       });
     },
   },

+ 48 - 20
src/views/grassrootsregistration/bdglsoldiers/index.vue

@@ -23,14 +23,28 @@
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <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)">查看</el-button>
-        </div>
-      </li>
-    </ul>
+    <div v-if="status == 1">
+      <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)">查看</el-button>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div v-if="status == 0">
+      <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)"
+              >查看</el-button
+            >
+          </div>
+        </li>
+      </ul>
+    </div>
 
     <!-- 查看第一次 -->
     <el-dialog
@@ -105,7 +119,7 @@
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        @pagination="chaKan1"
       />
     </el-dialog>
     <!-- 查看二次-->
@@ -154,31 +168,37 @@ export default {
       unitId: undefined,
       form: {},
       year: null,
+      status: null,
     };
   },
 
   created() {
-    this.getTime();
+    this.getSoulist();
   },
   methods: {
     resetQuery() {
       this.form.year = null;
-      this.getTime();
-    },
-    getTime() {
-      var myDate = new Date();
-      this.year = myDate.getFullYear() + ""; //获取当前年份(2位)
       getSoldierList(this.year).then((res) => {
+        res.rows.forEach((item) => {
+          this.status = 1;
+        });
         this.lieList = res.rows;
       });
     },
     getSoulist() {
-      this.year = this.form.year;
-      if (this.year == null) {
-       this.getTime()
+      if (this.form.year == null||this.form.year=="") {
+        getSoldierList().then((res) => {
+          res.rows.forEach((item) => {
+          this.status = 0;
+        });
+        this.lieList = res.rows;
+        });
       } else {
-        getSoldierList(this.year).then((res) => {
-          this.lieList = res.rows;
+        getSoldierList(this.form.year).then((res) => {
+          res.rows.forEach((item) => {
+          this.status = 1;
+        });
+        this.lieList = res.rows;
         });
       }
     },
@@ -199,6 +219,14 @@ export default {
         this.tableStatus = true;
       });
     },
+    chaKan1(row) {
+      getSoldierOnUnitList(this.queryParams).then((response) => {
+        this.bdglpartyList = response.rows;
+        this.total = response.total;
+        this.title = "查看军人委员会工作记录本";
+        this.tableStatus = true;
+      });
+    },
     handleChakan(row) {
       this.tableStatus = false;
       // console.log(row);

+ 1 - 1
src/views/pt.vue

@@ -388,7 +388,7 @@
                 <a href="#" class="a">医疗卫生管理</a>
               </div>
             </li>
-            <li v-if="str.includes('涉密物品外借') || str.includes('admin')">
+            <li v-if="str.includes('涉密载体') || str.includes('admin')">
               <div class="demo-box">
                 <div
                   class="demo active"

+ 1 - 0
src/views/workingArrangements/worktaskplan/index.vue

@@ -47,6 +47,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-if="aaa==1"
           v-hasPermi="['workingArrangements:worktaskplan:add']"
           >新增</el-button
         >