diff --git a/src/printFormat/roll_label.js b/src/printFormat/roll_label.js
index c821159..3d0cc2c 100644
--- a/src/printFormat/roll_label.js
+++ b/src/printFormat/roll_label.js
@@ -14,90 +14,190 @@ export const print_roll_label = (printList,printerName,hz = 0)=>{
     LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')
     for (let i = 0; i < printList.length; i++) {
       let row = printList[i];
-      LODOP.NewPage();
-      LODOP.SET_PRINTER_INDEXA(printerName)
-      LODOP.SET_PRINT_PAGESIZE(hz,450,250,"");
-      LODOP.ADD_PRINT_IMAGE(3,4,"18mm","18mm",row.qrCode);
-      LODOP.SET_PRINT_STYLEA(0,"Stretch",1);
-      LODOP.ADD_PRINT_IMAGE(7,120,30,8,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
-      LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-
-      LODOP.ADD_PRINT_TEXT(15,73,30,20,"REF");
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
-      LODOP.ADD_PRINT_TEXT(13,93,80,30,row.ref);
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
-      LODOP.ADD_PRINT_TEXT(24,73,25,20,"QTY");
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
-      LODOP.ADD_PRINT_TEXT(24,93,35,20,row.qty);
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
-      LODOP.ADD_PRINT_TEXT(24,122,25,20,"UOM");
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
-      LODOP.ADD_PRINT_TEXT(24,140,50,20,row.uom);
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
-      LODOP.ADD_PRINT_TEXT(32,73,30,20,"DESC");
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
-      LODOP.ADD_PRINT_TEXT(32,96,80,35,row.desc);
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-3);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
-      if (row.rollLabelRequired === 'Y'){
-        LODOP.ADD_PRINT_TEXT(56,73,30,20,"ROLL");
-      }else if (row.serialNumberRequired === 'Y'){
-        LODOP.ADD_PRINT_TEXT(56,73,50,20,"SERIAL");
-      }
-      if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
-        LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-        LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      console.log(row)
+      if (row.rollLabelFlag === 'Y'){
+        prePrintLabel(LODOP,row)
+      }else {
+        printLabel(LODOP,row)
       }
+      // LODOP.PRINT_DESIGN()
+    }
+  }
 
-      if (row.rollLabelRequired === 'Y'){
-        LODOP.ADD_PRINT_TEXT(56,95,80,20,row.rollNo);
-      }else if (row.serialNumberRequired === 'Y'){
-        LODOP.ADD_PRINT_TEXT(56,95,80,20,row.serialNumber);
-      }
-      if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
-        LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-        LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-        LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      }
+}
 
-      LODOP.ADD_PRINT_TEXT(63,73,29,15,"DATE");
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+function prePrintLabel(LODOP,row,hz=0){
+  LODOP.NewPage();
+  LODOP.SET_PRINT_PAGESIZE(hz,450,250,"");
+  LODOP.ADD_PRINT_IMAGE(3,4,"18mm","18mm",row.qrCode);
+  LODOP.SET_PRINT_STYLEA(0,"Stretch",1);
+  LODOP.ADD_PRINT_IMAGE(7,120,30,8,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
+  LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
+
+  LODOP.ADD_PRINT_TEXT(15,73,30,20,"REF");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(13,93,80,30,row.ref);
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(24,73,25,20,"QTY");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(24,93,35,20,row.qty);
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(24,122,25,20,"UOM");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(24,140,50,20,row.uom);
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(32,73,30,20,"DESC");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(32,96,80,35,row.desc);
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-3);
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  if (row.rollLabelRequired === 'Y'){
+    LODOP.ADD_PRINT_TEXT(56,73,30,20,"ROLL");
+  }else if (row.serialNumberRequired === 'Y'){
+    LODOP.ADD_PRINT_TEXT(56,73,50,20,"SERIAL");
+  }
+  if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
+    LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+    LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+    LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+  }
 
-      LODOP.ADD_PRINT_TEXT(63,95,85,16,row.date);
-      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+  if (row.rollLabelRequired === 'Y'){
+    LODOP.ADD_PRINT_TEXT(56,95,80,20,row.rollNo);
+  }else if (row.serialNumberRequired === 'Y'){
+    LODOP.ADD_PRINT_TEXT(56,95,80,20,row.serialNumber);
+  }
+  if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
+    LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+    LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+    LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+  }
 
