diff --git a/src/printFormat/RF_RFID.js b/src/printFormat/RF_RFID.js
index 2b86a9b..f6bac96 100644
--- a/src/printFormat/RF_RFID.js
+++ b/src/printFormat/RF_RFID.js
@@ -31,16 +31,25 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.ADD_PRINT_TEXT(63,126,50,20,"DESC");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.ADD_PRINT_TEXT(27,175,93,20,row.ref);
+      LODOP.ADD_PRINT_TEXT(18,175,93,20,row.ref);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.ADD_PRINT_TEXT(45,175,93,20,row.qty);
+      LODOP.ADD_PRINT_TEXT(40,175,93,20,row.qty);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
       LODOP.ADD_PRINT_TEXT(63,175,186,35,row.desc);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+
+      if (row.tradingMark && row.tradingMark === 'Y'){
+        LODOP.ADD_PRINT_TEXT(63,350,50,35,'®');
+        LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",18);
+      }
       LODOP.ADD_PRINT_TEXT(45,274,40,20,"UoM");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.ADD_PRINT_TEXT(45,321,40,20,row.uom);
+      LODOP.ADD_PRINT_TEXT(38,321,40,20,row.uom);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
       LODOP.ADD_PRINT_LINE(100,-2,99,406,0,1);
       LODOP.ADD_PRINT_LINE(146,-2,145,406,0,1);
       LODOP.ADD_PRINT_TEXT(104,25,151,20,"ROLL COUNT");
