Merge remote-tracking branch 'origin/master'

src/views/modules/production-inbound/inboundRegister.vue

@@ -91,12 +91,12 @@
                 <el-input v-model="inboundItem.height" type="number" placeholder="请输入高度" />
               </el-form-item></el-col>
               <!-- 勾选框 -->
-              <el-col :span="12" style="margin-top: 0px">
+              <el-col :span="12" style="margin-top: 2px">
                 <el-form-item>
                   <el-checkbox v-model="inboundItem.ifsAutoReport">Auto Report of Operation</el-checkbox>
                 </el-form-item>
               </el-col>
-              <el-col :span="24" style="margin-top: 5px">
+              <el-col :span="12" style="margin-top: 2px">
                 <el-form-item>
                   <el-checkbox v-model="inboundItem.ifsSimplifiedMaterial">Simplified Material Check</el-checkbox>
                 </el-form-item>
@@ -544,13 +544,13 @@ export default {
         if (data.code === 0) {
           this.$message.success("入库成功");
           this.clearAllHandlingUnitCache();
-          
+
           // 获取unitIds并打印标签
           const unitIds = data.unitIds || [];
           if (unitIds.length > 0) {
             this.printViaServer(unitIds);
           }
-          
+
           this.processFlag = 1;
           this.scanCode = '';
           this.shopOrderList = [];
@@ -586,7 +586,7 @@ export default {
           labelType: "库存成品标签"
         }
         console.log('打印请求:', printRequest);
-        
+
         const { data } = await printLabelCommon(printRequest)
         if (data.code === 200 || data.code === 0) {
           this.$message.success(`打印任务已发送！共${unitIds.length}个标签`)
@@ -605,7 +605,7 @@ export default {
      */
     parseHeightFromPartNo(partNo) {
       if (!partNo) return '';
-      
+
       // 检查是否包含横杠
       const parts = partNo.split('-');
       if (parts.length >= 2) {
@@ -615,7 +615,7 @@ export default {
         const height = parseInt(heightStr, 10);
         return isNaN(height) ? '' : height;
       }
-      
+
       return '';
     }
   },