修改表

src/api/grassrootsregistration/bdglarmament.js

@@ -16,6 +16,14 @@ export function getBdglarmament(id) {
     method: 'get'
   })
 }
+// 查看军械装备登记簿详细
+export function armamentunits(id) {
+  return request({
+    url: '/grassrootsregistration/bdglarmament/armamentunits?unitid=' + id,
+    method: 'get'
+  })
+}
+
 
 // 新增军械装备登记簿
 export function addBdglarmament(data) {
@@ -50,4 +58,4 @@ export function exportBdglarmament(query) {
     method: 'get',
     params: query
   })
-}
+}

src/api/grassrootsregistration/bdglpublicproperty.js

@@ -17,6 +17,14 @@ export function getBdglpublicproperty(id) {
   })
 }
 
+// 查看营产，公物管理登记簿详细
+export function publiccpropertyunits(id) {
+  return request({
+    url: '/grassrootsregistration/bdglpublicproperty/publiccpropertyunits?unitid=' + id,
+    method: 'get'
+  })
+}
+
 // 新增营产，公物管理登记簿
 export function addBdglpublicproperty(data) {
   return request({
@@ -50,4 +58,4 @@ export function exportBdglpublicproperty(query) {
     method: 'get',
     params: query
   })
-}
+}

src/components/look_word/bdglarmament.vue

@@ -153,158 +153,58 @@
               <p align="center" style="font-family: 'songti'">缺陷种类及数量</p>
             </td>
           </tr>
-          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'fangsong'">
+          <tr class="JR_tr" style="font-size: 16px;font-weight: 500;font-family: 'fangsong'" v-for="(item,i) in message" :key="i+' '">
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{message.id}}</p>
+              <p align="center">{{item.id}}</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center"  v-if="message.recordDate!=null">{{message.recordDate.split('-')[0]}}</p>
+              <p align="center"  v-if="item.recordDate!=null">{{item.recordDate.split('-')[0]}}</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right">
-              <p align="center"  v-if="message.recordDate!=null">{{message.recordDate.split('-')[1]}}</p>
+              <p align="center"  v-if="item.recordDate!=null">{{item.recordDate.split('-')[1]}}</p>
             </td>
             <td width="37" valign="center" nowrap="" class="JR_right" >
-              <p align="center" v-if="message.recordDate!=null">{{message.recordDate.split('-')[2]}}</p>
+              <p align="center" v-if="item.recordDate!=null">{{item.recordDate.split('-')[2]}}</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.metering }}</p>
+              <p align="center">{{ item.metering }}</p>
             </td>
             <td width="94" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.prepareNumber }}</p>
+              <p align="center">{{ item.prepareNumber }}</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.gist }}</p>
+              <p align="center">{{ item.gist }}</p>
             </td>
 
             <td width="47" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.sum }}</p>
+              <p align="center">{{ item.sum }}</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.intactNumber }}</p>
+              <p align="center">{{ item.intactNumber }}</p>
             </td>
             <td width="56" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.repairNumber }}</p>
+              <p align="center">{{ item.repairNumber }}</p>
             </td>
             <td width="47" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.sendNumber }}</p>
+              <p align="center">{{ item.sendNumber }}</p>
             </td>
             <td width="66" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.standard }}</p>
+              <p align="center">{{ item.standard }}</p>
             </td>
             <td width="56" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.existing }}</p>
+              <p align="center">{{ item.existing }}</p>
             </td>
             <td width="94" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.flaw }}</p>
+              <p align="center">{{ item.flaw }}</p>
             </td>
             <td width="75" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.peopleName }}</p>
+              <p align="center">{{ item.peopleName }}</p>
             </td>
             <td width="75" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.people1Name }}</p>
+              <p align="center">{{ item.people1Name }}</p>
             </td>
           </tr>
-          <tr class="JR_tr">
-            <td width="37" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="37" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="37" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="37" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-          </tr>
-          <tr class="JR_tr">
-            <td width="37" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="37" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="37" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="37" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-          </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" v-for="(item1,i1) in num" :key="i1+''">
             <td width="37" height="45px" valign="center" nowrap="">
               <p align="center"></p>
             </td>
@@ -377,6 +277,7 @@ export default {
   data() {
     return {
       title: "军械装备登记表（总表）",
+      num:0,
       style:
         ".b1{width:860px !important};.JR_tr {height: 40px;};.JR_left{font-size: 1.201em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.231em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
@@ -384,7 +285,13 @@ export default {
   created(){
     console.log(this.message);
   },
-
+  created() {
+    if (this.message.length >= 3){
+      this.num = 0
+    } else {
+      this.num = 3 - this.message.length
+    }
+  },
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);
@@ -408,4 +315,4 @@ tr:last-child {
   border: 1px solid rgb(129, 130, 131);
   border-radius: 5px;
 }
-</style>
+</style>

src/components/look_word/bdglpublicproperty.vue

@@ -103,266 +103,50 @@
             </th>
           </tr>
 
-          <tr class="JR_tr" style="font-family: 'fangsong'">
+          <tr class="JR_tr" style="font-family: 'fangsong'"  v-for="(item,i) in message" :key='i+"  "'>
             <td width="47" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.id }}</p>
+              <p align="center">{{ item.id }}</p>
             </td>
             <td width="66" valign="center" class="JR_right">
-              <p align="center" width="66">{{ message.name }}</p>
+              <p align="center" width="66">{{ item.name }}</p>
             </td>
             <td width="94" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.version }}</p>