-      LODOP.PRINT();
-      // LODOP.PRINT_DESIGN()
-    }
+  LODOP.ADD_PRINT_TEXT(63,73,29,15,"DATE");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(63,95,85,16,row.date);
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.PRINT();
+}
+
+function printLabel(LODOP,row){
+  LODOP.NewPage();
+  LODOP.SET_PRINT_PAGESIZE(0,565,252,"");
+  LODOP.ADD_PRINT_IMAGE(-6,-5,"21.99mm","21.99mm",row.qrCode);
+  LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
+
+  LODOP.ADD_PRINT_IMAGE(1,137,62,12,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
+  LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
+
+  LODOP.ADD_PRINT_TEXT(14,70,25,13,"REF");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(27,70,25,13,"QTY");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(40,70,35,14,"DESC");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(13,94,76,18,row.ref);
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+  LODOP.SET_PRINT_STYLEA(0,"LetterSpacing",-1);
+
+  LODOP.ADD_PRINT_TEXT(27,94,45,13,row.qty);
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(40,94,110,31,row.desc);
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+  LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-2);
+
+  if (row.rollLabelRequired === 'Y'){
+    LODOP.ADD_PRINT_TEXT(69,4,96,13,"ROLL NUMBER");
+  }else if (row.serialNumberRequired === 'Y'){
+    LODOP.ADD_PRINT_TEXT(69,4,96,13,"SERIAL NUMBER");
   }
+  if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
+    LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+    LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+    LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+  }
+
+  LODOP.ADD_PRINT_TEXT(79,4,119,13,"MANUFACTURE DATE");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  LODOP.ADD_PRINT_TEXT(79,94,105,13,row.date);
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+  if (row.rollLabelRequired === 'Y'){
+    LODOP.ADD_PRINT_TEXT(69,94,130,13,row.rollNo);
+  }else if (row.serialNumberRequired === 'Y'){
+    LODOP.ADD_PRINT_TEXT(69,94,130,13,row.serialNumber);
+  }
+  if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
+    LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+    LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+    LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+  }
+
+  LODOP.ADD_PRINT_TEXT(27,141,29,13,"UoM");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+
+  LODOP.ADD_PRINT_TEXT(27,165,40,13,row.uom);
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
+  //这个是固定的，在料号的后面
+  LODOP.ADD_PRINT_TEXT(14,141,66,13,"(Global P/N)");
+  LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+  LODOP.SET_PRINT_STYLEA(0,"FontSize",6);
+  LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+  LODOP.PRINT();
 }
diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue
index b5604df..a2354a9 100644
--- a/src/views/modules/label/printer.vue
+++ b/src/views/modules/label/printer.vue
@@ -1031,6 +1031,7 @@ export default {
               rollLabelRequired: item.rollLabelRequired,
               serialNumberRequired: item.serialNumberRequired,
               serialNumber: item.serialNumber,
+              rollLabelFlag: item.rollLabelFlag,// 判断标签类型
             }
           });
           let qrCodeList = this.$refs.qrCode.init(prints.map((item)=>{
diff --git a/src/views/modules/label/roll.vue b/src/views/modules/label/roll.vue
index b4549fc..f9f618d 100644
--- a/src/views/modules/label/roll.vue
+++ b/src/views/modules/label/roll.vue
@@ -379,6 +379,7 @@ export default {
                   rollLabelRequired: item.rollLabelRequired,
                   serialNumberRequired: item.serialNumberRequired,
                   serialNumber: item.serialNumber,
+                  rollLabelFlag: item.rollLabelFlag,// 判断标签类型
                 }
               })
               let qrCodeList = this.$refs.qrCode.init(arr.map((item)=>{
diff --git a/src/views/modules/part/external.vue b/src/views/modules/part/external.vue
index 94c1882..6699153 100644
--- a/src/views/modules/part/external.vue
+++ b/src/views/modules/part/external.vue
@@ -42,6 +42,7 @@ let part = {
   printStr1: '',
   printStr2: '',
   printStr3: '',
+  rollLabelFlag: 'N',
 }
 export default {
   name: 'ExternalPart',
@@ -1527,7 +1528,7 @@ export default {
     <el-dialog v-drag :title="`Part`" :close-on-click-modal="false" @close="closeSavePart" width="550px"
                :visible.sync="savePartVisible">
       <el-form :model="savePart" label-position="top" ref="savePartForm" :rules="partRules">
-        <el-row :gutter="20">
+        <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="Part No" prop="partNo" :show-message="false">
               <el-input :readonly="savePart.site !== ''" :disabled="savePart.site !== ''"
@@ -1544,7 +1545,7 @@ export default {
               <el-input v-model="savePart.printStr1"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="$store.state.user.autoSerialNumber === 'Y'">
+          <el-col :span="7" v-if="$store.state.user.autoSerialNumber === 'Y'">
             <el-form-item label="Print Str2" :show-message="false">
               <el-input v-model="savePart.printStr2"></el-input>
             </el-form-item>
@@ -1580,7 +1581,7 @@ export default {
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="10">
           <el-col :span="8" v-if="category.rollLabelRequired === 'Y'">
             <el-form-item label="Qty Per Roll" prop="qtyPerRoll" :show-message="false">
               <el-input-number :step="0" :min="0" :controls="false"
@@ -1603,7 +1604,7 @@ export default {
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item label="OOC" :show-message="false" prop="freeInfo2">
               <el-select v-model="savePart.freeInfo2" placeholder="" style="width: 100%">
@@ -1623,7 +1624,7 @@ export default {
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="10">
           <el-col :span="3">
             <el-form-item label=" " :show-message="false">
               <el-checkbox v-model="savePart.active" true-label="Y" false-label="N">Active</el-checkbox>
@@ -1640,7 +1641,7 @@ export default {
                                :precision="6"></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="4">
             <el-form-item label="Weight UM" prop="weightUmId" :show-message="false">
               <el-select v-model="savePart.weightUmId" placeholder="" :show-message="false" clearable
                          style="width: 100%">
@@ -1649,6 +1650,11 @@ export default {
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="3">
+            <el-form-item label=" " :show-message="false">
+              <el-checkbox v-model="savePart.rollLabelFlag" true-label="Y" false-label="N">40*20 Label</el-checkbox>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">