diff --git a/src/views/modules/print/print_outBox_label.js b/src/views/modules/print/print_outBox_label.js
index e3bcbd3..c7c2d37 100644
--- a/src/views/modules/print/print_outBox_label.js
+++ b/src/views/modules/print/print_outBox_label.js
@@ -39,7 +39,7 @@ export function printOutBoxLabel(printList) {
       LODOP.ADD_PRINT_LINE(240,136,120,137,0,1);
       LODOP.ADD_PRINT_LINE(90,438,60,439,0,1);
       LODOP.ADD_PRINT_LINE(120,438,90,439,0,1);
-      LODOP.ADD_PRINT_LINE(180,436,150,437,0,1);
+      LODOP.ADD_PRINT_LINE(180,469,150,470,0,1);
       LODOP.ADD_PRINT_LINE(330,57,300,58,0,1);
       LODOP.ADD_PRINT_LINE(330,290,300,291,0,1);
       LODOP.ADD_PRINT_LINE(330,435,300,436,0,1);
@@ -185,12 +185,12 @@ export function printOutBoxLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
 
-      LODOP.ADD_PRINT_TEXT(157,370,65,25,printData.hARDNESS);
+      LODOP.ADD_PRINT_TEXT(157,370,105,25,printData.hARDNESS);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(157,438,121,25,printData.cOLOR);
+      LODOP.ADD_PRINT_TEXT(157,471,121,25,printData.cOLOR);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
diff --git a/src/views/modules/production/outboundLabelScan.vue b/src/views/modules/production/outboundLabelScan.vue
index 14fac98..752ce0e 100644
--- a/src/views/modules/production/outboundLabelScan.vue
+++ b/src/views/modules/production/outboundLabelScan.vue
@@ -54,6 +54,7 @@ export default {
       boxNum:0,
       endBoxQty:0,
       scatteredBoxNo:0,
+      boxLabelTotalQty:0,
     }
   },
   mounted () {
@@ -145,7 +146,7 @@ export default {
         delNotifyItemNo:row.delNotifyItemNo,
         partNo:row.partNo,
         partDesc:row.partDescription,
-        shipQty:row.shipQty,
+        shipQty:row.allNum,
         qtyPerBox:0,
         qtyPerBag:0,
         printTotalBoxCount:0,
@@ -154,7 +155,9 @@ export default {
       getPrintBoxLabel(this.selectDelNotifyDetail).then(({data})=>{
         if (data && data.code === 0){
           if (data.row){
-            this.selectDelNotifyDetail.qtyPerBox = data.row.QtyPerBox;
+            this.boxLabelTotalQty = data.row.QtyPerBox;
+            this.selectDelNotifyDetail.qtyPerBag = data.row.QtyPerBag;
+            this.selectDelNotifyDetail.qtyPerBox = data.row.BagPerBox;
             this.selectDelNotifyDetail.printTotalBoxCount = data.row.PrintTotalBoxCount;
             this.selectDelNotifyDetail.printBoxSeqNo = data.row.PrintBoxSeqNo;
           }
@@ -279,17 +282,19 @@ export default {
       }else {
         this.scatteredBoxNo = 0
       }
+    },
+    "selectDelNotifyDetail.qtyPerBag"(newVal,oldVal){
+      if (newVal > 0){
+        this.boxLabelTotalQty = this.selectDelNotifyDetail.qtyPerBag * this.selectDelNotifyDetail.qtyPerBox
+      }
+    },
+    "selectDelNotifyDetail.qtyPerBox"(newVal,oldVal){
+      if (newVal > 0){
+        this.boxLabelTotalQty = this.selectDelNotifyDetail.qtyPerBag * this.selectDelNotifyDetail.qtyPerBox
+      }
     }
   },
   computed:{
-    boxLabelTotalQty:{
-      get(){
-        return this.selectDelNotifyDetail.qtyPerBag * this.selectDelNotifyDetail.qtyPerBox
-      },
-      set(val){
-
-      }
-    },
   },
   created() {
     this.searchDelHeaderList();
@@ -724,7 +729,7 @@ export default {
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="每箱中的盒数" required>
+            <el-form-item label="每箱中的盒(袋)数" required>
               <el-input-number v-model="selectDelNotifyDetail.qtyPerBox" :controls="false" :step="0"></el-input-number>
             </el-form-item>
           </el-col>
diff --git a/src/views/modules/production/shippingScan.vue b/src/views/modules/production/shippingScan.vue
index f87e22f..40f0cca 100644
--- a/src/views/modules/production/shippingScan.vue
+++ b/src/views/modules/production/shippingScan.vue
@@ -54,6 +54,7 @@ export default {
       boxNum:0,
       endBoxQty:0,
       scatteredBoxNo:0,
+      boxLabelTotalQty:0,
     }
   },
   mounted () {
@@ -162,7 +163,7 @@ export default {
         delNotifyItemNo:row.delNotifyItemNo,
         partNo:row.partNo,
         partDesc:row.partDescription,
-        shipQty:row.shipQty,
+        shipQty:row.allNum,
         qtyPerBox:0,
         qtyPerBag:0,
         printTotalBoxCount:0,
@@ -171,7 +172,9 @@ export default {
       getPrintBoxLabel(this.selectDelNotifyDetail).then(({data})=>{
         if (data && data.code === 0){
           if (data.row){
-            this.selectDelNotifyDetail.qtyPerBox = data.row.QtyPerBox;
+            this.boxLabelTotalQty = data.row.QtyPerBox;
+            this.selectDelNotifyDetail.qtyPerBag = data.row.QtyPerBag;
+            this.selectDelNotifyDetail.qtyPerBox = data.row.BagPerBox;
             this.selectDelNotifyDetail.printTotalBoxCount = data.row.PrintTotalBoxCount;
             this.selectDelNotifyDetail.printBoxSeqNo = data.row.PrintBoxSeqNo;
           }
@@ -299,17 +302,20 @@ export default {
       }else {
         this.scatteredBoxNo = 0
       }
+    },
+    "selectDelNotifyDetail.qtyPerBag"(newVal,oldVal){
+      if (newVal > 0){
+        this.boxLabelTotalQty = this.selectDelNotifyDetail.qtyPerBag * this.selectDelNotifyDetail.qtyPerBox
+      }
+    },
+    "selectDelNotifyDetail.qtyPerBox"(newVal,oldVal){
+      if (newVal > 0){
+        this.boxLabelTotalQty = this.selectDelNotifyDetail.qtyPerBag * this.selectDelNotifyDetail.qtyPerBox
+      }
     }
   },
   computed:{
-    boxLabelTotalQty:{
-      get(){
-        return this.selectDelNotifyDetail.qtyPerBag * this.selectDelNotifyDetail.qtyPerBox
-      },
-      set(val){
 
-      }
-    },
   }
 }
 </script>
@@ -747,7 +753,7 @@ export default {
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="每箱中的盒数" required>
+            <el-form-item label="每箱中的盒(袋)数" required>
               <el-input-number v-model="selectDelNotifyDetail.qtyPerBox" :controls="false" :step="0" :precision="0"></el-input-number>
             </el-form-item>
           </el-col>