Merge remote-tracking branch 'origin/master'

src/views/modules/label/printer.vue

@@ -1530,6 +1530,7 @@ export default {
     </el-tab-pane>
   </el-tabs>
 
+  <!--  产品和箱标 卷标-->
   <el-dialog v-drag title="Print Label" :close-on-click-modal="false" @close="closePrintDialog" :visible.sync="printVisible" width="600px" modal-append-to-body>
     <el-form :model="printCurrentPart" ref="printForm" :rules="printRules" label-position="top" >
       <el-row :gutter="10">
@@ -1688,7 +1689,7 @@ export default {
       <el-button style="width: 60px" @click="printVisible = false">Cancel</el-button>
     </div>
   </el-dialog>
-
+  <!-- 物流 -->
   <el-dialog v-drag title="Print Label" :close-on-click-modal="false" :visible.sync="logisticVisible" width="400px">
     <el-form :model="currentPartLogistic" label-position="top" :rules="printRules" ref="logisticForm">
       <el-row :gutter="10">