Merge remote-tracking branch 'origin/js_dev' into js_dev

src/views/plan/workOrder/components/work-order-seq.vue

@@ -99,7 +99,7 @@
               <el-text>订单编号:</el-text>
               <el-text>{{ info.orderCode }}</el-text>
             </div>
-<!--            <div>
+            <!--            <div>
               <el-text>物料号:</el-text
               ><el-text>{{ info.materialCode }}</el-text>
             </div>
@@ -120,22 +120,28 @@
             <div class="printItem">
               <div class="leftItem">
                 <div>
-                  <div class="lable" style="font-size: 14px;">流转卡号:</div>
-                  <div class="value" style="font-size: 14px;">{{ item.seqNo }}</div>
+                  <div class="lable" style="font-size: 14px">流转卡号:</div>
+                  <div class="value" style="font-size: 14px">
+                    {{ item.seqNo }}
+                  </div>
                 </div>
                 <div>
-                  <div class="lable" style="font-size: 14px;">工单号:</div>
-                  <div class="value" style="font-size: 14px;">{{ info.workOrderCode }}</div>
+                  <div class="lable" style="font-size: 14px">工单号:</div>
+                  <div class="value" style="font-size: 14px">
+                    {{ info.workOrderCode }}
+                  </div>
                 </div>
                 <div>
-                  <div class="lable" style="font-size: 14px;">订单编号:</div>
-                  <div class="value" style="font-size: 14px;">{{ info.orderCode }}</div>
+                  <div class="lable" style="font-size: 14px">订单编号:</div>
+                  <div class="value" style="font-size: 14px">
+                    {{ info.orderCode }}
+                  </div>
                 </div>
-<!--                <div>
+                <!--                <div>
                   <div class="lable">物料号:</div>
                   <div class="value">{{ info.materialCode }}</div>
                 </div>-->
-<!--                <div>
+                <!--                <div>
                   <div class="lable">物料名称:</div>
 
                   <template v-if="info.materialName.length > 23">
@@ -151,7 +157,7 @@
                     </div>
                   </template>
                 </div>-->
-<!--                <div>
+                <!--                <div>
                   <div class="lable">物料型号:</div>
 
                   <template v-if="info.materialModel.length > 23">
@@ -342,6 +348,14 @@ const importExcelData = () => {
   left: 0;
   display: none;
 }
+@media print {
+  #printScreen {
+    position: absolute; /* 或 absolute, fixed, 根据需要调整 */
+    top: 20px; /* 调整顶部位置 */
+    margin: 0; /* 重置边距 */
+    //width: 1000px;
+  }
+}
 #printScreen {
   width: 80mm;
   .printItem {