@@ -52,7 +61,7 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => {
       LODOP.ADD_PRINT_TEXT(104,202,100,20,row.rollCount);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       if(rightIndex === 'Y'){
-        LODOP.ADD_PRINT_TEXT(152,255,115,20,row.freeInfo2);
+        LODOP.ADD_PRINT_TEXT(152,255,180,20,row.freeInfo2);
         LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       }
       for(let i = 0; i < icons.length; i++){
diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js
index 2b1fe86..bc2a710 100644
--- a/src/printFormat/alphaHardTagPrintFormat.js
+++ b/src/printFormat/alphaHardTagPrintFormat.js
@@ -36,21 +36,27 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
       LODOP.ADD_PRINT_TEXT(53,126,50,20,"DESC");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
-      LODOP.ADD_PRINT_TEXT(22,175,93,20,row.ref);
+      LODOP.ADD_PRINT_TEXT(15,175,93,20,row.ref);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
-      LODOP.ADD_PRINT_TEXT(38,175,93,20,row.qty);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.ADD_PRINT_TEXT(32,175,93,20,row.qty);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
-      LODOP.ADD_PRINT_TEXT(53,175,186,35,row.desc);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.ADD_PRINT_TEXT(50,175,186,35,row.desc);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+
+      if (row.tradingMark && row.tradingMark === 'Y'){
+        LODOP.ADD_PRINT_TEXT(53,350,50,35,'®');
+        LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",18);
+      }
       LODOP.ADD_PRINT_TEXT(38,274,40,20,"UoM");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
-      LODOP.ADD_PRINT_TEXT(38,321,40,20,row.uom);
+      LODOP.ADD_PRINT_TEXT(32,321,40,20,row.uom);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
       LODOP.ADD_PRINT_LINE(86,-2,85,406,0,1);
       LODOP.ADD_PRINT_LINE(146,-2,145,406,0,1);
       LODOP.ADD_PRINT_TEXT(114,25,151,20,"MANUFACTURE DATE");
@@ -71,6 +77,22 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
       LODOP.ADD_PRINT_TEXT(85,176,190,20,row.manufacturer);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+
+      if (row.weightUmName && row.weight){
+        LODOP.ADD_PRINT_TEXT(85,250,50,20,"WEIGHT");
+        LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+
+        LODOP.ADD_PRINT_TEXT(85,320,50,20,row.weight);
+        LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+        LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+
+        LODOP.ADD_PRINT_TEXT(85,372,50,20,row.weightUmName);
+        LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+      }
+
       LODOP.ADD_PRINT_TEXT(99,25,151,20,"MOLD CODE");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
@@ -78,7 +100,7 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       if(rightIndex === 'Y'){
-        LODOP.ADD_PRINT_TEXT(152,255,115,20,row.freeInfo2);
+        LODOP.ADD_PRINT_TEXT(152,255,180,20,row.freeInfo2);
         LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       }
       for(let i = 0; i < icons.length; i++){
diff --git a/src/printFormat/antenna.js b/src/printFormat/antenna.js
index c355df2..2091f58 100644
--- a/src/printFormat/antenna.js
+++ b/src/printFormat/antenna.js
@@ -31,16 +31,25 @@ export const printAntennaLabel = (printList, icons, printerName) => {
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
       LODOP.ADD_PRINT_TEXT(55, 126, 50, 20, 'DESC')
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
-      LODOP.ADD_PRINT_TEXT(19, 175, 93, 20, row.ref)
+      LODOP.ADD_PRINT_TEXT(10, 175, 93, 20, row.ref)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
-      LODOP.ADD_PRINT_TEXT(37, 175, 93, 20, row.qty)
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.ADD_PRINT_TEXT(32, 175, 93, 20, row.qty)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
       LODOP.ADD_PRINT_TEXT(55, 175, 186, 35, row.desc)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+
+      if (row.tradingMark && row.tradingMark === 'Y'){
+        LODOP.ADD_PRINT_TEXT(55,350,50,35,'®');
+        LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",18);
+      }
       LODOP.ADD_PRINT_TEXT(37, 274, 40, 20, 'UoM')
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
-      LODOP.ADD_PRINT_TEXT(37, 321, 40, 20, row.uom)
+      LODOP.ADD_PRINT_TEXT(32, 321, 40, 20, row.uom)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
       LODOP.ADD_PRINT_LINE(92, -2, 91, 406, 0, 1)
       LODOP.ADD_PRINT_LINE(146, -2, 145, 406, 0, 1)
       LODOP.ADD_PRINT_TEXT(93, 25, 151, 20, 'PRODUCT REV.')
@@ -56,7 +65,7 @@ export const printAntennaLabel = (printList, icons, printerName) => {
       LODOP.ADD_PRINT_TEXT(128, 176, 180, 20, row.sn)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
       if (rightIndex === 'Y') {
-        LODOP.ADD_PRINT_TEXT(152, 255, 115, 20, row.freeInfo2)
+        LODOP.ADD_PRINT_TEXT(152, 255, 180, 20, row.freeInfo2)
         LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
       }
       for (let i = 0; i < icons.length; i++) {
diff --git a/src/printFormat/roll_label.js b/src/printFormat/roll_label.js
index 76c01da..e043937 100644
--- a/src/printFormat/roll_label.js
+++ b/src/printFormat/roll_label.js
@@ -19,20 +19,20 @@ export const print_roll_label = (printList,printerName)=>{
       LODOP.SET_PRINT_PAGESIZE(0,450,250,"");
       LODOP.ADD_PRINT_IMAGE(0,4,"18mm","18mm",`<img src="${row.qrCode}"/>`);
       LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
-      LODOP.ADD_PRINT_IMAGE(4,100,62,12,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
+      LODOP.ADD_PRINT_IMAGE(4,120,30,8,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
       LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
 
-      LODOP.ADD_PRINT_TEXT(15,73,25,20,"REF");
+      LODOP.ADD_PRINT_TEXT(12,73,25,20,"REF");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_TEXT(25,73,25,20,"QTY");
+      LODOP.ADD_PRINT_TEXT(24,73,25,20,"QTY");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_TEXT(25,122,25,20,"UOM");
+      LODOP.ADD_PRINT_TEXT(24,122,25,20,"UOM");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -42,19 +42,19 @@ export const print_roll_label = (printList,printerName)=>{
       LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_TEXT(15,93,60,20,row.ref);
+      LODOP.ADD_PRINT_TEXT(10,93,60,20,row.ref);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_TEXT(25,93,35,20,row.qty);
+      LODOP.ADD_PRINT_TEXT(22,93,35,20,row.qty);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_TEXT(25,140,35,20,row.uom);
+      LODOP.ADD_PRINT_TEXT(22,140,35,20,row.uom);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
       LODOP.ADD_PRINT_TEXT(35,96,80,35,row.desc);
diff --git a/src/views/modules/customer/info.vue b/src/views/modules/customer/info.vue
index b8fba8a..084ff59 100644
--- a/src/views/modules/customer/info.vue
+++ b/src/views/modules/customer/info.vue
@@ -154,7 +154,7 @@ export default {
             }
             saveCustomer(params).then(({data})=>{
               if (data && data.code === 0){
-                this.handleSearch();
+                this.handleSelectCustomerPage();
                 this.saveCustomerVisible = false;
                 this.$message.success(data.msg)
               }else {
@@ -242,7 +242,7 @@ export default {
         if (valid){
           updateCustomer(this.saveCustomer).then(({data})=>{
             if (data && data.code === 0){
-              this.handleSearch();
+              this.handleSelectCustomerPage();
               this.saveCustomerVisible = false;
               this.$message.success(data.msg)
             }else {
diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue
index cc7b3ea..7935a70 100644
--- a/src/views/modules/label/printer.vue
+++ b/src/views/modules/label/printer.vue
@@ -97,7 +97,7 @@ export default {
           functionId: 30004,
           serialNumber: '30004TableCustomerNo',
           tableId: "30004Table",
-          tableName: "外部料号客户信息表",
+          tableName: "Part Customer Table",
           columnProp: "customerNo",
           headerAlign: "center",
           align: "left",
@@ -114,7 +114,7 @@ export default {
           functionId: 30004,
           serialNumber: '30004TableCustomerName',
           tableId: "30004Table",
-          tableName: "外部料号客户信息表",
+          tableName: "Part Customer Table",
           columnProp: "customerName",
           headerAlign: "center",
           align: "left",
@@ -131,7 +131,7 @@ export default {
           functionId: 30004,
           serialNumber: '30004TablePartNo',
           tableId: "30004Table",
-          tableName: "外部料号客户信息表",
+          tableName: "Part Customer Table",
           columnProp: "partNo",
           headerAlign: "center",
           align: "left",
@@ -148,7 +148,7 @@ export default {
           functionId: 30004,
           serialNumber: '30004TablePartDesc',
           tableId: "30004Table",
-          tableName: "外部料号客户信息表",
+          tableName: "Part Customer Table",
           columnProp: "partDesc",
           headerAlign: "center",
           align: "left",
@@ -165,7 +165,7 @@ export default {
           functionId: 30004,
           serialNumber: '30004TableRev',
           tableId: "30004Table",
-          tableName: "外部料号客户信息表",
+          tableName: "Part Customer Table",
           columnProp: "rev",
           headerAlign: "center",
           align: "left",
@@ -182,7 +182,7 @@ export default {
           functionId: 30004,
           serialNumber: '30004TableCategory',
           tableId: "30004Table",
-          tableName: "外部料号客户信息表",
+          tableName: "Part Customer Table",
           columnProp: "category",
           headerAlign: "center",
           align: "left",
@@ -199,7 +199,7 @@ export default {
           functionId: 30004,
           serialNumber: '30004TableUmName',
           tableId: "30004Table",
-          tableName: "外部料号客户信息表",
+          tableName: "Part Customer Table",
           columnProp: "umName",
           headerAlign: "center",
           align: "left",
@@ -216,11 +216,11 @@ export default {
           functionId: 30004,
           serialNumber: '30004TableFreeInfo',
           tableId: "30004Table",
-          tableName: "外部料号客户信息表",
+          tableName: "Part Customer Table",
           columnProp: "freeInfo",
           headerAlign: "center",
           align: "left",
-          columnLabel: "Free Info1",
+          columnLabel: "Free Info",
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -233,11 +233,29 @@ export default {
           functionId: 30004,
           serialNumber: '30004TableFreeInfo2',
           tableId: "30004Table",
-          tableName: "外部料号客户信息表",
+          tableName: "Part Customer Table",
           columnProp: "freeInfo2",
           headerAlign: "center",
           align: "left",
-          columnLabel: "Free Info2",
+          columnLabel: "OOC",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 10,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 30004,
+          serialNumber: '30004TableTradingMark',
+          tableId: "30004Table",
+          tableName: "Part Customer Table",
+          columnProp: "tradingMark",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Trading Mark",
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -246,11 +264,46 @@ export default {
           fixed: '',
           columnWidth: 120
         },{
+          userId: this.$store.state.user.name,
+          functionId: 30004,
+          serialNumber: '30004TablePackingWeight',
+          tableId: "30004Table",
+          tableName: "Part Customer Table",
+          columnProp: "packingWeight",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Packing Weight",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 10,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },{
+          userId: this.$store.state.user.name,
+          functionId: 30004,
+          serialNumber: '30004TableWeightUM',
+          tableId: "30004Table",
+          tableName: "Part Customer Table",
+          columnProp: "weightUmName",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Weight UM",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 10,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 30004,
           serialNumber: '30004TableActive',
           tableId: "30004Table",
-          tableName: "外部料号客户信息表",
+          tableName: "Part Customer Table",
           columnProp: "active",
           headerAlign: "center",
           align: "left",
@@ -698,6 +751,9 @@ export default {
                 moldCode: item.moldCode,
                 sn: item.serialNumber,
                 freeInfo2: item.freeInfo2,
+                tradingMark: item.tradingMark,
+                weightUmName: item.weightUmName,
+                weight: item.packingWeight * item.qtyPerCarton,
               }
             });
             // let value = this.printCurrentPart.totalShipQty % this.printCurrentPart.qtyPerCarton
diff --git a/src/views/modules/label/record.vue b/src/views/modules/label/record.vue
index 7337f55..75d7029 100644
--- a/src/views/modules/label/record.vue
+++ b/src/views/modules/label/record.vue
@@ -408,6 +408,9 @@ export default {
           moldCode: item.moldCode,
           sn: item.serialNumber,
           freeInfo2:item.freeInfo2,
+          tradingMark: item.tradingMark,
+          weightUmName: item.weightUmName,
+          weight: item.packingWeight * item.qtyPerCarton,
         }
       })
 
diff --git a/src/views/modules/part/external.vue b/src/views/modules/part/external.vue
index f0f297b..7c40f3b 100644
--- a/src/views/modules/part/external.vue
+++ b/src/views/modules/part/external.vue
@@ -28,6 +28,9 @@ let part = {
   freeInfo2:'',
   rev:'',
   active:'',
+  tradingMark:'N',
+  packingWeight:undefined,
+  weightUmId:undefined,
   moldCode:'',
   category:'',
   qtyPerCarton:0,
@@ -84,7 +87,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TablePartNo',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "partNo",
           headerAlign: "center",
           align: "left",
@@ -101,7 +104,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TablePartDesc',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "partDesc",
           headerAlign: "center",
           align: "left",
@@ -118,7 +121,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableRev',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "rev",
           headerAlign: "center",
           align: "left",
@@ -135,7 +138,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableCategory',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "category",
           headerAlign: "center",
           align: "left",
@@ -153,7 +156,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableUmName',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "moldCode",
           headerAlign: "center",
           align: "left",
@@ -170,7 +173,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableUmName',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "manufacturer",
           headerAlign: "center",
           align: "left",
@@ -187,7 +190,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableUmName',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "umName",
           headerAlign: "center",
           align: "left",
@@ -205,7 +208,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableQtyPerRoll',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "qtyPerRoll",
           headerAlign: "center",
           align: "left",
@@ -222,7 +225,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableRollsPerCarton',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "rollsPerCarton",
           headerAlign: "center",
           align: "left",
@@ -239,7 +242,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableQtyPerCarton',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "qtyPerCarton",
           headerAlign: "center",
           align: "left",
@@ -257,11 +260,11 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableFreeInfo',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "freeInfo",
           headerAlign: "center",
           align: "left",
-          columnLabel: "Free Info1",
+          columnLabel: "Free Info",
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -274,8 +277,8 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableFreeInfo2',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
-          columnProp: "freeInfo2",
+          tableName: "Part Table",
+          columnProp: "OOC",
           headerAlign: "center",
           align: "left",
           columnLabel: "Free Info2",
@@ -287,11 +290,63 @@ export default {
           fixed: '',
           columnWidth: 120
         },{
+          userId: this.$store.state.user.name,
+          functionId: 10002,
+          serialNumber: '10002TableTradingMark',
+          tableId: "10002Table",
+          tableName: "Part Table",
+          columnProp: "tradingMark",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Trading Mark",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 10,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },{
+          userId: this.$store.state.user.name,
+          functionId: 10002,
+          serialNumber: '10002TablePackingWeight',
+          tableId: "10002Table",
+          tableName: "Part Table",
+          columnProp: "packingWeight",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Packing Weight",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 10,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },{
+          userId: this.$store.state.user.name,
+          functionId: 10002,
+          serialNumber: '10002TableWeightUM',
+          tableId: "10002Table",
+          tableName: "Part Table",
+          columnProp: "weightUmName",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Weight UM",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 10,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
+        {
           userId: this.$store.state.user.name,
           functionId: 10002,
           serialNumber: '10002TableActive',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "active",
           headerAlign: "center",
           align: "left",
@@ -308,7 +363,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableCreateBy',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "createBy",
           headerAlign: "center",
           align: "left",
@@ -325,7 +380,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableCreateTime',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "createTime",
           headerAlign: "center",
           align: "left",
@@ -342,7 +397,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableUpdateBy',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "updateBy",
           headerAlign: "center",
           align: "left",
@@ -359,7 +414,7 @@ export default {
           functionId: 10002,
           serialNumber: '10002TableUpdateTime',
           tableId: "10002Table",
-          tableName: "外部料号信息表",
+          tableName: "Part Table",
           columnProp: "updateTime",
           headerAlign: "center",
           align: "left",
@@ -803,6 +858,10 @@ export default {
     },
     handleSave(){
       if (this.savePartVisible){
+        if ((this.savePart.packingWeight || this.savePart.packingWeight == 0) && !this.savePart.weightUmId){
+          this.$message.warning('Please select Weight UM')
+          return
+        }
         this.$refs.savePartForm.validate((valid,obj) => {
           if (valid) {
             if (this.savePart.qtyPerCarton === 0){
@@ -817,7 +876,7 @@ export default {
             }
             saveExternalPart(params).then(({data})=>{
               if (data && data.code === 0){
-                this.selectExternalPartList()
+                this.handleSelectExternalPartPage()
                 this.savePartVisible = false
                 this.$message.success(data.msg)
               }else {
@@ -891,6 +950,10 @@ export default {
       }
     },
     handleUpdate(){
+      if ((this.savePart.packingWeight || this.savePart.packingWeight == 0) && !this.savePart.weightUmId){
+        this.$message.warning('Please select Weight UM')
+        return
+      }
       this.$refs.savePartForm.validate((valid,obj) => {
         if (valid) {
           if (this.savePart.qtyPerCarton === 0){
@@ -907,7 +970,7 @@ export default {
           }
           updateExternalPart(params).then(({data})=>{
             if (data && data.code === 0){
-              this.selectExternalPartList()
+              this.handleSelectExternalPartPage()
               this.savePartVisible = false
               this.$message.success(data.msg)
             }else {
@@ -1203,34 +1266,34 @@ export default {
     </el-tab-pane>
   </el-tabs>
 
-  <el-dialog v-drag :title="`Part`" :close-on-click-modal="false" @close="closeSavePart" width="600px" :visible.sync="savePartVisible">
+  <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="10">
-        <el-col :span="7">
+      <el-row :gutter="20">
+        <el-col :span="8">
           <el-form-item label="Part No" prop="partNo" :show-message="false">
             <el-input :readonly="savePart.site !== ''" :disabled="savePart.site !== ''" v-model="savePart.partNo"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="17">
+        <el-col :span="15">
           <el-form-item label="Part Description" prop="partDesc" :show-message="false">
             <el-input v-model="savePart.partDesc"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8">
           <el-form-item label="Part Category" prop="category" :show-message="false">
             <el-select v-model="savePart.category" placeholder="" style="width: 100%">
               <el-option :label="item.categoryName" :value="item.categoryValue" :key="item.id" v-for="item in partCategoryList"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="7">
           <el-form-item label="UM" prop="umId" :show-message="false">
-            <el-select v-model="savePart.umId" placeholder="" :show-message="false">
+            <el-select v-model="savePart.umId" placeholder="" :show-message="false" style="width: 100%">
               <el-option v-for="item in unitList" :key="item.umId" :label="item.umName" :value="item.umId"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="7" :offset="2">
+        <el-col :span="8">
           <el-form-item v-if="savePart.moldCodeRequired === 'Y'" key="moldCode" label="Mold Code" prop="moldCode" :show-message="false">
             <el-input v-model="savePart.moldCode"></el-input>
           </el-form-item>
@@ -1239,8 +1302,8 @@ export default {
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="10">
-        <el-col :span="7" v-if="category.rollLabelRequired === 'Y'">
+      <el-row :gutter="20">
+        <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" :disabled="this.savePart.serialNumberRequired === 'Y'" v-model="savePart.qtyPerRoll"></el-input-number>
           </el-form-item>
@@ -1250,40 +1313,51 @@ export default {
             <el-input-number :step="0" :min="0" :controls="false" :disabled="this.savePart.serialNumberRequired === 'Y'" v-model="savePart.rollsPerCarton"></el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+        <el-col :span="8">
           <el-form-item :label="category.qtyPerRollPart" prop="qtyPerCarton" :show-message="false">
             <el-input-number :step="0" :min="0" :controls="false" @change="changeQtyRollCarton" :disabled="category.editQtyPerCarton === 'N'" v-model="savePart.qtyPerCarton"></el-input-number>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="10">
+      <el-row :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="OOC" :show-message="false" prop="freeInfo2">
+            <el-select v-model="savePart.freeInfo2" placeholder="" style="width: 100%">
+              <el-option v-for="item in countryList" :label="item.countryNo" :value="item.countryNo" :key="item.countryNo"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="7">
           <el-form-item label="Rev No" prop="rev" :show-message="false">
             <el-input v-model="savePart.rev"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="17">
-<!--          <el-form-item label="Free Info1" :show-message="false">-->
-<!--            <el-input v-model="savePart.freeInfo"></el-input>-->
-<!--          </el-form-item>-->
+        <el-col :span="8">
           <el-form-item label="Free Info" :show-message="false">
             <el-input v-model="savePart.freeInfo"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="7">
+      </el-row>
+      <el-row :gutter="20">
+        <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>
           </el-form-item>
         </el-col>
-<!--        <el-col :span="17">-->
-<!--          <el-form-item label="Free Info2" :show-message="false">-->
-<!--            <el-input v-model="savePart.freeInfo2"></el-input>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
+        <el-col :span="5">
+          <el-form-item label=" " :show-message="false">
+            <el-checkbox v-model="savePart.tradingMark" true-label="Y" false-label="N">Trading Mark</el-checkbox>
+          </el-form-item>
+      </el-col>
         <el-col :span="7">
-          <el-form-item label="OOC" :show-message="false" prop="freeInfo2">
-            <el-select v-model="savePart.freeInfo2" placeholder="" style="width: 100%">
-              <el-option v-for="item in countryList" :label="item.countryNo" :value="item.countryNo" :key="item.countryNo"></el-option>
+          <el-form-item label="Packing Weight" prop="packingWeight">
+            <el-input-number :min="0" :controls="false" v-model="savePart.packingWeight" :precision="6"></el-input-number>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <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%">
+              <el-option v-for="item in unitList" :key="item.weightUmId" :label="item.umName" :value="item.umId"></el-option>
             </el-select>
           </el-form-item>
         </el-col>