修改标签

src/views/system/jbdScan/goods/deviceFailureTag.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bg">
     <el-dialog 
-      width="21cm"
+      width="11cm"
       height="10cm" 
        :modal-append-to-body='true' :append-to-body="true" title="设备故障标签" :visible.sync="scanVisible">
       <!-- 表单是否显示 -->
@@ -10,9 +10,9 @@
           <vue-easy-print tableShow ref="easyPrint"
             :onePageRow="onePageRow"
           >
-            <div v-for="(item1, index1) in list" :key="index1"  style="display: inline-block" >
+            <div v-for="(item1, index1) in list" :key="index1"  >
               <div v-for="(item2, index2) in parseInt(item1.num)" :key="index2" 
-              style="display: inline-block"
+              
               ><!-- style="page-break-after:always" -->
                <div class="All">
                 <div class="tagBox">
@@ -54,7 +54,7 @@
                   </div>
                  
                   <div class="ewm">
-                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 :displayValue="false"></vue-barcode>
+                    <vue-barcode :value="item1.serial" :width=2 :height=25 :fontSize=15 :margin=8 :displayValue="false"></vue-barcode>
                   </div>
 
                   <!-- <div
@@ -199,18 +199,28 @@ export default {
   // height: auto;
 }
 
-.tagBox {
-  width: 283px;   // 300  240
-  height: 283px;  // 180  150  94
+// .tagBox {
+//   width: 283px;   // 300  240
+//   height: 283px;  // 180  150  94
+//   position: relative;
+//   border: 2px solid #0a0a0a;
+//   padding: 5px;
+//   display: inline-block;
+//   // justify-content: space-around;
+//   // flex-direction: column;
+//   margin: 10px 5px;
+//   border-radius: 4px;
+//   background-color: #fff;
+// }
+.tagBox{
+  width: 300px;
+  height: 240px;
+  font-size: 14px;
+  padding: 10px;
+  margin: 0 auto 20px;
   position: relative;
-  border: 2px solid #ed0c0c;
-  padding: 5px;
-  display: inline-block;
-  // justify-content: space-around;
-  // flex-direction: column;
-  margin: 10px 5px;
+  border: 1px solid #000;
   border-radius: 4px;
-  background-color: #fff;
 }
 .ewm{
 
@@ -239,10 +249,13 @@ export default {
 .lh {
   // line-height: auto;
   font-size: 18px;  //16
-  color: #ed0c0c;
+  color: #0a0a0a;
   display: flex;
   align-items: center;
   // padding: 4px;
 
 }
+.All{
+  text-align: center
+}
 </style>

src/views/system/jbdScan/goods/deviceTag.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bg">
     <el-dialog 
-      width="21cm"
+      width="11cm"
       height="10cm" 
        :modal-append-to-body='true' :append-to-body="true" title="设备标签" :visible.sync="scanVisible">
       <!-- 表单是否显示 -->
@@ -10,9 +10,9 @@
           <vue-easy-print tableShow ref="easyPrint"
             :onePageRow="onePageRow"
           >
-            <div v-for="(item1, index1) in list" :key="index1"  style="display: inline-block" >
+            <div v-for="(item1, index1) in list" :key="index1"  >
               <div v-for="(item2, index2) in parseInt(item1.num)" :key="index2" 
-              style="display: inline-block"
+              
               ><!-- style="page-break-after:always" -->
                <div class="All">
                 <div class="tagBox">
@@ -26,6 +26,10 @@
                       <div>{{ item1.serial }}</div>
                     </div>
                   </div>
+                  <div class="lh">
+                    <div>规格型号：</div>
+                    <div>{{ item1.specifications }}</div>
+                  </div>
                   <div class="lh">
                     <div>存放地点：</div>
                     <div>{{ item1.local }}</div>
@@ -55,7 +59,7 @@
                   </div>
                  
                   <div class="ewm">
-                    <vue-barcode :value="item1.serial" :width=1.5 :height=25 :fontSize=15 :margin=8 :displayValue="false"></vue-barcode>
+                    <vue-barcode :value="item1.serial" :width=2 :height=25 :fontSize=15 :margin=8 :displayValue="false"></vue-barcode>
                   </div>
 
                   <!-- <div
@@ -121,7 +125,8 @@ export default {
         condition: 1,
         money:1,
         time:1,
-        status:1
+        status:1,
+        specifications:1
       }],
       visible: true,
     }
@@ -166,6 +171,7 @@ export default {
               money:item.zi_chan_yuan_zhi_,
               time:item.qi_yong_ri_qi_!=null?this.getTime(item.qi_yong_ri_qi_):'',
               status:item.she_bei_zhuang_ta,
+              specifications:item.gui_ge_xing_hao_
             }
             list.push(o)
           })
@@ -198,19 +204,32 @@ export default {
 .bg {
   // height: auto;
 }
+.All{
+  text-align: center
+}
+// .tagBox {
+//   width: 283px;   // 300  240
+//   height: 283px;  // 180  150  94
+//   position: relative;
+//   border: 2px solid #000000;
+//   padding: 5px;
+//   display: inline-block;
+//   // justify-content: space-around;
+//   // flex-direction: column;
+//   margin: 10px 5px;
+//   border-radius: 4px;
+//   background-color: #fff;
+// }
 
-.tagBox {
-  width: 283px;   // 300  240
-  height: 283px;  // 180  150  94
+.tagBox{
+  width: 300px;
+  height: 240px;
+  font-size: 14px;
+  padding: 10px;
+  margin: 0 auto 20px;
   position: relative;
-  border: 2px solid #000000;
-  padding: 5px;
-  display: inline-block;
-  // justify-content: space-around;
-  // flex-direction: column;
-  margin: 10px 5px;
+  border: 1px solid #000;
   border-radius: 4px;
-  background-color: #fff;
 }
 .ewm{
 

src/views/system/jbdScan/goods/deviceVerificationTag.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bg">
     <el-dialog 
-      width="21cm"
+      width="11cm"
       height="10cm" 
        :modal-append-to-body='true' :append-to-body="true" title="设备检定校准标签" :visible.sync="scanVisible">
       <!-- 表单是否显示 -->
@@ -10,9 +10,9 @@
           <vue-easy-print tableShow ref="easyPrint"
             :onePageRow="onePageRow"
           >
-            <div v-for="(item1, index1) in list" :key="index1"  style="display: inline-block" >
+            <div v-for="(item1, index1) in list" :key="index1" >
               <div v-for="(item2, index2) in parseInt(item1.num)" :key="index2" 
-              style="display: inline-block"
+              
               ><!-- style="page-break-after:always" -->
                <div class="All">
                 <div class="tagBox">
@@ -215,6 +215,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
+.All{
+  text-align: center
+}
 .bg {
   // height: auto;
 }