From f01bdc72f0452d30db87758cd84afbc0a6f17b0f Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Sun, 9 Feb 2025 01:42:54 +0800
Subject: [PATCH] =?UTF-8?q?2025.02.09=20=E6=96=87=E6=A1=A3=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main-sidebar.vue                    |   4 +-
 .../modules/eam/com_project_proof_record.vue  |  20 +-
 .../eam/eamBuDocumentListDefinition.vue       |   9 +
 .../modules/eam/eamDocumentTypeDefinition.vue |   8 +
 src/views/modules/eam/eamProjectInfo.vue      |  25 ++-
 .../modules/eam/eamProjectInfoForConfirm.vue  |  12 +-
 .../modules/eam/eamProjectInfoForProof.vue    |  13 +-
 .../modules/eam/eamProjectInfoForUploads.vue  |  18 +-
 src/views/modules/eam/eamProjectPartInfo.vue  |  54 +++--
 .../modules/partspare/inventorystock.vue      | 210 ++++++++++++++++++
 10 files changed, 325 insertions(+), 48 deletions(-)

diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index 8c49048..9d45932 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -7,9 +7,9 @@
         :collapse="sidebarFold"
         :collapseTransition="false"
         class="site-sidebar__menu">
-        <el-menu-item style=" padding-left: 15px;" class="menu">
+        <el-menu-item style=" padding-left: -5px;" class="menu">
           <span slot="title"> <el-input v-model="search" placeholder="搜索" class="custom-input"
-                                        @keyup.enter.native="searchMenu1" style="margin-left: -8px"></el-input></span>
+                                        @keyup.enter.native="searchMenu1" style="margin-left: -2px"></el-input></span>
           <i type="primary" class="el-icon-search" style="font-size: small" @click="searchMenu1()"></i>
         </el-menu-item>
         <el-menu-item index="home" @click="$router.push({ name: 'home' })">
diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue
index 877d617..eb23ac8 100644
--- a/src/views/modules/eam/com_project_proof_record.vue
+++ b/src/views/modules/eam/com_project_proof_record.vue
@@ -85,7 +85,7 @@
                     </span>
                   </template>
                 </el-table-column>
-                <el-table-column label="文档类型" align="center">
+                <el-table-column label="文档类型" align="left">
                   <template slot-scope="scope">
                     <span>
                       {{ getCombinedDocumentType(scope.row) }}
@@ -421,13 +421,13 @@
           <el-table-column
             prop="documentType"
             header-align="center"
-            align="center"
+            align="left"
             label="文档类型">
           </el-table-column>
           <el-table-column
             prop="responsibleDepartment"
             header-align="center"
-            align="center"
+            align="left"
             label="责任部门">
           </el-table-column>
         </el-table>
@@ -697,7 +697,7 @@
             tableName: '打样记录表',
             columnProp: 'proofingNo',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '打样单号',
             columnHidden: false,
             columnImage: false,
@@ -1008,7 +1008,7 @@
             tableName: "打样文档表",
             columnProp: 'projectLeader',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '文档负责人',
             columnHidden: false,
             columnImage: false,
@@ -1080,7 +1080,7 @@
             tableName: '打样文档表',
             columnProp: 'createdBy',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '上传人',
             columnHidden: false,
             columnImage: false,
@@ -2131,3 +2131,11 @@
   margin-bottom: 10px;
 }
 </style>
+
+<style lang="scss" scoped>
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
+```
diff --git a/src/views/modules/eam/eamBuDocumentListDefinition.vue b/src/views/modules/eam/eamBuDocumentListDefinition.vue
index 4df1bd0..46cd1a9 100644
--- a/src/views/modules/eam/eamBuDocumentListDefinition.vue
+++ b/src/views/modules/eam/eamBuDocumentListDefinition.vue
@@ -65,6 +65,7 @@
     </el-form>
 
     <el-table
+      @header-dragend="handleColumnResize"
       :height="height"
       :data="dataList"
       border
@@ -1026,3 +1027,11 @@
     text-decoration: none; /* 可选，去掉链接的下划线 */
   }
 </style>
+
+<style lang="scss" scoped>
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
+```
diff --git a/src/views/modules/eam/eamDocumentTypeDefinition.vue b/src/views/modules/eam/eamDocumentTypeDefinition.vue
index 966a7b7..eb1f3a9 100644
--- a/src/views/modules/eam/eamDocumentTypeDefinition.vue
+++ b/src/views/modules/eam/eamDocumentTypeDefinition.vue
@@ -800,3 +800,11 @@
     }
   }
 </script>