+              <p align="center">{{ item.version }}</p>
             </td>
             <td width="56" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.quantity }}</p>
+              <p align="center">{{ item.quantity }}</p>
             </td>
             <td width="66" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.price }}</p>
+              <p align="center">{{ item.price }}</p>
             </td>
             <td width="66" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.totalPrice }}</p>
+              <p align="center">{{ item.totalPrice }}</p>
             </td>
             <td width="122" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.equipTime }}</p>
+              <p align="center">{{ item.equipTime }}</p>
             </td>
             <td width="94" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.peopleName }}</p>
+              <p align="center">{{ item.peopleName }}</p>
             </td>
             <td width="75" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.acquire }}</p>
+              <p align="center">{{ item.acquire }}</p>
             </td>
 
             <td width="75" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.quality }}</p>
+              <p align="center">{{ item.quality }}</p>
             </td>
             <td width="75" valign="center" nowrap="" class="JR_right">
               <p align="center">是</p>
             </td>
             <td width="75" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.address }}</p>
+              <p align="center">{{ item.address }}</p>
             </td>
             <td width="56" valign="center" nowrap="" class="JR_right">
-              <p align="center">{{ message.remark }}</p>
+              <p align="center">{{ item.remark }}</p>
             </td>
           </tr>
 
-          <tr class="JR_tr">
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
-              </p>
-            </td>
-            <td width="66" height="45px" valign="center">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="122" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-          </tr>
-
-          <tr class="JR_tr">
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
-              </p>
-            </td>
-            <td width="66" height="45px" valign="center">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="122" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-          </tr>
-          <tr class="JR_tr">
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
-              </p>
-            </td>
-            <td width="66" height="45px" valign="center">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="122" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-          </tr>
-          <tr class="JR_tr">
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
-              </p>
-            </td>
-            <td width="66" height="45px" valign="center">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="122" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-          </tr>
-          <tr class="JR_tr">
-            <td width="47" height="45px" valign="center" nowrap="">
-              <p align="center" style="margin: 5px">
-                <span style="display: none"></span>
-              </p>
-            </td>
-            <td width="66" height="45px" valign="center">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="66" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="122" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="94" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="75" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-            <td width="56" height="45px" valign="center" nowrap="">
-              <p align="center"></p>
-            </td>
-          </tr>
-          <tr class="JR_tr">
+          <tr class="JR_tr" v-for="(item1,i1) in num" :key="i1+''">
             <td width="47" height="45px" valign="center" nowrap="">
               <p align="center" style="margin: 5px">
                 <span style="display: none"></span>
@@ -419,10 +203,18 @@ export default {
   data() {
     return {
       title: "营产、公物管理登记簿",
+      num:0,
       style:
         ".b1{width:860px !important};.JR_tr {height: 40px;width:105px};.JR_left{font-size: 1.131em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.231em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
     };
   },
+  created(){
+     if (this.message.length >= 6){
+          this.num = 0
+        } else {
+          this.num = 6 - this.message.length
+        }
+  },
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);
@@ -445,4 +237,4 @@ tr:last-child {
   border: 1px solid rgb(129, 130, 131);
   border-radius: 5px;
 }
-</style>
+</style>

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -324,6 +324,7 @@ import {
   addBdglarmament,
   updateBdglarmament,
   exportBdglarmament,
+  armamentunits
 } from "@/api/grassrootsregistration/bdglarmament";
 import {
   getZhuChiRen,
@@ -559,8 +560,8 @@ export default {
     handleChakan(row) {
       // 是否隐藏按钮
       this.opens = false;
-      const id = row.id || this.ids;
-      getBdglarmament(id).then((response) => {
+      const id = row.unitId;
+      armamentunits(id).then((response) => {
         this.wordInfo = response.data;
         this.title = "查看军械装备登记簿";
         this.menuRoleVisible = true;
@@ -791,4 +792,4 @@ export default {
 #chakan /deep/ .el-dialog__body {
   padding: 30px 0px 30px 5px;
 }
-</style>
+</style>

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -288,6 +288,7 @@ import {
   addBdglpublicproperty,
   updateBdglpublicproperty,
   exportBdglpublicproperty,
+  publiccpropertyunits
 } from "@/api/grassrootsregistration/bdglpublicproperty";
 import {
   getZhuChiRen,
@@ -309,7 +310,7 @@ export default {
     return {
       //查看页面
       menuRoleVisible: false,
-      wordInfo: {},
+      wordInfo: [],
       //判断关闭
       style: "2",
       // 遮罩层
@@ -503,10 +504,10 @@ export default {
     },
     //查看按钮操作
     handleChakan(row) {
+    const unitId =row.unitId
       // 是否隐藏按钮
       this.opens = false;
-      const id = row.id || this.ids;
-      getBdglpublicproperty(id).then((response) => {
+      publiccpropertyunits(unitId).then((response) => {
         this.wordInfo = response.data;
         this.title = "查看营产/公物管理登记簿";
         this.menuRoleVisible = true;
@@ -742,4 +743,4 @@ export default {
 #chakan /deep/ .el-dialog__body {
   padding: 30px 0px 30px 16px;
 }
-</style>
+</style>