20241105

src/views/modules/label/printer.vue

@@ -1267,11 +1267,11 @@ export default {
           </el-form-item>
         </el-col>
         <el-col :span="(status === 0 && rowSpan === 5)? rowSpan-1:rowSpan">
-          <el-form-item v-if="printCurrentPart.serialNumberRequired === 'Y'" :label="status === 0 ? printCurrentPart.cartonCountLabel:printCurrentPart.rollCountLabel" :show-message="false">
+          <el-form-item v-if="printCurrentPart.serialNumberRequired === 'Y' && $store.state.user.autoSerialNumber !== 'Y'" :label="status === 0 ? printCurrentPart.cartonCountLabel:printCurrentPart.rollCountLabel" :show-message="false">
             <el-input-number :step="0" :min="1" :controls="false" v-model="printCurrentPart.cartonCount" disabled></el-input-number>
           </el-form-item>
           <el-form-item v-else key="cartonCount" :label="status === 0 ? printCurrentPart.cartonCountLabel:printCurrentPart.rollCountLabel" prop="cartonCount" :show-message="false">
-            <el-input-number :step="0" :min="1" :controls="false" v-model="printCurrentPart.cartonCount"></el-input-number>
+            <el-input-number :step="0" :min="1" :precision="0" :controls="false" v-model="printCurrentPart.cartonCount"></el-input-number>
           </el-form-item>
         </el-col>
         <el-col :span="rowSpan">
@@ -1282,7 +1282,7 @@ export default {
             <el-input-number :step="0" :min="0" :controls="false" v-model="printCurrentPart.totalShipQty" disabled></el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="24" v-if="printCurrentPart.category !== 'Alpha/Hard Tag-Serials' || $store.state.user.autoSerialNumber !== 'Y'">
           <el-form-item v-if="printCurrentPart.serialNumberRequired === 'Y'" key="serialNumber" label="Serial Number" prop="serialNumber" :show-message="false">
             <el-input v-model="printCurrentPart.serialNumber"></el-input>
           </el-form-item>