+
+<style lang="scss" scoped>
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
+```
diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue
index a675b7c..6fe06be 100644
--- a/src/views/modules/eam/eamProjectInfo.vue
+++ b/src/views/modules/eam/eamProjectInfo.vue
@@ -833,6 +833,7 @@
     <el-tabs style="height:100%; margin-top: 0px; width: 100%;"  v-model="activeName" class="customer-tab" type="border-card" @tab-click="tabClick">
       <el-tab-pane label="项目物料" name="projectPart">
         <el-table
+            @header-dragend="handleColumnResize"
             :data="projectPartList"
             border
             style="width: 100%;margin-top: 5px;"
@@ -1379,7 +1380,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 170,
           },
           {
             userId: this.$store.state.user.name,
@@ -1397,7 +1398,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 150,
           },
           {
             userId: this.$store.state.user.name,
@@ -1578,7 +1579,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 130,
           },
           {
             userId: this.$store.state.user.name,
@@ -1614,7 +1615,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 130,
           },
           {
             userId: this.$store.state.user.name,
@@ -1832,7 +1833,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 170,
           },
           {
             userId: this.$store.state.user.name,
@@ -1850,7 +1851,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 150,
           },
           {
             userId: this.$store.state.user.name,
@@ -2066,7 +2067,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 130,
           },
           {
             userId: this.$store.state.user.name,
@@ -2102,7 +2103,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 130,
           },
           {
             userId: this.$store.state.user.name,
@@ -4103,3 +4104,11 @@ import {updateColumnSize} from "../../../api/table";
   font-size: medium; /* 调整字号 */
 }
 </style>
+
+<style lang="scss" scoped>
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
+```
diff --git a/src/views/modules/eam/eamProjectInfoForConfirm.vue b/src/views/modules/eam/eamProjectInfoForConfirm.vue
index 8a97655..b78f44b 100644
--- a/src/views/modules/eam/eamProjectInfoForConfirm.vue
+++ b/src/views/modules/eam/eamProjectInfoForConfirm.vue
@@ -727,7 +727,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 170,
         },
         {
           userId: this.$store.state.user.name,
@@ -745,7 +745,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 150,
         },
         {
           userId: this.$store.state.user.name,
@@ -2099,3 +2099,11 @@ export default {
   margin: 10px 0;
 }
 </style>
+
+<style lang="scss" scoped>
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
+```
diff --git a/src/views/modules/eam/eamProjectInfoForProof.vue b/src/views/modules/eam/eamProjectInfoForProof.vue
index f8bc10e..dbe99e6 100644
--- a/src/views/modules/eam/eamProjectInfoForProof.vue
+++ b/src/views/modules/eam/eamProjectInfoForProof.vue
@@ -126,6 +126,7 @@
     </el-form>
 
     <el-table
+      @header-dragend="handleColumnResize"
       :data="dataList"
       border
       :height="height"
@@ -502,7 +503,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 170,
         },
         {
           userId: this.$store.state.user.name,
@@ -520,7 +521,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 150,
         },
         {
           userId: this.$store.state.user.name,
@@ -1599,3 +1600,11 @@ export default {
   margin: 10px 0;
 }
 </style>
+
+<style lang="scss" scoped>
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
+```
diff --git a/src/views/modules/eam/eamProjectInfoForUploads.vue b/src/views/modules/eam/eamProjectInfoForUploads.vue
index 6941034..bfaac2d 100644
--- a/src/views/modules/eam/eamProjectInfoForUploads.vue
+++ b/src/views/modules/eam/eamProjectInfoForUploads.vue
@@ -584,7 +584,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 170,
         },
         {
           userId: this.$store.state.user.name,
@@ -602,7 +602,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120,
+          columnWidth: 150,
         },
         {
           userId: this.$store.state.user.name,
@@ -1127,7 +1127,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 130
         },
         {
           userId: this.$store.state.user.name,
@@ -2510,8 +2510,8 @@ export default {
 };
 </script>
 
-<style>
-.row-production {
+<style lang="scss">
+.row-production{
   background-color: rgb(185, 244, 250) !important;
 }
 .card-item {
@@ -2561,3 +2561,11 @@ export default {
   margin: 10px 0;
 }
 </style>
+
+<style lang="scss" scoped>
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
+```
diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue
index 2e3b506..6480235 100644
--- a/src/views/modules/eam/eamProjectPartInfo.vue
+++ b/src/views/modules/eam/eamProjectPartInfo.vue
@@ -331,7 +331,7 @@
                       </span>
               </template>
             </el-table-column>
-            <el-table-column label="文档类型" align="center">
+            <el-table-column label="文档类型" align="left">
               <template slot-scope="scope">
                       <span>
                         {{ getCombinedDocumentType(scope.row) }}
@@ -385,7 +385,7 @@
                     </span>
             </template>
           </el-table-column>
-          <el-table-column label="文档类型" align="center">
+          <el-table-column label="文档类型" align="left">
             <template slot-scope="scope">
                     <span>
                       {{ getCombinedDocumentType(scope.row) }}
@@ -420,8 +420,8 @@
                         style="width: 100%;margin-top: -5px;"
                         :height="this.height + 95">
                 <el-table-column header-align="center" align="center" width="50" prop="itemNo" label="序号"></el-table-column>
-                <el-table-column header-align="center" align="center" prop="documentType" label="文档类型"></el-table-column>
-                <el-table-column header-align="center" align="center" prop="fileName" label="文件名"></el-table-column>
+                <el-table-column header-align="center" align="left" prop="documentType" label="文档类型"></el-table-column>
+                <el-table-column header-align="center" align="left" prop="fileName" label="文件名"></el-table-column>
                 <el-table-column
                   header-align="center"
                   align="center"
@@ -443,14 +443,14 @@
                         style="width: 100%;margin-top: -5px;"
                         :height="this.height + 95">
                 <el-table-column header-align="center" align="center" width="40" prop="itemNo" label="序号"></el-table-column>
-                <el-table-column header-align="center" align="center" width="70" prop="userDisplay" label="指定确认人"></el-table-column>
+                <el-table-column header-align="center" align="left" width="70" prop="userDisplay" label="指定确认人"></el-table-column>
                 <el-table-column header-align="center" align="center" :formatter="formatDate" prop="wantedConfirmDate" label="要求确认日期"></el-table-column>
                 <el-table-column header-align="center" align="center" prop="confirmFlag" label="是否确认"></el-table-column>
-                <el-table-column header-align="center" align="center" prop="confirmedBy" label="实际确认人"></el-table-column>
-                <el-table-column header-align="center" align="center" prop="remark" label="备注"></el-table-column>
+                <el-table-column header-align="center" align="left" prop="confirmedBy" label="实际确认人"></el-table-column>
+                <el-table-column header-align="center" align="left" prop="remark" label="备注"></el-table-column>
                 <el-table-column header-align="center" align="center" prop="confirmedDate" label="实际确认时间"></el-table-column>
                 <el-table-column header-align="center" align="center" prop="createDate" label="推送时间"></el-table-column>
-                <el-table-column header-align="center" align="center" prop="createBy" label="推送人"></el-table-column>
+                <el-table-column header-align="center" align="left" prop="createBy" label="推送人"></el-table-column>
                 <el-table-column
                   header-align="center"
                   align="center"
@@ -681,13 +681,13 @@
         <el-table-column
           prop="documentType"
           header-align="center"
-          align="center"
+          align="left"
           label="文档类型">
         </el-table-column>
         <el-table-column
           prop="responsibleDepartment"
           header-align="center"
-          align="center"
+          align="left"
           label="责任部门">
         </el-table-column>
       </el-table>
@@ -1932,7 +1932,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 170,
           },
           {
             userId: this.$store.state.user.name,
@@ -1950,7 +1950,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 150,
           },
           {
             userId: this.$store.state.user.name,
@@ -2166,7 +2166,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 130,
           },
           {
             userId: this.$store.state.user.name,
@@ -2202,7 +2202,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 130,
           },
           {
             userId: this.$store.state.user.name,
@@ -2269,7 +2269,7 @@ import {updateColumnSize} from "../../../api/table";
             tableName: "打样文档表",
             columnProp: 'projectLeader',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '文档负责人',
             columnHidden: false,
             columnImage: false,
@@ -2331,7 +2331,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120
+            columnWidth: 130
           },
           {
             userId: this.$store.state.user.name,
@@ -2341,7 +2341,7 @@ import {updateColumnSize} from "../../../api/table";
             tableName: '打样文档表',
             columnProp: 'createdBy',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '创建人',
             columnHidden: false,
             columnImage: false,
@@ -2415,7 +2415,7 @@ import {updateColumnSize} from "../../../api/table";
             tableName: "BU文档清单表",
             columnProp: 'estimatedCompletionDays',
             headerAlign: "center",
-            align: "left",
+            align: "right",
             columnLabel: '预计完成天数',
             columnHidden: false,
             columnImage: false,
@@ -2435,7 +2435,7 @@ import {updateColumnSize} from "../../../api/table";
             tableName: "BU文档清单表",
             columnProp: 'proofingNo',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '打样单号',
             columnHidden: false,
             columnImage: false,
@@ -2508,7 +2508,7 @@ import {updateColumnSize} from "../../../api/table";
             tableName: "打样文档表",
             columnProp: 'projectLeader',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '文档负责人',
             columnHidden: false,
             columnImage: false,
@@ -2580,7 +2580,7 @@ import {updateColumnSize} from "../../../api/table";
             tableName: '打样文档表',
             columnProp: 'createdBy',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '创建人',
             columnHidden: false,
             columnImage: false,
@@ -2618,7 +2618,7 @@ import {updateColumnSize} from "../../../api/table";
             tableName: "项目物料BOM表",
             columnProp: 'partNo2',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '物料编码',
             columnHidden: false,
             columnImage: false,
@@ -2692,7 +2692,7 @@ import {updateColumnSize} from "../../../api/table";
             tableName: "项目物料BOM表",
             columnProp: 'partNo2',
             headerAlign: "center",
-            align: "center",
+            align: "left",
             columnLabel: '物料编码',
             columnHidden: false,
             columnImage: false,
@@ -5653,3 +5653,11 @@ import {updateColumnSize} from "../../../api/table";
   font-size: medium; /* 调整字号 */
 }
 </style>
+
+<style lang="scss" scoped>
+.el-table /deep/ .cell{
+  height: auto;
+  line-height: 1.5;
+}
+</style>
+```
diff --git a/src/views/modules/partspare/inventorystock.vue b/src/views/modules/partspare/inventorystock.vue
index 3767bcb..c3b98f9 100644
--- a/src/views/modules/partspare/inventorystock.vue
+++ b/src/views/modules/partspare/inventorystock.vue
@@ -154,6 +154,7 @@ import {
 } from '@/api/partspare/wareHouseEntity.js'
 import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
 import {getAllBuList}from  '@/api/factory/site.js'
+import {getTableDefaultListLanguage, getTableUserListLanguage} from "../../../api/table";
 export default {
   data() {
     return {
@@ -200,6 +201,11 @@ export default {
       // 料号汇总
       arrayPart: [
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1BuDesc',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'buDesc',
           headerAlign: "center",
           align: "left",
@@ -213,6 +219,11 @@ export default {
           columnWidth: 80,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1PartNo',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'partNo',
           headerAlign: "center",
           align: "left",
@@ -226,6 +237,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1PartDescription',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'partDescription',
           headerAlign: "center",
           align: "left",
@@ -239,6 +255,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1WarehouseId',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'warehouseId',
           headerAlign: "center",
           align: "left",
@@ -251,6 +272,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1LocationId',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'locationId',
           headerAlign: "center",
           align: "left",
@@ -263,6 +289,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1InQty',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'inQty',
           headerAlign: "center",
           align: "right",
@@ -275,6 +306,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1OutQty',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'outQty',
           headerAlign: "center",
           align: "right",
@@ -287,6 +323,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1QtyOnHand',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'qtyOnHand',
           headerAlign: "center",
           align: "right",
@@ -299,6 +340,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1MaxStock',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'maxStock',
           headerAlign: "center",
           align: "right",
@@ -311,6 +357,12 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1MinStock',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'minStock',
           headerAlign: "center",
           align: "right",
@@ -323,6 +375,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         },{
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table1Spec',
+          tableId: '200101103Table1',
+          tableName: '库存信息汇总表',
           columnProp: 'spec',
           headerAlign: "center",
           align: "right",
@@ -338,6 +395,11 @@ export default {
       // 料号_序号
       arrayColumns: [
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2BuDesc',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'buDesc',
           headerAlign: "center",
           align: "left",
@@ -351,6 +413,11 @@ export default {
           columnWidth: 80,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2PartNo',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'partNo',
           headerAlign: "center",
           align: "left",
@@ -364,6 +431,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2PartDescription',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'partDescription',
           headerAlign: "center",
           align: "left",
@@ -377,6 +449,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2BatchNo',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'batchNo',
           headerAlign: "center",
           align: "left",
@@ -389,6 +466,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2WarehouseId',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'warehouseId',
           headerAlign: "center",
           align: "left",
@@ -401,6 +483,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2LocationId',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'locationId',
           headerAlign: "center",
           align: "left",
@@ -414,6 +501,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2Umid',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'umid',
           headerAlign: "center",
           align: "left",
@@ -427,6 +519,11 @@ export default {
           columnWidth: 100,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2AveragePrice',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'averagePrice',
           headerAlign: "center",
           align: "right",
@@ -440,6 +537,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2InQty',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'inQty',
           headerAlign: "center",
           align: "right",
@@ -452,6 +554,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2OutQty',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'outQty',
           headerAlign: "center",
           align: "right",
@@ -464,6 +571,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2QtyOnHand',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'qtyOnHand',
           headerAlign: "center",
           align: "right",
@@ -476,6 +588,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2MaxStock',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'maxStock',
           headerAlign: "center",
           align: "right",
@@ -488,6 +605,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2MinStock',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'minStock',
           headerAlign: "center",
           align: "right",
@@ -501,6 +623,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2TotalCost',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'totalCost',
           headerAlign: "center",
           align: "right",
@@ -514,6 +641,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2Spec',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'spec',
           headerAlign: "center",
           align: "left",
@@ -526,6 +658,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2PartnerId',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'partnerId',
           headerAlign: "center",
           align: "left",
@@ -538,6 +675,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101103,
+          serialNumber: '200101103Table2FirstInDate',
+          tableId: '200101103Table2',
+          tableName: '库存信息序号表',
           columnProp: 'firstInDate',
           headerAlign: "center",
           align: "left",
@@ -566,6 +708,13 @@ export default {
     }
   },
   activated() {
+    // this.getDataList()
+    // this.getWareHouseList()
+  },
+  created() {
+    // 动态列
+    this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+    this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
     this.getDataList()
     this.getWareHouseList()
   },
@@ -722,6 +871,67 @@ export default {
         }
       })
     },
+
+    // 动态列开始 获取 用户保存的 格式列
+    async getTableUserColumn(tableId, columnId) {
+      let queryTableUser = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        status: true,
+        languageCode: this.$i18n.locale
+      }
+      await getTableUserListLanguage(queryTableUser).then(({data}) => {
+        if (data.rows.length > 0) {
+          //this.columnList1 = []
+          switch (columnId) {
+            case 1:
+              this.arrayColumns = data.rows
+              break;
+            case 2:
+              this.arrayPart = data.rows
+              break;
+            // case 3:
+            //   this.columnList2 = data.rows
+            //   break;
+            // case 4:
+            //   this.columnList3 = data.rows
+            //   break;
+          }
+        } else {
+          this.getColumnList(tableId, columnId)
+        }
+      })
+    },
+
+    // 获取 tableDefault 列
+    async getColumnList (tableId, columnId) {
+      let queryTable= {
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        languageCode: this.$i18n.locale
+      }
+      await getTableDefaultListLanguage(queryTable).then(({data}) => {
+        if (!data.rows.length == 0) {
+          switch (columnId) {
+            case 1:
+                this.arrayColumns = data.rows
+                break;
+            case 2:
+              this.arrayPart = data.rows
+              break;
+            // case 3:
+            //   this.columnList2 = data.rows
+            //   break;
+            // case 4:
+            //   this.columnList3 = data.rows
+            //   break;
+          }
+        } else {
+          // this.showDefault = true.
+        }
+      })
+    },
   }
 }
 </script>