Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

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

@@ -3,14 +3,14 @@
     <el-dialog 
       width="21cm"
       height="10cm" 
-       :modal-append-to-body='true' :append-to-body="true" title="样品标签" :visible.sync="scanVisible" @close="sacnClose">
+       :modal-append-to-body='true' :append-to-body="true" title="样品标签" :visible.sync="scanVisible">
       <!-- 表单是否显示 -->
       <div style="height:500px" v-if="scanVisible">
           <div ref="qrcode" id="box">
           <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" -->
@@ -308,9 +308,6 @@ export default {
           this.list = list
       })
     },
-    sacnClose(){
-      this.list = []
-    }
   }
 }
 </script>
@@ -329,7 +326,8 @@ export default {
   display: inline-block;
   // justify-content: space-around;
   // flex-direction: column;
-  margin: 10px 5px;
+  // margin: 10px 5px;
+  margin: 10px 300px;
   border-radius: 4px;
   background-color: #fff;
 }
@@ -363,5 +361,8 @@ export default {
   display: flex;
   align-items: center;
 
+}
+.All{
+  
 }
 </style>