20250218

src/views/modules/customer/info.vue

@@ -290,7 +290,7 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length === 0) {
+        if (data.rows.length > 0) {
           switch (columnId) {
             case 1:
               this.columnList = data.rows

src/views/modules/label/format.vue

@@ -379,7 +379,7 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length === 0) {
+        if (data.rows.length > 0) {
           this.caseTable(data.rows,columnId)
         } else {
 

src/views/modules/label/printer.vue

@@ -623,6 +623,13 @@ export default {
         this.$refs.uploadFile.clearFiles();
         this.importExcelLoading = false;
       }
+    },
+    printLoading(newVal,oldVal){
+      if (newVal === true){
+        setTimeout(()=>{
+          this.printLoading = false
+        },5000)
+      }
     }
   },
   methods:{
@@ -1062,7 +1069,7 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length === 0) {
+        if (data.rows.length > 0) {
           this.caseTable(data.rows,columnId)
         } else {
 
@@ -1110,6 +1117,7 @@ export default {
           return item.serialNumber
         }),
       }
+      this.printLoading = true;
       // 请求接口
       savePrintRollLabelRecord(params).then(({data})=>{
         if (data && data.code === 0) {
@@ -1159,8 +1167,10 @@ export default {
         }else {
           this.$message.warning(data.msg)
         }
+        this.printLoading = false;
       }).catch((error)=>{
         this.$message.error(error)
+        this.printLoading = false;
       })
     },
     loadQrCode(){
@@ -1378,6 +1388,10 @@ export default {
       });
     },
     handleSaveSerialNumber(){
+      if (this.serialNumberList.length === 0){
+        this.$message.warning("Please input Serial Number")
+        return
+      }
       this.serialNumberList = [...this.scanSerialNumberList]
       this.$message.success("success")
       this.serialNumberVisible = false

src/views/modules/label/record.vue

@@ -513,7 +513,7 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length === 0) {
+        if (data.rows.length > 0) {
           this.caseTable(data.rows,columnId)
         } else {
 

src/views/modules/label/roll.vue

@@ -489,7 +489,7 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length === 0) {
+        if (data.rows.length > 0) {
           this.caseTable(data.rows,columnId)
         } else {
 

src/views/modules/label/userDefault.vue

@@ -252,7 +252,7 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length === 0) {
+        if (data.rows.length > 0) {
           this.caseTable(data.rows,columnId)
         } else {
 

src/views/modules/manufacturer/manufacturerInformation.vue

@@ -66,7 +66,7 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="560px">
+    <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="420px">
       <el-form label-position="top" :model="modalData" :rules="rules" ref="saveForm">
         <el-row :gutter="10">
           <el-col :span="8">
@@ -183,13 +183,13 @@ export default {
       columnList: [
         {
           userId: this.$store.state.user.name,
-          functionId: 601008,
-          serialNumber: '601008Table1ManufacturerId',
-          tableId: '601008Table1',
-          tableName: '制造商信息表',
+          functionId: 20003,
+          serialNumber: '20003Table1ManufacturerId',
+          tableId: '20003Table1',
+          tableName: 'Manufacture Table',
           columnProp: 'manufacturerNo',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: 'Manufacturer No',
           columnHidden: false,
           columnImage: false,
@@ -201,9 +201,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 601008,
-          serialNumber: '601008Table1ManufacturerName',
-          tableId: '601008Table1',
+          functionId: 20003,
+          serialNumber: '20003Table1ManufacturerName',
+          tableId: '20003Table1',
           tableName: '制造商表',
           columnProp: 'manufacturerName',
           headerAlign: 'center',
@@ -218,10 +218,28 @@ export default {
           columnWidth: 120
         },
         {
-          functionId: 601008,
-          serialNumber: '601008Table1Active',
-          tableId: '601008Table1',
-          tableName: '制造商信息表',
+          userId: this.$store.state.user.name,
+          functionId: 20003,
+          serialNumber: '20003Table1ManufacturerCode',
+          tableId: '20003Table1',
+          tableName: 'Manufacture Table',
+          columnProp: 'manufacturerCode',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: 'Factory Code',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
+        {
+          functionId: 20003,
+          serialNumber: '20003Table1Active',
+          tableId: '20003Table1',
+          tableName: 'Manufacture Table',
           columnProp: 'active',
           headerAlign: 'center',
           align: 'center',
@@ -236,10 +254,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 601008,
-          serialNumber: '601008Table1CreateDate',
-          tableId: '601008Table1',
-          tableName: '制造商表',
+          functionId: 20003,
+          serialNumber: '20003Table1CreateDate',
+          tableId: '20003Table1',
+          tableName: 'Manufacture Table',
           columnProp: 'createDate',
           headerAlign: 'center',
           align: 'center',
@@ -254,10 +272,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 601008,
-          serialNumber: '601008Table1CreateBy',
-          tableId: '601008Table1',
-          tableName: '制造商表',
+          functionId: 20003,
+          serialNumber: '20003Table1CreateBy',
+          tableId: '20003Table1',
+          tableName: 'Manufacture Table',
           columnProp: 'createBy',
           headerAlign: 'center',
           align: 'center',
@@ -272,10 +290,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 601008,
-          serialNumber: '601008Table1UpdateDate',
-          tableId: '601008Table1',
-          tableName: '制造商表',
+          functionId: 20003,
+          serialNumber: '20003Table1UpdateDate',
+          tableId: '20003Table1',
+          tableName: 'Manufacture Table',
           columnProp: 'updateDate',
           headerAlign: 'center',
           align: 'center',
@@ -290,10 +308,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 601008,
-          serialNumber: '601008Table1UpdateBy',
-          tableId: '601008Table1',
-          tableName: '制造商表',
+          functionId: 20003,
+          serialNumber: '20003Table1UpdateBy',
+          tableId: '20003Table1',
+          tableName: 'Manufacture Table',
           columnProp: 'updateBy',
           headerAlign: 'center',
           align: 'center',
@@ -537,7 +555,7 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length === 0) {
+        if (data.rows.length > 0) {
           switch (columnId) {
             case 1:
               this.columnList = data.rows

src/views/modules/part/external.vue

@@ -1152,7 +1152,7 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length === 0) {
+        if (data.rows.length > 0) {
           this.caseTable(data.rows, columnId)
         } else {
 

src/views/modules/part/partCustomer.vue

@@ -96,9 +96,9 @@ export default {
       columnList:[
         {
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TablePartNo',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TablePartNo',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "partNo",
           headerAlign: "center",
@@ -113,9 +113,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TablePartDesc',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TablePartDesc',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "partDesc",
           headerAlign: "center",
@@ -131,9 +131,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableCustomerNo',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableCustomerNo',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "customerNo",
           headerAlign: "center",
@@ -148,9 +148,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableCustomerName',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableCustomerName',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "customerName",
           headerAlign: "center",
@@ -166,9 +166,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableRev',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableRev',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "rev",
           headerAlign: "center",
@@ -183,9 +183,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableCategory',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableCategory',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "category",
           headerAlign: "center",
@@ -201,9 +201,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableUmName',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableUmName',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "moldCode",
           headerAlign: "center",
@@ -218,9 +218,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableUmName',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableUmName',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "umName",
           headerAlign: "center",
@@ -236,9 +236,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableQtyPerRoll',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableQtyPerRoll',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "qtyPerRoll",
           headerAlign: "center",
@@ -253,9 +253,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableRollsPerCarton',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableRollsPerCarton',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "rollsPerCarton",
           headerAlign: "center",
@@ -270,9 +270,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableQtyPerCarton',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableQtyPerCarton',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "qtyPerCarton",
           headerAlign: "center",
@@ -288,9 +288,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableFreeInfo',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableFreeInfo',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "freeInfo",
           headerAlign: "center",
@@ -305,9 +305,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableFreeInfo2',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableFreeInfo2',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "freeInfo2",
           headerAlign: "center",
@@ -322,9 +322,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableTradingMark',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableTradingMark',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "tradingMark",
           headerAlign: "center",
@@ -339,9 +339,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TablePackingWeight',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TablePackingWeight',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "packingWeight",
           headerAlign: "center",
@@ -356,9 +356,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableWeightUM',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableWeightUM',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "weightUmName",
           headerAlign: "center",
@@ -374,9 +374,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableActive',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableActive',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "active",
           headerAlign: "center",
@@ -391,9 +391,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableCreateBy',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableCreateBy',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "createBy",
           headerAlign: "center",
@@ -408,9 +408,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableCreateTime',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableCreateTime',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "createTime",
           headerAlign: "center",
@@ -425,9 +425,9 @@ export default {
           columnWidth: 140
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableUpdateBy',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableUpdateBy',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "updateBy",
           headerAlign: "center",
@@ -442,9 +442,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004TableUpdateTime',
-          tableId: "10004Table",
+          functionId: 20004,
+          serialNumber: '20004TableUpdateTime',
+          tableId: "20004Table",
           tableName: "Part Table",
           columnProp: "updateTime",
           headerAlign: "center",
@@ -462,10 +462,10 @@ export default {
       manufacturerColumnList:[
         {
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004Table4ManufacturerNo',
-          tableId: "10004Table4",
-          tableName: "外部料号供应商信息表",
+          functionId: 20004,
+          serialNumber: '20004Table2ManufacturerNo',
+          tableId: "20004Table2",
+          tableName: "Manufacturer Table",
           columnProp: "manufacturerNo",
           headerAlign: "center",
           align: "left",
@@ -479,10 +479,10 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004Table4ManufacturerName',
-          tableId: "10004Table4",
-          tableName: "外部料号供应商信息表",
+          functionId: 20004,
+          serialNumber: '20004Table2ManufacturerName',
+          tableId: "20004Table2",
+          tableName: "Manufacturer Table",
           columnProp: "manufacturerName",
           headerAlign: "center",
           align: "left",
@@ -496,10 +496,10 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004Table4CreateTime',
-          tableId: "10004Table4",
-          tableName: "外部料号供应商信息表",
+          functionId: 20004,
+          serialNumber: '20004Table2CreateTime',
+          tableId: "20004Table2",
+          tableName: "Manufacturer Table",
           columnProp: "createTime",
           headerAlign: "center",
           align: "center",
@@ -513,10 +513,10 @@ export default {
           columnWidth: 140
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004Table4CreateBy',
-          tableId: "10004Table4",
-          tableName: "外部料号供应商信息表",
+          functionId: 20004,
+          serialNumber: '20004Table2CreateBy',
+          tableId: "20004Table2",
+          tableName: "Manufacturer Table",
           columnProp: "createBy",
           headerAlign: "center",
           align: "left",
@@ -530,10 +530,10 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004Table4UpdateTime',
-          tableId: "10004Table4",
-          tableName: "外部料号供应商信息表",
+          functionId: 20004,
+          serialNumber: '20004Table2UpdateTime',
+          tableId: "20004Table2",
+          tableName: "Manufacturer Table",
           columnProp: "updateTime",
           headerAlign: "center",
           align: "center",
@@ -547,10 +547,10 @@ export default {
           columnWidth: 140
         },{
           userId: this.$store.state.user.name,
-          functionId: 10004,
-          serialNumber: '10004Table4UpdateBy',
-          tableId: "10004Table4",
-          tableName: "外部料号供应商信息表",
+          functionId: 20004,
+          serialNumber: '20004Table2UpdateBy',
+          tableId: "20004Table2",
+          tableName: "Manufacturer Table",
           columnProp: "updateBy",
           headerAlign: "center",
           align: "left",
@@ -888,7 +888,7 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length === 0) {
+        if (data.rows.length > 0) {
           this.caseTable(data.rows,columnId)
         } else {
 
@@ -902,12 +902,6 @@ export default {
             this.columnList = list
             break;
           case 2:
-            this.pictureColumnList = list
-            break;
-          case 3:
-            this.customerColumnList = list
-            break;
-          case 4:
             this.manufacturerColumnList = list
             break;
         }
@@ -1073,10 +1067,8 @@ export default {
     // this.selectExternalPartList();
     this.handleSelectExternalPartAndCustomerPage();
     this.getUserSiteDefaultCountry();
-    this.getTableUserColumn("10004Table", 1)
-    this.getTableUserColumn("10004Table2", 2)
-    this.getTableUserColumn("10004Table3", 3)
-    this.getTableUserColumn("10004Table4", 4)
+    this.getTableUserColumn("20004Table", 1)
+    this.getTableUserColumn("20004Table2", 2)
   }
 }
 </script>

src/views/modules/part/partManufacturer.vue

@@ -96,9 +96,9 @@ export default {
       columnList:[
         {
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TablePartNo',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TablePartNo',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "partNo",
           headerAlign: "center",
@@ -113,9 +113,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TablePartDesc',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TablePartDesc',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "partDesc",
           headerAlign: "center",
@@ -131,9 +131,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableManufacturerNo',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableManufacturerNo',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "manufacturerNo",
           headerAlign: "center",
@@ -148,9 +148,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableManufacturerName',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableManufacturerName',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "manufacturerName",
           headerAlign: "center",
@@ -165,9 +165,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableRev',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableRev',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "rev",
           headerAlign: "center",
@@ -182,9 +182,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableCategory',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableCategory',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "category",
           headerAlign: "center",
@@ -200,9 +200,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableUmName',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableUmName',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "moldCode",
           headerAlign: "center",
@@ -217,9 +217,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableUmName',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableUmName',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "umName",
           headerAlign: "center",
@@ -235,9 +235,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableQtyPerRoll',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableQtyPerRoll',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "qtyPerRoll",
           headerAlign: "center",
@@ -252,9 +252,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableRollsPerCarton',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableRollsPerCarton',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "rollsPerCarton",
           headerAlign: "center",
@@ -269,9 +269,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableQtyPerCarton',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableQtyPerCarton',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "qtyPerCarton",
           headerAlign: "center",
@@ -287,9 +287,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableFreeInfo',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableFreeInfo',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "freeInfo",
           headerAlign: "center",
@@ -304,9 +304,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableFreeInfo2',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableFreeInfo2',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "freeInfo2",
           headerAlign: "center",
@@ -321,9 +321,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableTradingMark',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableTradingMark',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "tradingMark",
           headerAlign: "center",
@@ -338,9 +338,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TablePackingWeight',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TablePackingWeight',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "packingWeight",
           headerAlign: "center",
@@ -355,9 +355,9 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableWeightUM',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableWeightUM',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "weightUmName",
           headerAlign: "center",
@@ -373,9 +373,9 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableActive',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableActive',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "active",
           headerAlign: "center",
@@ -390,9 +390,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableCreateBy',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableCreateBy',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "createBy",
           headerAlign: "center",
@@ -407,9 +407,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableCreateTime',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableCreateTime',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "createTime",
           headerAlign: "center",
@@ -424,9 +424,9 @@ export default {
           columnWidth: 140
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableUpdateBy',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableUpdateBy',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "updateBy",
           headerAlign: "center",
@@ -441,9 +441,9 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005TableUpdateTime',
-          tableId: "10005Table",
+          functionId: 20005,
+          serialNumber: '20005TableUpdateTime',
+          tableId: "20005Table",
           tableName: "Part Table",
           columnProp: "updateTime",
           headerAlign: "center",
@@ -461,10 +461,10 @@ export default {
       customerColumnList:[
         {
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005Table3CustomerNo',
-          tableId: "10005Table3",
-          tableName: "外部料号客户信息表",
+          functionId: 20005,
+          serialNumber: '20005Table3CustomerNo',
+          tableId: "20005Table2",
+          tableName: "Customer Table",
           columnProp: "customerNo",
           headerAlign: "center",
           align: "left",
@@ -478,10 +478,10 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005Table3CustomerName',
-          tableId: "10005Table3",
-          tableName: "外部料号客户信息表",
+          functionId: 20005,
+          serialNumber: '20005Table2CustomerName',
+          tableId: "20005Table2",
+          tableName: "Customer Table",
           columnProp: "customerName",
           headerAlign: "center",
           align: "left",
@@ -495,10 +495,10 @@ export default {
           columnWidth: 120
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005Table3CreateTime',
-          tableId: "10005Table3",
-          tableName: "外部料号客户信息表",
+          functionId: 20005,
+          serialNumber: '20005Table2CreateTime',
+          tableId: "20005Table2",
+          tableName: "Customer Table",
           columnProp: "createTime",
           headerAlign: "center",
           align: "center",
@@ -512,10 +512,10 @@ export default {
           columnWidth: 140
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005Table3CreateBy',
-          tableId: "10005Table3",
-          tableName: "外部料号客户信息表",
+          functionId: 20005,
+          serialNumber: '20005Table2CreateBy',
+          tableId: "20005Table2",
+          tableName: "Customer Table",
           columnProp: "createBy",
           headerAlign: "center",
           align: "left",
@@ -529,10 +529,10 @@ export default {
           columnWidth: 80
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005Table3UpdateTime',
-          tableId: "10005Table3",
-          tableName: "外部料号客户信息表",
+          functionId: 20005,
+          serialNumber: '20005Table2UpdateTime',
+          tableId: "20005Table2",
+          tableName: "Customer Table",
           columnProp: "updateTime",
           headerAlign: "center",
           align: "center",
@@ -546,10 +546,10 @@ export default {
           columnWidth: 140
         },{
           userId: this.$store.state.user.name,
-          functionId: 10005,
-          serialNumber: '10005Table3UpdateBy',
-          tableId: "10005Table3",
-          tableName: "外部料号客户信息表",
+          functionId: 20005,
+          serialNumber: '20005Table2UpdateBy',
+          tableId: "20005Table2",
+          tableName: "Customer Table",
           columnProp: "updateBy",
           headerAlign: "center",
           align: "left",
@@ -887,7 +887,7 @@ export default {
         languageCode: this.$i18n.locale
       }
       await getTableDefaultListLanguage(queryTable).then(({data}) => {
-        if (!data.rows.length === 0) {
+        if (data.rows.length > 0) {
           this.caseTable(data.rows,columnId)
         } else {
 
@@ -901,14 +901,8 @@ export default {
             this.columnList = list
             break;
           case 2:
-            this.pictureColumnList = list
-            break;
-          case 3:
             this.customerColumnList = list
             break;
-          case 4:
-            this.manufacturerColumnList = list
-            break;
         }
       }
     },
@@ -1059,10 +1053,8 @@ export default {
     // this.selectExternalPartList();
     this.handleSelectExternalPartAndManufacturerPage();
     this.getUserSiteDefaultCountry();
-    this.getTableUserColumn("10005Table", 1)
-    this.getTableUserColumn("10005Table2", 2)
-    this.getTableUserColumn("10005Table3", 3)
-    this.getTableUserColumn("10005Table4", 4)
+    this.getTableUserColumn("20005Table", 1)
+    this.getTableUserColumn("20005Table2", 2)
   }
 }
 </script>