Merge remote-tracking branch 'origin/master'

src/views/wms/returnorderzs/index.vue

@@ -283,23 +283,21 @@
           <el-row>
             <div class="my-print-head">
               <el-col :span="24" style="text-align: center;">
-                  <h3 style="margin: 0; display: flex; align-items: center; justify-content: center; text-align: center; margin-left: 250px;">
+                <div style="display: flex; align-items: center; justify-content: center; margin-top: 10px;">
-                    普通领料/退料单
+                  <div style="text-align: center; margin-left: 250px;">
-                    <svg id="barcode" style="margin-left: 10px;"></svg>
+                    <h3 style="margin: 0;">普通领料/退料单</h3>
-                  </h3>
-                  <div style="margin-top: 10px;">
                     <span>领料</span>
                     <span style="margin-left: 20px;">退料 <span style="color: green;">✓</span></span>
                   </div>
-<!--                  &lt;!&ndash; 将条形码放在这里 &ndash;&gt;-->
+                  <div style="margin-left: 20px;">
-<!--                  <div style="margin-top: 10px; display: flex; justify-content: center;">-->
+                    <!-- 将条形码放在这里 -->
-<!--                    -->
+                    <svg id="barcode"></svg>
-<!--                  </div>-->
+                  </div>
+                </div>
               </el-col>
-
-
             </div>
           </el-row>
+
           <!-- 导航栏 -->
             <el-row class="my-print-nav">
               <el-col :span="6">领料单:{{printData.factory}}</el-col>